From 44eb64bef08ce231ac95d5ee482b046014dc8afa Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 08 九月 2025 11:29:26 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java               |  135 --------------
 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java             |  115 ------------
 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java             |   80 --------
 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java             |   90 ----------
 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanCtrl.java |   53 -----
 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java              |    4 
 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java   |   44 ----
 7 files changed, 9 insertions(+), 512 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
index b71783d..7e22357 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
@@ -109,13 +109,6 @@
         return prIntakeMapper.getSupperByVillageId(vaId);
     }
 
-    /**
-     * 淇濆瓨淇敼瀹炰綋
-     *
-     * @param po 瀹炰綋
-     * @return 鏁伴噺
-     */
-
     public int update(PrIntake po) {
 //        if (po.getTownId() == null || po.getTownId() == 0) {
 //            Long townId = getSupperByVillageId(po.getVillageId());
@@ -129,12 +122,6 @@
 //        return this.prIntakeMapper.updateByPrimaryKey(po);
     }
 
-    /**
-     * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鍙栨按鍙ｈ褰�
-     *
-     * @param queryVo 鏌ヨ瑙嗗浘
-     * @return 鍙栨按鍙ｈ褰曞垪琛�
-     */
     public QueryResultVo<List<VoIntake>> getIntakes(QueryVo queryVo) {
         Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
         Long itemTotal = prIntakeMapper.getRecordCount(params);
@@ -147,76 +134,35 @@
         return rsVo;
     }
 
-    /**
-     * 鏍规嵁鎸囧畾鏉′欢瀵煎嚭鍙栨按鍙ｅ垪琛�
-     *
-     * @param queryVo
-     * @return
-     */
     public List<VoIntake> exportIntakes(QueryVo queryVo) {
         Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
         List<VoIntake> rsVo = prIntakeMapper.getIntakes(params);
         return rsVo;
     }
 
-    /**
-     * 寰楀埌鎵�鏈夊彇姘村彛
-     *
-     * @return 鎵�鏈夊彇姘村彛闆嗗悎
-     */
     public QueryResultVo<List<VoAllIntake>> selectAll() {
         QueryResultVo<List<VoAllIntake>> rsVo = new QueryResultVo<>();
         rsVo.obj = this.prIntakeMapper.selectAll();
         return rsVo;
     }
 
-    /**
-     * 寰楀埌涓�涓彇姘村彛
-     *
-     * @param id 鍙栨按鍙D
-     * @return 鍙栨按鍙ｅ疄浣�
-     */
     public VoAllIntake selectById(Long id) {
         return this.prIntakeMapper.selectByPrimaryKey(id);
     }
 
-    /**
-     * 閫昏緫鍒犻櫎瀹炰綋
-     *
-     * @param id 瀹炰綋ID
-     * @return 鏁伴噺
-     */
     @Transactional
     public int delete(Long id) {
         return this.prIntakeMapper.deleteLogicById(id);
     }
 
-    /**
-     * 鏍规嵁鍙栨按鍙ｇ紪鍙疯幏鍙栨湭鍒犻櫎鐨勫彇姘村彛鏁伴噺
-     *
-     * @param intakeId
-     * @return
-     */
     public Integer getRecordCountOfIntake(Long intakeId) {
         return prIntakeMapper.getRecordCountOfIntake(intakeId);
     }
 
-    /**
-     * 鏍规嵁鏉慖d鑾峰彇鍏ㄩ儴鍦板潃
-     *
-     * @param villageId 鏉慖d
-     * @return address  鍏ㄩ儴浜旂骇鍦板潃
-     */
     public String getAddressByVillageId(long villageId) {
         return prIntakeMapper.getAddressByVillageId(villageId);
     }
 
-    /**
-     * 鏍规嵁鍖哄煙Id鑾峰彇鍖哄煙绛夌骇
-     *
-     * @param regionId 鍖哄煙Id
-     * @return Level  鍖哄煙绛夌骇
-     */
     public int getLevelByRegionId(long regionId) {
         return prIntakeMapper.getLevelByRegionId(regionId);
     }
@@ -293,11 +239,6 @@
         return prIntakeMapper.getUsedIntakes(jsonArray.toJSONString(), operator);
     }
 
-    /**
-     * 鍙戦�佸懡浠�
-     *
-     * @return
-     */
     protected BaseResponse sendCom2Mw(Command com) {
         String url = UriComponentsBuilder.fromUriString(comSendUrl)
                 .build()
@@ -320,40 +261,19 @@
     }
 
 
-    /**
-     * 鍙栨按鍙ｅ悕绉版崲鍙栨按鍙D锛岄獙璇佹槸鍚﹂噸澶嶅悕绉颁娇鐢�
-     *
-     * @param intakeName
-     * @return
-     */
     public List<Long> getIntakeIdsByName(String intakeName) {
         return prIntakeMapper.getIntakeIdsByName(intakeName);
     }
 
-    /**
-     * 鍙栨按鍙ｅ悕绉版崲鍙栨按鍙D锛岄獙璇佹槸鍚﹂噸澶嶅悕绉颁娇鐢�
-     *
-     * @param intakeName
-     * @return
-     */
     public List<Long> getIntakeIdByNameExcludeId(Long id, String intakeName) {
         return prIntakeMapper.getIntakeIdByNameExcludeId(id, intakeName);
     }
 
 
-    /**
-     * app淇敼鍙栨按鍙ｇ粡绾害
-     * @param po
-     * @return
-     */
     public int updateIntakeLngLat(IntakeUpdateLngLat po) {
         return prIntakeMapper.updateByPrimaryKeySelective1(po);
     }
 
