From de890b3e1f5050e699ea9d9bebb0ab3ce0b7d207 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 29 八月 2024 11:06:42 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database.yml | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/config/ByteArrayHttpMessageConverter.java | 5
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/config/ByteArrayHttpMessageConverterConfig.java | 4
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/DtoBase.java | 5
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/result/RemoteResultCode.java | 3
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/ComSupportP206V202404.java | 9
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java | 351 ++++++++++++++++++++++++++++---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java | 50 ++++
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuLogCtrl.java | 136 ++++++++++++
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/CommandP206V202404Ctrl.java | 67 ++++-
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/result/WechatResultCode.java | 5
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/ValveOpen.java | 5
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml | 6
pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml | 4
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/rtuLog/RtuLogSupport.java | 1
15 files changed, 579 insertions(+), 74 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/rtuLog/ByteArrayHttpMessageConverter.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/config/ByteArrayHttpMessageConverter.java
similarity index 89%
rename from pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/rtuLog/ByteArrayHttpMessageConverter.java
rename to pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/config/ByteArrayHttpMessageConverter.java
index 5e6256e..7e7e980 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/rtuLog/ByteArrayHttpMessageConverter.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/config/ByteArrayHttpMessageConverter.java
@@ -1,4 +1,4 @@
-package com.dy.pipIrrMwTestWeb.rtuLog;
+package com.dy.pipIrrGlobal.config;
import org.springframework.http.HttpInputMessage;
import org.springframework.http.HttpOutputMessage;
@@ -6,6 +6,7 @@
import org.springframework.http.converter.AbstractHttpMessageConverter;
import org.springframework.http.converter.HttpMessageNotReadableException;
import org.springframework.http.converter.HttpMessageNotWritableException;
+import org.springframework.util.StreamUtils;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -29,7 +30,7 @@
@Override
protected byte[] readInternal(Class<? extends byte[]> clazz, HttpInputMessage inputMessage) throws IOException, HttpMessageNotReadableException {
// Read the byte array from the input message
- return org.springframework.util.StreamUtils.copyToByteArray(inputMessage.getBody());
+ return StreamUtils.copyToByteArray(inputMessage.getBody());
}
@Override
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/rtuLog/ByteArrayConverterConfig.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/config/ByteArrayHttpMessageConverterConfig.java
similarity index 82%
rename from pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/rtuLog/ByteArrayConverterConfig.java
rename to pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/config/ByteArrayHttpMessageConverterConfig.java
index 4adcc2d..a5c0672 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/rtuLog/ByteArrayConverterConfig.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/config/ByteArrayHttpMessageConverterConfig.java
@@ -1,4 +1,4 @@
-package com.dy.pipIrrMwTestWeb.rtuLog;
+package com.dy.pipIrrGlobal.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -10,7 +10,7 @@
* @Description
*/
@Configuration
-public class ByteArrayConverterConfig {
+public class ByteArrayHttpMessageConverterConfig {
@Bean
public HttpMessageConverter<byte[]> logFileByteArrayHttpMessageConverter() {
return new ByteArrayHttpMessageConverter();
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml
index cae00fe..87a63f2 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml
@@ -5,10 +5,10 @@
#name: ym
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+# url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
# url: jdbc:mysql://8.130.130.233:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#url: jdbc:mysql://8.140.179.55:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
-# url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+ url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
username: root
password: dysql,;.abc!@#
druid:
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
index 83b82ab..ce65e3e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -71,7 +71,7 @@
pipIrr:
global:
- dev: true #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
+ dev: false #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
dsName: ym #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
mw:
webPort: 8070
@@ -149,8 +149,12 @@
#鍛戒护鍙戦�佸湴鍧�(涓紑鏄満鏋則ag锛屽叾涔熸槸鏁版嵁婧愬悗缂�鍚嶇О)
ym:
comSendUrl: "http://127.0.0.1:8070/rtuMw/com/send"
+ rtuLogFileUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogFile"
+ rtuLogTextUrl: "http://127.0.0.1:8070/rtuMw/com/rtuLogText"
pj:
comSendUrl: "http://127.0.0.1:8071/rtuMw/com/send"
+ rtuLogFileUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogFile"
+ rtuLogTextUrl: "http://127.0.0.1:8071/rtuMw/com/rtuLogText"
#鐩戞祴鎺у埗妯″潡鍥炶皟鍦板潃
rtuCallbackUrl_rm: "http://127.0.0.1:8081/remote/comRes/receive"
#寰俊灏忕▼搴忓洖璋冨湴鍧�
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database.yml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database.yml
index 9e7786d..1b486e8 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database.yml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/application-database.yml
@@ -4,7 +4,7 @@
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
- #url: jdbc:mysql://8.130.130.233:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+# url: jdbc:mysql://8.130.130.233:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#url: jdbc:mysql://8.140.179.55:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
username: root
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/ComSupportP206V202404.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/ComSupportP206V202404.java
index 2496adb..d9198ea 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/ComSupportP206V202404.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/ComSupportP206V202404.java
@@ -19,10 +19,13 @@
* @Description
*/
public class ComSupportP206V202404 {
- protected static String mwUrlTest = "http://127.0.0.1:8070/rtuMw/com/test" ;
- protected static String mwUrlSendCom = "http://127.0.0.1:8070/rtuMw/com/send" ;
+ protected static final String mwIp = "romq9311819.vicp.fun" ; //http://romq9311819.vicp.fun:16583
+ protected static final String mwPort = "16583" ;
- protected static String rtuAddr = "37142501020100215" ;
+ protected static String mwUrlTest = "http://" + mwIp + ":" + mwPort + "/rtuMw/com/test" ;
+ protected static String mwUrlSendCom = "http://" + mwIp + ":" + mwPort + "/rtuMw/com/send" ;
+
+ protected static String rtuAddr = "41162810400100001" ;
protected static String rtuResultSendWebUrl = "http://127.0.0.1:65535/test/comRes/receive" ;
protected static String controllerType = "57" ;//鎺у埗鍣ㄧ被鍨�
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/CommandP206V202404Ctrl.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/CommandP206V202404Ctrl.java
index a7e9eb7..1a4430f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/CommandP206V202404Ctrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V202404test/CommandP206V202404Ctrl.java
@@ -18,23 +18,56 @@
public class CommandP206V202404Ctrl extends ComSupportP206V202404 {
@GetMapping(path = "test")
- public BaseResponse<String> test() {
- //return this.connect() ;//杩炴帴閫氫俊涓棿浠舵祴璇�
- //return this.cdXY(CodeV202404.cd_9C) ;//鍙戦�佸浐瀹氬弬鏁癤Y鐨勫懡浠�
- //return this.cd55(1) ;
- //return this.cd15() ;
- //return this.cd16() ;
- //return this.cd21() ;
- //return this.cd22() ;
- //return this.cd23() ;
- //return this.cd24() ;
- //return this.cd26() ;
- //return this.cd31() ;
- //return this.cd86() ;
- //return this.cd87() ;
- return this.cd92() ;
- //return this.cd93() ;
- //return this.cd9C() ;
+ public BaseResponse<String> test(String com) {
+ BaseResponse<String> rt = null ;
+ if(com == null){
+ rt = this.connect() ;//杩炴帴閫氫俊涓棿浠舵祴璇�
+ }else{
+ try{
+ if(com.equals("10")){
+ rt = this.cd10() ;
+ }else if(com.equals("15")){
+ rt = this.cd15() ;
+ }else if(com.equals("16")){
+ rt = this.cd16() ;
+ }else if(com.equals("21")){
+ rt = this.cd21() ;
+ }else if(com.equals("22")){
+ rt = this.cd22() ;
+ }else if(com.equals("23")){
+ rt = this.cd23() ;
+ }else if(com.equals("24")){
+ rt = this.cd24() ;
+ }else if(com.equals("26")){
+ rt = this.cd26() ;
+ }else if(com.equals("31")){
+ rt = this.cd31() ;
+ }else if(com.equals("55")){
+ rt = this.cd55(1) ;
+ }else if(com.equals("65")){
+ rt = this.cd65(1) ;
+ }else if(com.equals("86")){
+ rt = this.cd86() ;
+ }else if(com.equals("87")){
+ rt = this.cd87() ;
+ }else if(com.equals("92")){
+ rt = this.cd92() ;
+ }else if(com.equals("93")){
+ rt = this.cd93() ;
+ }else if(com.equals("9C")){
+ rt = this.cd9C() ;
+ }else if(com.equals("A2")){
+ rt = this.cdA2() ;
+ }else if(com.equals("A3")){
+ rt = this.cdA3() ;
+ }else{
+ rt = this.cdXY(com) ;//鍙戦�佸浐瀹氬弬鏁癤Y鐨勫懡浠�, 渚嬪懡浠odeV202404.cd_9C
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+ return rt ;
}
/**
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/rtuLog/RtuLogSupport.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/rtuLog/RtuLogSupport.java
index 162347c..2266d33 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/rtuLog/RtuLogSupport.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/rtuLog/RtuLogSupport.java
@@ -3,7 +3,6 @@
import com.dy.common.webUtil.BaseResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.*;
-import org.springframework.http.HttpRequest;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponentsBuilder;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/DtoBase.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/DtoBase.java
index 347169c..e960b9e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/DtoBase.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/DtoBase.java
@@ -21,6 +21,11 @@
private Long intakeId;
/**
+ * 鍙栨按鍙ｅ悕绉�
+ */
+ private String intakeName;
+
+ /**
* 鎿嶄綔浜�
*/
@NotNull(message = "鎿嶄綔浜轰笉鑳戒负绌�")
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/ValveOpen.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/ValveOpen.java
index cc4a505..67c911b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/ValveOpen.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/ValveOpen.java
@@ -18,9 +18,4 @@
*/
private Long vcId;
- /**
- * 鐢ㄦ埛绫诲瀷 1-骞冲彴锛�2-APP
- */
- //@NotNull(message = "鎿嶄綔绫诲瀷涓嶈兘涓虹┖")
- //private Integer userType;
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/result/RemoteResultCode.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/result/RemoteResultCode.java
index c825c41..befa7c9 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/result/RemoteResultCode.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/result/RemoteResultCode.java
@@ -21,11 +21,14 @@
IN_USE_VC_CANNOT_OPEN_VALVE(10004, "浣跨敤涓櫄鎷熷崱涓嶈兘鐢ㄦ潵寮�闃�"),
VALVE_CLOSED(10005, "璇ュ彇姘村彛涓嶅湪绾挎垨宸插叧闃�"),
THE_DEVICE_DOES_NOT_HAVE_THIS_FUNCTION(10006, "璇ヨ澶囨棤姝ゅ悓鑳�"),
+ NO_WATER_PRICE(10007, "鏈彇鍒版按浠�"),
+ NO_ORDER_NUMBER(10008, "鏈敓鎴愯鍗曞彿"),
/**
* RTU
*/
RTU_NOT_EXIST(20001, "闃�鎺у櫒涓嶅瓨鍦�"),
+ RTU_NOT_SET_DATA_SOURCE(20002, "闃�鎺у櫒鏈缃暟鎹簮"),
CLIENT_CARD_NOT_EXIST(30001, "姘村崱涓嶅瓨鍦�");
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuLogCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuLogCtrl.java
new file mode 100644
index 0000000..025eb89
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuLogCtrl.java
@@ -0,0 +1,136 @@
+package com.dy.pipIrrRemote.rtu;
+
+import com.dy.common.aop.SsoAop;
+import com.dy.common.multiDataSource.DataSourceContext;
+import com.dy.common.webUtil.BaseResponse;
+import com.dy.common.webUtil.BaseResponseUtils;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import java.net.URLEncoder;
+import java.util.List;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/8/29 9:22
+ * @Description
+ */
+
+@Slf4j
+@RestController
+@RequestMapping(path="rtuLog")
+public class RtuLogCtrl {
+
+ private static final String pro_mw = "mw";
+ private static final String key_mw_file = "rtuLogFileUrl";
+ private static final String key_mw_text = "rtuLogTextUrl";
+
+ private Environment env ;
+ private RestTemplate restTemplate;
+
+ @Autowired
+ public RtuLogCtrl(Environment env, RestTemplate restTemplate) {
+ this.env = env;
+ this.restTemplate = restTemplate;
+ }
+
+ /**
+ * 鍙戦�佸懡浠わ紝璇锋眰涓嬭浇rtu涓婁笅琛屾暟鎹棩蹇楁枃浠�
+ * @param rtuAddr rtu鍦板潃
+ * @return
+ */
+ @GetMapping(path = "file")
+ @SsoAop()
+ public BaseResponse<List<String>> rtuLogFile(String rtuAddr, HttpServletRequest req, HttpServletResponse rep){
+ String mwUrlRtuLogFile = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw_file);
+ ServletOutputStream out = null ;
+ try{
+ byte[] bs = this.requestMw4File(rtuAddr, mwUrlRtuLogFile) ;
+ if(bs != null && bs.length > 0){
+ String fileReName = rtuAddr + ".log" ;
+ //URLEncoder.encode鍙互闃叉涓枃涔辩爜
+ fileReName = URLEncoder.encode(fileReName, "UTF-8").replaceAll("\\+", "%20");
+ rep.addHeader("content-type", "application/octet-stream;charset=UTF-8");
+ rep.addHeader("Content-Disposition", "attachment;fileName=" + fileReName);
+ out = rep.getOutputStream() ;
+ out.write(bs, 0, (bs==null?0:bs.length));
+ out.flush();
+ }else{
+ return BaseResponseUtils.buildError("鑾峰彇鏂囦欢澶辫触") ;
+ }
+ }catch (Exception e){
+ }finally {
+ if(out != null){
+ try{
+ out.close();
+ }catch(Exception e){
+ }
+ }
+ }
+ return null ;
+ }
+
+ /**
+ * 鍙戦�佸懡浠わ紝璇锋眰rtu涓婁笅琛屾暟鎹棩蹇楁枃浠跺唴瀹�
+ * @param rtuAddr rtu鍦板潃
+ * @return
+ */
+ @GetMapping(path="text")
+ @SsoAop()
+ public BaseResponse<List<String>> rtuLogText(String rtuAddr){
+ String mwUrlRtuLogText = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw_text);
+ return this.requestMw4Text(rtuAddr, mwUrlRtuLogText) ;
+ }
+
+
+ /**
+ * 鍙戦�佸懡浠わ紝璇锋眰涓嬭浇rtu涓婁笅琛屾暟鎹棩蹇楁枃浠�
+ * @param rtuAddr rtu鍦板潃
+ * @param mwUrl mw鏈嶅姟鍣ㄥ湴鍧�
+ * @return
+ */
+ private byte[] requestMw4File(String rtuAddr, String mwUrl) throws Exception{
+ String url = UriComponentsBuilder.fromUriString(mwUrl)
+ .build()
+ .toUriString();
+ UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(url)
+ .queryParam("rtuAddr", rtuAddr);
+ return restTemplate.getForObject(builder.toUriString(), byte[].class);
+ }
+
+ /**
+ * 鍙戦�佸懡浠わ紝璇锋眰rtu涓婁笅琛屾暟鎹棩蹇楁枃浠跺唴瀹�
+ * @param rtuAddr rtu鍦板潃
+ * @param mwUrl mw鏈嶅姟鍣ㄥ湴鍧�
+ * @return
+ */
+ private BaseResponse<List<String>> requestMw4Text(String rtuAddr, String mwUrl){
+ String url = UriComponentsBuilder.fromUriString(mwUrl)
+ .build()
+ .toUriString();
+
+ UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(url)
+ .queryParam("rtuAddr", rtuAddr);
+
+ ResponseEntity<BaseResponse> response = restTemplate.exchange(builder.toUriString(),
+ HttpMethod.GET,
+ new HttpEntity<>(new HttpHeaders()),
+ BaseResponse.class);
+
+ return (response==null?null:response.getBody());
+ }
+
+}
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 4ddcf26..648354f 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
@@ -78,7 +78,7 @@
}
/**
- * 骞冲彴杩滅▼寮�闃�
+ * 骞冲彴杩滅▼寮�闃�锛堝己鍒跺紑闃�锛�
* @param valve
* @param bindingResult
* @return
@@ -97,31 +97,11 @@
Long operator = valve.getOperator();
Long comId = idLongGenerator.generate();
- /**
- * 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
- * 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱
- * 濡傛灉鍙栨按鍙ｆ病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱
- */
- if(vcId == null) {
- vcId = commandSv.getVcIdByIntakeId(intakeId);
- if(vcId == null) {
- return BaseResponseUtils.buildErrorMsg(RemoteResultCode.PLEASE_SELECT_A_VC.getMessage());
- }
- }
-
- // 铏氭嫙鍗D鎹㈣櫄鎷熷崱瀵硅薄
- VoVirtualCard vc = commandSv.getVcById(vcId);
- if(vc == null) {
- return BaseResponseUtils.buildErrorMsg(RemoteResultCode.PLEASE_SELECT_A_VC.getMessage());
- }
-
- //鍢夊唱鍏抽」鐩櫄鎷熷崱涓嶆墸璐癸紝涓嶅仛浣跨敤涓垽鏂�
- //if(vc.getInUse() == 1) {
- // return BaseResponseUtils.buildErrorMsg(RemoteResultCode.IN_USE_VC_CANNOT_OPEN_VALVE.getMessage());
- //}
-
// 鑾峰彇姘翠环
Double waterPrice = commandSv.getPrice();
+ if(waterPrice == null) {
+ return BaseResponseUtils.buildErrorMsg(RemoteResultCode.NO_WATER_PRICE.getMessage());
+ }
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
@@ -131,13 +111,37 @@
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
String orgTag = job_rtu.getString("orgTag");
+ if(orgTag == null) {
+ return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ }
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鐢熸垚璁㈠崟鍙�
String orderNo = generateOrderNo();
+ if(orderNo == null) {
+ return BaseResponseUtils.buildErrorMsg(RemoteResultCode.NO_ORDER_NUMBER.getMessage());
+ }
String commandCode = null;
if(protocol.equals("p206V202404")) {
+ // 鏂板崗璁弬鏁颁腑闇�瑕佽櫄鎷熷崱
+ if(vcId == null) {
+ vcId = commandSv.getVcIdByIntakeId(intakeId);
+ if(vcId == null) {
+ return BaseResponseUtils.buildErrorMsg(RemoteResultCode.PLEASE_SELECT_A_VC.getMessage());
+ }
+ }
+
+ // 铏氭嫙鍗D鎹㈣櫄鎷熷崱瀵硅薄
+ VoVirtualCard vc = commandSv.getVcById(vcId);
+ if(vc == null) {
+ return BaseResponseUtils.buildErrorMsg(RemoteResultCode.PLEASE_SELECT_A_VC.getMessage());
+ }
+
+ if(vc.getInUse()) {
+ return BaseResponseUtils.buildErrorMsg(RemoteResultCode.IN_USE_VC_CANNOT_OPEN_VALVE.getMessage());
+ }
+
// 鑾峰彇鍔熻兘鐮�
commandCode = CodeV202404.cd_92;
@@ -174,13 +178,6 @@
// 鑾峰彇鍔熻兘鐮�
commandCode = CodeV1_0_1.cd_92;
- // 鍒涘缓瑙嗗浘
- Com97Vo param = new Com97Vo() ;
- param.icCardNo = vc.getVcNum().toString();
- param.moneyRemain = vc.getMoney();
- param.waterPrice = waterPrice;
- param.orderNo = orderNo;
-
/**
* 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
* 1 鍑嗗鍙傛暟
@@ -195,7 +192,7 @@
myParam.setRtuAddr(rtuAddr);
myParam.setProtocol(protocol);
myParam.setVcId(vcId);
- myParam.setParam(param);
+ //myParam.setParam(param);
myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
myParam.setOperator(operator);
return dealWithCommandResult(myParam);
@@ -205,7 +202,7 @@
}
/**
- * 骞冲彴杩滅▼鍏抽榾_鍙栨按鍙ｆā寮�
+ * 骞冲彴杩滅▼鍏抽榾锛堝己鍒跺叧闃�锛�
* @param dtoBase
* @param bindingResult
* @return
@@ -245,6 +242,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(RemoteResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ }
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
String commandCode = null;
@@ -281,8 +281,247 @@
// 鑾峰彇鍔熻兘鐮�
commandCode = CodeV1_0_1.cd_93;
+ /**
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * 1 鍑嗗鍙傛暟
+ * 2 璋冪敤鍏叡鏂规硶
+ */
+ Param myParam = new Param();
+ myParam.setComId(comId);
+ myParam.setComType((byte)2);
+ myParam.setCommandCode(commandCode);
+ myParam.setCommandName(CodeV1_0_1.getCodeName(commandCode));
+ myParam.setIntakeId(intakeId);
+ myParam.setRtuAddr(rtuAddr);
+ myParam.setProtocol(protocol);
+ myParam.setVcId(vcId);
+ //myParam.setParam(param);
+ myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
+ myParam.setOperator(operator);
+ return dealWithCommandResult(myParam);
+ } else {
+ return BaseResponseUtils.buildErrorMsg("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
+ }
+ }
+
+ /**
+ * 杩滅▼寮�闃�锛堜唬鍐滄埛锛�
+ * @param valve
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "open_client", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ public BaseResponse<Boolean> openClient(@RequestBody @Valid ValveOpen valve, BindingResult bindingResult) {
+ if (bindingResult != null && bindingResult.hasErrors()) {
+ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+
+ Long intakeId = valve.getIntakeId();
+ Long vcId = valve.getVcId();
+ Long operator = valve.getOperator();
+ Long comId = idLongGenerator.generate();
+
+ /**
+ * 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
+ * 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱
+ * 濡傛灉鍙栨按鍙ｆ病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱
+ */
+ if (vcId == null) {
+ vcId = commandSv.getVcIdByIntakeId(intakeId);
+ if (vcId == null) {
+ return BaseResponseUtils.buildErrorMsg(RemoteResultCode.PLEASE_SELECT_A_VC.getMessage());
+ }
+ }
+
+ // 铏氭嫙鍗D鎹㈣櫄鎷熷崱瀵硅薄
+ VoVirtualCard vc = commandSv.getVcById(vcId);
+ if (vc == null) {
+ return BaseResponseUtils.buildErrorMsg(RemoteResultCode.PLEASE_SELECT_A_VC.getMessage());
+ }
+
+ // 铏氭嫙鍗＄姸鎬佷负浣跨敤涓紝涓斾笉鏄己鍒跺紑闃�鏃舵彁绀�
+ if (vc.getInUse()) {
+ return BaseResponseUtils.buildCodeMsg(RemoteResultCode.IN_USE_VC_CANNOT_OPEN_VALVE.getCode(), RemoteResultCode.IN_USE_VC_CANNOT_OPEN_VALVE.getMessage());
+ }
+
+ // 鑾峰彇姘翠环
+ Double waterPrice = commandSv.getPrice();
+ if(waterPrice == null) {
+ return BaseResponseUtils.buildErrorMsg(RemoteResultCode.NO_WATER_PRICE.getMessage());
+ }
+
+ // 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
+ JSONObject job_rtu = getRtu(intakeId, null);
+ if (job_rtu == null) {
+ return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_EXIST.getMessage());
+ }
+ String rtuAddr = job_rtu.getString("rtuAddr");
+ String protocol = job_rtu.getString("protocol");
+ String orgTag = job_rtu.getString("orgTag");
+ if(orgTag == null) {
+ return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ }
+ comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
+
+ // 鐢熸垚璁㈠崟鍙�
+ String orderNo = generateOrderNo();
+ if(orderNo == null) {
+ return BaseResponseUtils.buildErrorMsg(RemoteResultCode.NO_ORDER_NUMBER.getMessage());
+ }
+
+ String commandCode = null;
+ if (protocol.equals("p206V202404")) {
+ // 鑾峰彇鍔熻兘鐮�
+ commandCode = CodeV202404.cd_A2;
+
// 鍒涘缓瑙嗗浘
- Com98Vo param = new Com98Vo() ;
+ ComCd92_A2Vo param = new ComCd92_A2Vo();
+ param.controllerType = controllerType;
+ param.projectNo = projectNo;
+ param.icCardNo = vc.getVcNum().toString();
+ param.waterRemain = 0.0;
+ param.moneyRemain = vc.getMoney();
+ param.waterPrice = waterPrice;
+ param.elePrice = 0.0;
+ param.orderNo = orderNo;
+
+ /**
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * 1 鍑嗗鍙傛暟
+ * 2 璋冪敤鍏叡鏂规硶
+ */
+ Param myParam = new Param();
+ myParam.setComId(comId);
+ myParam.setComType((byte)1);
+ myParam.setCommandCode(commandCode);
+ myParam.setCommandName(CodeV202404.getCodeName(commandCode));
+ myParam.setIntakeId(intakeId);
+ myParam.setRtuAddr(rtuAddr);
+ myParam.setProtocol(protocol);
+ myParam.setVcId(vcId);
+ myParam.setParam(param);
+ myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
+ myParam.setOperator(operator);
+ return dealWithCommandResult(myParam);
+
+ } else if (protocol.equals("p206V1_0_1")) {
+ // 鑾峰彇鍔熻兘鐮�
+ commandCode = CodeV1_0_1.cd_97;
+
+ // 鍒涘缓瑙嗗浘
+ Com97Vo param = new Com97Vo();
+ param.icCardNo = vc.getVcNum().toString();
+ param.moneyRemain = vc.getMoney();
+ param.waterPrice = waterPrice;
+ param.orderNo = orderNo;
+
+ /**
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * 1 鍑嗗鍙傛暟
+ * 2 璋冪敤鍏叡鏂规硶
+ */
+ Param myParam = new Param();
+ myParam.setComId(comId);
+ myParam.setComType((byte)1);
+ myParam.setCommandCode(commandCode);
+ myParam.setCommandName(CodeV1_0_1.getCodeName(commandCode));
+ myParam.setIntakeId(intakeId);
+ myParam.setRtuAddr(rtuAddr);
+ myParam.setProtocol(protocol);
+ myParam.setVcId(vcId);
+ myParam.setParam(param);
+ myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
+ myParam.setOperator(operator);
+ return dealWithCommandResult(myParam);
+ } else {
+ return BaseResponseUtils.buildErrorMsg("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
+ }
+ }
+
+ /**
+ * 杩滅▼鍏抽榾锛堜唬鍐滄埛锛�
+ * @param dtoBase
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "close_client", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ public BaseResponse<Boolean> closeClient(@RequestBody @Valid DtoBase dtoBase, BindingResult bindingResult) {
+ if (bindingResult != null && bindingResult.hasErrors()) {
+ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+
+ Long intakeId = dtoBase.getIntakeId();
+ Long operator = dtoBase.getOperator();
+
+ VoUnclosedParam voUnclosedParam = null;
+ try {
+ voUnclosedParam = commandSv.getUncloseParam(intakeId);
+ }catch (Exception e) {
+ return BaseResponseUtils.buildErrorMsg("鑾峰彇鏈叧闃�淇℃伅閿欒");
+ }
+
+ if(voUnclosedParam == null) {
+ return BaseResponseUtils.buildSuccess(RemoteResultCode.VALVE_CLOSED.getMessage());
+ }
+ String rtuAddr = voUnclosedParam.getRtuAddr();
+ String vcNum = voUnclosedParam.getVcNum();
+ Long vcId = Optional.ofNullable(seVirtualCardMapper.getVcIdByNum(vcNum)).orElse(0L);
+ String orderNo = voUnclosedParam.getOrderNo();
+ Long comId = idLongGenerator.generate();
+
+ // 闃�鎺у櫒鍦板潃鎹㈠彇姘村彛ID鍜岄�氳鍗忚
+ JSONObject job_rtu = getRtu(null, rtuAddr);
+ if(job_rtu == null) {
+ return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_EXIST.getMessage());
+ }
+ String protocol = job_rtu.getString("protocol");
+ String orgTag = job_rtu.getString("orgTag");
+ if(orgTag == null) {
+ return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ }
+
+ comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
+
+ String commandCode = null;
+ if (protocol.equals("p206V202404")) {
+ // 鑾峰彇鍔熻兘鐮�
+ commandCode = CodeV202404.cd_A3;
+
+ // 鍒涘缓瑙嗗浘
+ ComCd93_A3Vo param = new ComCd93_A3Vo();
+ param.controllerType = controllerType;
+ param.projectNo = projectNo;
+ param.icCardNo = vcNum;
+ param.orderNo = orderNo;
+
+ /**
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * 1 鍑嗗鍙傛暟
+ * 2 璋冪敤鍏叡鏂规硶
+ */
+ Param myParam = new Param();
+ myParam.setComId(comId);
+ myParam.setComType((byte)2);
+ myParam.setCommandCode(commandCode);
+ myParam.setCommandName(CodeV202404.getCodeName(commandCode));
+ myParam.setIntakeId(intakeId);
+ myParam.setRtuAddr(rtuAddr);
+ myParam.setProtocol(protocol);
+ myParam.setVcId(vcId);
+ myParam.setParam(param);
+ myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
+ myParam.setOperator(operator);
+ return dealWithCommandResult(myParam);
+ } else if (protocol.equals("p206V1_0_1")) {
+ // 鑾峰彇鍔熻兘鐮�
+ commandCode = CodeV1_0_1.cd_98;
+
+ // 鍒涘缓瑙嗗浘
+ Com98Vo param = new Com98Vo();
param.icCardNo = vcNum;
param.orderNo = orderNo;
@@ -310,7 +549,7 @@
}
/**
- * 瀹氭椂鍏抽榾
+ * 瀹氭椂鍏抽榾寮忓紑闃�
* @param automaticClose
* @param bindingResult
* @return
@@ -351,6 +590,9 @@
// 鑾峰彇姘翠环
Double waterPrice = commandSv.getPrice();
+ if(waterPrice == null) {
+ return BaseResponseUtils.buildErrorMsg(RemoteResultCode.NO_WATER_PRICE.getMessage());
+ }
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
@@ -360,10 +602,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(RemoteResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ }
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鐢熸垚璁㈠崟鍙�
String orderNo = generateOrderNo();
+ if(orderNo == null) {
+ return BaseResponseUtils.buildErrorMsg(RemoteResultCode.NO_ORDER_NUMBER.getMessage());
+ }
String commandCode = null;
if(protocol.equals("p206V202404")) {
@@ -404,7 +652,7 @@
}
/**
- * 瀹氶噺鍏抽榾
+ * 瀹氶噺鍏抽榾寮忓紑闃�
* @param automaticClose
* @param bindingResult
* @return
@@ -445,6 +693,9 @@
// 鑾峰彇姘翠环
Double waterPrice = commandSv.getPrice();
+ if(waterPrice == null) {
+ return BaseResponseUtils.buildErrorMsg(RemoteResultCode.NO_WATER_PRICE.getMessage());
+ }
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
@@ -454,10 +705,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(RemoteResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ }
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鐢熸垚璁㈠崟鍙�
String orderNo = generateOrderNo();
+ if(orderNo == null) {
+ return BaseResponseUtils.buildErrorMsg(RemoteResultCode.NO_ORDER_NUMBER.getMessage());
+ }
String commandCode = null;
if(protocol.equals("p206V202404")) {
@@ -498,7 +755,7 @@
}
/**
- * 璁″垝寮�闃�瀹氭椂鍏抽榾
+ * 瀹氭椂鍏抽榾寮忚鍒掑紑闃�
* @param automaticClose
* @param bindingResult
* @return
@@ -546,6 +803,9 @@
// 鑾峰彇姘翠环
Double waterPrice = commandSv.getPrice();
+ if(waterPrice == null) {
+ return BaseResponseUtils.buildErrorMsg(RemoteResultCode.NO_WATER_PRICE.getMessage());
+ }
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
@@ -555,10 +815,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(RemoteResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ }
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鐢熸垚璁㈠崟鍙�
String orderNo = generateOrderNo();
+ if(orderNo == null) {
+ return BaseResponseUtils.buildErrorMsg(RemoteResultCode.NO_ORDER_NUMBER.getMessage());
+ }
String commandCode = null;
if(protocol.equals("p206V202404")) {
@@ -604,7 +870,7 @@
}
/**
- * 璁″垝寮�闃�瀹氶噺鍏抽榾
+ * 瀹氶噺鍏抽榾寮忚鍒掑紑闃�
* @param automaticClose
* @param bindingResult
* @return
@@ -652,6 +918,9 @@
// 鑾峰彇姘翠环
Double waterPrice = commandSv.getPrice();
+ if(waterPrice == null) {
+ return BaseResponseUtils.buildErrorMsg(RemoteResultCode.NO_WATER_PRICE.getMessage());
+ }
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
@@ -661,10 +930,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(RemoteResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ }
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鐢熸垚璁㈠崟鍙�
String orderNo = generateOrderNo();
+ if(orderNo == null) {
+ return BaseResponseUtils.buildErrorMsg(RemoteResultCode.NO_ORDER_NUMBER.getMessage());
+ }
String commandCode = null;
if(protocol.equals("p206V202404")) {
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 64acd6b..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
@@ -51,7 +51,6 @@
@Tag(name = "灏忕▼搴忛榾鎺у櫒鎺у埗", description = "灏忕▼搴忛榾鎺у櫒鎺у埗")
@RestController
@RequestMapping(path = "valve")
-//@RequiredArgsConstructor
public class ValveCtrl extends ComSupport {
private final CommandSv commandSv;
private final SeVirtualCardMapper seVirtualCardMapper;
@@ -134,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);
@@ -143,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")) {
@@ -246,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;
@@ -351,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);
@@ -360,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")) {
@@ -444,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);
@@ -453,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();
@@ -543,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);
@@ -552,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")) {
@@ -648,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);
@@ -657,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")) {
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/result/WechatResultCode.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/result/WechatResultCode.java
index ada7522..4b8b279 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/result/WechatResultCode.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/result/WechatResultCode.java
@@ -23,13 +23,16 @@
PLEASE_SELECT_A_INTAKE(10004, "璇烽�夋嫨涓�涓彇姘村彛"),
IN_USE_VC_CANNOT_OPEN_VALVE(10005, "浣跨敤涓櫄鎷熷崱涓嶈兘鐢ㄦ潵寮�闃�"),
THE_DEVICE_DOES_NOT_HAVE_THIS_FUNCTION(10006, "璇ヨ澶囨棤姝ゅ悓鑳�"),
+ NO_WATER_PRICE(10007, "鏈彇鍒版按浠�"),
+ NO_ORDER_NUMBER(10008, "鏈敓鎴愯鍗曞彿"),
/**
* RTU
*/
RTU_NOT_EXIST(20001, "闃�鎺у櫒涓嶅瓨鍦�"),
//RTU_ADDR_CANNOT_BE_NULL(20002, "闃�鎺у櫒鍦板潃涓嶈兘涓虹┖");
- CLIENT_CARD_NOT_EXIST(30001, "姘村崱涓嶅瓨鍦�"),
+ CLIENT_CARD_NOT_EXIST(20002, "姘村崱涓嶅瓨鍦�"),
+ RTU_NOT_SET_DATA_SOURCE(20003, "闃�鎺у櫒鏈缃暟鎹簮"),
/**
* 寰俊鐢ㄦ埛
--
Gitblit v1.8.0