From 7e423ad2b34cee92e08f06514e0bbd718a9707d5 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 06 六月 2024 16:52:45 +0800
Subject: [PATCH] 2024-06-06 朱宝民 优化平台远程开阀回调处理
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java | 12 +++++++++++-
pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml | 4 ++--
2 files changed, 13 insertions(+), 3 deletions(-)
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 9a2ab89..87cffb8 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,8 +5,8 @@
#name: ym
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.91.73: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://192.168.91.73: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-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 ae3742c..86043fe 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
@@ -240,6 +240,7 @@
/**
* 绯婃帀瓒呮椂锛屾殏鏃惰涓烘墽琛屾垚鍔�
* 鏇存敼铏氭嫙鍗＄姸鎬侊細鏄惁浣跨敤涓�佹渶鍚庢搷浣溿�佹渶鍚庢搷浣滄椂闂�
+ * 杩斿洖寮�闃�闇�瑕佺殑鍙傛暟
*/
SeVirtualCard virtualCard = new SeVirtualCard();
virtualCard.setId(vcId);
@@ -247,7 +248,15 @@
virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
virtualCard.setLastOperateTime(new Date());
seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
- return BaseResponseUtils.buildSuccess(RemoteResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
+
+ JSONObject job_response = new JSONObject();
+ job_response.put("message", RemoteResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
+ job_response.put("rtuAddr", rtuAddr);
+ job_response.put("vcNum", vc.getVcNum());
+ job_response.put("orderNo", orderNo);
+ //job_response.put("operator", operator);
+ return BaseResponseUtils.buildSuccess(job_response);
+ //return BaseResponseUtils.buildSuccess(RemoteResultCode.GET_RESULT_IN_ONE_MINUTE.getMessage());
}
// 鍥炶皟鎴愬姛锛屽啀鍒ゆ柇鎵ц鏄惁鎴愬姛
@@ -276,6 +285,7 @@
//return BaseResponseUtils.buildSuccess(myData) ;
JSONObject job_response = new JSONObject();
+ job_response.put("message", "ok");
job_response.put("rtuAddr", rtuAddr);
job_response.put("vcNum", vc.getVcNum());
job_response.put("orderNo", orderNo);
--
Gitblit v1.8.0