Merge remote-tracking branch 'origin/jtdev' into jtdev

guoshilong

2024-02-22 9a1fc806b7cd4e4e11778f9d3bf51987f8b7908b

 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
@@ -55,11 +60,11 @@

         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,7 +72,10 @@
         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()  && StringUtil.isNotBlank(String.valueOf(editResInfoVO.getXqswObjZ().getTbFlseLimStag()))) {
         AttResFlseLim attResFlseLimZ = editResInfoVO.getXqswObjZ();
@@ -76,11 +84,11 @@

         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,7 +96,11 @@
         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() && StringUtil.isNotBlank(String.valueOf(editResInfoVO.getXqswObjH().getTbFlseLimStag()))) {
         AttResFlseLim attResFlseLimH = editResInfoVO.getXqswObjH();
@@ -97,11 +109,11 @@

         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,21 @@
         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);
      }

      return attResStagCharService.customizeUpdateByGuid(attResStagChar);
   }
}