-    /**
-     * 鑾峰彇鏈粦瀹氬埌杞亴缁勭殑鍙栨按鍙ｅ垪琛�
-     * @return
-     */
     public List<VoIntakeSimple> getFreeIntakes(QoIntake queryVo) {
         Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
         return prIntakeMapper.getFreeIntakes(params);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java
index 3fbbe44..513b023 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/CommandSv.java
@@ -218,6 +218,10 @@
         //    VoUnclosedParam voUnclosedParam = new VoUnclosedParam();
         //    return voUnclosedParam;
         }
+
+        if(jsonArray.size() == 0) {
+            return null;
+        }
         return rmCommandHistoryMapper.getUncloseParam(jsonArray.toJSONString(), intakeId);
     }
 
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java
index 9823cfe..504c532 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java
@@ -80,12 +80,6 @@
         this.env = env;
     }
 
-    /**
-     * 骞冲彴杩滅▼寮�闃�锛堝己鍒跺紑闃�锛�
-     * @param valve
-     * @param bindingResult
-     * @return
-     */
     @PostMapping(path = "open", consumes = MediaType.APPLICATION_JSON_VALUE)
     @Transactional(rollbackFor = Exception.class)
     @SsoAop()
@@ -160,11 +154,6 @@
             param.elePrice = 0.0;
             param.orderNo = orderNo;
 
-            /**
-             * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
-             * 1 鍑嗗鍙傛暟
-             * 2 璋冪敤鍏叡鏂规硶
-             */
             Param myParam = new Param();
             myParam.setComId(comId);
             myParam.setComType((byte)1);
@@ -182,11 +171,6 @@
             // 鑾峰彇鍔熻兘鐮�
             commandCode = CodeV1.cd_92;
 
-            /**
-             * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
-             * 1 鍑嗗鍙傛暟
-             * 2 璋冪敤鍏叡鏂规硶
-             */
             Param myParam = new Param();
             myParam.setComId(comId);
             myParam.setComType((byte)1);
@@ -205,12 +189,6 @@
         }
     }
 
-    /**
-     * 骞冲彴杩滅▼鍏抽榾锛堝己鍒跺叧闃�锛�
-     * @param dtoBase
-     * @param bindingResult
-     * @return
-     */
     @PostMapping(path = "close_intake", consumes = MediaType.APPLICATION_JSON_VALUE)
     @Transactional(rollbackFor = Exception.class)
     @SsoAop()
@@ -225,6 +203,9 @@
         VoUnclosedParam voUnclosedParam = null;
         try {
             voUnclosedParam = commandSv.getUncloseParam(intakeId);
+            if(voUnclosedParam == null) {
+                return BaseResponseUtils.buildErrorMsg("涓嶅瓨鍦ㄧ鍚堟潯浠剁殑鏈叧闃�鍙栨按鍙�");
+            }
         }catch (Exception e) {
             return BaseResponseUtils.buildErrorMsg("鑾峰彇鏈叧闃�淇℃伅閿欒");
         }
@@ -309,12 +290,6 @@
         }
     }
 
-    /**
-     * 杩滅▼寮�闃�锛堜唬鍐滄埛锛�
-     * @param valve
-     * @param bindingResult
-     * @return
-     */
     @PostMapping(path = "open_client", consumes = MediaType.APPLICATION_JSON_VALUE)
     @Transactional(rollbackFor = Exception.class)
     @SsoAop()
@@ -328,11 +303,6 @@
         Long operator = valve.getOperator();
         Long comId = new IDLongGenerator().generate();
 
-        /**
-         * 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
-         * 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱
-         * 濡傛灉鍙栨按鍙ｆ病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱
-         */
         if (vcId == null) {
             vcId = commandSv.getVcIdByIntakeId(intakeId);
             if (vcId == null) {
@@ -393,11 +363,6 @@
             param.elePrice = 0.0;
             param.orderNo = orderNo;
 
-            /**
-             * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
-             * 1 鍑嗗鍙傛暟
-             * 2 璋冪敤鍏叡鏂规硶
-             */
             Param myParam = new Param();
             myParam.setComId(comId);
             myParam.setComType((byte)1);
@@ -423,11 +388,6 @@
             param.waterPrice = waterPrice;
             param.orderNo = orderNo;
 
-            /**
-             * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
-             * 1 鍑嗗鍙傛暟
-             * 2 璋冪敤鍏叡鏂规硶
-             */
             Param myParam = new Param();
             myParam.setComId(comId);
             myParam.setComType((byte)1);
@@ -446,12 +406,6 @@
         }
     }
 
-    /**
-     * 杩滅▼鍏抽榾锛堜唬鍐滄埛锛�
-     * @param dtoBase
-     * @param bindingResult
-     * @return
-     */
     @PostMapping(path = "close_client", consumes = MediaType.APPLICATION_JSON_VALUE)
     @Transactional(rollbackFor = Exception.class)
     @SsoAop()
@@ -504,11 +458,6 @@
             param.icCardNo = vcNum;
             param.orderNo = orderNo;
 
-            /**
-             * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
-             * 1 鍑嗗鍙傛暟
-             * 2 璋冪敤鍏叡鏂规硶
-             */
             Param myParam = new Param();
             myParam.setComId(comId);
             myParam.setComType((byte)2);
@@ -531,11 +480,6 @@
             param.icCardNo = vcNum;
             param.orderNo = orderNo;
 
-            /**
-             * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
-             * 1 鍑嗗鍙傛暟
-             * 2 璋冪敤鍏叡鏂规硶
-             */
             Param myParam = new Param();
             myParam.setComId(comId);
             myParam.setComType((byte)2);
