From fc2adc3521931c2f7bc5b2f3a3d94ebf407828d6 Mon Sep 17 00:00:00 2001
From: yxm <zhp1521624>
Date: Mon, 01 Jul 2024 09:40:55 +0800
Subject: [PATCH] 水库堤防白蚁普查资料当前页压缩导出新增条件优化v20240701
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java | 63 +++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 17 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java
index 72083ac..c68c2ba 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java
@@ -1,10 +1,12 @@
package cn.gistack.sm.sjztmd.service.impl;
+import cn.gistack.sm.sjztmd.entity.AttResDangerManageSpecial;
import cn.gistack.sm.sjztmd.entity.AttResFlseLim;
import cn.gistack.sm.sjztmd.entity.AttResStagChar;
import cn.gistack.sm.sjztmd.entity.AttResWaterBlock;
import cn.gistack.sm.sjztmd.mapper.AttResFlseLimMapper;
+import cn.gistack.sm.sjztmd.service.IAttResDangerManageSpecialService;
import cn.gistack.sm.sjztmd.service.IAttResFlseLimService;
import cn.gistack.sm.sjztmd.service.IAttResStagCharService;
import cn.gistack.sm.sjztmd.service.IAttResWaterBlockService;
@@ -40,6 +42,9 @@
private IAttResWaterBlockService attResWaterBlockService;
@Autowired
+ private IAttResDangerManageSpecialService attResDangerManageSpecialService;
+
+ @Autowired
private IUserClient userClient;
@Override
@@ -48,18 +53,18 @@
editResInfoVO.setUpdateTime(DateUtil.now());
// 修改汛期水位
- if (null != editResInfoVO.getXqswObjQ()) {
+ if (null != editResInfoVO.getXqswObjQ() && StringUtil.isNotBlank(String.valueOf(editResInfoVO.getXqswObjQ().getTbFlseLimStag()))) {
AttResFlseLim attResFlseLimQ = editResInfoVO.getXqswObjQ();
attResFlseLimQ.setResGuid(editResInfoVO.getResGuid());
attResFlseLimQ.setUpdateTime(DateUtil.now());
JSONObject paramJson = new JSONObject();
paramJson.put("time", DateUtil.format(new Date(),"yyyy-MM-dd"));
- String editPar = "tb_flse_lim_stag";
+ String editPar = "tb_flse_lim_stag：修改值为" + editResInfoVO.getXqswObjQ().getTbFlseLimStag();
if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonStart()))
- editPar += ",tb_flood_season_start";
+ editPar += ",tb_flood_season_start：修改值为" + editResInfoVO.getXqswObjQ().getTbFloodSeasonStart();
if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonEnd()))
- editPar += ",tb_flood_season_end";
+ editPar += ",tb_flood_season_end：修改值为" + editResInfoVO.getXqswObjQ().getTbFloodSeasonEnd();
paramJson.put("editPar", editPar);
paramJson.put("ly", "ywxt");
paramJson.put("user_id", AuthUtil.getUserId());
@@ -67,20 +72,23 @@
paramJson.put("phone", userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
attResFlseLimQ.setUpdateBy(paramJson.toJSONString());
- baseMapper.updateAttResFlseLimByGuid(attResFlseLimQ,"前汛期");
+ Integer ret = baseMapper.updateAttResFlseLimByGuid(attResFlseLimQ,"前汛期");
+ if (ret == 0) {
+ baseMapper.addAttResFlseLim(attResFlseLimQ,"前汛期");
+ }
}
- if (null != editResInfoVO.getXqswObjZ()) {
+ if (null != editResInfoVO.getXqswObjZ() && StringUtil.isNotBlank(String.valueOf(editResInfoVO.getXqswObjZ().getTbFlseLimStag()))) {
AttResFlseLim attResFlseLimZ = editResInfoVO.getXqswObjZ();
attResFlseLimZ.setResGuid(editResInfoVO.getResGuid());
attResFlseLimZ.setUpdateTime(DateUtil.now());
JSONObject paramJson = new JSONObject();
paramJson.put("time", DateUtil.format(new Date(),"yyyy-MM-dd"));
- String editPar = "tb_flse_lim_stag";
+ String editPar = "tb_flse_lim_stag：修改值为" + editResInfoVO.getXqswObjZ().getTbFlseLimStag();
if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonStart()))
- editPar += ",tb_flood_season_start";
+ editPar += ",tb_flood_season_start：修改值为" + editResInfoVO.getXqswObjQ().getTbFloodSeasonStart();
if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonEnd()))
- editPar += ",tb_flood_season_end";
+ editPar += ",tb_flood_season_end：修改值为" + editResInfoVO.getXqswObjQ().getTbFloodSeasonEnd();
paramJson.put("editPar", editPar);
paramJson.put("ly", "ywxt");
paramJson.put("user_id", AuthUtil.getUserId());
@@ -88,20 +96,24 @@
paramJson.put("phone", userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
attResFlseLimZ.setUpdateBy(paramJson.toJSONString());
- baseMapper.updateAttResFlseLimByGuid(attResFlseLimZ,"中汛期");
+ Integer ret = baseMapper.updateAttResFlseLimByGuid(attResFlseLimZ,"中汛期");
+
+ if (ret == 0) {
+ baseMapper.addAttResFlseLim(attResFlseLimZ,"中汛期");
+ }
}
- if (null != editResInfoVO.getXqswObjH()) {
+ if (null != editResInfoVO.getXqswObjH() && StringUtil.isNotBlank(String.valueOf(editResInfoVO.getXqswObjH().getTbFlseLimStag()))) {
AttResFlseLim attResFlseLimH = editResInfoVO.getXqswObjH();
attResFlseLimH.setResGuid(editResInfoVO.getResGuid());
attResFlseLimH.setUpdateTime(DateUtil.now());
JSONObject paramJson = new JSONObject();
paramJson.put("time", DateUtil.format(new Date(),"yyyy-MM-dd"));
- String editPar = "tb_flse_lim_stag";
+ String editPar = "tb_flse_lim_stag：修改值为" + editResInfoVO.getXqswObjH().getTbFlseLimStag();
if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonStart()))
- editPar += ",tb_flood_season_start";
+ editPar += ",tb_flood_season_start：修改值为" + editResInfoVO.getXqswObjQ().getTbFloodSeasonStart();
if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonEnd()))
- editPar += ",tb_flood_season_end";
+ editPar += ",tb_flood_season_end：修改值为" + editResInfoVO.getXqswObjQ().getTbFloodSeasonEnd();
paramJson.put("editPar", editPar);
paramJson.put("ly", "ywxt");
paramJson.put("user_id", AuthUtil.getUserId());
@@ -109,7 +121,10 @@
paramJson.put("phone", userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
attResFlseLimH.setUpdateBy(paramJson.toJSONString());
- baseMapper.updateAttResFlseLimByGuid(attResFlseLimH,"后汛期");
+ Integer ret = baseMapper.updateAttResFlseLimByGuid(attResFlseLimH,"后汛期");
+ if (ret == 0) {
+ baseMapper.addAttResFlseLim(attResFlseLimH,"后汛期");
+ }
}
// 修改水位特征参数
@@ -133,13 +148,27 @@
attResStagChar.setWatShedArea(editResInfoVO.getWatShedArea());
// 修改坝顶高程
- if (StringUtil.isNotBlank(editResInfoVO.getTopDamTopElevation())) {
+ if (StringUtil.isNotBlank(editResInfoVO.getTbDamTopElevation())) {
AttResWaterBlock resWaterBlock = new AttResWaterBlock();
resWaterBlock.setResGuid(editResInfoVO.getResGuid());
- resWaterBlock.setTopDamTopElevation(editResInfoVO.getTopDamTopElevation());
+ resWaterBlock.setTbDamTopElevation(editResInfoVO.getTbDamTopElevation());
attResWaterBlockService.updateAttResWaterBlockByResId(resWaterBlock);
}
+ // 修改控制运行水位
+ if (StringUtil.isNotBlank(editResInfoVO.getTbControlZ())) {
+ AttResDangerManageSpecial attResDangerManageSpecial = new AttResDangerManageSpecial();
+ attResDangerManageSpecial.setResGuid(editResInfoVO.getResGuid());
+ attResDangerManageSpecial.setTbControlZ(editResInfoVO.getTbControlZ());
+ attResDangerManageSpecialService.updateAttResDangerManageSpecialByResId(attResDangerManageSpecial);
+ }else{
+ //如果控制运行水位为空，则置空
+ AttResDangerManageSpecial attResDangerManageSpecial = new AttResDangerManageSpecial();
+ attResDangerManageSpecial.setResGuid(editResInfoVO.getResGuid());
+ attResDangerManageSpecial.setTbControlZ("");
+ attResDangerManageSpecialService.updateAttResDangerManageSpecialByResId(attResDangerManageSpecial);
+ }
+
return attResStagCharService.customizeUpdateByGuid(attResStagChar);
}
}
--
Gitblit v1.9.3