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 | 136 +--------------------------------------------
1 files changed, 4 insertions(+), 132 deletions(-)
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 4c4b193..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
@@ -19,6 +19,7 @@
import com.dy.pipIrrGlobal.command.ComSupport;
import com.dy.pipIrrGlobal.command.dto.Param;
import com.dy.pipIrrGlobal.daoSe.SeVirtualCardMapper;
+import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
import com.dy.pipIrrGlobal.voRm.VoUnclosedParam;
import com.dy.pipIrrGlobal.voRm.VoUnclosedValve;
import com.dy.pipIrrGlobal.voSe.VoVirtualCard;
@@ -79,12 +80,6 @@
this.env = env;
}
- /**
- * 骞冲彴杩滅▼寮�闃�锛堝己鍒跺紑闃�锛�
- * @param valve
- * @param bindingResult
- * @return
- */
@PostMapping(path = "open", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
@@ -159,11 +154,6 @@
param.elePrice = 0.0;
param.orderNo = orderNo;
- /**
- * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
- * 1 鍑嗗鍙傛暟
- * 2 璋冪敤鍏叡鏂规硶
- */
Param myParam = new Param();
myParam.setComId(comId);
myParam.setComType((byte)1);
@@ -181,11 +171,6 @@
// 鑾峰彇鍔熻兘鐮�
commandCode = CodeV1.cd_92;
- /**
- * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
- * 1 鍑嗗鍙傛暟
- * 2 璋冪敤鍏叡鏂规硶
- */
Param myParam = new Param();
myParam.setComId(comId);
myParam.setComType((byte)1);
@@ -204,12 +189,6 @@
}
}
- /**
- * 骞冲彴杩滅▼鍏抽榾锛堝己鍒跺叧闃�锛�
- * @param dtoBase
- * @param bindingResult
- * @return
- */
@PostMapping(path = "close_intake", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
@@ -224,6 +203,9 @@
VoUnclosedParam voUnclosedParam = null;
try {
voUnclosedParam = commandSv.getUncloseParam(intakeId);
+ if(voUnclosedParam == null) {
+ return BaseResponseUtils.buildErrorMsg("涓嶅瓨鍦ㄧ鍚堟潯浠剁殑鏈叧闃�鍙栨按鍙�");
+ }
}catch (Exception e) {
return BaseResponseUtils.buildErrorMsg("鑾峰彇鏈叧闃�淇℃伅閿欒");
}
@@ -308,12 +290,6 @@
}
}
- /**
- * 杩滅▼寮�闃�锛堜唬鍐滄埛锛�
- * @param valve
- * @param bindingResult
- * @return
- */
@PostMapping(path = "open_client", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
@@ -327,11 +303,6 @@
Long operator = valve.getOperator();
Long comId = new IDLongGenerator().generate();
- /**
- * 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
- * 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱
- * 濡傛灉鍙栨按鍙ｆ病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱
- */
if (vcId == null) {
vcId = commandSv.getVcIdByIntakeId(intakeId);
if (vcId == null) {
@@ -392,11 +363,6 @@
param.elePrice = 0.0;
param.orderNo = orderNo;
- /**
- * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
- * 1 鍑嗗鍙傛暟
- * 2 璋冪敤鍏叡鏂规硶
- */
Param myParam = new Param();
myParam.setComId(comId);
myParam.setComType((byte)1);
@@ -422,11 +388,6 @@
param.waterPrice = waterPrice;
param.orderNo = orderNo;
- /**
- * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
- * 1 鍑嗗鍙傛暟
- * 2 璋冪敤鍏叡鏂规硶
- */
Param myParam = new Param();
myParam.setComId(comId);
myParam.setComType((byte)1);
@@ -445,12 +406,6 @@
}
}
- /**
- * 杩滅▼鍏抽榾锛堜唬鍐滄埛锛�
- * @param dtoBase
- * @param bindingResult
- * @return
- */
@PostMapping(path = "close_client", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
@@ -503,11 +458,6 @@
param.icCardNo = vcNum;
param.orderNo = orderNo;
- /**
- * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
- * 1 鍑嗗鍙傛暟
- * 2 璋冪敤鍏叡鏂规硶
- */
Param myParam = new Param();
myParam.setComId(comId);
myParam.setComType((byte)2);
@@ -530,11 +480,6 @@
param.icCardNo = vcNum;
param.orderNo = orderNo;
- /**
- * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
- * 1 鍑嗗鍙傛暟
- * 2 璋冪敤鍏叡鏂规硶
- */
Param myParam = new Param();
myParam.setComId(comId);
myParam.setComType((byte)2);
@@ -553,12 +498,6 @@
}
}
- /**
- * 瀹氭椂鍏抽榾寮忓紑闃�
- * @param automaticClose
- * @param bindingResult
- * @return
- */
@PostMapping(path = "timed_close", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
@@ -573,11 +512,6 @@
Long operator = automaticClose.getOperator();
Long comId = new IDLongGenerator().generate();
- /**
- * 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
- * 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱
- * 濡傛灉鍙栨按鍙ｆ病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱
- */
if(vcId == null) {
vcId = commandSv.getVcIdByIntakeId(intakeId);
if(vcId == null) {
@@ -634,11 +568,6 @@
param.setMinutes(minutes);
param.setOrderNo(orderNo);
- /**
- * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
- * 1 鍑嗗鍙傛暟
- * 2 璋冪敤鍏叡鏂规硶
- */
Param myParam = new Param();
myParam.setComId(comId);
myParam.setComType((byte)2);
@@ -657,12 +586,6 @@
}
}
- /**
- * 瀹氶噺鍏抽榾寮忓紑闃�
- * @param automaticClose
- * @param bindingResult
- * @return
- */
@PostMapping(path = "quantify_close", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
@@ -677,11 +600,6 @@
Long operator = automaticClose.getOperator();
Long comId = new IDLongGenerator().generate();
- /**
- * 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
- * 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱
- * 濡傛灉鍙栨按鍙ｆ病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱
- */
if(vcId == null) {
vcId = commandSv.getVcIdByIntakeId(intakeId);
if(vcId == null) {
@@ -738,11 +656,6 @@
param.setWaterAmount(waterAmount);
param.setOrderNo(orderNo);
- /**
- * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
- * 1 鍑嗗鍙傛暟
- * 2 璋冪敤鍏叡鏂规硶
- */
Param myParam = new Param();
myParam.setComId(comId);
myParam.setComType((byte)2);
@@ -761,12 +674,6 @@
}
}
- /**
- * 瀹氭椂鍏抽榾寮忚鍒掑紑闃�
- * @param automaticClose
- * @param bindingResult
- * @return
- */
@PostMapping(path = "planed_open_timed_close", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
@@ -788,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) {
@@ -854,11 +756,6 @@
param.setMinute(minute);
param.setOrderNo(orderNo);
- /**
- * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
- * 1 鍑嗗鍙傛暟
- * 2 璋冪敤鍏叡鏂规硶
- */
Param myParam = new Param();
myParam.setComId(comId);
myParam.setComType((byte)2);
@@ -904,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) {
@@ -970,11 +862,6 @@
param.setMinute(minute);
param.setOrderNo(orderNo);
- /**
- * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
- * 1 鍑嗗鍙傛暟
- * 2 璋冪敤鍏叡鏂规硶
- */
Param myParam = new Param();
myParam.setComId(comId);
myParam.setComType((byte)2);
@@ -993,11 +880,6 @@
}
}
- /**
- * 鏍规嵁鎿嶄綔鍛業D鑾峰彇鏈叧闃�璁板綍
- * @param operator
- * @return
- */
@GetMapping(path = "/get")
@SsoAop()
public BaseResponse<List<VoUnclosedValve>> getUnclosedValves(@RequestParam Long operator){
@@ -1081,11 +963,6 @@
param.chargeWater = chargeWater;
param.flowNo = flowNo;
- /**
- * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
- * 1 鍑嗗鍙傛暟
- * 2 璋冪敤鍏叡鏂规硶
- */
Param myParam = new Param();
myParam.setComId(comId);
myParam.setCommandCode(commandCode);
@@ -1142,11 +1019,6 @@
param.projectNo = projectNo;
param.icCardAddr = cardAddr;
- /**
- * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
- * 1 鍑嗗鍙傛暟
- * 2 璋冪敤鍏叡鏂规硶
- */
Param myParam = new Param();
myParam.setComId(comId);
myParam.setCommandCode(commandCode);
--
Gitblit v1.8.0