@@ -554,12 +498,6 @@
         }
     }
 
-    /**
-     * 瀹氭椂鍏抽榾寮忓紑闃�
-     * @param automaticClose
-     * @param bindingResult
-     * @return
-     */
     @PostMapping(path = "timed_close", consumes = MediaType.APPLICATION_JSON_VALUE)
     @Transactional(rollbackFor = Exception.class)
     @SsoAop()
@@ -574,11 +512,6 @@
         Long operator = automaticClose.getOperator();
         Long comId = new IDLongGenerator().generate();
 
-        /**
-         * 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
-         * 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱
-         * 濡傛灉鍙栨按鍙ｆ病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱
-         */
         if(vcId == null) {
             vcId = commandSv.getVcIdByIntakeId(intakeId);
             if(vcId == null) {
@@ -635,11 +568,6 @@
             param.setMinutes(minutes);
             param.setOrderNo(orderNo);
 
-            /**
-             * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
-             * 1 鍑嗗鍙傛暟
-             * 2 璋冪敤鍏叡鏂规硶
-             */
             Param myParam = new Param();
             myParam.setComId(comId);
             myParam.setComType((byte)2);
@@ -658,12 +586,6 @@
         }
     }
 
-    /**
-     * 瀹氶噺鍏抽榾寮忓紑闃�
-     * @param automaticClose
-     * @param bindingResult
-     * @return
-     */
     @PostMapping(path = "quantify_close", consumes = MediaType.APPLICATION_JSON_VALUE)
     @Transactional(rollbackFor = Exception.class)
     @SsoAop()
@@ -678,11 +600,6 @@
         Long operator = automaticClose.getOperator();
         Long comId = new IDLongGenerator().generate();
 
-        /**
-         * 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
-         * 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱
-         * 濡傛灉鍙栨按鍙ｆ病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱
-         */
         if(vcId == null) {
             vcId = commandSv.getVcIdByIntakeId(intakeId);
             if(vcId == null) {
@@ -739,11 +656,6 @@
             param.setWaterAmount(waterAmount);
             param.setOrderNo(orderNo);
 
-            /**
-             * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
-             * 1 鍑嗗鍙傛暟
-             * 2 璋冪敤鍏叡鏂规硶
-             */
             Param myParam = new Param();
             myParam.setComId(comId);
             myParam.setComType((byte)2);
@@ -762,12 +674,6 @@
         }
     }
 
-    /**
-     * 瀹氭椂鍏抽榾寮忚鍒掑紑闃�
-     * @param automaticClose
-     * @param bindingResult
-     * @return
-     */
     @PostMapping(path = "planed_open_timed_close", consumes = MediaType.APPLICATION_JSON_VALUE)
     @Transactional(rollbackFor = Exception.class)
     @SsoAop()
@@ -789,11 +695,6 @@
         Integer hour = Integer.parseInt(String.format("%tH", plannedOpenTime));
         Integer minute = Integer.parseInt(String.format("%tM", plannedOpenTime));
 
