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

guoshilong

2023-05-30 bbaaa7dda42c73311c2cd526f7d31fcf4988a61c

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java

@@ -10,6 +10,7 @@
import cn.gistack.sm.sjztmd.service.IAttResWaterBlockService;
import cn.gistack.sm.sjztmd.vo.EditResInfoVO;
import cn.gistack.system.user.feign.IUserClient;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
@@ -19,6 +20,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.Date;

/**
 * @PROJECT_NAME: skjcmanager
@@ -45,25 +48,67 @@
      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());
         attResFlseLimQ.setUpdateBy(AuthUtil.getUserName() + "-" + userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());

         JSONObject paramJson = new JSONObject();
         paramJson.put("time", DateUtil.format(new Date(),"yyyy-MM-dd"));
         String editPar = "tb_flse_lim_stag";
         if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonStart()))
            editPar += ",tb_flood_season_start";
         if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonEnd()))
            editPar += ",tb_flood_season_end";
         paramJson.put("editPar", editPar);
         paramJson.put("ly", "ywxt");
         paramJson.put("user_id", AuthUtil.getUserId());
         paramJson.put("user_name", AuthUtil.getUserName());
         paramJson.put("phone", userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
         attResFlseLimQ.setUpdateBy(paramJson.toJSONString());

         baseMapper.updateAttResFlseLimByGuid(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());
         attResFlseLimZ.setUpdateBy(AuthUtil.getUserName() + "-" + userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());

         JSONObject paramJson = new JSONObject();
         paramJson.put("time", DateUtil.format(new Date(),"yyyy-MM-dd"));
         String editPar = "tb_flse_lim_stag";
         if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonStart()))
            editPar += ",tb_flood_season_start";
         if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonEnd()))
            editPar += ",tb_flood_season_end";
         paramJson.put("editPar", editPar);
         paramJson.put("ly", "ywxt");
         paramJson.put("user_id", AuthUtil.getUserId());
         paramJson.put("user_name", AuthUtil.getUserName());
         paramJson.put("phone", userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
         attResFlseLimZ.setUpdateBy(paramJson.toJSONString());

         baseMapper.updateAttResFlseLimByGuid(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());
         attResFlseLimH.setUpdateBy(AuthUtil.getUserName() + "-" + userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());

         JSONObject paramJson = new JSONObject();
         paramJson.put("time", DateUtil.format(new Date(),"yyyy-MM-dd"));
         String editPar = "tb_flse_lim_stag";
         if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonStart()))
            editPar += ",tb_flood_season_start";
         if (StringUtil.isNotBlank(editResInfoVO.getXqswObjQ().getTbFloodSeasonEnd()))
            editPar += ",tb_flood_season_end";
         paramJson.put("editPar", editPar);
         paramJson.put("ly", "ywxt");
         paramJson.put("user_id", AuthUtil.getUserId());
         paramJson.put("user_name", AuthUtil.getUserName());
         paramJson.put("phone", userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
         attResFlseLimH.setUpdateBy(paramJson.toJSONString());

         baseMapper.updateAttResFlseLimByGuid(attResFlseLimH,"后汛期");
      }