湖北水库项目
parent: a00f7b43 | patch | commit | ignore whitespace
guoshilong
2024-02-22 9a1fc806b7cd4e4e11778f9d3bf51987f8b7908b 
Merge remote-tracking branch 'origin/jtdev' into jtdev
5 files modified
38 ■■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResDangerManageSpecialServiceImpl.java 2 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java 18 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResRsbNorspiServiceImpl.java 2 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResStagCharServiceImpl.java 14 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResWaterBlockServiceImpl.java 2 ●●●●● patch | view | raw | blame | history 
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResDangerManageSpecialServiceImpl.java


@@ -38,7 +38,7 @@


        attResDangerManageSpecial.setUpdateTime(DateUtil.now());


        JSONObject paramJson = new JSONObject();


        paramJson.put("time", DateUtil.format(new Date(),"yyyy-MM-dd"));


        paramJson.put("editPar", "tb_control_z");


        paramJson.put("editPar", "tb_control_z：修改值为" + attResDangerManageSpecial.getTbControlZ());


        paramJson.put("ly", "ywxt");


        paramJson.put("user_id", AuthUtil.getUserId());


        paramJson.put("user_name", AuthUtil.getUserName());




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


@@ -60,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());


@@ -84,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());


@@ -109,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());




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


@@ -37,7 +37,7 @@




        JSONObject paramJson = new JSONObject();


        paramJson.put("time", DateUtil.format(new Date(),"yyyy-MM-dd"));


        paramJson.put("editPar", "tb_weir_top_elevation");


        paramJson.put("editPar", "tb_weir_top_elevation:修改值为" + attResRsbNorspi.getTbWeirTopElevation());


        paramJson.put("ly", "ywxt");


        paramJson.put("user_id", AuthUtil.getUserId());


        paramJson.put("user_name", AuthUtil.getUserName());




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


@@ -43,19 +43,19 @@


        paramJson.put("time", DateUtil.format(new Date(),"yyyy-MM-dd"));


        String editPar = "";


        if (StringUtil.isNotBlank(attResStagChar.getTbChecFlStag()))


            editPar += ",tb_chec_fl_stag";


            editPar += ",tb_chec_fl_stag:修改值为" + attResStagChar.getTbChecFlStag();


        if (StringUtil.isNotBlank(attResStagChar.getTbDeadStag()))


            editPar += ",tb_dead_stag";


            editPar += ",tb_dead_stag:修改值为" + attResStagChar.getTbDeadStag();


        if (StringUtil.isNotBlank(attResStagChar.getTbDesFlStag()))


            editPar += ",tb_des_fl_stag";


            editPar += ",tb_des_fl_stag:修改值为" + attResStagChar.getTbDesFlStag();


        if (StringUtil.isNotBlank(attResStagChar.getTbFlprHighStag()))


            editPar += ",tb_flpr_high_stag";


            editPar += ",tb_flpr_high_stag:修改值为" + attResStagChar.getTbFlprHighStag();


        if (StringUtil.isNotBlank(attResStagChar.getTbNormPoolStag()))


            editPar += ",tb_norm_pool_stag";


            editPar += ",tb_norm_pool_stag:修改值为" + attResStagChar.getTbNormPoolStag();


        if (StringUtil.isNotBlank(attResStagChar.getTbDeadCap()))


            editPar += ",tb_dead_cap";


            editPar += ",tb_dead_cap:修改值为" + attResStagChar.getTbDeadCap();


        if (StringUtil.isNotBlank(attResStagChar.getTbTotCap()))


            editPar += ",tb_tot_cap";


            editPar += ",tb_tot_cap:修改值为" + attResStagChar.getTbTotCap();


        paramJson.put("editPar", editPar);


        paramJson.put("ly", "ywxt");


        paramJson.put("user_id", AuthUtil.getUserId());




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


@@ -34,7 +34,7 @@




        JSONObject paramJson = new JSONObject();


        paramJson.put("time", DateUtil.format(new Date(),"yyyy-MM-dd"));


        paramJson.put("editPar", "top_dam_top_elevation");


        paramJson.put("editPar", "top_dam_top_elevation：修改值为" + attResWaterBlock.getTbDamTopElevation());


        paramJson.put("ly", "ywxt");


        paramJson.put("user_id", AuthUtil.getUserId());


        paramJson.put("user_name", AuthUtil.getUserName());