From cf119adeab46dcc843c4c7b28a719a0c027d7c88 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 26 Jul 2024 15:13:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml | 2
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java | 16 +
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java | 121 +++++++++----
skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/mapper/TextualResearchAttachMapper.xml | 120 +++++++------
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/TbWordVO.java | 35 ++-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/AttResBaseVO.java | 1
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml | 28 +++
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java | 73 +++-----
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterBlock.java | 2
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/entity/ReportFloodRecord.java | 24 ++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml | 15 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java | 82 ++++++--
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/resources/word/doc/skcgmb.docx | 0
13 files changed, 344 insertions(+), 175 deletions(-)
diff --git a/skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/mapper/TextualResearchAttachMapper.xml b/skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/mapper/TextualResearchAttachMapper.xml
index 69a0a83..13cebc7 100644
--- a/skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/mapper/TextualResearchAttachMapper.xml
+++ b/skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/mapper/TextualResearchAttachMapper.xml
@@ -29,64 +29,67 @@
<select id="getSyLackAlertList" resultMap="vo">
- SELECT
- info.res_cd,
- info.res_nm,
- info.town_cd,
- info.town_nm,
- info.county_cd,
- info.county_nm,
- info.city_cd,
- info.city_nm,
- info.typeList as type
+ SELECT info.res_cd,
+ info.res_nm,
+ info.town_cd,
+ info.town_nm,
+ info.county_cd,
+ info.county_nm,
+ info.city_cd,
+ info.city_nm,
+ info.typeList as type
- FROM (
- SELECT
- basic."guid" res_cd,
- basic."name" res_nm,
- basic.townCode town_cd,
- basic.townName town_nm,
- basic.countyCode county_cd,
- basic.countyName county_nm,
- basic.cityCode city_cd,
- basic.cityName city_nm,
- LISTAGG(basic.type, ',') WITHIN GROUP (ORDER BY basic.type ASC) typeList from (
- SELECT
- distinct
- arb."guid",arb."name",
- stra.type,
- case when town."ad_grad" = 4 THEN town."ad_code" ELSE NULL END AS townCode,
- case when town."ad_grad" = 4 THEN town."ad_name" ELSE NULL END AS townName,
- case
- when town."ad_grad" = 3 THEN town."ad_code"
- when county."ad_grad" = 3 THEN county."ad_code" END AS countyCode,
- case
- when town."ad_grad" = 3 THEN town."ad_name"
- when county."ad_grad" = 3 THEN county."ad_name" END AS countyName,
- case
- when town."ad_grad" = 2 THEN town."ad_code"
- when county."ad_grad" = 2 THEN county."ad_code"
- ELSE city."ad_code" END AS cityCode,
- case
- when town."ad_grad" = 2 THEN town."ad_name"
- when county."ad_grad" = 2 THEN county."ad_name"
- ELSE city."ad_name" END AS cityName
- FROM SJZT_MD."att_res_base" arb
- LEFT JOIN SJZT_MD."att_ad_base" town ON town."ad_code" = arb."interior_ad_guid"
- LEFT JOIN SJZT_MD."att_ad_base" county ON county."ad_code" = town."p_ad_code"
- LEFT JOIN SJZT_MD."att_ad_base" city ON city."ad_code" = county."p_ad_code"
- LEFT JOIN YWXT.SM_TEXTUAL_RESEARCH_ATTACH STRA ON STRA.RES_GUID = arb."guid" and (stra.type = 2 or stra.type = 3 or stra.type = 8 or stra.type = 11 or stra.type = 12)
- )basic
- group by basic."guid",basic."name",
- basic.townCode,basic.townName,
- basic.countyCode,basic.countyName,
- basic.cityCode,basic.cityName
- )info
- where info.typeList != '2,3,8,11,12' or info.typeList is null
+ FROM (SELECT basic."guid" res_cd,
+ basic."name" res_nm,
+ basic.townCode town_cd,
+ basic.townName town_nm,
+ basic.countyCode county_cd,
+ basic.countyName county_nm,
+ basic.cityCode city_cd,
+ basic.cityName city_nm,
+ LISTAGG(basic.type, ',') WITHIN GROUP (ORDER BY basic.type ASC) typeList
+ from (
+ select
+
+ distinct
+ arb."guid", arb."name",
+ stra.type,
+ case when town."ad_grad" = 4 THEN town."ad_code" ELSE NULL END AS townCode,
+ case when town."ad_grad" = 4 THEN town."ad_name" ELSE NULL END AS townName,
+ case
+ when town."ad_grad" = 3 THEN town."ad_code"
+ when county."ad_grad" = 3 THEN county."ad_code" END AS countyCode,
+ case
+ when town."ad_grad" = 3 THEN town."ad_name"
+ when county."ad_grad" = 3 THEN county."ad_name" END AS countyName,
+ case
+ when town."ad_grad" = 2 THEN town."ad_code"
+ when county."ad_grad" = 2 THEN county."ad_code"
+ ELSE city."ad_code" END AS cityCode,
+ case
+ when town."ad_grad" = 2 THEN town."ad_name"
+ when county."ad_grad" = 2 THEN county."ad_name"
+ ELSE city."ad_name" END AS cityName
+
+ from (
+ select arb.* from (
+ select distinct "res_cd" from sjzt_md."att_cd_base" where "cd_type" = 'sy' and "res_cd" is not null
+ ) a
+ left join SJZT_MD."att_res_base" arb on (a."res_cd" = arb."guid")
+ ) arb
+ LEFT JOIN SJZT_MD."att_ad_base" town ON town."ad_code" = arb."interior_ad_guid"
+ LEFT JOIN SJZT_MD."att_ad_base" county ON county."ad_code" = town."p_ad_code"
+ LEFT JOIN SJZT_MD."att_ad_base" city ON city."ad_code" = county."p_ad_code"
+ LEFT JOIN YWXT.SM_TEXTUAL_RESEARCH_ATTACH STRA ON STRA.RES_GUID = arb."guid" and (stra.type = 2 or stra.type = 3 or stra.type = 8 or stra.type = 11 or stra.type = 12)
+ ) basic
+ group by basic."guid", basic."name",
+ basic.townCode, basic.townName,
+ basic.countyCode, basic.countyName,
+ basic.cityCode, basic.cityName) info
+ where info.typeList != '2,3,8,11,12' or info.typeList is null order by info.res_cd
</select>
<select id="getWyLackAlertList" resultMap="vo">
-
- SELECT
+ select
distinct
arb."guid" res_cd,
arb."name" res_nm,
@@ -107,7 +110,12 @@
when county."ad_grad" = 2 THEN county."ad_name"
ELSE city."ad_name" END AS city_nm,
stra.type
- from sjzt_md."att_res_base" arb
+ from (
+ select * from (
+ select distinct "res_cd" from sjzt_md."att_wy_cd_base" awcb
+ ) a
+ left join sjzt_md."att_res_base" arb on (a."res_cd" = arb."guid")
+ ) arb
LEFT JOIN SJZT_MD."att_ad_base" town ON town."ad_code" = arb."interior_ad_guid"
LEFT JOIN SJZT_MD."att_ad_base" county ON county."ad_code" = town."p_ad_code"
LEFT JOIN SJZT_MD."att_ad_base" city ON city."ad_code" = county."p_ad_code"
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java
index c4cc1e7..05677e7 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java
@@ -32,4 +32,20 @@
private List<Long> projectIds;
private String startTime;
private String endTime;
+ /**
+ * 工程规模
+ */
+ private String engScal;
+
+ /**
+ * 水库编码
+ */
+ private String resCd;
+
+ /**
+ * 是否开工 1开工 2未开工
+ */
+ private Integer isBegin;
+
+
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java
index d9df36b..d9e4e43 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java
@@ -16,6 +16,7 @@
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
+import java.time.LocalTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -63,6 +64,9 @@
list.add(alarmRecord.getId().toString());
}
}
+
+ if (!isTimeSend()) return;
+
// 调用短信服务
smsService.sendMergeSignMsg(smsRequestTemplate);
}
@@ -113,6 +117,8 @@
list.add(alarmRecord.getId().toString());
}
}
+
+ if (!isTimeSend()) return map;
// 调用短信服务
map = smsService.sendSignMsg(smsRequestTemplate);
// 返回
@@ -165,6 +171,8 @@
list.add(alarmRecord.getId().toString());
}
}
+
+ if(!isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -215,6 +223,9 @@
list.add(alarmRecord.getId().toString());
}
}
+
+ if (!isTimeSend()) return map;
+
// 调用短信服务
map = smsService.sendSignMsg(smsRequestTemplate);
return map;
@@ -269,6 +280,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
// 调用短信服务
map = smsService.sendSignMsg(smsRequestTemplate);
return map;
@@ -322,6 +334,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
// 调用短信服务
map = smsService.sendSignMsg(smsRequestTemplate);
return map;
@@ -375,6 +388,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
// 调用短信服务
map = smsService.sendSignMsg(smsRequestTemplate);
return map;
@@ -426,6 +440,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
// 调用短信服务
// map = smsService.sendSignMsg(smsRequestTemplate);
return map;
@@ -472,6 +487,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -518,6 +534,8 @@
list.add(alarmRecord.getId().toString());
}
}
+
+ if(!isTimeSend()) return map;
List<String> list = noticeHandle.createOutCallTaskByAlarm(smsRequestTemplate);
map.put("list", list);
// 调用短信服务
@@ -564,6 +582,8 @@
list.add(alarmRecord.getId().toString());
}
}
+
+ if (!isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -616,6 +636,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -660,6 +681,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -712,6 +734,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -755,6 +778,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -807,6 +831,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -858,6 +883,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -906,6 +932,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -955,6 +982,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1007,6 +1035,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1050,6 +1079,7 @@
list.add(alarmRecord.getId().toString());
}
}
+ if (!isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1093,7 +1123,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsgMergeCd(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1122,7 +1152,7 @@
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
@@ -1146,7 +1176,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 需要合并水库保存站内信记录信息
noticeHandle.saveInStationInfoMerge(smsRequestTemplate, alarmRule);
}
@@ -1170,7 +1200,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsgMergeCd(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1196,7 +1226,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1236,7 +1266,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1274,7 +1304,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1312,7 +1342,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
// map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1349,7 +1379,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1382,7 +1412,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1422,7 +1452,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1456,7 +1486,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1494,7 +1524,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1528,7 +1558,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1568,7 +1598,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1613,7 +1643,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1674,7 +1704,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1712,7 +1742,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1765,7 +1795,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1803,7 +1833,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1848,7 +1878,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1886,7 +1916,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -1933,7 +1963,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -1971,7 +2001,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -2017,7 +2047,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -2063,7 +2093,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -2109,7 +2139,7 @@
list.add(alarmRecord.getId().toString());
}
}
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -2150,7 +2180,7 @@
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -2189,7 +2219,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -2229,7 +2259,7 @@
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsg(smsRequestTemplate);
// 调用短信服务
return map;
@@ -2275,7 +2305,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
@@ -2307,7 +2337,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfoMergeNoCd(smsRequestTemplate, alarmRule);
}
@@ -2341,7 +2371,7 @@
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfoMergeVideo(smsRequestTemplate, alarmRule);
}
@@ -2361,7 +2391,7 @@
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 调用短信服务
smsService.sendMergeSignMsg(smsRequestTemplate);
}
@@ -2389,7 +2419,7 @@
}
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return map;
+ if (isDay.equals("day") || !isTimeSend()) return map;
map = smsService.sendSignMsgMergeCdVideo(smsRequestTemplate);
// 调用短信服务
return map;
@@ -2442,9 +2472,28 @@
}
//如果参数是day，表示是每天生成告警，不需要发信息
- if (isDay.equals("day")) return;
+ if (isDay.equals("day") || !isTimeSend()) return;
// 保存站内信记录信息
noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
}
}
+
+ /**
+ * 是否在时间范围内发送
+ * @return
+ */
+ private boolean isTimeSend(){
+ boolean flag = false;
+ // 判断时间范围
+ // 开始时间
+ LocalTime startTime = LocalTime.parse("08:00");
+ // 结束时间
+ LocalTime endTime = LocalTime.parse("22:00");
+ // 当前时间
+ LocalTime now = LocalTime.now();
+ // 比较
+ flag = !now.isBefore(startTime) && !now.isAfter(endTime);
+ // 返回
+ return flag;
+ }
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java
index e1307a4..95915dd 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java
@@ -186,7 +186,7 @@
// 遍历
for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
// 电话，站内信需满足规定时间范围内才发送
- if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
asyncNoticeHandle.waterComeOverHandle(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.waterComeOverList, true, adCode, true);
}
}
@@ -360,7 +360,7 @@
// asyncNoticeHandle.outCallHandleCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterComeDesignList2,true, adCode, false,uuid);
// }
// 电话，站内信需满足规定时间范围内才发送
- if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
asyncNoticeHandle.waterComeDesignHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.waterComeDesignList3, true, adCode, true, uuid);
}
}
@@ -647,7 +647,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.sixHourRainHandle(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.sixHourRainList, false, adCode, false, uuid);
}
- if (alarmRuleDetail.getAlarmMode().equals("电话") && isTimeSend()) {
+ if (alarmRuleDetail.getAlarmMode().equals("电话")) {
asyncNoticeHandle.outCallHandleCall(alarmRule, alarmRuleDetail, whztData,ZtApiDataColumnConstant.sixHourRainList,false, adCode, false,uuid);
}
}
@@ -680,7 +680,7 @@
if (alarmRuleDetailList.size() > 0) {
// 遍历
for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
- if (alarmRuleDetail.getAlarmMode().equals("短信") && isTimeSend()) {
+ if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetyHandle(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.damSafetyList, true, adCode, false, uuid,arg2);
}
}
@@ -716,7 +716,7 @@
if (alarmRuleDetailList.size() > 0) {
// 遍历
for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
- if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
asyncNoticeHandle.damSafetySyHandle(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetySyList, true, adCode, true, uuid,arg2);
}
}
@@ -754,7 +754,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetyHandle(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
asyncNoticeHandle.damSafetySyNoneHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, true, uuid,arg2);
}
}
@@ -790,7 +790,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetyHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
asyncNoticeHandle.damSafetySyNoneHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, true, uuid,arg2);
}
}
@@ -826,7 +826,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetyHandle(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
asyncNoticeHandle.damSafetySyNoneHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, true, uuid,arg2);
}
}
@@ -861,7 +861,7 @@
if (alarmRuleDetailList.size() > 0) {
// 遍历
for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
- if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
asyncNoticeHandle.damSafetySyDataMissingHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syDataMissingList, false, adCode, true, uuid,arg2);
}
if (alarmRuleDetail.getAlarmMode().equals("短信")){
@@ -897,7 +897,7 @@
if (alarmRuleDetailList.size() > 0) {
// 遍历
for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
- if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
asyncNoticeHandle.damSafetySyDataMissingHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.bxDataMissingList, false, adCode, true, uuid,arg2);
}
if (alarmRuleDetail.getAlarmMode().equals("短信")){
@@ -938,7 +938,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetySyLessThenPipeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syLessThenPipe, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
asyncNoticeHandle.damSafetySyLessThenPipeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syLessThenPipe, true, adCode, true, uuid,arg2);
}
}
@@ -980,7 +980,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetySyHigherThenNozzleHandleSms(alarmRule, alarmRuleDetail, resultData,ZtApiDataColumnConstant.syHigherThenNozzle,true, adCode, false,uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
asyncNoticeHandle.damSafetySyHigherThenNozzleHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenNozzle, true, adCode, true, uuid,arg2);
}
}
@@ -1020,7 +1020,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetySyHigherThenBdElevationHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenBdElevation, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
asyncNoticeHandle.damSafetySyHigherThenBdElevationHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenBdElevation, true, adCode, true, uuid,arg2);
}
}
@@ -1058,7 +1058,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetySyHigherThenWaterLevelHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenWaterLevel, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
asyncNoticeHandle.damSafetySyHigherThenWaterLevelHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenWaterLevel, true, adCode, true, uuid,arg2);
}
}
@@ -1100,7 +1100,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetySyYellowChangeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syYellowRzChange, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
asyncNoticeHandle.damSafetySyYellowChangeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syYellowRzChange, true, adCode, true, uuid,arg2);
}
}
@@ -1139,7 +1139,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetySyOrangeChangeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syOrangeRzChange, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
asyncNoticeHandle.damSafetySyOrangeChangeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syOrangeRzChange, true, adCode, true, uuid,arg2);
}
}
@@ -1178,7 +1178,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetySyRedChangeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syRedRzChange, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
asyncNoticeHandle.damSafetySyRedChangeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syRedRzChange, true, adCode, true, uuid,arg2);
}
}
@@ -1216,7 +1216,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetySyRz1hChangeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syRz1hChange, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
asyncNoticeHandle.damSafetySyRz1hChangeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syRz1hChange, true, adCode, true, uuid,arg2);
}
}
@@ -1255,7 +1255,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetyWyOver2Less5HandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver2Less5, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
asyncNoticeHandle.damSafetyWyOver2Less5HandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver2Less5, true, adCode, true, uuid,arg2);
}
}
@@ -1296,7 +1296,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetyWyOver5Less10HandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver5Less10, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
asyncNoticeHandle.damSafetyWyOver5Less10HandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver5Less10, true, adCode, true, uuid,arg2);
}
}
@@ -1338,7 +1338,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetyWyOver10HandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver10, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
asyncNoticeHandle.damSafetyWyOver10HandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver10, true, adCode, true, uuid,arg2);
}
}
@@ -1377,7 +1377,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetyWy1hChangeOver10HandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
asyncNoticeHandle.damSafetyWy1hChangeOver10HandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, true, uuid,arg2);
}
}
@@ -1419,7 +1419,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetySlOverLessHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.slOverLess, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
asyncNoticeHandle.damSafetySlOverLessHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.slOverLess, true, adCode, true, uuid,arg2);
}
}
@@ -1460,7 +1460,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetySlOverLessHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.slOverLess, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
asyncNoticeHandle.damSafetySlOverLessHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.slOverLess, true, adCode, true, uuid,arg2);
}
}
@@ -1503,7 +1503,7 @@
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
asyncNoticeHandle.damSafetySlOverLessHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.slOverLess, true, adCode, false, uuid,arg2);
}
- if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
asyncNoticeHandle.damSafetySlOverLessHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.slOverLess, true, adCode, true, uuid,arg2);
}
}
@@ -1535,7 +1535,7 @@
if (alarmRuleDetailList.size() > 0) {
// 遍历
for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
- if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
asyncNoticeHandle.videoOfflineHandleStation(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.videoOffline, false, adCode, true, uuid,arg2);
}
if (alarmRuleDetail.getAlarmMode().equals("短信")) {
@@ -1571,7 +1571,7 @@
if (alarmRuleDetailList.size() > 0) {
// 遍历
for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
- if (alarmRuleDetail.getAlarmMode().equals("站内信") && isTimeSend()) {
+ if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
asyncNoticeHandle.topLevOfFloAlertHandleStation(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.topLevOfFloAlertList, true, adCode, true, uuid,arg2);
}
}
@@ -1896,22 +1896,5 @@
return result;
}
- /**
- * 是否在时间范围内发送
- * @return
- */
- public boolean isTimeSend(){
- boolean flag = false;
- // 判断时间范围
- // 开始时间
- LocalTime startTime = LocalTime.parse("08:00");
- // 结束时间
- LocalTime endTime = LocalTime.parse("22:00");
- // 当前时间
- LocalTime now = LocalTime.now();
- // 比较
- flag = !now.isBefore(startTime) && !now.isAfter(endTime);
- // 返回
- return flag;
- }
+
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/entity/ReportFloodRecord.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/entity/ReportFloodRecord.java
index c65fa85..fe40797 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/entity/ReportFloodRecord.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/entity/ReportFloodRecord.java
@@ -4,12 +4,16 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.springblade.core.mp.base.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
/**
* 报汛记录
@@ -123,6 +127,26 @@
@ApiModelProperty("行政区划")
private String adCode;
+ @DateTimeFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ @ApiModelProperty("报汛时间")
+ private Date reportTime;
+ @ApiModelProperty("昨日雨量")
+ private Double yRain;
+ @ApiModelProperty("是否有白蚁活动")
+ private Integer isBaiyiAction;
+
+ @ApiModelProperty("主站水位(米)")
+ private Double mainZ;
+
+ @ApiModelProperty("主站超溢洪道(米)")
+ private Double mainOZ;
+
+
/**
* 是否审核（1、审核通过；2、审核未通过）
*/
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml
index 77511d2..ff2707f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml
@@ -46,6 +46,11 @@
<result property="resRegCode" column="resRegCode"/>
<result property="lon" column="lon"/>
<result property="lat" column="lat"/>
+ <result property="reportTime" column="report_time"/>
+ <result property="yRain" column="y_rain"/>
+ <result property="isBaiyiAction" column="is_baiyi_action"/>
+ <result property="mainZ" column="main_z"/>
+ <result property="mainOZ" column="main_o_z"/>
</resultMap>
@@ -131,8 +136,29 @@
</select>
<select id="getDetailVO" resultMap="vo">
- SELECT R.*,arb."name" reservoirName FROM SM_REPORT_FLOOD_RECORD r
+ SELECT R.*,arb."name" reservoirName ,
+ arb."res_reg_code" as resRegCode,
+ arb."eng_scal" as engScal,
+ arb."center_long" lon,
+ arb."center_lat" lat,
+ case when town."ad_grad" = 4 THEN town."ad_code" ELSE NULL END AS townCode,
+ case when town."ad_grad" = 4 THEN town."ad_name" ELSE NULL END AS townName,
+ case when town."ad_grad" = 3 THEN town."ad_code"
+ when county."ad_grad" = 3 THEN county."ad_code" END AS countyCode,
+ case when town."ad_grad" = 3 THEN town."ad_name"
+ when county."ad_grad" = 3 THEN county."ad_name" END AS countyName,
+ case when town."ad_grad" = 2 THEN town."ad_code"
+ when county."ad_grad" = 2 THEN county."ad_code"
+ ELSE city."ad_code" END AS cityCode,
+ case when town."ad_grad" = 2 THEN town."ad_name"
+ when county."ad_grad" = 2 THEN county."ad_name"
+ ELSE city."ad_name" END AS cityName
+ FROM SM_REPORT_FLOOD_RECORD r
LEFT JOIN "SJZT_MD"."att_res_base" arb on arb."guid" = r.reservoir_id
+ LEFT JOIN SJZT_MD."att_ad_base"town ON arb."interior_ad_guid" = town."guid"
+ LEFT JOIN SJZT_MD."att_ad_base" county ON town."p_ad_code" = county."guid"
+ LEFT JOIN SJZT_MD."att_ad_base" city ON county."p_ad_code" = city."guid"
+ LEFT JOIN SJZT_MD."att_ad_base" province ON province."guid" = city."p_ad_code"
WHERE r.is_deleted = 0 AND r.id = #{id}
</select>
</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
index 3bff4cf..ad255da 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
@@ -21,6 +21,21 @@
<if test="dto.skName != null and dto.skName != ''">
and info.sk_name like concat(concat('%',#{dto.skName}),'%')
</if>
+ <if test="dto.resCd != null and dto.resCd != '' ">
+ and info.sk_id like CONCAT(CONCAT('%', #{dto.resCd}), '%')
+ </if>
+ <if test="dto.engScal != null and dto.engScal != '' ">
+ and dria."eng_scal" like CONCAT(CONCAT('%', #{dto.engScal}), '%')
+ </if>
+ <if test="dto.status != null">
+ and info.status = #{dto.status}
+ </if>
+ <if test="dto.isBegin != null and dto.isBegin == 1">
+ and info.status in(1,2)
+ </if>
+ <if test="dto.isBegin != null and dto.isBegin == 2">
+ and info.status = 0
+ </if>
<if test="dto.projectIds != null and dto.projectIds.size > 0">
and info.id in
<foreach collection="dto.projectIds" item="id" separator="," open="(" close=")">
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterBlock.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterBlock.java
index a99dd6d..11d2ad0 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterBlock.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterBlock.java
@@ -155,7 +155,7 @@
* 副坝座数
*/
@ApiModelProperty(value = "副坝座数")
- @TableField(value="\"sub_dam_num\"",fill = FieldFill.UPDATE)
+ @TableField(value="\"sub_dam_num\"")
private Integer subDamNum;
/**
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
index b3bbba8..efd6612 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
@@ -158,12 +158,14 @@
arb."eng_scal",
arb."res_loc" ,
arb."res_reg_code",
+ arrn."tb_weir_top_elevation" as tbWeirTopElevation,
<include refid="resBase"></include>
FROM "att_res_base" arb
left join "att_ad_base" town on town."guid" = arb."interior_ad_guid"
left join "att_ad_base" county on town."p_ad_code" = county."ad_code"
left join "att_ad_base" city on county."p_ad_code" = city."ad_code"
left join "att_ad_base" province on city."p_ad_code" = province."ad_code"
+ left join "att_res_rsb_norspi" arrn on arb."guid" = arrn."res_guid"
WHERE arb."is_deleted"=0
<if test="obj.code != null and obj.code != '' ">
and (town."ad_code" = #{obj.code} or county."ad_code" = #{obj.code} or city."ad_code" = #{obj.code} or province."ad_code"
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/AttResBaseVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/AttResBaseVO.java
index cc636e8..9a9ac50 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/AttResBaseVO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/AttResBaseVO.java
@@ -26,4 +26,5 @@
private String townCode;
private String townName;
+ private String tbWeirTopElevation;
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java
index 52bfed1..cf21a3b 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/service/impl/SjztmdServiceImpl.java
@@ -291,10 +291,31 @@
tableMap.put("damMainBodyTopElevation", damMainBodyTopElevation);
tableMap.put("damMainDrainType", damMainDrainType);
tableMap.put("mainDamBodyType", mainDamBodyType);
- tableMap.put("subDamNum", subDamNum);
- tableMap.put("subDamTotLength", subDamTotLength);
- tableMap.put("subDamMaxHeight", subDamMaxHeight);
- tableMap.put("subDamTopWidth", subDamTopWidth);
+ int subDamNumNew = tbAttResWaterBlockList.size() - 1;
+ tableMap.put("subDamNum", subDamNumNew);
+ if (subDamNumNew > 0) {
+ double damHeight = 0.0;
+ int index = 0;
+ double damTopLength = 0.0;
+ for (int i = 1; i < tbAttResWaterBlockList.size(); i++) {
+ TbAttResWaterBlock waterBlock = tbAttResWaterBlockList.get(i);
+ if (waterBlock.getDamHeight() > damHeight) {
+ damHeight = waterBlock.getDamHeight();
+ index = i;
+ }
+ damTopLength += waterBlock.getDamTopLength();
+ }
+ tableMap.put("subDamMaxHeight", damHeight);//副坝最大坝高
+ tableMap.put("subDamTopWidth", tbAttResWaterBlockList.get(index).getDamWidth());//坝顶宽引用最高那座的坝顶宽
+ tableMap.put("subDamTotLength", damTopLength);//坝长算所有副坝的总长度
+ } else {
+ tableMap.put("subDamMaxHeight", "");//副坝最大坝高
+ tableMap.put("subDamTopWidth", "");//坝顶宽引用最高那座的坝顶宽
+ tableMap.put("subDamTotLength", "");
+ }
+
+
+
//正常溢洪道
List<TbAttResRsbNorspi> tbAttResRsbNorspiList = (List<TbAttResRsbNorspi>) resRsbNorsipiVerspiMionitorDetailByGuid.get("tbAttResRsbNorspiList");
@@ -322,7 +343,19 @@
} else if (tbAttResRsbNorspi.getIsGate() == "是") {
// 平板闸门，3X3
String typeName = RsbWorkingGateEnum.find(tbAttResRsbNorspi.getWorkingGateType().toString()).getLabel();
- norWorkingGateType = StringUtil.format("{},{}X{}", typeName, tbAttResRsbNorspi.getGateWide(), tbAttResRsbNorspi.getGateLength());
+ String norwgtStr = "";
+ if (StringUtil.isNotBlank(typeName)) {
+ norwgtStr = typeName;
+ }
+ if (null != tbAttResRsbNorspi.getGateWide()) {
+ if (StringUtil.isNotBlank(typeName)) {
+ norwgtStr += "，" + tbAttResRsbNorspi.getGateWide() + "×" + tbAttResRsbNorspi.getGateLength();
+ } else {
+ norwgtStr += tbAttResRsbNorspi.getGateWide() + "×" + tbAttResRsbNorspi.getGateLength();
+ }
+ }
+// norWorkingGateType = StringUtil.format("{},{}X{}", typeName, tbAttResRsbNorspi.getGateWide(), tbAttResRsbNorspi.getGateLength());
+ norWorkingGateType = norwgtStr;
}
norCheckingFloodDischarge = isNullObject(tbAttResRsbNorspi.getCheckingFloodDischarge());
@@ -337,8 +370,12 @@
String ocType = OcTypeEnum.find(isNullObject(tbAttResRsbNorspi.getOcType())).getLabel();
- list.add(ocType);
- list.add(tbAttResRsbNorspi.getOcPower());
+ if (StringUtil.isNotBlank(ocType)) {
+ list.add(ocType);
+ }
+ if (StringUtil.isNotBlank(tbAttResRsbNorspi.getOcPower())) {
+ list.add(tbAttResRsbNorspi.getOcPower());
+ }
norOc = String.join(",", list);
}
@@ -552,30 +589,30 @@
//水库效益
List<String> protectList = new ArrayList<>();
- if (tbAttResEngBene!=null &&!tbAttResEngBene.getCity().equals("无") ) {
+ if (tbAttResEngBene!=null &&!tbAttResEngBene.getCity().equals("无") && StringUtil.isNotBlank(tbAttResEngBene.getCity())) {
protectList.add(tbAttResEngBene.getCity());
}
- if (tbAttResEngBene!=null &&!tbAttResEngBene.getTown().equals("无")) {
+ if (tbAttResEngBene!=null &&!tbAttResEngBene.getTown().equals("无") && StringUtil.isNotBlank(tbAttResEngBene.getTown())) {
protectList.add(tbAttResEngBene.getTown());
}
- if (tbAttResEngBene!=null &&!tbAttResEngBene.getRailway().equals("无")) {
+ if (tbAttResEngBene!=null &&!tbAttResEngBene.getRailway().equals("无") && StringUtil.isNotBlank(tbAttResEngBene.getRailway())) {
protectList.add(tbAttResEngBene.getRailway());
}
- if (tbAttResEngBene!=null &&!tbAttResEngBene.getHighway().equals("无")) {
+ if (tbAttResEngBene!=null &&!tbAttResEngBene.getHighway().equals("无") && StringUtil.isNotBlank(tbAttResEngBene.getHighway())) {
protectList.add(tbAttResEngBene.getHighway());
}
- if (tbAttResEngBene!=null &&!tbAttResEngBene.getImportCommunication().equals("无")) {
+ if (tbAttResEngBene!=null &&!tbAttResEngBene.getImportCommunication().equals("无") && StringUtil.isNotBlank(tbAttResEngBene.getImportCommunication())) {
protectList.add(tbAttResEngBene.getImportCommunication());
}
- if (tbAttResEngBene!=null &&!tbAttResEngBene.getImportFactory().equals("无")) {
+ if (tbAttResEngBene!=null &&!tbAttResEngBene.getImportFactory().equals("无") && StringUtil.isNotBlank(tbAttResEngBene.getImportFactory())) {
protectList.add(tbAttResEngBene.getImportFactory());
}
- if (tbAttResEngBene!=null &&!tbAttResEngBene.getImportOtherFac().equals("无")) {
+ if (tbAttResEngBene!=null &&!tbAttResEngBene.getImportOtherFac().equals("无") && StringUtil.isNotBlank(tbAttResEngBene.getImportOtherFac())) {
protectList.add(tbAttResEngBene.getImportOtherFac());
}
//只留前四个
@@ -589,16 +626,21 @@
double person = 0;
if (tbAttResEngBene !=null && tbAttResEngBene.getFlControlPerson() != null) {
person = tbAttResEngBene.getFlControlPerson() / 10000.0;
- tableMap.put("flControlPerson", String.format("%.2f", person));
+ tableMap.put("flControlPerson", WordUtil.removeTrailingZero(String.format("%.2f", person)));
} else {
tableMap.put("flControlPerson", "");
}
- tableMap.put("flControlLand", tbAttResEngBene==null?"":tbAttResEngBene.getFlControlLand()==null?"":String.format("%.2f", tbAttResEngBene.getFlControlLand() / 10000));
+ tableMap.put("flControlLand", tbAttResEngBene==null?"":tbAttResEngBene.getFlControlLand()==null?"":
+ WordUtil.removeTrailingZero(String.format("%.2f", tbAttResEngBene.getFlControlLand() / 10000)));
tableMap.put("irrObject", tbAttResEngBene==null?"":tbAttResEngBene.getIrrObject()==null?"":tbAttResEngBene.getIrrObject());
- tableMap.put("moyearIrrAvg", tbAttResEngBene==null?"":tbAttResEngBene.getMoyearIrrAvg() == null?"":tbAttResEngBene.getMoyearIrrAvg());
- tableMap.put("desIrrArea", tbAttResEngBene==null?"":tbAttResEngBene.getDesIrrArea() == null ?"":String.format("%.2f", tbAttResEngBene.getDesIrrArea() / 10000));
- tableMap.put("checIrrArea", tbAttResEngBene==null?"":tbAttResEngBene.getChecIrrArea()==null?"":String.format("%.2f", tbAttResEngBene.getChecIrrArea() / 10000));
- tableMap.put("supplyObject", tbAttResEngBene==null?"":tbAttResEngBene.getSupplyObject()==null?"":tbAttResEngBene.getSupplyObject());
+ tableMap.put("moyearIrrAvg", tbAttResEngBene==null?"":tbAttResEngBene.getMoyearIrrAvg() == null?"":
+ WordUtil.removeTrailingZero(tbAttResEngBene.getMoyearIrrAvg().toString()));
+ tableMap.put("desIrrArea", tbAttResEngBene==null?"":tbAttResEngBene.getDesIrrArea() == null ?"":
+ WordUtil.removeTrailingZero(String.format("%.2f", tbAttResEngBene.getDesIrrArea() / 10000)));
+ tableMap.put("checIrrArea", tbAttResEngBene==null?"":tbAttResEngBene.getChecIrrArea()==null?"":
+ WordUtil.removeTrailingZero(String.format("%.2f", tbAttResEngBene.getChecIrrArea() / 10000)));
+ tableMap.put("supplyObject", tbAttResEngBene==null?"":tbAttResEngBene.getSupplyObject()==null?"":
+ tbAttResEngBene.getSupplyObject());
// Double sup = 0.0;
// String supS = "";
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/TbWordVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/TbWordVO.java
index e737e4c..cb0e022 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/TbWordVO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/vo/TbWordVO.java
@@ -201,7 +201,7 @@
//大坝数量
int damCount = tbAttResWaterBlockList.size();
if (damCount > 1) {
- buildingList.add(StringUtil.format("副坝({})座", damCount - 1));
+ buildingList.add(StringUtil.format("副坝({}座)", damCount - 1));
//根据名字判断主坝
List<TbAttResWaterBlock> mainDamList = tbAttResWaterBlockList.stream().filter(tbAttResWaterBlock -> tbAttResWaterBlock.getName().indexOf("主坝") > -1).collect(Collectors.toList());
@@ -327,7 +327,7 @@
String disCharge = isNull(norspi.getCheckingFloodDischarge());
String text = StringUtil.format("溢洪道为{}，{}，堰顶高程{}m，堰顶净宽{}m{}，最大泄洪量{}m³/s。",
- typeName, gateText, StringUtil.format("", String.format("%.2f",norspi.getWeirTopElevation())), WordUtil.removeTrailingZero(weirTopWidth), holeText, WordUtil.removeTrailingZero(disCharge));
+ typeName, gateText, String.format("%.2f",norspi.getWeirTopElevation()), WordUtil.removeTrailingZero(weirTopWidth), holeText, WordUtil.removeTrailingZero(disCharge));
return text;
}
@@ -395,7 +395,7 @@
if (attResManagePerson.getType().equals("1")) {
//行政
- this.administrativeInfo = StringUtil.format("{}({}，{})",
+ this.administrativeInfo = StringUtil.format("{}（{}，{}）",
attResManagePerson.getUserName(), attResManagePerson.getPosition(), attResManagePerson.getUserPhone());
this.administrativeUnit = attResManagePerson.getUserUnit();
@@ -403,7 +403,7 @@
if (attResManagePerson.getType().equals("3")) {
//主管
- this.competentDepartmentInfo = StringUtil.format("{}({}，{})",
+ this.competentDepartmentInfo = StringUtil.format("{}（{}，{}）",
attResManagePerson.getUserName(), attResManagePerson.getPosition(), attResManagePerson.getUserPhone());
}
@@ -518,7 +518,7 @@
hydrologicalCharacteristicsList.add(StringUtil.format("死库容{}万m³", WordUtil.removeTrailingZero(tbAttResStagChar.getDeadCap().toString())));
}
if (tbAttResStagChar.getChecFlStag() != null) {
- hydrologicalCharacteristicsList2.add(StringUtil.format(this.resName + "校核洪水位{}m", String.format("%.2f",tbAttResStagChar.getChecFlStag())));
+ hydrologicalCharacteristicsList2.add(StringUtil.format("校核洪水位{}m", String.format("%.2f",tbAttResStagChar.getChecFlStag())));
}
if (tbAttResStagChar.getDesFlStag() != null) {
hydrologicalCharacteristicsList2.add(StringUtil.format("设计洪水位{}m", String.format("%.2f",tbAttResStagChar.getDesFlStag())));
@@ -541,13 +541,13 @@
TbAttResWaterDelivery tbAttResWaterDelivery = tbAttResWaterDeliveryList.get(0);
if (tbAttResWaterDeliveryList.size() > 1) {
- this.aqueductType = "水库主要采用输水";
+ this.aqueductType = "水库主要采用";
} else {
- this.aqueductType = "水库采用输水";
+ this.aqueductType = "水库采用";
}
- this.aqueductType = this.aqueductType + convertType(tbAttResWaterDelivery.getAqueductType(),"AqueductTypeEnum");
+ this.aqueductType = this.aqueductType + convertType(tbAttResWaterDelivery.getAqueductType(),"AqueductTypeEnum") + "输水";
this.section = isNull(tbAttResWaterDelivery.getSectionWide()) + "×" + isNull(tbAttResWaterDelivery.getSectionHigh());
@@ -572,19 +572,19 @@
double person = tbAttResEngBene.getFlControlPerson() / 10000.0;
if (person > 0) {
- this.protectPersonLand = String.format("%.2f",person) + "万人口";
+ this.protectPersonLand = WordUtil.removeTrailingZero(String.format("%.2f",person)) + "万人口";
}
if (tbAttResEngBene.getFlControlLand() > 0) {
if (StringUtil.isBlank(this.protectPersonLand)) {
- this.protectPersonLand = String.format("%.2f", tbAttResEngBene.getFlControlLand()) + "万亩耕地";
+ this.protectPersonLand = WordUtil.removeTrailingZero(String.format("%.2f", tbAttResEngBene.getFlControlLand())) + "万亩耕地";
} else {
- this.protectPersonLand = this.protectPersonLand + "、" + String.format("%.2f", tbAttResEngBene.getFlControlLand()) + "万亩耕地";
+ this.protectPersonLand = this.protectPersonLand + "、" + WordUtil.removeTrailingZero(String.format("%.2f", tbAttResEngBene.getFlControlLand())) + "万亩耕地";
}
}
this.protectPersonLand =
- StringUtil.format("{}万人口、{}万亩耕地", String.format("%.2f",person) , String.format("%.2f", tbAttResEngBene.getFlControlLand() / 1000));
+ StringUtil.format("{}万人口、{}万亩耕地", WordUtil.removeTrailingZero(String.format("%.2f",person)) , WordUtil.removeTrailingZero(String.format("%.2f", tbAttResEngBene.getFlControlLand() / 1000)));
////铁路、公路、管线、企业几个依次罗列，超过三个列出第二个后为“XX等”，后面不需罗列
String railway = tbAttResEngBene.getRailway();
@@ -623,7 +623,10 @@
if (StringUtils.isNotBlank(tbAttResEngBene.getIrrObject())) {
this.economicBenefit =
StringUtil.format("水库为{}提供灌溉用水，设计灌溉面积{}万亩，有效灌溉面积{}万亩，多年平均灌溉水量{}万m³。",
- tbAttResEngBene.getIrrObject(), String.format("%.2f", tbAttResEngBene.getDesIrrArea() / 10000), String.format("%.2f", tbAttResEngBene.getChecIrrArea() / 10000), tbAttResEngBene.getMoyearIrrAvg());
+ tbAttResEngBene.getIrrObject(),
+ WordUtil.removeTrailingZero(String.format("%.2f", tbAttResEngBene.getDesIrrArea() / 10000)),
+ WordUtil.removeTrailingZero(String.format("%.2f", tbAttResEngBene.getChecIrrArea() / 10000)),
+ WordUtil.removeTrailingZero(tbAttResEngBene.getMoyearIrrAvg().toString()));
}
if (StringUtil.isNotBlank(tbAttResEngBene.getSupplyObject())) {
@@ -654,10 +657,10 @@
String surveyProblem = tbAttResSafetyMonitor.getSurveyProblem();
//（若一类坝，不介绍问题，二、三类坝介绍）
if (tbAttResSafetyMonitor.getSafetyAppraisalResult().equals("1")) {
- this.safetyMonitorText = StringUtil.format("{}，水库进行安全鉴定，鉴定结果为\"{}\"。",
+ this.safetyMonitorText = StringUtil.format("{}，水库进行安全鉴定，鉴定结果为“{}”。",
time, type);
} else {
- this.safetyMonitorText = StringUtil.format("{}，水库进行安全鉴定，鉴定结果为\"{}\"，工程主要存在问题为{}",
+ this.safetyMonitorText = StringUtil.format("{}，水库进行安全鉴定，鉴定结果为“{}”，工程主要存在问题为{}",
time, type, surveyProblem);
}
}
@@ -669,7 +672,7 @@
}
this.mUnitName = tbAttResMgrSysB.getMUnitName();
- this.mUnitNature = tbAttResMgrSysB.getMUnitNature();
+ this.mUnitNature = tbAttResMgrSysB.getMUnitNature().replace("公益类","事业单位");
this.mUnitPersonNumber = tbAttResMgrSysB.getMUnitPersonNumber().toString();
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/resources/word/doc/skcgmb.docx b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/resources/word/doc/skcgmb.docx
index 8f4e05c..cd3ecdc 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/resources/word/doc/skcgmb.docx
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/resources/word/doc/skcgmb.docx
Binary files differ
--
Gitblit v1.9.3