From 7efbf921192559cad13a4f8086c46c3617ad2a05 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 十月 2024 08:34:42 +0800
Subject: [PATCH] 1、协议解析中，关阀报（83）中的RTU时钟改为关阀时间，但代码误注解掉了这行代码，修改之； 2、通信中间件测试web系统增加查询所在在线情况的命令下发。
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCtrl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCtrl.java
index 3a14a0f..b8c2185 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCtrl.java
@@ -112,6 +112,12 @@
return BaseResponseUtils.buildErrorMsg(WechatResultCode.PHONE_NUMBER_CANNOT_BE_NULL.getMessage());
}
+ Long clientId = clientSv.getClientIdByPhone(phoneNumber);
+ if(clientId == null) {
+ return BaseResponseUtils.buildErrorMsg("璇ユ墜鏈哄彿瀵瑰簲鐨勫啘鎴蜂笉瀛樺湪");
+ }
+
+
// 鐢熸垚6浣嶉獙璇佺爜骞惰浆涓篔son鏍煎紡
String securityCode = String.valueOf(RandomCode.genCode());
JSONObject param = new JSONObject();
@@ -207,7 +213,7 @@
}
JSONObject job_result = new JSONObject();
- job_result.put("clientId", clientId);
+ job_result.put("clientId", String.valueOf(clientId));
job_result.put("sessionId", sessionId);
return BaseResponseUtils.buildSuccess(job_result);
--
Gitblit v1.8.0