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/word/vo/OverWord.java | 72 ++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 31 deletions(-)
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)) {
--
Gitblit v1.9.3