From 3dc2929d22a5f437fbee133df66aaff26a10d243 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 13 九月 2024 09:47:10 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java | 66 ++++++++++++++++++++++++++++++++
1 files changed, 65 insertions(+), 1 deletions(-)
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 e534438..74589e5 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
@@ -10,10 +10,12 @@
import com.dy.common.util.IDLongGenerator;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
+import com.dy.common.webUtil.QueryResultVo;
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.VoIrrigaterProfile;
import com.dy.pipIrrGlobal.voRm.VoUnclosedValve;
import com.dy.pipIrrGlobal.voSe.VoVirtualCard;
import com.dy.pipIrrWechat.command.dto.AutomaticClose;
@@ -49,7 +51,6 @@
@Tag(name = "灏忕▼搴忛榾鎺у櫒鎺у埗", description = "灏忕▼搴忛榾鎺у櫒鎺у埗")
@RestController
@RequestMapping(path = "valve")
-//@RequiredArgsConstructor
public class ValveCtrl extends ComSupport {
private final CommandSv commandSv;
private final SeVirtualCardMapper seVirtualCardMapper;
@@ -132,6 +133,9 @@
// 鑾峰彇姘翠环
Double waterPrice = commandSv.getPrice();
+ if(waterPrice == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_WATER_PRICE.getMessage());
+ }
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
@@ -141,10 +145,16 @@
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
String orgTag = job_rtu.getString("orgTag");
+ if(orgTag == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ }
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鐢熸垚璁㈠崟鍙�
String orderNo = generateOrderNo();
+ if(orderNo == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_ORDER_NUMBER.getMessage());
+ }
String commandCode = null;
if (protocol.equals("p206V202404")) {
@@ -244,6 +254,9 @@
Long intakeId = job_rtu.getLong("intakeId");
String protocol = job_rtu.getString("protocol");
String orgTag = job_rtu.getString("orgTag");
+ if(orgTag == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ }
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
String commandCode = null;
@@ -349,6 +362,9 @@
// 鑾峰彇姘翠环
Double waterPrice = commandSv.getPrice();
+ if(waterPrice == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_WATER_PRICE.getMessage());
+ }
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
@@ -358,10 +374,16 @@
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
String orgTag = job_rtu.getString("orgTag");
+ if(orgTag == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ }
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鐢熸垚璁㈠崟鍙�
String orderNo = generateOrderNo();
+ if(orderNo == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_ORDER_NUMBER.getMessage());
+ }
String commandCode = null;
if(protocol.equals("p206V202404")) {
@@ -442,6 +464,9 @@
// 鑾峰彇姘翠环
Double waterPrice = commandSv.getPrice();
+ if(waterPrice == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_WATER_PRICE.getMessage());
+ }
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
@@ -451,10 +476,17 @@
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
String orgTag = job_rtu.getString("orgTag");
+ if(orgTag == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ }
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鐢熸垚璁㈠崟鍙�
String orderNo = generateOrderNo();
+ if(orderNo == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_ORDER_NUMBER.getMessage());
+ }
+
String commandCode = null;
if(protocol.equals("p206V202404")) {
return BaseResponseUtils.buildSuccess();
@@ -541,6 +573,9 @@
// 鑾峰彇姘翠环
Double waterPrice = commandSv.getPrice();
+ if(waterPrice == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_WATER_PRICE.getMessage());
+ }
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
@@ -550,10 +585,16 @@
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
String orgTag = job_rtu.getString("orgTag");
+ if(orgTag == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ }
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鐢熸垚璁㈠崟鍙�
String orderNo = generateOrderNo();
+ if(orderNo == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_ORDER_NUMBER.getMessage());
+ }
String commandCode = null;
if(protocol.equals("p206V202404")) {
@@ -646,6 +687,9 @@
// 鑾峰彇姘翠环
Double waterPrice = commandSv.getPrice();
+ if(waterPrice == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_WATER_PRICE.getMessage());
+ }
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
@@ -655,10 +699,16 @@
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
String orgTag = job_rtu.getString("orgTag");
+ if(orgTag == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ }
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鐢熸垚璁㈠崟鍙�
String orderNo = generateOrderNo();
+ if(orderNo == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.NO_ORDER_NUMBER.getMessage());
+ }
String commandCode = null;
if(protocol.equals("p206V202404")) {
@@ -794,4 +844,18 @@
return BaseResponseUtils.buildFail("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
}
}
+
+ /**
+ * 鏍规嵁閰嶇疆绫诲瀷鑾峰彇閰嶇疆鍊�
+ * @param type
+ * @return
+ */
+ @GetMapping(path = "/irrigate_profile")
+ public BaseResponse<QueryResultVo<List<VoIrrigaterProfile>>> getIrrPro(Integer type){
+ try {
+ return BaseResponseUtils.buildSuccess(commandSv.getIrrPro(type));
+ } catch (Exception e) {
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ }
}
--
Gitblit v1.8.0