From 11cbff75d8b18ce599a05cbb4d84cec104583358 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Thu, 20 Jun 2024 16:28:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/SjztMdClientImpl.java | 16 +++--
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeInvestigationController.java | 1
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/SzInfo.java | 5 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml | 4
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbDykeInvestigationServiceImpl.java | 24 ++++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/OverWord.java | 72 +++++++++++++----------
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.xml | 4
7 files changed, 84 insertions(+), 42 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.xml
index 99f3676..8e978c0 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.xml
@@ -25,10 +25,10 @@
and sst.content like concat('%',#{smsResult.templateContent},'%')
</if>
<if test="smsResult.startTime!=null and smsResult.startTime!=''">
- and date_format(ssr.create_time,'%Y-%m-%d') >= #{smsResult.startTime}
+ and ssr.create_time >= #{smsResult.startTime}
</if>
<if test="smsResult.endTime!=null and smsResult.endTime!=''">
- and date_format(ssr.create_time,'%Y-%m-%d') <= #{smsResult.endTime}
+ and ssr.create_time <= #{smsResult.endTime}
</if>
<if test="smsResult.smsType!=null and smsResult.smsType!=''">
and sst.sms_type = #{smsResult.smsType}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml
index 0ee42df..14a2b24 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml
@@ -917,10 +917,10 @@
where 1=1
<if test="callTaskResult.startTime!=null and callTaskResult.startTime!=''">
and ct."scene_id" = 228
- and date_format(ctr."gmt_create",'%Y-%m-%d') >= #{callTaskResult.startTime}
+ and ctr."gmt_create" >= #{callTaskResult.startTime}
</if>
<if test="callTaskResult.endTime!=null and callTaskResult.endTime!=''">
- and date_format(ctr."gmt_create",'%Y-%m-%d') <= #{callTaskResult.endTime}
+ and ctr."gmt_create" <= #{callTaskResult.endTime}
</if>
<if test="list != null and list.size()>0">
and ctr."task_id" in
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeInvestigationController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeInvestigationController.java
index 034863e..e840d41 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeInvestigationController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbDykeInvestigationController.java
@@ -105,6 +105,7 @@
// if (tbDykeInvestigation.getGuid() == null) {
tbDykeInvestigation.setCreateTime(new Date());
// }
+
return tbDykeInvestigationService.saveOrUpdateBy(tbDykeInvestigation);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/SjztMdClientImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/SjztMdClientImpl.java
index 7d08d98..ec51071 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/SjztMdClientImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/SjztMdClientImpl.java
@@ -32,6 +32,7 @@
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.HashMap;
@@ -65,21 +66,22 @@
//短信预警数量
SmsResultVO vo = new SmsResultVO();
// 获取当前日期
- LocalDate today = LocalDate.now();
+ LocalDateTime now = LocalDateTime.now();
// 获取前一天日期
- LocalDate yesterday = today.minusDays(1);
+ LocalDateTime oneDayBefore = now.minusDays(1);
// 格式化日期并打印
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- vo.setStartTime(yesterday.format(formatter));
- vo.setEndTime(yesterday.format(formatter));
+ // 定义日期时间格式，包含年-月-日 时:分:秒
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ vo.setStartTime(oneDayBefore.format(formatter));
+ vo.setEndTime(now.format(formatter));
vo.setSmsType("2");
vo.setResCode("0");
List<SmsResultVO> dxyjList = smsRecordClient.smsSuccessList(vo);
//外呼统计
CallTaskResultVO callTaskResult = new CallTaskResultVO();
- callTaskResult.setStartTime(yesterday.format(formatter));
- callTaskResult.setEndTime(yesterday.format(formatter));
+ callTaskResult.setStartTime(oneDayBefore.format(formatter));
+ callTaskResult.setEndTime(now.format(formatter));
List<CallTaskResultVO> whtjList = (List<CallTaskResultVO>) callService.getCallResultListTemp(null, callTaskResult);
HashMap<String, String> over10Params = new HashMap<>();
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbDykeInvestigationServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbDykeInvestigationServiceImpl.java
index 092991c..404fdde 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbDykeInvestigationServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbDykeInvestigationServiceImpl.java
@@ -74,6 +74,18 @@
entity.setTbStateId(state.getGuid());
// return R.status(this.saveOrUpdate(entity));
+
+ // 如果有危害，设置危害长度只留一个
+ if (entity.getHazardRating().equals("有危害")) {
+ QueryWrapper qw = new QueryWrapper();
+ qw.eq("\"dyke_guid\"",entity.getDykeGuid());
+ qw.eq("\"unit\"",entity.getUnit());
+ long count = count(qw);
+ if (count > 0) {
+ entity.setDangerLength(0D);
+ }
+ }
+
this.saveOrUpdate(entity);
return R.data(entity);
}
@@ -111,6 +123,7 @@
// delete.eq("\"tb_state_id\"",state.getGuid());
// boolean remove = remove(delete);
+ String lengStr = "";//处理危害长度问题
for (int i = 0; i < list.size(); i++) {
TbDykeInvestigation tbDykeInvestigation = list.get(i);
//id清空方便批量新增
@@ -126,6 +139,17 @@
//设置状态表id
tbDykeInvestigation.setTbStateId(state.getGuid());
+
+
+ //处理危害长度
+ if (tbDykeInvestigation.getHazardRating().equals("有危害")) {
+ if (lengStr.indexOf(tbDykeInvestigation.getUnit()) > -1) {
+ tbDykeInvestigation.setDangerLength(0D);
+ }
+ }
+
+ lengStr = lengStr + tbDykeInvestigation.getUnit();
+
}
return R.status(saveOrUpdateBatch(list));
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/OverWord.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/OverWord.java
index a9f7fef..f0c14f3 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/OverWord.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/OverWord.java
@@ -46,7 +46,7 @@
private String smsResultInfo;
- public OverWord(List<TotalInfo> totalList, List<DzkInfo> dzkList, List<OverDetail> overDetailList, List<SzInfo> szInfoList, List<SmsResultVO> resultVOList, List<CallTaskResultVO> whtjList,String isNew) {
+ public OverWord(List<TotalInfo> totalList, List<DzkInfo> dzkList, List<OverDetail> overDetailList, List<SzInfo> szInfoList, List<SmsResultVO> resultVOList, List<CallTaskResultVO> whtjList, String isNew) {
this.tm = new SimpleDateFormat("MM月dd日H时").format(new Date());
this.hour = new SimpleDateFormat("H时").format(new Date());
@@ -75,7 +75,7 @@
cityNames = cityNames + callTaskResultVO.getCityName();
} else {
//如果存在不添加
- if (cityNames.indexOf(callTaskResultVO.getCityName()) < 0 && cityNameIndex <4) {
+ if (cityNames.indexOf(callTaskResultVO.getCityName()) < 0 && cityNameIndex < 4) {
cityNames = cityNames + "、" + callTaskResultVO.getCityName();
cityNameIndex = cityNameIndex + 1;
}
@@ -88,9 +88,11 @@
}
}
- double jtl = Double.valueOf(jtCount) / whtjList.size() * 100;
+
+ double whtjCount = whtjList.size() > 0 ? whtjList.size() : 1;
+ double jtl = Double.valueOf(jtCount) / whtjCount * 100;
String str = StringUtil.format("过去24小时内，发送水库短信预警{}条，抽查{}等水库防汛责任人{}人次，应答率{}，责任人履职情况总体较好。",
- dxyjCount,cityNames,whtjList.size(),String.format("%.2f", jtl) + "%");
+ dxyjCount, cityNames, whtjList.size(), String.format("%.2f", jtl) + "%");
this.smsResultInfo = str;
}
@@ -263,33 +265,41 @@
String control_z = "";
String wat_shed_area = "";
- switch (resNm) {
- case "高关水库":
- flse_lim_stag = "118";
- control_z = "117";
- wat_shed_area = "303";
- break;
- case "王英水库":
- flse_lim_stag = "70";
- control_z = "67";
- wat_shed_area = "243";
- break;
- case "吴岭水库":
- flse_lim_stag = "62.20";
- control_z = "";
- wat_shed_area = "102";
- break;
- case "富水水库":
- flse_lim_stag = "57";
- control_z = "55";
- wat_shed_area = "2450";
- break;
- case "漳河水库":
- flse_lim_stag = "122.6";
- control_z = "122";
- wat_shed_area = "2212";
- break;
- }
+ if (null != szInfo.getFlse_lim_stag())
+ flse_lim_stag = String.valueOf(szInfo.getFlse_lim_stag());
+ if (null != szInfo.getControl_z())
+ control_z = String.valueOf(szInfo.getControl_z());
+ if (null != szInfo.getWat_shed_area())
+ wat_shed_area = String.valueOf(szInfo.getWat_shed_area());
+
+ // 之前临时处理逻辑 --2024-06-20去除--
+// switch (resNm) {
+// case "高关水库":
+// flse_lim_stag = "118";
+// control_z = "117";
+// wat_shed_area = "";
+// break;
+// case "王英水库":
+// flse_lim_stag = "70";
+// control_z = "67";
+// wat_shed_area = "";
+// break;
+// case "吴岭水库":
+// flse_lim_stag = "62.20";
+// control_z = "";
+// wat_shed_area = "102";
+// break;
+// case "富水水库":
+// flse_lim_stag = "55";
+// control_z = "54";
+// wat_shed_area = "";
+// break;
+// case "漳河水库":
+// flse_lim_stag = "122.6";
+// control_z = "121.8";
+// wat_shed_area = "";
+// break;
+// }
List<String> detailList = new ArrayList<>();
if (StringUtil.isNotBlank(flse_lim_stag)) {
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/SzInfo.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/SzInfo.java
index a291104..e5741d5 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/SzInfo.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/SzInfo.java
@@ -23,4 +23,9 @@
//水位差值
private Double diff_rz;
+
+ private Double flse_lim_stag;//汛限水位
+ private Double control_z;//控制水位
+ private Double wat_shed_area;//集雨面积
+
}
--
Gitblit v1.9.3