From 6721936cef653ec5338ce34ec9a5f2bb87b556a8 Mon Sep 17 00:00:00 2001
From: bayuzhen <bayuzhen@beyondcent.com>
Date: Tue, 19 Nov 2024 17:01:08 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix=20=E8=B0=83=E7=94=A8=E8=BF=90=E6=8E=A7?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=A9=BA=E6=8C=87=E9=92=88=E9=97=AE=E9=A2=98?=
=?UTF-8?q?&=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../sms/booter/scheduler/YunKongMessageSchedule.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/scheduler/YunKongMessageSchedule.java b/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/scheduler/YunKongMessageSchedule.java
index 07ec310..26434d7 100644
--- a/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/scheduler/YunKongMessageSchedule.java
+++ b/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/scheduler/YunKongMessageSchedule.java
@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
import java.util.*;
@@ -59,7 +60,7 @@ public class YunKongMessageSchedule {
String url = host + "/system/common/queryYKInterface";
HttpClient httpClient = new HttpClient(PostDataFormat.RAW);
- log.info("curl -k -X POST -H 'Content-Type: application/json' -d '{}' '{}'", JSON.toJSONString(request), url);
+ log.info("【运控接口】curl -k -X POST -H 'Content-Type: application/json' -d '{}' '{}'", JSON.toJSONString(request), url);
Result result = httpClient.post(new HashMap<>(), request, url);
Assert.isTrue(result.isSuccess(), result.getMessage());
@@ -70,6 +71,10 @@ public class YunKongMessageSchedule {
for (int i = 0; i < array.size(); i++) {
JSONObject item = array.getJSONObject(i);
String externalId = item.getString("record_id");
+ if (StringUtils.isEmpty(externalId)) {
+ log.info("【运控接口】当前外部id为null：" + item.toJSONString());
+ continue;
+ }
Message message = oldMessages.stream()
.filter(m -> externalId.equals(m.getExternalId()))
.findFirst().orElse(new Message());
From 14e5c154ec509da5ed45ee2bb6b74ee9bf80bb79 Mon Sep 17 00:00:00 2001
From: bayuzhen <bayuzhen@beyondcent.com>
Date: Tue, 19 Nov 2024 17:06:47 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/java/com/bocloud/sms/service/TrxServiceImpl.java | 5 +++++
.../src/main/java/com/bocloud/sms/service/utils/QxUtils.java | 1 +
2 files changed, 6 insertions(+)
diff --git a/bocloud.sms.service/src/main/java/com/bocloud/sms/service/TrxServiceImpl.java b/bocloud.sms.service/src/main/java/com/bocloud/sms/service/TrxServiceImpl.java
index 2216000..618e601 100644
--- a/bocloud.sms.service/src/main/java/com/bocloud/sms/service/TrxServiceImpl.java
+++ b/bocloud.sms.service/src/main/java/com/bocloud/sms/service/TrxServiceImpl.java
@@ -70,6 +70,7 @@ public class TrxServiceImpl implements TrxService {
log.info("调用天融信获取随机字符串接口, 请求信息:" + JSONObject.toJSONString(httpRequest));
HttpResponse response = httpRequest.execute();
result = JSONObject.parseObject(response.body());
+ log.info("调用天融信获取随机字符串接口, 响应信息:" + JSONObject.toJSONString(result));
if ("-1".equals(result.getString("result"))) {
return new GeneralResult(false, "获取随机数失败" + result.getString("errmsg"));
}
@@ -95,6 +96,7 @@ public class TrxServiceImpl implements TrxService {
log.info("调用天融信获取随机字符串接口, 请求信息:" + JSONObject.toJSONString(httpRequest));
HttpResponse response = httpRequest.execute();
result = JSONObject.parseObject(response.body());
+ log.info("调用天融信获取随机字符串接口, 响应信息:" + JSONObject.toJSONString(result));
if ("-1".equals(result.getString("result"))) {
return new GeneralResult(false, "获取随机数失败" + result.getString("errmsg"));
}
@@ -146,6 +148,7 @@ public class TrxServiceImpl implements TrxService {
log.info("调用天融信用户登录接口, 请求信息:" + JSONObject.toJSONString(httpRequest));
HttpResponse response = httpRequest.execute();
result = JSONObject.parseObject(response.body());
+ log.info("调用天融信用户登录接口, 响应信息:" + JSONObject.toJSONString(result));
if (!"0".equals(result.getString("result"))) {
return new GeneralResult(false, "用户登录天融信失败" + result.getString("errmsg"));
}
@@ -194,6 +197,7 @@ public class TrxServiceImpl implements TrxService {
log.info("调用天融信用户软key登录接口, 请求信息:" + JSONObject.toJSONString(httpRequest));
HttpResponse response = httpRequest.execute();
result = JSONObject.parseObject(response.body());
+ log.info("调用天融信用户软key登录接口, 响应信息:" + JSONObject.toJSONString(result));
if (!"0".equals(result.getString("result"))) {
return new GeneralResult(false, "用户登录天融信失败" + result.getString("errmsg"));
}
@@ -319,6 +323,7 @@ public class TrxServiceImpl implements TrxService {
log.info("调用天融信下线接口, 请求信息:" + JSONObject.toJSONString(httpRequest));
HttpResponse response = httpRequest.execute();
JSONObject result = JSONObject.parseObject(response.body());
+ log.info("调用天融信下线接口, 响应信息: " + JSONObject.toJSONString(result));
if (!"0".equals(result.getString("result"))) {
return new GeneralResult(false, "下线失败" + result.getString("msg"));
}
diff --git a/bocloud.sms.service/src/main/java/com/bocloud/sms/service/utils/QxUtils.java b/bocloud.sms.service/src/main/java/com/bocloud/sms/service/utils/QxUtils.java
index 6c379a2..1aa5fc7 100644
--- a/bocloud.sms.service/src/main/java/com/bocloud/sms/service/utils/QxUtils.java
+++ b/bocloud.sms.service/src/main/java/com/bocloud/sms/service/utils/QxUtils.java
@@ -36,6 +36,7 @@ public class QxUtils {
String str = JSONObject.toJSONString(qxReqVo);
logger.info("call method[{}] req params[{}]",url,str);
JSONObject result = JSONObject.parseObject(HttpUtil.post(url,str, 10000));
+ logger.info("调用权限系统接口响应信息" + result.toJSONString());
if (!"200".equals(result.getString("status"))) {
throw new IllegalArgumentException("调用权限系统接口异常" + result.getString("msg"));
}
From 5431d23a0fd9842189aa1ff56223226277b0e526 Mon Sep 17 00:00:00 2001
From: admin <592225189@qq.com>
Date: Wed, 20 Nov 2024 14:41:32 +0800
Subject: [PATCH 3/3] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?=
=?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=90=E6=8E=A7=E7=B3=BB=E7=BB=9F=E9=85=8D?=
=?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../scheduler/YunKongGetAppSchedule.java | 2 +-
.../scheduler/YunKongMessageSchedule.java | 6 +--
.../bocloud/sms/service/IndexServiceImpl.java | 50 +++++++++----------
.../bocloud/sms/service/TrxServiceImpl.java | 2 +-
4 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/scheduler/YunKongGetAppSchedule.java b/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/scheduler/YunKongGetAppSchedule.java
index 6d3fb99..fe5d620 100644
--- a/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/scheduler/YunKongGetAppSchedule.java
+++ b/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/scheduler/YunKongGetAppSchedule.java
@@ -34,7 +34,7 @@ public class YunKongGetAppSchedule {
JSONObject params = new JSONObject();
params.put("type", "user");
params.put("page", "0");
- params.put("limit", "1000");
+ params.put("limit", "20");
JSONObject obj = ykUtils.call(YkInf.getAppList,params,JSONObject.class);
List<AppEntity> appList = JSONArray.parseArray(obj.getString("list"),AppEntity.class);
diff --git a/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/scheduler/YunKongMessageSchedule.java b/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/scheduler/YunKongMessageSchedule.java
index 26434d7..e5bbad5 100644
--- a/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/scheduler/YunKongMessageSchedule.java
+++ b/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/scheduler/YunKongMessageSchedule.java
@@ -40,13 +40,13 @@ public class YunKongMessageSchedule {
private final MessageRepository messageRepository;
- @Scheduled(cron = "${message.schedule:0 0/1 * * * ?}")
+ @Scheduled(cron = "${message.schedule:0 0/2 * * * ?}")
protected void schedule() {
if (!enable) return;
Map<String, Object> params = new HashMap<>();
params.put("page", 1);
- params.put("limit", 1000);
+ params.put("limit", 15);
params.put("approve_status", 1);
params.put("userId", userId);
params.put("taskStatus", "");
@@ -72,7 +72,7 @@ public class YunKongMessageSchedule {
JSONObject item = array.getJSONObject(i);
String externalId = item.getString("record_id");
if (StringUtils.isEmpty(externalId)) {
- log.info("【运控接口】当前外部id为null：" + item.toJSONString());
+// log.info("【运控接口】当前外部id为null：" + item.toJSONString());
continue;
}
Message message = oldMessages.stream()
diff --git a/bocloud.sms.service/src/main/java/com/bocloud/sms/service/IndexServiceImpl.java b/bocloud.sms.service/src/main/java/com/bocloud/sms/service/IndexServiceImpl.java
index 7980c36..064ab8c 100644
--- a/bocloud.sms.service/src/main/java/com/bocloud/sms/service/IndexServiceImpl.java
+++ b/bocloud.sms.service/src/main/java/com/bocloud/sms/service/IndexServiceImpl.java
@@ -50,10 +50,10 @@ public class IndexServiceImpl implements IndexService {
param.put("limit", pager.getRows());
String result = ykUtil.call(YkInfo.getTaskList, param, JSONArray.class);
JSONObject jsonObject = JSONArray.parseObject(result, JSONObject.class);
- return new GeneralResult(true, jsonObject, "查询成功");
+ return new GeneralResult(true, jsonObject, "待办工单列表查询成功");
} catch (Exception e) {
- log.info("查询失败", e);
- return new GeneralResult(false, "查询失败");
+ log.info("待办工单列表查询失败", e);
+ return new GeneralResult(false, "待办工单列表查询失败");
}
}
@@ -81,10 +81,10 @@ public class IndexServiceImpl implements IndexService {
resultMap.put("waitDoneTotal", jsonObject.getInteger("todoCount"));
resultMap.put("doneTotal", jsonObject.getInteger("doneCount"));
- return new GeneralResult(true, resultMap, "查询成功");
+ return new GeneralResult(true, resultMap, "工单统计查询成功");
} catch (Exception e) {
- log.info("查询失败", e);
- return new GeneralResult(false, "查询失败");
+ log.info("工单统计查询失败", e);
+ return new GeneralResult(false, "工单统计查询失败");
}
}
@@ -114,10 +114,10 @@ public class IndexServiceImpl implements IndexService {
List<JSONObject> list = JSONObject.parseObject(data, List.class);
- return new GeneralResult(true, list, "查询成功");
+ return new GeneralResult(true, list, "获取用户数据权限申请数量查询成功");
} catch (Exception e) {
- log.info("查询失败", e);
- return new GeneralResult(false, "查询失败");
+ log.info("获取用户数据权限申请数量查询失败", e);
+ return new GeneralResult(false, "获取用户数据权限申请数量查询失败");
}
}
@@ -130,7 +130,7 @@ public class IndexServiceImpl implements IndexService {
JSONObject param = new JSONObject();
param.put("type", "user");
param.put("page", 1);
- param.put("limit", Integer.MAX_VALUE);
+ param.put("limit", 15);
String result = ykUtil.call(YkInfo.getAllAppList, param, JSONArray.class);
JSONObject allAppJson = JSONObject.parseObject(result, JSONObject.class);
List<JSONObject> allAppList = JSONObject.parseObject(allAppJson.getString("list"), List.class);
@@ -158,10 +158,10 @@ public class IndexServiceImpl implements IndexService {
}
}
log.info("allAppList:{}", JSON.toJSONString(allAppList));
- return new GeneralResult(true, allAppList, "查询成功");
+ return new GeneralResult(true, allAppList, "首页数据展示模块查询成功");
} catch (Exception e) {
- log.error("查询失败", e);
- return new GeneralResult(true,new ArrayList<>(),"查询失败");
+ log.error("首页数据展示模块查询失败", e);
+ return new GeneralResult(true,new ArrayList<>(),"首页数据展示模块查询失败");
}
}
@@ -173,13 +173,13 @@ public class IndexServiceImpl implements IndexService {
JSONObject jsonObject = JSONObject.parseObject(result);
if (!"200".equals(jsonObject.getString("code"))) {
log.info("result:" + result);
- return new GeneralResult(false, "查询失败");
+ return new GeneralResult(false, "近7日告警趋势查询失败");
}
JSONObject data = jsonObject.getJSONObject("data");
- return new GeneralResult(true, data, "查询成功");
+ return new GeneralResult(true, data, "近7日告警趋势查询成功");
} catch (Exception e) {
- log.info("查询失败", e);
- return new GeneralResult(false, "查询失败");
+ log.info("近7日告警趋势查询失败", e);
+ return new GeneralResult(false, "近7日告警趋势查询失败");
}
}
@@ -191,13 +191,13 @@ public class IndexServiceImpl implements IndexService {
JSONObject jsonObject = JSONObject.parseObject(result);
if (!"200".equals(jsonObject.getString("code"))) {
log.info("result:" + result);
- return new GeneralResult(false, "查询失败");
+ return new GeneralResult(false, "单日告警统计查询失败");
}
JSONObject data = jsonObject.getJSONObject("data");
- return new GeneralResult(true, data, "查询成功");
+ return new GeneralResult(true, data, "单日告警统计查询成功");
} catch (Exception e) {
- log.info("查询失败", e);
- return new GeneralResult(false, "查询失败");
+ log.info("单日告警统计查询失败", e);
+ return new GeneralResult(false, "单日告警统计查询失败");
}
}
@@ -208,13 +208,13 @@ public class IndexServiceImpl implements IndexService {
JSONObject jsonObject = JSONObject.parseObject(result);
if (!"200".equals(jsonObject.getString("code"))) {
log.info("result:" + result);
- return new GeneralResult(false, "查询失败");
+ return new GeneralResult(false, "单日告警统计查询失败");
}
List<JSONObject> data = JSONObject.parseObject(jsonObject.getString("data"), List.class);
- return new GeneralResult(true, data, "查询成功");
+ return new GeneralResult(true, data, "单日告警统计查询成功");
} catch (Exception e) {
- log.info("查询失败", e);
- return new GeneralResult(false, "查询失败");
+ log.info("单日告警统计查询失败", e);
+ return new GeneralResult(false, "单日告警统计查询失败");
}
}
diff --git a/bocloud.sms.service/src/main/java/com/bocloud/sms/service/TrxServiceImpl.java b/bocloud.sms.service/src/main/java/com/bocloud/sms/service/TrxServiceImpl.java
index 618e601..037cd86 100644
--- a/bocloud.sms.service/src/main/java/com/bocloud/sms/service/TrxServiceImpl.java
+++ b/bocloud.sms.service/src/main/java/com/bocloud/sms/service/TrxServiceImpl.java
@@ -199,7 +199,7 @@ public class TrxServiceImpl implements TrxService {
result = JSONObject.parseObject(response.body());
log.info("调用天融信用户软key登录接口, 响应信息:" + JSONObject.toJSONString(result));
if (!"0".equals(result.getString("result"))) {
- return new GeneralResult(false, "用户登录天融信失败" + result.getString("errmsg"));
+ return new GeneralResult(false, "天融信登录返回失败:" + result.getString("errmsg"));
}
String trxToken = result.getString("token");
String userId = result.getString("user_id");