-        /**
-         * 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
-         * 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱
-         * 濡傛灉鍙栨按鍙ｆ病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱
-         */
         if(vcId == null) {
             vcId = commandSv.getVcIdByIntakeId(intakeId);
             if(vcId == null) {
@@ -855,11 +756,6 @@
             param.setMinute(minute);
             param.setOrderNo(orderNo);
 
-            /**
-             * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
-             * 1 鍑嗗鍙傛暟
-             * 2 璋冪敤鍏叡鏂规硶
-             */
             Param myParam = new Param();
             myParam.setComId(comId);
             myParam.setComType((byte)2);
@@ -905,11 +801,6 @@
         Integer hour = Integer.parseInt(String.format("%tH", plannedOpenTime));
         Integer minute = Integer.parseInt(String.format("%tM", plannedOpenTime));
 
-        /**
-         * 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
-         * 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱
-         * 濡傛灉鍙栨按鍙ｆ病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱
-         */
         if(vcId == null) {
             vcId = commandSv.getVcIdByIntakeId(intakeId);
             if(vcId == null) {
@@ -971,11 +862,6 @@
             param.setMinute(minute);
             param.setOrderNo(orderNo);
 
-            /**
-             * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
-             * 1 鍑嗗鍙傛暟
-             * 2 璋冪敤鍏叡鏂规硶
-             */
             Param myParam = new Param();
             myParam.setComId(comId);
             myParam.setComType((byte)2);
@@ -994,11 +880,6 @@
         }
     }
 
-    /**
-     * 鏍规嵁鎿嶄綔鍛業D鑾峰彇鏈叧闃�璁板綍
-     * @param operator
-     * @return
-     */
     @GetMapping(path = "/get")
     @SsoAop()
     public BaseResponse<List<VoUnclosedValve>> getUnclosedValves(@RequestParam Long operator){
@@ -1082,11 +963,6 @@
             param.chargeWater = chargeWater;
             param.flowNo = flowNo;
 
-            /**
-             * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
-             * 1 鍑嗗鍙傛暟
-             * 2 璋冪敤鍏叡鏂规硶
-             */
             Param myParam = new Param();
             myParam.setComId(comId);
             myParam.setCommandCode(commandCode);
@@ -1143,11 +1019,6 @@
             param.projectNo = projectNo;
             param.icCardAddr = cardAddr;
 
-            /**
-             * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
-             * 1 鍑嗗鍙傛暟
-             * 2 璋冪敤鍏叡鏂规硶
-             */
             Param myParam = new Param();
             myParam.setComId(comId);
             myParam.setCommandCode(commandCode);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java
index c9d9717..f4df780 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java
@@ -103,28 +103,16 @@
         this.irrigationSv = irrigationSv;
         this.prIntakeControllerMapper = prIntakeControllerMapper;
     }
-    /**
-     * 铏氭嫙鍗D鎹㈣櫄鎷熷崱瀵硅薄
-     * @param vcId
-     * @return
-     */
+
     public VoVirtualCard getVcById(Long vcId) {
         return seVirtualCardMapper.getVcById(vcId);
     }
 
-    /**
-     * 鑾峰彇姘翠环
-     * @return
-     */
+
     public Double getPrice() {
         return prWaterPriceMapper.getPrice();
     }
 
-    /**
-     * 鏍规嵁鎿嶄綔鍛業D鑾峰彇鏈叧闃�璁板綍锛堝寘鍚湪绾挎儏鍐碉級
-     * @param operator
-     * @return
-     */
     public List<VoUnclosedValve> getUnclosedValves(Long operator) {
         Command com = new Command() ;
         com.id = Command.defaultId;
@@ -148,10 +136,6 @@
             //System.out.println(jsonArray.toJSONString());
         }
 
-        /**
-         * 鑾峰彇鏈叧闃�鐨凴TU鍦板潃鍜岃櫄鎷熷崱缂栧彿瀵规暟缁�
-         * 閬嶅巻鏁扮粍鑾峰彇鏈�鍚庡懡浠ゆ棩蹇桰D闆嗗悎
-         */
         List<VoRtuAndVc> rtus = rmCommandHistoryMapper.getUnclosedRtus(operator);
         String comIds = "";
         if(rtus != null && rtus.size() > 0) {
@@ -173,78 +157,37 @@
         return new ArrayList<>();
     }
 
-    /**
-     * 涓烘寚瀹氾紙闃�鎺у櫒鍦板潃銆佹按鍗＄紪鍙枫�佹棤鍏抽榾璁板綍锛夊紑鍏抽榾鏈�鏂拌褰曟坊鍔犲叧闃�鏃堕棿锛屼娇涔嬩笉鍦ㄦ湭鍏抽榾璁板綍涓樉绀�
-     * @param rtuAddr
-     * @param icCardNo
-     * @return
-     */
     public Integer addClostTime(String rtuAddr, String icCardNo) {
         return rmOpenCloseValveLastMapper.addCloseTime(rtuAddr, icCardNo);
     }
 
-    /**
-     * 鏍规嵁鍙栨按鍙D鑾峰彇涓庝箣缁戝畾铏氭嫙鍗D
-     * @param intakeId
-     * @return
-     */
     public Long getVcIdByIntakeId(Long intakeId) {
         return prIntakeVcMapper.getVcIdByIntakeId(intakeId);
     }
 
-    /**
-     * 鏍规嵁姘村崱缂栧彿鑾峰彇姘村崱瀵硅薄锛岃繙绋嬪厖鍊间娇鐢�
-     * @param cardId
-     * @return
-     */
     public SeClientCard geClientCardByCardId(Long cardId) {
         return seClientCardMapper.selectByPrimaryKey(cardId);
     }
 
-    /**
-     * 娣诲姞鍛戒护鏃ュ織
-     * @param po 鍛戒护鏃ュ織瀵硅薄
-     * @return 瀛楃涓茬被鍨嬬殑涓婚敭
-     */
     public Long insert(RmCommandHistory po) {
         rmCommandHistoryMapper.insert(po);
         return po.getComId();
     }
 
-    /**
-     * 淇敼鍛戒护鏃ュ織淇℃伅
-     * @param po 鍛戒护鏃ュ織瀵硅薄
-     * @return 褰卞搷璁板綍鏁伴噺
-     */
     public Integer update(RmCommandHistory po) {
         return rmCommandHistoryMapper.updateByPrimaryKeySelective(po);
     }
 
-    /**
-     * 鍙栨按鍙ｅ悕绉版崲鍙栨按鍙D锛屾壂鐮佸紑闃�浣跨敤
-     * @param intakeName
-     * @return
-     */
     public Long getIntakeIdByName(String intakeName) {
         return prIntakeMapper.getIntakeIdByName(intakeName);
     }
 
-    /**
-     * 鏍规嵁閰嶇疆绫诲瀷鑾峰彇閰嶇疆鍊�
-     * @param type
-     * @return
-     */
     QueryResultVo<List<VoIrrigaterProfile>> getIrrPro(Integer type) {
         QueryResultVo<List<VoIrrigaterProfile>> rsVo = new QueryResultVo<>() ;
         rsVo.obj = rmIrrigateProfileMapper.getIrrPro(type);
         return rsVo ;
     }
 
-    /**
-     * 娣诲姞鍙栨按鍙ｆ搷浣滆褰曪紝杞亴杩囩▼鍛戒护涓嬪彂鏃朵娇鐢�
-     * @param po
-     * @return
-     */
     public Long addIntakeOperate(IrIntakeOperate po) {
         irIntakeOperateMapper.insert(po);
         return po.getId();
@@ -260,11 +203,6 @@
     //    return irIntakeOperateMapper.updateByCommandId(commandId, commandResult);
     //}
 
-    /**
-     * 瀹氭椂鍏抽榾寮忚鍒掑紑闃�
-     * @param automaticClose
-     * @return
-     */
     @Transactional(rollbackFor = Exception.class)
     public Map planedOpenTimedClose(AutomaticClose automaticClose, Long planId, Byte operatetype, Date startTime, Integer duration) {
         Long intakeId = automaticClose.getIntakeId();
@@ -303,11 +241,6 @@
         Integer hour = Integer.parseInt(String.format("%tH", plannedOpenTime));
         Integer minute = Integer.parseInt(String.format("%tM", plannedOpenTime));
 
-        /**
-         * 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
-         * 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱
-         * 濡傛灉鍙栨按鍙ｆ病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱
-         */
         if(vcId == null) {
             vcId = getVcIdByIntakeId(intakeId);
             if(vcId == null) {
@@ -417,11 +350,6 @@
             param.setMinute(minute);
             param.setOrderNo(orderNo);
 
-            /**
-             * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
-             * 1 鍑嗗鍙傛暟
-             * 2 璋冪敤鍏叡鏂规硶
-             */
             Param myParam = new Param();
             myParam.setComId(comId);
             myParam.setComType((byte)1);
@@ -463,13 +391,6 @@
         }
     }
 
-    /**
-     * 灏忕▼搴忚繙绋嬪紑闃�
-     * @param valve
-     * @param planId
-     * @param operatetype
-     * @return
-     */
     public Map openWx(ValveOpen valve, Long planId, Byte operatetype) {
         Long intakeId = valve.getIntakeId();
         String intakeName = valve.getIntakeName();
@@ -523,11 +444,6 @@
             }
         }
 
-        /**
-         * 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
-         * 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱
-         * 濡傛灉鍙栨按鍙ｆ病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱
-         */
         if (vcId == null) {
             vcId = getVcIdByIntakeId(intakeId);
             if (vcId == null) {
@@ -626,11 +542,6 @@
             param.elePrice = 0.0;
             param.orderNo = orderNo;
 
-            /**
-             * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
-             * 1 鍑嗗鍙傛暟
-             * 2 璋冪敤鍏叡鏂规硶
-             */
             Param myParam = new Param();
             myParam.setComId(comId);
             myParam.setComType((byte)1);
@@ -669,11 +580,6 @@
             param.waterPrice = waterPrice;
             param.orderNo = orderNo;
 
-            /**
-             * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
-             * 1 鍑嗗鍙傛暟
-             * 2 璋冪敤鍏叡鏂规硶
-             */
             Param myParam = new Param();
             myParam.setComId(comId);
             myParam.setComType((byte)1);
@@ -706,13 +612,6 @@
         }
     }
 
-    /**
-     * 灏忕▼搴忚繙绋嬪叧闃�
-     * @param valve
-     * @param planId
-     * @param operatetype
-     * @return
-     */
     @Transactional(rollbackFor = Exception.class)
     public Map closeWx(ValveClose valve, Long planId, Byte operatetype) {
         String rtuAddr = valve.getRtuAddr();
@@ -771,11 +670,6 @@
             param.icCardNo = vcNum;
             param.orderNo = orderNo;
 
-            /**
-             * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
-             * 1 鍑嗗鍙傛暟
-             * 2 璋冪敤鍏叡鏂规硶
-             */
             Param myParam = new Param();
             myParam.setComId(comId);
             myParam.setComType((byte)2);
@@ -805,11 +699,6 @@
             param.icCardNo = vcNum;
             param.orderNo = orderNo;
 
-            /**
-             * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
-             * 1 鍑嗗鍙傛暟
-             * 2 璋冪敤鍏叡鏂规硶
-             */
             Param myParam = new Param();
             myParam.setComId(comId);
             myParam.setComType((byte)2);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java
index 1f38ed5..4e8fe9f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java
@@ -70,12 +70,6 @@
         this.env = env;
     }
 
-    /**
-     * 灏忕▼搴忚繙绋嬪紑闃�
-     * @param valve
-     * @param bindingResult
-     * @return
-     */
     @PostMapping(path = "open_wx", consumes = MediaType.APPLICATION_JSON_VALUE)
     @Transactional(rollbackFor = Exception.class)
     public BaseResponse<Boolean> open(@RequestBody @Valid ValveOpen valve, BindingResult bindingResult) {
@@ -222,13 +216,6 @@
         //}
     }
 
-    /**
-     * 灏忕▼搴忚繙绋嬪叧闃�
-     *
-     * @param valve
-     * @param bindingResult
-     * @return
-     */
     @PostMapping(path = "close_wx", consumes = MediaType.APPLICATION_JSON_VALUE)
     //@Transactional(rollbackFor = Exception.class)
     public BaseResponse<Boolean> close(@RequestBody @Valid ValveClose valve, BindingResult bindingResult) {
@@ -325,12 +312,6 @@
         //}
     }
 
-    /**
-     * 瀹氭椂鍏抽榾
-     * @param automaticClose
-     * @param bindingResult
-     * @return
-     */
     @PostMapping(path = "timed_close", consumes = MediaType.APPLICATION_JSON_VALUE)
     @Transactional(rollbackFor = Exception.class)
     public BaseResponse<Boolean> timedClose(@RequestBody @Valid AutomaticClose automaticClose, BindingResult bindingResult) {
@@ -344,11 +325,6 @@
         Long operator = automaticClose.getOperator();
         Long comId = new IDLongGenerator().generate();
 
-        /**
-         * 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
-         * 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱
-         * 濡傛灉鍙栨按鍙ｆ病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱
-         */
         if(vcId == null) {
             vcId = commandSv.getVcIdByIntakeId(intakeId);
             if(vcId == null) {
@@ -436,12 +412,6 @@
         }
     }
 
-    /**
-     * 瀹氶噺鍏抽榾
-     * @param automaticClose
-     * @param bindingResult
-     * @return
-     */
     @PostMapping(path = "quantify_close", consumes = MediaType.APPLICATION_JSON_VALUE)
     @Transactional(rollbackFor = Exception.class)
     public BaseResponse<Boolean> quantifyClose(@RequestBody @Valid AutomaticClose automaticClose, BindingResult bindingResult) {
@@ -455,11 +425,6 @@
         Long operator = automaticClose.getOperator();
         Long comId = new IDLongGenerator().generate();
 
-        /**
-         * 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
-         * 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱
-         * 濡傛灉鍙栨按鍙ｆ病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱
-         */
         if(vcId == null) {
             vcId = commandSv.getVcIdByIntakeId(intakeId);
             if(vcId == null) {
@@ -516,11 +481,6 @@
             param.setWaterAmount(waterAmount);
             param.setOrderNo(orderNo);
 
-            /**
-             * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
-             * 1 鍑嗗鍙傛暟
-             * 2 璋冪敤鍏叡鏂规硶
-             */
             Param myParam = new Param();
             myParam.setComId(comId);
             myParam.setComType((byte)1);
@@ -547,12 +507,6 @@
         }
     }
 
-    /**
-     * 璁″垝寮�闃�瀹氭椂鍏抽榾
-     * @param automaticClose
-     * @param bindingResult
-     * @return
-     */
     @PostMapping(path = "planed_open_timed_close", consumes = MediaType.APPLICATION_JSON_VALUE)
     @Transactional(rollbackFor = Exception.class)
     public BaseResponse<Boolean> planedOpenTimedClose(@RequestBody @Valid AutomaticClose automaticClose, BindingResult bindingResult) {
@@ -679,12 +633,6 @@
         //}
     }
 
-    /**
-     * 璁″垝寮�闃�瀹氶噺鍏抽榾
-     * @param automaticClose
-     * @param bindingResult
-     * @return
-     */
     @PostMapping(path = "planed_open_quantify_close", consumes = MediaType.APPLICATION_JSON_VALUE)
     @Transactional(rollbackFor = Exception.class)
     public BaseResponse<Boolean> planedOpenQuantifyClose(@RequestBody @Valid AutomaticClose automaticClose, BindingResult bindingResult) {
@@ -705,11 +653,6 @@
         Integer hour = Integer.parseInt(String.format("%tH", plannedOpenTime));
         Integer minute = Integer.parseInt(String.format("%tM", plannedOpenTime));
 
-        /**
-         * 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
-         * 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱
-         * 濡傛灉鍙栨按鍙ｆ病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱
-         */
         if(vcId == null) {
             vcId = commandSv.getVcIdByIntakeId(intakeId);
             if(vcId == null) {
@@ -771,11 +714,6 @@
             param.setMinute(minute);
             param.setOrderNo(orderNo);
 
-            /**
-             * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
-             * 1 鍑嗗鍙傛暟
-             * 2 璋冪敤鍏叡鏂规硶
-             */
             Param myParam = new Param();
             myParam.setComId(comId);
             myParam.setComType((byte)1);
@@ -802,12 +740,6 @@
         }
     }
 
-    /**
-     * 鏍规嵁鎿嶄綔鍛業D鑾峰彇鏈叧闃�璁板綍
-     *
-     * @param operator
-     * @return
-     */
     @GetMapping(path = "/get")
     public BaseResponse<List<VoUnclosedValve>> getUnclosedValves(@RequestParam Long operator) {
         try {
@@ -819,12 +751,6 @@
         }
     }
 
-    /**
-     * 寮哄埗闅愯棌鏈叧闃�璁板綍锛氫负鎸囧畾锛堥榾鎺у櫒鍦板潃銆佹按鍗＄紪鍙枫�佹棤鍏抽榾璁板綍锛夊紑鍏抽榾鏈�鏂拌褰曟坊鍔犲叧闃�鏃堕棿锛屼娇涔嬩笉鍦ㄦ湭鍏抽榾璁板綍涓樉绀�
-     * @param po
-     * @param bindingResult
-     * @return
-     */
     @PostMapping(path = "deleteUnclosed", consumes = MediaType.APPLICATION_JSON_VALUE)
     public BaseResponse<Boolean> deleteUnclosed(@RequestBody @Valid deleteUnclosedParam po, BindingResult bindingResult) {
         if(bindingResult != null && bindingResult.hasErrors()){
@@ -835,12 +761,6 @@
         return BaseResponseUtils.buildSuccess();
     }
 
-    /**
-     * 灏忕▼搴忚繙绋嬪厖鍊�
-     * @param po
-     * @param bindingResult
-     * @return
-     */
     @PostMapping(path = "recharge", consumes = MediaType.APPLICATION_JSON_VALUE)
     @Transactional(rollbackFor = Exception.class)
     public BaseResponse<Boolean> recharge(@RequestBody @Valid Recharge po, BindingResult bindingResult) {
@@ -887,11 +807,6 @@
             param.chargeWater = chargeWater;
             param.flowNo = flowNo;
 
-            /**
-             * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
-             * 1 鍑嗗鍙傛暟
-             * 2 璋冪敤鍏叡鏂规硶
-             */
             Param myParam = new Param();
             myParam.setComId(comId);
             myParam.setCommandCode(commandCode);
@@ -910,11 +825,6 @@
         }
     }
 
-    /**
-     * 鏍规嵁閰嶇疆绫诲瀷鑾峰彇閰嶇疆鍊�
-     * @param type
-     * @return
-     */
     @GetMapping(path = "/irrigate_profile")
     public BaseResponse<QueryResultVo<List<VoIrrigaterProfile>>> getIrrPro(Integer type){
         try {
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanCtrl.java
index f1cebfe..6f5032d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanCtrl.java
@@ -52,15 +52,6 @@
     private final IrrigatePlanSv irrigatePlanSv;
     private final CommandSv commandSv;
 
-    /**
-     * 鍒涘缓鐏屾簤璁″垝
-     * 1. 娣诲姞鐏屾簤璁″垝
-     * 2. 娣诲姞鐏屾簤娆″簭
-     * 3. 娣诲姞鐏屾簤璁″垝鎿嶄綔璁板綍
-     * @param planAndSchedule
-     * @param bindingResult
-     * @return
-     */
     @PostMapping(path = "createPlan", consumes = MediaType.APPLICATION_JSON_VALUE)
     //@Transactional(rollbackFor = Exception.class)
     public BaseResponse<Boolean> createPlan(@RequestBody @Valid IrrigatePlan planAndSchedule, BindingResult bindingResult){
@@ -165,12 +156,6 @@
         return BaseResponseUtils.buildSuccess();
     }
 
-    /**
-     * 鍒犻櫎鐏屾簤璁″垝
-     * @param planSimple
-     * @param bindingResult
-     * @return
-     */
     @PostMapping(path = "deletePlan")
     public BaseResponse<Boolean> deletePlan(@RequestBody @Valid PlanSimple planSimple, BindingResult bindingResult) {
         if(bindingResult != null && bindingResult.hasErrors()){
@@ -184,15 +169,6 @@
         return BaseResponseUtils.buildSuccess() ;
     }
 
-    /**
-     * 鍙戝竷鐏屾簤璁″垝
-     * 1. 淇敼鐏屾簤璁″垝鐘舵�佷负鍙戝竷鐘舵��
-     * 2. 娣诲姞鐏屾簤璁″垝鎿嶄綔璁板綍
-     * 3. 鐢熸垚寮�闃�璁″垝
-     * @param planSimple
-     * @param bindingResult
-     * @return
-     */
     @PostMapping(path = "publishPlan", consumes = MediaType.APPLICATION_JSON_VALUE)
     //@Transactional(rollbackFor = Exception.class)
     public BaseResponse<Boolean> publishPlan(@RequestBody @Valid PlanSimple planSimple, BindingResult bindingResult){
@@ -290,11 +266,6 @@
         //return BaseResponseUtils.buildSuccess();
     }
 
-    /**
-     * 鏍规嵁璁″垝ID鑾峰彇璁″垝鏈�鏂扮姸鎬�
-     * @param planId
-     * @return
-     */
     @GetMapping(path = "/getPlanLatestState")
     public BaseResponse<Integer> getPlanLatestState(@RequestParam Long planId) {
         if(planId == null) {
@@ -309,12 +280,6 @@
         }
     }
 
-    /**
-     * 缁堟鐏屾簤璁″垝
-     * @param planSimple
-     * @param bindingResult
-     * @return
-     */
     @PostMapping(path = "terminatePlan", consumes = MediaType.APPLICATION_JSON_VALUE)
     //@Transactional(rollbackFor = Exception.class)
     public BaseResponse<Boolean> terminatePlan(@RequestBody @Valid PlanSimple planSimple, BindingResult bindingResult){
@@ -397,10 +362,6 @@
         return BaseResponseUtils.buildSuccess();
     }
 
-    /**
-     * 鑾峰彇鏈畬鎴愮殑璁″垝鍒楄〃锛屽皬绋嬪簭璁″垝鍒楄〃椤典娇鐢�
-     * @return
-     */
     @GetMapping(path = "/getNotCompletePlans")
     public BaseResponse<List<VoPlans>> getNotCompletePlans() {
         try {
@@ -412,10 +373,6 @@
         }
     }
 
-    /**
-     * 鑾峰彇宸插畬鎴愮殑璁″垝鍒楄〃锛屽皬绋嬪簭璁″垝鍒楄〃椤典娇鐢�
-     * @return
-     */
     @GetMapping(path = "/getCompletedPlans")
     public BaseResponse<QueryResultVo<List<VoPlans>>> getCompletedPlans(QueryConditionVo qo) {
         try {
@@ -426,11 +383,6 @@
         }
     }
 
-    /**
-     * 鏍规嵁璁″垝ID鑾峰彇璁″垝鍙戝竷缁撴灉
-     * @param planId
-     * @return
-     */
     @GetMapping(path = "/getPublishResults")
     public BaseResponse<VoPlanDetails> getPublishResults(@RequestParam Long planId) {
         if(planId == null) {
@@ -446,11 +398,6 @@
         }
     }
 
-    /**
-     * 鏍规嵁璁″垝ID鑾峰彇璁″垝缁堟鎿嶄綔缁撴灉
-     * @param planId
-     * @return
-     */
     @GetMapping(path = "/getTerminateResults")
     public BaseResponse<VoPlanDetails> getTerminateResults(@RequestParam Long planId) {
         if(planId == null) {
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java
index 86c013c..614ff75 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java
@@ -79,24 +79,12 @@
     @Value("${wechat.irr.plan.planTerminateLimitMinutes:5}")
     private Integer planTerminateLimitMinutes; // 璁″垝缁堟鍚庨檺鍒跺彂甯冩柊璁″垝鐨勬椂闂撮棿闅�(鍒嗛挓)
 
-    /**
-     * 娣诲姞鐏屾簤璁″垝
-     *
-     * @param po
-     * @return
-     */
     @Transactional(rollbackFor = Exception.class)
     public Long addIrrigatePlan(IrIrrigatePlan po) {
         irrigatePlanMapper.insert(po);
         return po.getId();
     }
 
-    /**
-     * 鍒犻櫎鐏屾簤璁″垝
-     *
-     * @param planSimple
-     * @return
-     */
     @Transactional(rollbackFor = Exception.class)
     public Map deletePlan(PlanSimple planSimple) {
         Long planId = planSimple.getPlanId();
@@ -142,12 +130,6 @@
         }
     }
 
-    /**
-     * 鍙戝竷鐏屾簤璁″垝
-     *
-     * @param planSimple
-     * @return
-     */
     public Map publishPlan(PlanSimple planSimple) {
         Long planId = planSimple.getPlanId();
         Long operatorId = planSimple.getOperatorId();
@@ -184,10 +166,6 @@
             }
         }
 
-        /**
-         * 鑾峰彇鐏屾簤璁″垝淇℃伅
-         * 鏇存柊鐏屾簤璁″垝璧锋鏃堕棿鍙婅鍒掔姸鎬�
-         */
         VoPlanSimple plan = irrigatePlanMapper.getPlanSimple(planId);
         if (plan == null) {
             Map map = new HashMap<>();
@@ -217,39 +195,32 @@
         }
         planStartTime = Date.from(startTime.atZone(ZoneId.systemDefault()).toInstant());
         
-        // 鏇存柊姣忎釜鐏屾簤娆″簭鐨勫紑濮嬫椂闂村苟璁＄畻鏈�鍚庝竴缁勫叧闃�鏃堕棿
         List<VoIrrigateSchedule> schedules = getSchedulesByPlanId(planId);
         Date scheduleStartTime = null;
         LocalDateTime lastScheduleEndTime = null;
         Integer sort = 0;
         
-        // 绗竴娆￠亶鍘嗭細鏇存柊姣忎釜鐏屾簤娆″簭鐨勫紑濮嬫椂闂�
         for (VoIrrigateSchedule schedule : schedules) {
             if (scheduleStartTime == null) {
                 scheduleStartTime = planStartTime;
             }
             this.updateScheduleStartTime(schedule.getScheduleId(), scheduleStartTime);
             
-            // 璁＄畻褰撳墠娆″簭鐨勭粨鏉熸椂闂�
             LocalDateTime currentScheduleStartTime = scheduleStartTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
             LocalDateTime currentScheduleEndTime = currentScheduleStartTime.plusMinutes(schedule.getDuration());
             
-            // 鏇存柊鏈�鍚庝竴缁勭殑缁撴潫鏃堕棿
             lastScheduleEndTime = currentScheduleEndTime;
             
-            // 璁＄畻涓嬩竴缁勭殑寮�濮嬫椂闂�
             LocalDateTime LocalscheduleStartTime = scheduleStartTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
             LocalscheduleStartTime = LocalscheduleStartTime.plusMinutes(schedule.getDuration());
             LocalscheduleStartTime = LocalscheduleStartTime.minusMinutes(preOpeningTime);
             scheduleStartTime = Date.from(LocalscheduleStartTime.atZone(ZoneId.systemDefault()).toInstant());
 
-            // 纭繚涓嬩竴缁勭殑寮�濮嬫椂闂翠笉鏃╀簬璁″垝寮�濮嬫椂闂�
             if (scheduleStartTime.before(planStartTime)) {
                 scheduleStartTime = planStartTime;
             }
         }
         
-        // 鏍规嵁鏈�鍚庝竴缁勫叧闃�鏃堕棿璁剧疆璁″垝缁撴潫鏃堕棿
         if (lastScheduleEndTime != null) {
             planStopTime = Date.from(lastScheduleEndTime.atZone(ZoneId.systemDefault()).toInstant());
         } else {
@@ -258,7 +229,6 @@
             planStopTime = Date.from(stopTime.atZone(ZoneId.systemDefault()).toInstant());
         }
 
-        // 鏍规嵁璁″垝ID鏇存柊璁″垝淇℃伅锛堣捣姝㈡椂闂淬�佽鍒掔姸鎬侊級
         if (this.updatePlanTimes(planStartTime, planStopTime, planId) == 0) {
             Map map = new HashMap<>();
             map.put("success", false);
@@ -267,7 +237,6 @@
             return map;
         }
 
-        // 娣诲姞鐏屾簤璁″垝鎿嶄綔璁板綍
         IrPlanOperate planOperate = new IrPlanOperate();
         planOperate.setPlanId(planId);
         planOperate.setOperator(operatorId);
@@ -541,12 +510,6 @@
         return irIrrigateUnitMapper.getIntakeIdByUnitId(unitId);
     }
 
-    /**
-     * 鏍规嵁璁″垝ID鑾峰彇璁″垝鍙戝竷缁撴灉
-     *
-     * @param planId
-     * @return
-     */
     public VoPlanDetails getPublishResults(Long planId) {
         VoPlanDetails planDetails = irrigatePlanMapper.getPlanDetails(planId);
         if (planDetails == null) {
@@ -571,15 +534,8 @@
 
         planDetails.setGroups(groupResults);
         return planDetails;
-
     }
 
-    /**
-     * 鏍规嵁璁″垝ID鑾峰彇璁″垝缁堟鎿嶄綔缁撴灉
-     *
-     * @param planId
-     * @return
-     */
     public VoPlanDetails getTerminateResults(Long planId) {
         // 鑾峰彇璁″垝缁堟鏃堕棿
         Date terminateTime = Optional.ofNullable(irPlanOperateMapper.getTerminateTime(planId)).orElse(null);

--
Gitblit v1.8.0