From 06506ef4d9c09bdbf8d32d7759cf9d0ee53e512f Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 28 四月 2024 22:37:06 +0800
Subject: [PATCH] 优化代码
---
service-common/src/main/java/com/java110/common/cmd/system/ListSystemInfoCmd.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 46 insertions(+), 5 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/system/ListSystemInfoCmd.java b/service-common/src/main/java/com/java110/common/cmd/system/ListSystemInfoCmd.java
index 1e32004..f9f3d0e 100644
--- a/service-common/src/main/java/com/java110/common/cmd/system/ListSystemInfoCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/system/ListSystemInfoCmd.java
@@ -15,22 +15,26 @@
*/
package com.java110.common.cmd.system;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.client.RestTemplate;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.dto.systemInfo.SystemInfoDto;
+import com.java110.dto.system.SystemInfoDto;
import com.java110.intf.common.ISystemInfoV1InnerServiceSMO;
import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.ListUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
import java.util.ArrayList;
import java.util.List;
@@ -53,6 +57,9 @@
@Autowired
private ISystemInfoV1InnerServiceSMO systemInfoV1InnerServiceSMOImpl;
+ @Autowired
+ private RestTemplate outRestTemplate;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
super.validatePageInfo(reqJson);
@@ -69,11 +76,14 @@
if (count > 0) {
systemInfoDtos = systemInfoV1InnerServiceSMOImpl.querySystemInfos(systemInfoDto);
- systemInfoDtos.get(0).setOwnerUrl(MappingCache.getValue("OWNER_WECHAT_URL"));
- systemInfoDtos.get(0).setPropertyUrl(MappingCache.getValue("STAFF_WECHAT_URL"));
+ systemInfoDtos.get(0).setOwnerUrl(UrlCache.getOwnerUrl());
+ systemInfoDtos.get(0).setPropertyUrl(UrlCache.getPropertyPhoneUrl());
} else {
systemInfoDtos = new ArrayList<>();
}
+
+ //todo 鏌ヨ绗笁鏂瑰紑鍙戠殑鎻掍欢
+ queryThirdPlugin(systemInfoDtos);
ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, systemInfoDtos);
@@ -81,4 +91,35 @@
cmdDataFlowContext.setResponseEntity(responseEntity);
}
+
+ private void queryThirdPlugin(List<SystemInfoDto> systemInfoDtos) {
+
+ String pluginSwitch = MappingCache.getValue("PLUGIN", "PLUGIN_SWITCH");
+
+ if (!"ON".equals(pluginSwitch)) {
+ return;
+ }
+
+ if (ListUtil.isNull(systemInfoDtos)) {
+ return;
+ }
+
+ try {
+ JSONObject paramIn = new JSONObject();
+
+ HttpHeaders header = new HttpHeaders();
+ HttpEntity<String> httpEntity = new HttpEntity<String>(paramIn.toJSONString(), header);
+
+ String pluginUrl = MappingCache.getValue("PLUGIN", "PLUGIN_URL") + "/plugin/plugin.queryValidPlugins";
+
+ ResponseEntity<String> tokenRes = outRestTemplate.exchange(pluginUrl, HttpMethod.POST, httpEntity, String.class);
+
+ String body = tokenRes.getBody();
+ JSONObject paramOut = JSONObject.parseObject(body);
+
+ systemInfoDtos.get(0).setPlugins(paramOut.getJSONArray("data"));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
}
--
Gitblit v1.8.0