From d26b58fd108757f792dd4bb3c676377cc9a8b585 Mon Sep 17 00:00:00 2001 From: bayuzhen Date: Mon, 26 Aug 2024 10:35:32 +0800 Subject: [PATCH 01/31] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bocloud/sms/service/utils/QxUtils.java | 4 ++-- .../main/java/com/bocloud/sms/service/utils/YkUtils.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) 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 c194fa0..37f1162 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 @@ -11,9 +11,9 @@ import org.springframework.stereotype.Component; @Component public class QxUtils { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Value("${qx.queryAppUrl}") + @Value("${qx.queryAppUrl:http://117.47.88.120:8081/authority/api/v1/apps}") private String queryAppUrl; - @Value("${qx.queryAppModulesUrl}") + @Value("${qx.queryAppModulesUrl:http://117.47.88.120:8081/authority/api/v1/appModules}") private String queryAppModulesUrl; public String queryApp(String userToken, String userId){ diff --git a/bocloud.sms.service/src/main/java/com/bocloud/sms/service/utils/YkUtils.java b/bocloud.sms.service/src/main/java/com/bocloud/sms/service/utils/YkUtils.java index 77c073e..4560232 100644 --- a/bocloud.sms.service/src/main/java/com/bocloud/sms/service/utils/YkUtils.java +++ b/bocloud.sms.service/src/main/java/com/bocloud/sms/service/utils/YkUtils.java @@ -13,13 +13,13 @@ import org.springframework.stereotype.Component; public class YkUtils { private final Logger logger = LoggerFactory.getLogger(this.getClass()); //参考application.yml配置文件 - @Value("${yk.url}") + @Value("${yk.url:http://36.111.150.83:9527/}") private String url; - @Value("${yk.reqUserId}") + @Value("${yk.reqUserId:1}") private String reqUserId; - @Value("${yk.systemId}") + @Value("${yk.systemId:1}") private String systemId; From 0dce3033de36fb3d7e48611ecc2deb40a106620b Mon Sep 17 00:00:00 2001 From: bayuzhen Date: Mon, 26 Aug 2024 14:58:40 +0800 Subject: [PATCH 02/31] =?UTF-8?q?=E6=B7=BB=E5=8A=A0ukey=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3=E7=99=BD=E5=90=8D=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bocloud/sms/booter/config/WhiteApiCache.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/config/WhiteApiCache.java b/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/config/WhiteApiCache.java index b86ce9c..2aff99f 100644 --- a/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/config/WhiteApiCache.java +++ b/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/config/WhiteApiCache.java @@ -31,7 +31,7 @@ public class WhiteApiCache implements InitializingBean { taskExecutor.execute(() -> { //设置白名单 List whiteList = Lists.newArrayList("^GET:/v1/users/permissions$", - "^GET:/v1/login/detail$", "^GET:/v1/messages$", "^GET:/v1/token$","^POST:/v1/token/check$", + "^GET:/v1/login/detail$", "^GET:/v1/trx/randomstr$", "^POST:/v1/trx/login$", "^POST:/v1/trx/logout$", "^GET:/v1/messages$", "^GET:/v1/token$","^POST:/v1/token/check$", "^POST:/v1/users/logout$", "^POST:/v1/tenants/logout$", "^GET:/v1/config/license$", "^GET:/v1/roles/ids$"); redisTemplate.opsForValue().set("permission_white", JSONObject.toJSONString(whiteList)); }); From ac280af5814e2fa22653099470b2f6dd03122fa8 Mon Sep 17 00:00:00 2001 From: bayuzhen Date: Mon, 26 Aug 2024 15:06:12 +0800 Subject: [PATCH 03/31] =?UTF-8?q?=E6=B7=BB=E5=8A=A0ukey=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3=E7=99=BD=E5=90=8D=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bocloud/sms/booter/config/WebInterceptorConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/config/WebInterceptorConfiguration.java b/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/config/WebInterceptorConfiguration.java index 9f9e2b6..9f43721 100644 --- a/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/config/WebInterceptorConfiguration.java +++ b/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/config/WebInterceptorConfiguration.java @@ -45,7 +45,7 @@ public class WebInterceptorConfiguration implements InterceptorConfiguration { "/v1/logview", "/v1/logzip", "/status/**", "/v1/tokens", "/v1/config/captcha/install", "/v1/status/sid", "/v1/config/license/install", "/v1/config/status/", "/v1/status/sids", "/status", "/status/db", "/error", "/v1/*/info", "/v1/*/status", "/v1/config/**", "/v1/status/**", "/v1/config/license", - "/v3/api-docs/**", "/v1/autologin", "/v1/single/login", "/v1/token/check"}; + "/v3/api-docs/**", "/v1/autologin", "/v1/single/login", "/v1/token/check", "/v1/trx/**"}; private static final String[] LOG_EXCLUDES = new String[]{"/*/*.css", "/*/*.js", "/*/*.png", "/*/*.jpg", "/*/*.jpeg", "/*.html", "/*/*.html", "/swagger-resources/**", "/favicon.ico", "/webjars/**", "/v2/**", "/swagger-ui.html/**", "/error", "/v3/api-docs/**"}; From f2f8a4adbef7c97972837a41055701ebc80314e9 Mon Sep 17 00:00:00 2001 From: bayuzhen Date: Mon, 26 Aug 2024 15:51:43 +0800 Subject: [PATCH 04/31] =?UTF-8?q?=E6=A8=A1=E6=8B=9FuKey=E7=99=BB=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E5=9C=BA=E6=99=AF=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bocloud/sms/service/TrxServiceImpl.java | 159 +++++++++++++++--- 1 file changed, 140 insertions(+), 19 deletions(-) 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 f7ea86b..ce5886e 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 @@ -57,14 +57,58 @@ public class TrxServiceImpl implements TrxService { Map paramsMap = new HashMap<>(); paramsMap.put("isToken", false); paramsMap.put("ngx_cookie", ngxCookie); - JSONObject result = JSONObject.parseObject(HttpUtil.get(url, paramsMap)); - if ("-1".equals(result.getString("result"))) { - return new GeneralResult(false, "获取随机数失败" + result.getString("errmsg")); - } - return new GeneralResult(true, result.getString("result"), "获取随机数成功"); + JSONObject result; +// try { +// log.info("调用天融信获取随机字符串接口, url:" + url + ", 参数：" + JSONObject.toJSONString(paramsMap)); +// result = JSONObject.parseObject(HttpUtil.get(url, paramsMap, 10000)); +// if ("-1".equals(result.getString("result"))) { +// return new GeneralResult(false, "获取随机数失败" + result.getString("errmsg")); +// } +// } catch (Exception e) { +// log.error("调用天融信获取随机字符串失败", e); +// return new GeneralResult(false, "获取随机数失败" + e.getMessage()); +// } +// return new GeneralResult(true, result.getString("result"), "获取随机数成功"); + return new GeneralResult(true, "randomstr", "获取随机数成功"); } // 获取天融信用户信息 +// @Override +// public GeneralResult getAuthToken(TrxAuthModel trxAuthModel) { +// String url = trxUrl + "/userAuthen"; +// Map paramsMap = new HashMap<>(); +// paramsMap.put("cookie", trxAuthModel.getClientHello()); +// paramsMap.put("certMd5", trxAuthModel.getServerHello()); +// paramsMap.put("client_ip", trxAuthModel.getClientIp()); +// JSONObject result; +// GeneralResult> login; +// try { +// log.info("调用天融信登录接口, url:" + url + ", 参数：" + JSONObject.toJSONString(paramsMap)); +// result = JSONObject.parseObject(HttpUtil.post(url, paramsMap, 10000)); +// if (!"0".equals(result.getString("result"))) { +// return new GeneralResult(false, "用户登录天融信失败" + result.getString("errmsg")); +// } +// String trxToken = result.getString("token"); +// String userId = result.getString("userId"); +// // 处理ukey登录用户 +// log.info("开始uKey登录用户入库"); +// saveUserByTrx(userId); +// log.info("uKey登录用户入库结束"); +// // 登录 +// log.info("开始uKey登录用户登录云管平台"); +// User user = userRepository.getByUserId(userId); +// Encryptor encryptor = new AESEncryptor(); +// String password = encryptor.encrypt(userId + "CMP", null); +// login = userServiceImpl.login(user.getAccount(), password, null, null, true); +// login.getData().put("trxToken", trxToken); +// log.info("uKey登录用户登录云管平台结束"); +// } catch (Exception e) { +// log.error("用户登录失败：", e); +// return new GeneralResult(false, "用户登录失败" + e.getMessage()); +// } +// return new GeneralResult(true, login, "用户登录成功"); +// } + @Override public GeneralResult getAuthToken(TrxAuthModel trxAuthModel) { String url = trxUrl + "/userAuthen"; @@ -72,20 +116,35 @@ public class TrxServiceImpl implements TrxService { paramsMap.put("cookie", trxAuthModel.getClientHello()); paramsMap.put("certMd5", trxAuthModel.getServerHello()); paramsMap.put("client_ip", trxAuthModel.getClientIp()); - JSONObject result = JSONObject.parseObject(HttpUtil.post(url, paramsMap)); - if (!"0".equals(result.getString("result"))) { - return new GeneralResult(false, "用户登录失败" + result.getString("errmsg")); + JSONObject result = null; + GeneralResult> login; + try { + log.info("调用天融信登录接口, url:" + url + ", 参数：" + JSONObject.toJSONString(paramsMap)); +// result = JSONObject.parseObject(HttpUtil.post(url, paramsMap, 10000)); + result.put("result", 0); + result.put("token", "trxTokenStr"); + result.put("userId", "100001"); + if (!"0".equals(result.getString("result"))) { + return new GeneralResult(false, "用户登录天融信失败" + result.getString("errmsg")); + } + String trxToken = result.getString("token"); + String userId = result.getString("userId"); + // 处理ukey登录用户 + log.info("开始uKey登录用户入库"); + saveUserByTrx(userId); + log.info("uKey登录用户入库结束"); + // 登录 + log.info("开始uKey登录用户登录云管平台"); + User user = userRepository.getByUserId(userId); + Encryptor encryptor = new AESEncryptor(); + String password = encryptor.encrypt(userId + "CMP", null); + login = userServiceImpl.login(user.getAccount(), password, null, null, true); + login.getData().put("trxToken", trxToken); + log.info("uKey登录用户登录云管平台结束"); + } catch (Exception e) { + log.error("用户登录失败：", e); + return new GeneralResult(false, "用户登录失败" + e.getMessage()); } - String trxToken = result.getString("token"); - String userId = result.getString("userId"); - // 处理ukey登录用户 - saveUserByTrx(userId); - // 登录 - User user = userRepository.getByUserId(userId); - Encryptor encryptor = new AESEncryptor(); - String password = encryptor.encrypt(userId + "CMP", null); - GeneralResult> login = userServiceImpl.login(user.getAccount(), password, null, null, true); - login.getData().put("trxToken", trxToken); return new GeneralResult(true, login, "用户登录成功"); } @@ -95,7 +154,12 @@ public class TrxServiceImpl implements TrxService { JSONObject params = new JSONObject(); params.put("userId", userId); //请求运控系统获取用户信息 - YkUserModel ykUser = JSONArray.parseArray(ykUtils.call(YkInf.queryAllUser, params, String.class), YkUserModel.class).get(0); +// YkUserModel ykUser = JSONArray.parseArray(ykUtils.call(YkInf.queryAllUser, params, String.class), YkUserModel.class).get(0); + YkUserModel ykUser = new YkUserModel(); + ykUser.setLoginName("trx01"); + ykUser.setUserName("trx01"); + ykUser.setMobile("15238853513"); + ykUser.setEmail("188834343@qq.com"); if (ObjectUtils.isEmpty(user)) { log.info("开始新增天融信登录用户，userId: " + userId); // 新增 以userId作为account 并添加注释 @@ -146,6 +210,63 @@ public class TrxServiceImpl implements TrxService { } } +// private void saveUserByTrx(String userId) { +// User user = userRepository.getByUserId(userId); +// // 根据userId获取运控系统用户信息 +// JSONObject params = new JSONObject(); +// params.put("userId", userId); +// //请求运控系统获取用户信息 +// YkUserModel ykUser = JSONArray.parseArray(ykUtils.call(YkInf.queryAllUser, params, String.class), YkUserModel.class).get(0); +// if (ObjectUtils.isEmpty(user)) { +// log.info("开始新增天融信登录用户，userId: " + userId); +// // 新增 以userId作为account 并添加注释 +// UserBean userBean = new UserBean(); +// userBean.setPassword(userId + "CMP"); +// userBean.setSex(true); +// userBean.setIsManager(true); +// userBean.setUserId(userId); +// userBean.setRemark("天融信登录添加用户"); +// // 设置运控用户信息 +// userBean.setAccount(ykUser.getLoginName()); +// userBean.setName(ykUser.getUserName()); +// userBean.setMobile(ykUser.getMobile()); +// userBean.setEmail(ykUser.getEmail()); +// userBean.setUserId(userId); +// RequestContext context = new RequestContext(); +// context.setTarget(1L); +// context.setCatalog(RequestContext.Catalog.Manager); +// userServiceImpl.create(userBean, context); +// /** +// * 云管授权当前用户全部角色 +// * 1，获取云管角色列表 +// * 2，授权 +// * */ +// User userByUserId = userRepository.getByUserId(userId); +// List roleIds = roleRepository.list().stream().map(Role::getId).collect(Collectors.toList()); +// userServiceImpl.accredit(userByUserId.getId(), roleIds, context); +// log.info("完成新增天融信登录用户，userId: " + userId); +// } else { +// // 修改 +// log.info("开始修改天融信登录用户，userId: " + userId); +// UserBean userBean = new UserBean(); +// userBean.setId(user.getId()); +// userBean.setSex(true); +// userBean.setIsManager(true); +// userBean.setUserId(userId); +// userBean.setRemark("天融信登录添加用户"); +// // 设置运控用户信息 +// userBean.setAccount(ykUser.getLoginName()); +// userBean.setName(ykUser.getUserName()); +// userBean.setMobile(ykUser.getMobile()); +// userBean.setEmail(ykUser.getEmail()); +// RequestContext context = new RequestContext(); +// context.setTarget(1L); +// context.setCatalog(RequestContext.Catalog.Manager); +// userServiceImpl.modify(user.getId(), userBean, context); +// log.info("完成修改天融信登录用户，userId: " + userId); +// } +// } + //确认天融信token是否有效 public GeneralResult getTokenOnline(String trxToken) { String url = trxUrl + "/tokenOnline"; From 50d67ff66f5e9becec88360b6fe9eb101d978ae0 Mon Sep 17 00:00:00 2001 From: bayuzhen Date: Mon, 26 Aug 2024 15:55:50 +0800 Subject: [PATCH 05/31] =?UTF-8?q?=E6=A8=A1=E6=8B=9FuKey=E7=99=BB=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E5=9C=BA=E6=99=AF=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bocloud/sms/service/TrxServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 ce5886e..0e40454 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 @@ -57,7 +57,7 @@ public class TrxServiceImpl implements TrxService { Map paramsMap = new HashMap<>(); paramsMap.put("isToken", false); paramsMap.put("ngx_cookie", ngxCookie); - JSONObject result; + JSONObject result = new JSONObject(); // try { // log.info("调用天融信获取随机字符串接口, url:" + url + ", 参数：" + JSONObject.toJSONString(paramsMap)); // result = JSONObject.parseObject(HttpUtil.get(url, paramsMap, 10000)); @@ -116,8 +116,8 @@ public class TrxServiceImpl implements TrxService { paramsMap.put("cookie", trxAuthModel.getClientHello()); paramsMap.put("certMd5", trxAuthModel.getServerHello()); paramsMap.put("client_ip", trxAuthModel.getClientIp()); - JSONObject result = null; - GeneralResult> login; + JSONObject result = new JSONObject(); + GeneralResult> login = new GeneralResult<>(); try { log.info("调用天融信登录接口, url:" + url + ", 参数：" + JSONObject.toJSONString(paramsMap)); // result = JSONObject.parseObject(HttpUtil.post(url, paramsMap, 10000)); From 2d147f816129aeda050929657050fbd057b603e5 Mon Sep 17 00:00:00 2001 From: bayuzhen Date: Mon, 26 Aug 2024 16:05:37 +0800 Subject: [PATCH 06/31] =?UTF-8?q?=E6=A8=A1=E6=8B=9FuKey=E7=99=BB=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E5=9C=BA=E6=99=AF=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bocloud/sms/repository/UserRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bocloud.sms.storage/src/main/java/com/bocloud/sms/repository/UserRepository.java b/bocloud.sms.storage/src/main/java/com/bocloud/sms/repository/UserRepository.java index 97987f6..3aa6892 100644 --- a/bocloud.sms.storage/src/main/java/com/bocloud/sms/repository/UserRepository.java +++ b/bocloud.sms.storage/src/main/java/com/bocloud/sms/repository/UserRepository.java @@ -137,7 +137,7 @@ public class UserRepository extends JdbcGenericDao { public User getByUserId(String userId) { String sql = "select u.*, t.account tenant_account,t.name tenant_name, t.discount discount from users u left join tenant t on u.tenant_id = t.id where u.is_deleted = 0 and u.user_id = :userId "; - Map params = MapTools.simpleMap("user_id", userId); + Map params = MapTools.simpleMap("userId", userId); List list = this.list(User.class, sql, params); // Assert.isTrue(list.size() <= 1, "该天融信用户已存在"); return list.isEmpty() ? null : list.get(0); From 297b04d12ba37a72c6ca1c3294e91f991ca89d01 Mon Sep 17 00:00:00 2001 From: bayuzhen Date: Mon, 26 Aug 2024 16:26:36 +0800 Subject: [PATCH 07/31] =?UTF-8?q?=E6=A8=A1=E6=8B=9FuKey=E7=99=BB=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E5=9C=BA=E6=99=AF=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/bocloud/sms/service/TrxServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 0e40454..f3957e9 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 @@ -129,8 +129,9 @@ public class TrxServiceImpl implements TrxService { } String trxToken = result.getString("token"); String userId = result.getString("userId"); + // 处理ukey登录用户 - log.info("开始uKey登录用户入库"); + log.info("开始uKey登录用户入库, userId:" + userId); saveUserByTrx(userId); log.info("uKey登录用户入库结束"); // 登录 From b580e352c9fa2c40eb668fc8e05a08e040f81bc1 Mon Sep 17 00:00:00 2001 From: guyuliang Date: Mon, 26 Aug 2024 16:33:13 +0800 Subject: [PATCH 08/31] =?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 --- .../src/main/java/com/bocloud/sms/service/IndexServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 dd238d8..53b4b26 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 @@ -28,7 +28,7 @@ public class IndexServiceImpl implements IndexService { try { JSONObject param = new JSONObject(); User user = userRepository.query(requestContext.getTarget()); - param.put("userId",user.getUserId()); + param.put("userId","1111"); param.put("page",pager.getPage()); param.put("limit",pager.getRows()); String result = ykUtil.call(YkInfo.getTaskList, param, JSONArray.class); From 49679a40c13185b43d96f4063b6e956a45f03ea8 Mon Sep 17 00:00:00 2001 From: bayuzhen Date: Mon, 26 Aug 2024 16:35:18 +0800 Subject: [PATCH 09/31] =?UTF-8?q?=E6=A8=A1=E6=8B=9FuKey=E7=99=BB=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E5=9C=BA=E6=99=AF=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/bocloud/sms/service/TrxServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f3957e9..3e22587 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 @@ -146,7 +146,7 @@ public class TrxServiceImpl implements TrxService { log.error("用户登录失败：", e); return new GeneralResult(false, "用户登录失败" + e.getMessage()); } - return new GeneralResult(true, login, "用户登录成功"); + return login; } private void saveUserByTrx(String userId) { From 72f332b3795caf918b0b5cd9d6a53c58a9994d47 Mon Sep 17 00:00:00 2001 From: guyuliang Date: Mon, 26 Aug 2024 16:38:32 +0800 Subject: [PATCH 10/31] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bocloud/sms/service/IndexServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 53b4b26..2558b30 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 @@ -34,8 +34,8 @@ public class IndexServiceImpl implements IndexService { String result = ykUtil.call(YkInfo.getTaskList, param, JSONArray.class); log.info("result"); - JSONArray dataArray = JSONArray.parseArray(result); - return new GeneralResult(true, dataArray,"查询成功"); + JSONObject jsonObject = JSONArray.parseObject(result, JSONObject.class); + return new GeneralResult(true, jsonObject,"查询成功"); } catch (Exception e) { log.info("查询失败",e); return new GeneralResult(false, "查询失败"); From b3f4c0b185de738de0b620ac2a056bf9422afe96 Mon Sep 17 00:00:00 2001 From: guyuliang Date: Mon, 26 Aug 2024 16:49:29 +0800 Subject: [PATCH 11/31] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BB=A3=E5=8A=9E?= =?UTF-8?q?=E6=80=BB=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IndexDataController.java | 8 ++- .../bocloud/sms/interfaces/IndexService.java | 2 + .../bocloud/sms/service/IndexServiceImpl.java | 55 ++++++++++++++++--- 3 files changed, 57 insertions(+), 8 deletions(-) diff --git a/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/IndexDataController.java b/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/IndexDataController.java index a3ce543..95997aa 100644 --- a/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/IndexDataController.java +++ b/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/IndexDataController.java @@ -30,7 +30,13 @@ public class IndexDataController { @GetMapping("/doneWorkOrder") @Operation(summary = "待办工单列表") - public GeneralResult list(Pager pager, @Value(Common.REQ_CONTEXT) RequestContext requestContext) { + public GeneralResult doneWorkOrder(Pager pager, @Value(Common.REQ_CONTEXT) RequestContext requestContext) { return indexService.doneWorkOrder(pager, requestContext); } + + @GetMapping("/workOrder/stattic") + @Operation(summary = "待办工单列表") + public GeneralResult workOrderStatic(Pager pager, @Value(Common.REQ_CONTEXT) RequestContext requestContext) { + return indexService.workOrderStatic(requestContext); + } } diff --git a/bocloud.sms.service/src/main/java/com/bocloud/sms/interfaces/IndexService.java b/bocloud.sms.service/src/main/java/com/bocloud/sms/interfaces/IndexService.java index a767c98..6dc7302 100644 --- a/bocloud.sms.service/src/main/java/com/bocloud/sms/interfaces/IndexService.java +++ b/bocloud.sms.service/src/main/java/com/bocloud/sms/interfaces/IndexService.java @@ -9,4 +9,6 @@ import java.util.List; public interface IndexService { GeneralResult doneWorkOrder(Pager pager, RequestContext requestContext); + + GeneralResult workOrderStatic(RequestContext requestContext); } 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 2558b30..6fb7bc7 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 @@ -14,6 +14,10 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + @Service("IndexService") @Slf4j public class IndexServiceImpl implements IndexService { @@ -28,16 +32,53 @@ public class IndexServiceImpl implements IndexService { try { JSONObject param = new JSONObject(); User user = userRepository.query(requestContext.getTarget()); - param.put("userId","1111"); - param.put("page",pager.getPage()); - param.put("limit",pager.getRows()); + param.put("userId", "1111"); + param.put("page", pager.getPage()); + param.put("limit", pager.getRows()); String result = ykUtil.call(YkInfo.getTaskList, param, JSONArray.class); - - log.info("result"); + log.info("result:" + result); JSONObject jsonObject = JSONArray.parseObject(result, JSONObject.class); - return new GeneralResult(true, jsonObject,"查询成功"); + return new GeneralResult(true, jsonObject, "查询成功"); } catch (Exception e) { - log.info("查询失败",e); + log.info("查询失败", e); + return new GeneralResult(false, "查询失败"); + } + } + + @Override + public GeneralResult workOrderStatic(RequestContext requestContext) { + try { + + JSONObject param = new JSONObject(); + User user = userRepository.query(requestContext.getTarget()); + param.put("userId", "1111"); + param.put("page",1); + param.put("limit", Integer.MAX_VALUE); + String result = ykUtil.call(YkInfo.getTaskList, param, JSONArray.class); + log.info("result:" + result); + JSONObject jsonObject = JSONArray.parseObject(result, JSONObject.class); + Integer total = jsonObject.getInteger("total"); + + Map resultMap = new HashMap<>(); + resultMap.put("orderTotal",total); + + List data = JSONObject.parseObject(jsonObject.getString("data"), List.class); + Integer waitDoneTotal = 0; + Integer doneTotal = 0; + for (JSONObject obj : data) { + if("0".equals(obj.getString("approve_status"))){ + waitDoneTotal++; + }else { + doneTotal++; + } + } + + resultMap.put("waitDoneTotal",waitDoneTotal); + resultMap.put("doneTotal",doneTotal); + + return new GeneralResult(true, "查询成功"); + } catch (Exception e) { + log.info("查询失败", e); return new GeneralResult(false, "查询失败"); } } From 6bacdb06bc02156bc8770f7717b465779e865b5b Mon Sep 17 00:00:00 2001 From: guyuliang Date: Mon, 26 Aug 2024 16:51:57 +0800 Subject: [PATCH 12/31] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BB=A3=E5=8A=9E?= =?UTF-8?q?=E6=80=BB=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bocloud/sms/service/IndexServiceImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 6fb7bc7..b522552 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 @@ -36,7 +36,6 @@ public class IndexServiceImpl implements IndexService { param.put("page", pager.getPage()); param.put("limit", pager.getRows()); String result = ykUtil.call(YkInfo.getTaskList, param, JSONArray.class); - log.info("result:" + result); JSONObject jsonObject = JSONArray.parseObject(result, JSONObject.class); return new GeneralResult(true, jsonObject, "查询成功"); } catch (Exception e) { @@ -55,7 +54,6 @@ public class IndexServiceImpl implements IndexService { param.put("page",1); param.put("limit", Integer.MAX_VALUE); String result = ykUtil.call(YkInfo.getTaskList, param, JSONArray.class); - log.info("result:" + result); JSONObject jsonObject = JSONArray.parseObject(result, JSONObject.class); Integer total = jsonObject.getInteger("total"); @@ -76,7 +74,7 @@ public class IndexServiceImpl implements IndexService { resultMap.put("waitDoneTotal",waitDoneTotal); resultMap.put("doneTotal",doneTotal); - return new GeneralResult(true, "查询成功"); + return new GeneralResult(true, resultMap,"查询成功"); } catch (Exception e) { log.info("查询失败", e); return new GeneralResult(false, "查询失败"); From 16f0a0967073b39180786ea667d1ec5a0c9bfcd3 Mon Sep 17 00:00:00 2001 From: bayuzhen Date: Mon, 26 Aug 2024 16:52:34 +0800 Subject: [PATCH 13/31] =?UTF-8?q?=E6=B7=BB=E5=8A=A0uKey=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=9C=BA=E6=99=AF=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sms/service/ManagerServiceImpl.java | 24 +-- .../bocloud/sms/service/TrxServiceImpl.java | 141 +++--------------- .../bocloud/sms/service/utils/QxUtils.java | 19 ++- .../bocloud/sms/service/utils/YkUtils.java | 2 +- 4 files changed, 49 insertions(+), 137 deletions(-) diff --git a/bocloud.sms.service/src/main/java/com/bocloud/sms/service/ManagerServiceImpl.java b/bocloud.sms.service/src/main/java/com/bocloud/sms/service/ManagerServiceImpl.java index 577bec6..45ed6e9 100644 --- a/bocloud.sms.service/src/main/java/com/bocloud/sms/service/ManagerServiceImpl.java +++ b/bocloud.sms.service/src/main/java/com/bocloud/sms/service/ManagerServiceImpl.java @@ -80,16 +80,20 @@ public class ManagerServiceImpl implements ManagerService { User user = userRepository.query(context.getTarget()); List qxAppModuleIds = new ArrayList<>(); if (null != user.getUserId()) { - // 天融信用户获取权限系统菜单权限 - log.info("开始获取天融信登录用户所拥有权限系统列表"); - List appModules = trxServiceImpl.queryQxCategoryList(trxToken, user.getUserId()); - if (CollectionUtils.isEmpty(appModules)) { - log.error("获取天融信登录用户所拥有权限系统列表失败"); - return new GeneralResult<>(false, "获取权限系统菜单信息失败"); - } - for (AppModule appModule : appModules) { - long id = Long.parseLong(appModule.getId()); - qxAppModuleIds.add(id); + try { + // 天融信用户获取权限系统菜单权限 + log.info("开始获取天融信登录用户所拥有权限系统列表"); + List appModules = trxServiceImpl.queryQxCategoryList(trxToken, user.getUserId()); + if (CollectionUtils.isEmpty(appModules)) { + log.error("获取天融信登录用户所拥有权限系统列表失败"); + return new GeneralResult<>(false, "获取权限系统菜单信息失败"); + } + for (AppModule appModule : appModules) { + long id = Long.parseLong(appModule.getId()); + qxAppModuleIds.add(id); + } + } catch (Exception e) { + log.error("获取天融信登录用户所拥有权限系统列表失败:", e); } } 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 3e22587..4088ba7 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 @@ -58,56 +58,19 @@ public class TrxServiceImpl implements TrxService { paramsMap.put("isToken", false); paramsMap.put("ngx_cookie", ngxCookie); JSONObject result = new JSONObject(); -// try { -// log.info("调用天融信获取随机字符串接口, url:" + url + ", 参数：" + JSONObject.toJSONString(paramsMap)); -// result = JSONObject.parseObject(HttpUtil.get(url, paramsMap, 10000)); -// if ("-1".equals(result.getString("result"))) { -// return new GeneralResult(false, "获取随机数失败" + result.getString("errmsg")); -// } -// } catch (Exception e) { -// log.error("调用天融信获取随机字符串失败", e); -// return new GeneralResult(false, "获取随机数失败" + e.getMessage()); -// } -// return new GeneralResult(true, result.getString("result"), "获取随机数成功"); - return new GeneralResult(true, "randomstr", "获取随机数成功"); + try { + log.info("调用天融信获取随机字符串接口, url:" + url + ", 参数：" + JSONObject.toJSONString(paramsMap)); + result = JSONObject.parseObject(HttpUtil.get(url, paramsMap, 10000)); + if ("-1".equals(result.getString("result"))) { + return new GeneralResult(false, "获取随机数失败" + result.getString("errmsg")); + } + } catch (Exception e) { + log.error("调用天融信获取随机字符串失败", e); + return new GeneralResult(false, "获取随机数失败" + e.getMessage()); + } + return new GeneralResult(true, result.getString("result"), "获取随机数成功"); } - // 获取天融信用户信息 -// @Override -// public GeneralResult getAuthToken(TrxAuthModel trxAuthModel) { -// String url = trxUrl + "/userAuthen"; -// Map paramsMap = new HashMap<>(); -// paramsMap.put("cookie", trxAuthModel.getClientHello()); -// paramsMap.put("certMd5", trxAuthModel.getServerHello()); -// paramsMap.put("client_ip", trxAuthModel.getClientIp()); -// JSONObject result; -// GeneralResult> login; -// try { -// log.info("调用天融信登录接口, url:" + url + ", 参数：" + JSONObject.toJSONString(paramsMap)); -// result = JSONObject.parseObject(HttpUtil.post(url, paramsMap, 10000)); -// if (!"0".equals(result.getString("result"))) { -// return new GeneralResult(false, "用户登录天融信失败" + result.getString("errmsg")); -// } -// String trxToken = result.getString("token"); -// String userId = result.getString("userId"); -// // 处理ukey登录用户 -// log.info("开始uKey登录用户入库"); -// saveUserByTrx(userId); -// log.info("uKey登录用户入库结束"); -// // 登录 -// log.info("开始uKey登录用户登录云管平台"); -// User user = userRepository.getByUserId(userId); -// Encryptor encryptor = new AESEncryptor(); -// String password = encryptor.encrypt(userId + "CMP", null); -// login = userServiceImpl.login(user.getAccount(), password, null, null, true); -// login.getData().put("trxToken", trxToken); -// log.info("uKey登录用户登录云管平台结束"); -// } catch (Exception e) { -// log.error("用户登录失败：", e); -// return new GeneralResult(false, "用户登录失败" + e.getMessage()); -// } -// return new GeneralResult(true, login, "用户登录成功"); -// } @Override public GeneralResult getAuthToken(TrxAuthModel trxAuthModel) { @@ -120,10 +83,7 @@ public class TrxServiceImpl implements TrxService { GeneralResult> login = new GeneralResult<>(); try { log.info("调用天融信登录接口, url:" + url + ", 参数：" + JSONObject.toJSONString(paramsMap)); -// result = JSONObject.parseObject(HttpUtil.post(url, paramsMap, 10000)); - result.put("result", 0); - result.put("token", "trxTokenStr"); - result.put("userId", "100001"); + result = JSONObject.parseObject(HttpUtil.post(url, paramsMap, 10000)); if (!"0".equals(result.getString("result"))) { return new GeneralResult(false, "用户登录天融信失败" + result.getString("errmsg")); } @@ -155,12 +115,7 @@ public class TrxServiceImpl implements TrxService { JSONObject params = new JSONObject(); params.put("userId", userId); //请求运控系统获取用户信息 -// YkUserModel ykUser = JSONArray.parseArray(ykUtils.call(YkInf.queryAllUser, params, String.class), YkUserModel.class).get(0); - YkUserModel ykUser = new YkUserModel(); - ykUser.setLoginName("trx01"); - ykUser.setUserName("trx01"); - ykUser.setMobile("15238853513"); - ykUser.setEmail("188834343@qq.com"); + YkUserModel ykUser = JSONArray.parseArray(ykUtils.call(YkInf.queryAllUser, params, String.class), YkUserModel.class).get(0); if (ObjectUtils.isEmpty(user)) { log.info("开始新增天融信登录用户，userId: " + userId); // 新增 以userId作为account 并添加注释 @@ -211,69 +166,17 @@ public class TrxServiceImpl implements TrxService { } } -// private void saveUserByTrx(String userId) { -// User user = userRepository.getByUserId(userId); -// // 根据userId获取运控系统用户信息 -// JSONObject params = new JSONObject(); -// params.put("userId", userId); -// //请求运控系统获取用户信息 -// YkUserModel ykUser = JSONArray.parseArray(ykUtils.call(YkInf.queryAllUser, params, String.class), YkUserModel.class).get(0); -// if (ObjectUtils.isEmpty(user)) { -// log.info("开始新增天融信登录用户，userId: " + userId); -// // 新增 以userId作为account 并添加注释 -// UserBean userBean = new UserBean(); -// userBean.setPassword(userId + "CMP"); -// userBean.setSex(true); -// userBean.setIsManager(true); -// userBean.setUserId(userId); -// userBean.setRemark("天融信登录添加用户"); -// // 设置运控用户信息 -// userBean.setAccount(ykUser.getLoginName()); -// userBean.setName(ykUser.getUserName()); -// userBean.setMobile(ykUser.getMobile()); -// userBean.setEmail(ykUser.getEmail()); -// userBean.setUserId(userId); -// RequestContext context = new RequestContext(); -// context.setTarget(1L); -// context.setCatalog(RequestContext.Catalog.Manager); -// userServiceImpl.create(userBean, context); -// /** -// * 云管授权当前用户全部角色 -// * 1，获取云管角色列表 -// * 2，授权 -// * */ -// User userByUserId = userRepository.getByUserId(userId); -// List roleIds = roleRepository.list().stream().map(Role::getId).collect(Collectors.toList()); -// userServiceImpl.accredit(userByUserId.getId(), roleIds, context); -// log.info("完成新增天融信登录用户，userId: " + userId); -// } else { -// // 修改 -// log.info("开始修改天融信登录用户，userId: " + userId); -// UserBean userBean = new UserBean(); -// userBean.setId(user.getId()); -// userBean.setSex(true); -// userBean.setIsManager(true); -// userBean.setUserId(userId); -// userBean.setRemark("天融信登录添加用户"); -// // 设置运控用户信息 -// userBean.setAccount(ykUser.getLoginName()); -// userBean.setName(ykUser.getUserName()); -// userBean.setMobile(ykUser.getMobile()); -// userBean.setEmail(ykUser.getEmail()); -// RequestContext context = new RequestContext(); -// context.setTarget(1L); -// context.setCatalog(RequestContext.Catalog.Manager); -// userServiceImpl.modify(user.getId(), userBean, context); -// log.info("完成修改天融信登录用户，userId: " + userId); -// } -// } - //确认天融信token是否有效 public GeneralResult getTokenOnline(String trxToken) { - String url = trxUrl + "/tokenOnline"; - JSONObject result = JSONObject.parseObject(HttpUtil.post(url, trxToken)); - if (!"0".equals(result.getString("result"))) { - return new GeneralResult(false, "当前token无效" + result.getString("errmsg")); + try { + String url = trxUrl + "/tokenOnline"; + JSONObject result = JSONObject.parseObject(HttpUtil.post(url, trxToken, 10000)); + if (!"0".equals(result.getString("result"))) { + return new GeneralResult(false, "当前token无效" + result.getString("errmsg")); + } + } catch (Exception e) { + log.error("获取天融信token状态失败：", e); + return new GeneralResult(false, "获取天融信token状态失败" + e.getMessage()); } return new GeneralResult(true, "当前token有效"); } 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 37f1162..16a85ad 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 @@ -3,6 +3,7 @@ package com.bocloud.sms.service.utils; import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSONObject; import com.bocloud.sms.model.QxReqVo; +import com.megatron.common.model.GeneralResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -27,13 +28,17 @@ public class QxUtils { } public String call(String url, QxReqVo qxReqVo){ - String str = JSONObject.toJSONString(qxReqVo); - logger.info("call method[{}] req params[{}]",url,str); - JSONObject result = JSONObject.parseObject(HttpUtil.post(url,str)); - if (!"200".equals(result.getString("status"))) { - throw new IllegalArgumentException("调用权限系统接口异常" + result.getString("msg")); + try { + String str = JSONObject.toJSONString(qxReqVo); + logger.info("call method[{}] req params[{}]",url,str); + JSONObject result = JSONObject.parseObject(HttpUtil.post(url,str, 10000)); + if (!"200".equals(result.getString("status"))) { + throw new IllegalArgumentException("调用权限系统接口异常" + result.getString("msg")); + } + return result.getString("data"); + } catch (Exception e) { + logger.error("获取天融信token状态失败：", e); } - - return result.getString("data"); + return null; } } diff --git a/bocloud.sms.service/src/main/java/com/bocloud/sms/service/utils/YkUtils.java b/bocloud.sms.service/src/main/java/com/bocloud/sms/service/utils/YkUtils.java index 4560232..db79a02 100644 --- a/bocloud.sms.service/src/main/java/com/bocloud/sms/service/utils/YkUtils.java +++ b/bocloud.sms.service/src/main/java/com/bocloud/sms/service/utils/YkUtils.java @@ -28,7 +28,7 @@ public class YkUtils { String str = JSONObject.toJSONString(reqVo); logger.info("call yk url [{}]" , url); logger.info("call yk method[{}] req params[{}]",reqVo.getMethod(),str); - String resultStr = HttpUtil.post(url, str); + String resultStr = HttpUtil.post(url, str, 10000); //logger.info("call method[{}] resp params[{}]",reqVo.getMethod(),resultStr); JSONObject result = JSONObject.parseObject(resultStr); logger.info("call yk result [{}]" , result.toString()); From 0f63fe8e24dc050716b193e0b76a069700a4b5a8 Mon Sep 17 00:00:00 2001 From: guyuliang Date: Mon, 26 Aug 2024 17:04:37 +0800 Subject: [PATCH 14/31] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IndexDataController.java | 26 ++++++++++++- .../bocloud/sms/interfaces/IndexService.java | 2 + .../bocloud/sms/service/IndexServiceImpl.java | 38 +++++++++++++++---- 3 files changed, 57 insertions(+), 9 deletions(-) diff --git a/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/IndexDataController.java b/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/IndexDataController.java index 95997aa..bfd6680 100644 --- a/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/IndexDataController.java +++ b/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/IndexDataController.java @@ -28,15 +28,39 @@ public class IndexDataController { private IndexService indexService; + /** + * 待办工单列表 + * @param pager + * @param requestContext + * @return + */ @GetMapping("/doneWorkOrder") @Operation(summary = "待办工单列表") public GeneralResult doneWorkOrder(Pager pager, @Value(Common.REQ_CONTEXT) RequestContext requestContext) { return indexService.doneWorkOrder(pager, requestContext); } + /** + * 工单统计 + * @param pager + * @param requestContext + * @return + */ @GetMapping("/workOrder/stattic") - @Operation(summary = "待办工单列表") + @Operation(summary = "工单统计") public GeneralResult workOrderStatic(Pager pager, @Value(Common.REQ_CONTEXT) RequestContext requestContext) { return indexService.workOrderStatic(requestContext); } + + /** + * 当前用户首页数据展示模块的数据查询 + * @param pager + * @param requestContext + * @return + */ + @GetMapping("/userData/stattic") + @Operation(summary = "当前用户首页数据展示模块的数据查询") + public GeneralResult userStatic(Pager pager, @Value(Common.REQ_CONTEXT) RequestContext requestContext) { + return indexService.userDataStatic(requestContext); + } } diff --git a/bocloud.sms.service/src/main/java/com/bocloud/sms/interfaces/IndexService.java b/bocloud.sms.service/src/main/java/com/bocloud/sms/interfaces/IndexService.java index 6dc7302..670afe4 100644 --- a/bocloud.sms.service/src/main/java/com/bocloud/sms/interfaces/IndexService.java +++ b/bocloud.sms.service/src/main/java/com/bocloud/sms/interfaces/IndexService.java @@ -11,4 +11,6 @@ public interface IndexService { GeneralResult doneWorkOrder(Pager pager, RequestContext requestContext); GeneralResult workOrderStatic(RequestContext requestContext); + + GeneralResult userDataStatic(RequestContext requestContext); } 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 b522552..6f69b74 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 @@ -51,30 +51,52 @@ public class IndexServiceImpl implements IndexService { JSONObject param = new JSONObject(); User user = userRepository.query(requestContext.getTarget()); param.put("userId", "1111"); - param.put("page",1); + param.put("page", 1); param.put("limit", Integer.MAX_VALUE); String result = ykUtil.call(YkInfo.getTaskList, param, JSONArray.class); JSONObject jsonObject = JSONArray.parseObject(result, JSONObject.class); Integer total = jsonObject.getInteger("total"); - Map resultMap = new HashMap<>(); - resultMap.put("orderTotal",total); + Map resultMap = new HashMap<>(); + resultMap.put("orderTotal", total); List data = JSONObject.parseObject(jsonObject.getString("data"), List.class); Integer waitDoneTotal = 0; Integer doneTotal = 0; for (JSONObject obj : data) { - if("0".equals(obj.getString("approve_status"))){ + if ("0".equals(obj.getString("approve_status"))) { waitDoneTotal++; - }else { + } else { doneTotal++; } } - resultMap.put("waitDoneTotal",waitDoneTotal); - resultMap.put("doneTotal",doneTotal); + resultMap.put("waitDoneTotal", waitDoneTotal); + resultMap.put("doneTotal", doneTotal); - return new GeneralResult(true, resultMap,"查询成功"); + return new GeneralResult(true, resultMap, "查询成功"); + } catch (Exception e) { + log.info("查询失败", e); + return new GeneralResult(false, "查询失败"); + } + } + + @Override + public GeneralResult userDataStatic(RequestContext requestContext) { + try { + //查询当前用户授权应用 + JSONObject param = new JSONObject(); + param.put("userId", "1111"); + param.put("type", "user"); + String result = ykUtil.call(YkInfo.getUserAppList, param, JSONArray.class); + + //获取用户信息 + JSONObject userParam = new JSONObject(); + param.put("userParam", "1111"); + String userRolesStr = ykUtil.call(YkInfo.getUserRoles, param, JSONArray.class); + + + return new GeneralResult(true, "查询成功"); } catch (Exception e) { log.info("查询失败", e); return new GeneralResult(false, "查询失败"); From 643e800e63e2b962522c724c81ca4d215598344a Mon Sep 17 00:00:00 2001 From: guyuliang Date: Mon, 26 Aug 2024 17:07:57 +0800 Subject: [PATCH 15/31] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bocloud/sms/booter/controller/IndexDataController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/IndexDataController.java b/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/IndexDataController.java index bfd6680..9743b22 100644 --- a/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/IndexDataController.java +++ b/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/IndexDataController.java @@ -58,7 +58,7 @@ public class IndexDataController { * @param requestContext * @return */ - @GetMapping("/userData/stattic") + @GetMapping("/userData/static") @Operation(summary = "当前用户首页数据展示模块的数据查询") public GeneralResult userStatic(Pager pager, @Value(Common.REQ_CONTEXT) RequestContext requestContext) { return indexService.userDataStatic(requestContext); From 651faaa42548a9b90faec7f4340ef8529bdf18ca Mon Sep 17 00:00:00 2001 From: guyuliang Date: Mon, 26 Aug 2024 17:10:09 +0800 Subject: [PATCH 16/31] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/bocloud/sms/enums/YkInfo.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bocloud.sms.storage/src/main/java/com/bocloud/sms/enums/YkInfo.java b/bocloud.sms.storage/src/main/java/com/bocloud/sms/enums/YkInfo.java index 9105340..a0872f4 100644 --- a/bocloud.sms.storage/src/main/java/com/bocloud/sms/enums/YkInfo.java +++ b/bocloud.sms.storage/src/main/java/com/bocloud/sms/enums/YkInfo.java @@ -7,6 +7,10 @@ public enum YkInfo { getAppList("/system/sysapp/getAppList"), //获取运维工单接口 getTaskList("/activiti/rwMainTask/getTaskList"), + //用户授权应用接口 + getUserAppList("/system/sysapp/getRoleOrUserHaveAppList"), + //获取用户角色信息 + getUserRoles("/system/user/queryUserRoles"), getTaskByUser("/system/task/countTaskByUser"); From 8bdf6b675124dbe275465b8437d94ddfc97bf575 Mon Sep 17 00:00:00 2001 From: guyuliang Date: Mon, 26 Aug 2024 17:12:05 +0800 Subject: [PATCH 17/31] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bocloud/sms/booter/controller/IndexDataController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/IndexDataController.java b/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/IndexDataController.java index 9743b22..6e5b1da 100644 --- a/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/IndexDataController.java +++ b/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/IndexDataController.java @@ -48,7 +48,7 @@ public class IndexDataController { */ @GetMapping("/workOrder/stattic") @Operation(summary = "工单统计") - public GeneralResult workOrderStatic(Pager pager, @Value(Common.REQ_CONTEXT) RequestContext requestContext) { + public GeneralResult workOrderStatic( @Value(Common.REQ_CONTEXT) RequestContext requestContext) { return indexService.workOrderStatic(requestContext); } @@ -60,7 +60,7 @@ public class IndexDataController { */ @GetMapping("/userData/static") @Operation(summary = "当前用户首页数据展示模块的数据查询") - public GeneralResult userStatic(Pager pager, @Value(Common.REQ_CONTEXT) RequestContext requestContext) { + public GeneralResult userStatic(@Value(Common.REQ_CONTEXT) RequestContext requestContext) { return indexService.userDataStatic(requestContext); } } From 4b34fcc45123fb1f2ccc69d66432e294ea83331c Mon Sep 17 00:00:00 2001 From: guyuliang Date: Mon, 26 Aug 2024 17:31:45 +0800 Subject: [PATCH 18/31] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bocloud/sms/service/IndexServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 6f69b74..41d6e03 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 @@ -85,15 +85,15 @@ public class IndexServiceImpl implements IndexService { public GeneralResult userDataStatic(RequestContext requestContext) { try { //查询当前用户授权应用 - JSONObject param = new JSONObject(); - param.put("userId", "1111"); - param.put("type", "user"); - String result = ykUtil.call(YkInfo.getUserAppList, param, JSONArray.class); +// JSONObject param = new JSONObject(); +// param.put("userId", "1111"); +// param.put("type", "user"); +// String result = ykUtil.call(YkInfo.getUserAppList, param, JSONArray.class); //获取用户信息 JSONObject userParam = new JSONObject(); - param.put("userParam", "1111"); - String userRolesStr = ykUtil.call(YkInfo.getUserRoles, param, JSONArray.class); + userParam.put("userId", "1111"); + String userRolesStr = ykUtil.call(YkInfo.getUserRoles, userParam, JSONArray.class); return new GeneralResult(true, "查询成功"); From b6b758a7707e23644f60f80b948cc4df44b51ebd Mon Sep 17 00:00:00 2001 From: guyuliang Date: Mon, 26 Aug 2024 18:58:08 +0800 Subject: [PATCH 19/31] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bocloud/sms/service/IndexServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 41d6e03..db9d107 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 @@ -85,10 +85,10 @@ public class IndexServiceImpl implements IndexService { public GeneralResult userDataStatic(RequestContext requestContext) { try { //查询当前用户授权应用 -// JSONObject param = new JSONObject(); -// param.put("userId", "1111"); -// param.put("type", "user"); -// String result = ykUtil.call(YkInfo.getUserAppList, param, JSONArray.class); + JSONObject param = new JSONObject(); + param.put("userId", "1111"); + param.put("type", "user"); + String result = ykUtil.call(YkInfo.getUserAppList, param, JSONArray.class); //获取用户信息 JSONObject userParam = new JSONObject(); From bab20f84ad3185722fb0102d6263d41c2ed1b561 Mon Sep 17 00:00:00 2001 From: guyuliang Date: Mon, 26 Aug 2024 19:25:16 +0800 Subject: [PATCH 20/31] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=8E=88=E6=9D=83app?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IndexDataController.java | 11 +++++++ .../bocloud/sms/interfaces/IndexService.java | 2 ++ .../bocloud/sms/service/IndexServiceImpl.java | 30 +++++++++++++++---- 3 files changed, 38 insertions(+), 5 deletions(-) diff --git a/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/IndexDataController.java b/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/IndexDataController.java index 6e5b1da..dfcb42a 100644 --- a/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/IndexDataController.java +++ b/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/IndexDataController.java @@ -63,4 +63,15 @@ public class IndexDataController { public GeneralResult userStatic(@Value(Common.REQ_CONTEXT) RequestContext requestContext) { return indexService.userDataStatic(requestContext); } + /** + * 当前用户授权应用列表 + * @param pager + * @param requestContext + * @return + */ + @GetMapping("/userAppList") + @Operation(summary = "当前用户首页数据展示模块的数据查询") + public GeneralResult userAppList(@Value(Common.REQ_CONTEXT) RequestContext requestContext) { + return indexService.userAppList(requestContext); + } } diff --git a/bocloud.sms.service/src/main/java/com/bocloud/sms/interfaces/IndexService.java b/bocloud.sms.service/src/main/java/com/bocloud/sms/interfaces/IndexService.java index 670afe4..5081def 100644 --- a/bocloud.sms.service/src/main/java/com/bocloud/sms/interfaces/IndexService.java +++ b/bocloud.sms.service/src/main/java/com/bocloud/sms/interfaces/IndexService.java @@ -13,4 +13,6 @@ public interface IndexService { GeneralResult workOrderStatic(RequestContext requestContext); GeneralResult userDataStatic(RequestContext requestContext); + + GeneralResult userAppList(RequestContext requestContext); } 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 db9d107..923d186 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 @@ -84,11 +84,10 @@ public class IndexServiceImpl implements IndexService { @Override public GeneralResult userDataStatic(RequestContext requestContext) { try { + Map resultMap = new HashMap<>(); //查询当前用户授权应用 - JSONObject param = new JSONObject(); - param.put("userId", "1111"); - param.put("type", "user"); - String result = ykUtil.call(YkInfo.getUserAppList, param, JSONArray.class); + List userAppList = getUserAppList(requestContext); + resultMap.put("userAppCount", userAppList.size()); //获取用户信息 JSONObject userParam = new JSONObject(); @@ -96,10 +95,31 @@ public class IndexServiceImpl implements IndexService { String userRolesStr = ykUtil.call(YkInfo.getUserRoles, userParam, JSONArray.class); - return new GeneralResult(true, "查询成功"); + return new GeneralResult(true, resultMap, "查询成功"); } catch (Exception e) { log.info("查询失败", e); return new GeneralResult(false, "查询失败"); } } + + @Override + public GeneralResult userAppList(RequestContext requestContext) { + + try { + List userAppList = getUserAppList(requestContext); + return new GeneralResult(true, userAppList, "查询成功"); + } catch (Exception e) { + log.info("查询失败", e); + return new GeneralResult(false, "查询失败"); + } + } + + private List getUserAppList(RequestContext requestContext) throws Exception { + //查询当前用户授权应用 + JSONObject param = new JSONObject(); + param.put("userId", "1111"); + param.put("type", "user"); + String result = ykUtil.call(YkInfo.getUserAppList, param, JSONArray.class); + return JSONObject.parseObject(result, List.class); + } } From 58755e20d927867f9ef801136b28ae188c2392c4 Mon Sep 17 00:00:00 2001 From: guyuliang Date: Mon, 26 Aug 2024 20:04:38 +0800 Subject: [PATCH 21/31] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=8E=88=E6=9D=83app?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bocloud/sms/service/IndexServiceImpl.java | 7 +++++++ .../src/main/java/com/bocloud/sms/enums/YkInfo.java | 2 ++ 2 files changed, 9 insertions(+) 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 923d186..035f22a 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 @@ -106,6 +106,13 @@ public class IndexServiceImpl implements IndexService { public GeneralResult userAppList(RequestContext requestContext) { try { + //获取所有的appList + //查询当前用户授权应用 + JSONObject param = new JSONObject(); + param.put("type", "user"); + String result = ykUtil.call(YkInfo.getAllAppList, param, JSONArray.class); + + List userAppList = getUserAppList(requestContext); return new GeneralResult(true, userAppList, "查询成功"); } catch (Exception e) { diff --git a/bocloud.sms.storage/src/main/java/com/bocloud/sms/enums/YkInfo.java b/bocloud.sms.storage/src/main/java/com/bocloud/sms/enums/YkInfo.java index a0872f4..53dd9ef 100644 --- a/bocloud.sms.storage/src/main/java/com/bocloud/sms/enums/YkInfo.java +++ b/bocloud.sms.storage/src/main/java/com/bocloud/sms/enums/YkInfo.java @@ -9,6 +9,8 @@ public enum YkInfo { getTaskList("/activiti/rwMainTask/getTaskList"), //用户授权应用接口 getUserAppList("/system/sysapp/getRoleOrUserHaveAppList"), + //获取所有app接口 + getAllAppList("/system/sysapp/getAppList"), //获取用户角色信息 getUserRoles("/system/user/queryUserRoles"), From c1f55e4c99f9da7b68252dc99bad12ed01e0b387 Mon Sep 17 00:00:00 2001 From: guyuliang Date: Mon, 26 Aug 2024 20:07:53 +0800 Subject: [PATCH 22/31] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=8E=88=E6=9D=83app?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bocloud/sms/service/IndexServiceImpl.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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 035f22a..8819b8a 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 @@ -17,6 +17,7 @@ import org.springframework.stereotype.Service; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Service("IndexService") @Slf4j @@ -110,10 +111,18 @@ public class IndexServiceImpl implements IndexService { //查询当前用户授权应用 JSONObject param = new JSONObject(); param.put("type", "user"); + param.put("page", 1); + param.put("limit", Integer.MAX_VALUE); String result = ykUtil.call(YkInfo.getAllAppList, param, JSONArray.class); - + List list = JSONObject.parseObject(result, List.class); List userAppList = getUserAppList(requestContext); + List appIdList = userAppList.stream().map(jsonObject -> jsonObject.getString("appId")).collect(Collectors.toList()); + for (JSONObject data : list) { + if(appIdList.contains(data.getString("appId"))){ + data.put("enable", "1"); + } + } return new GeneralResult(true, userAppList, "查询成功"); } catch (Exception e) { log.info("查询失败", e); From ddd530f9694800c4d850ca6027a26e26a7164563 Mon Sep 17 00:00:00 2001 From: guyuliang Date: Mon, 26 Aug 2024 20:10:42 +0800 Subject: [PATCH 23/31] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=8E=88=E6=9D=83app?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bocloud/sms/service/IndexServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 8819b8a..6830919 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 @@ -114,16 +114,18 @@ public class IndexServiceImpl implements IndexService { param.put("page", 1); param.put("limit", Integer.MAX_VALUE); String result = ykUtil.call(YkInfo.getAllAppList, param, JSONArray.class); - List list = JSONObject.parseObject(result, List.class); + JSONObject allAppJson = JSONObject.parseObject(result, JSONObject.class); + List allAppList = JSONObject.parseObject(allAppJson.getString("list"), List.class); + List userAppList = getUserAppList(requestContext); List appIdList = userAppList.stream().map(jsonObject -> jsonObject.getString("appId")).collect(Collectors.toList()); - for (JSONObject data : list) { + for (JSONObject data : allAppList) { if(appIdList.contains(data.getString("appId"))){ data.put("enable", "1"); } } - return new GeneralResult(true, userAppList, "查询成功"); + return new GeneralResult(true, allAppList, "查询成功"); } catch (Exception e) { log.info("查询失败", e); return new GeneralResult(false, "查询失败"); From 57ec1cc3351bb2e059040dfb639aca4a8ba9f5e2 Mon Sep 17 00:00:00 2001 From: guyuliang Date: Mon, 26 Aug 2024 20:14:42 +0800 Subject: [PATCH 24/31] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=8E=88=E6=9D=83app?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bocloud/sms/service/IndexServiceImpl.java | 34 +++++++++++++------ .../java/com/bocloud/sms/enums/YkInfo.java | 2 ++ 2 files changed, 26 insertions(+), 10 deletions(-) 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 6830919..97a00a0 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 @@ -49,13 +49,7 @@ public class IndexServiceImpl implements IndexService { public GeneralResult workOrderStatic(RequestContext requestContext) { try { - JSONObject param = new JSONObject(); - User user = userRepository.query(requestContext.getTarget()); - param.put("userId", "1111"); - param.put("page", 1); - param.put("limit", Integer.MAX_VALUE); - String result = ykUtil.call(YkInfo.getTaskList, param, JSONArray.class); - JSONObject jsonObject = JSONArray.parseObject(result, JSONObject.class); + JSONObject jsonObject = getTaskList(requestContext); Integer total = jsonObject.getInteger("total"); Map resultMap = new HashMap<>(); @@ -82,6 +76,17 @@ public class IndexServiceImpl implements IndexService { } } + private JSONObject getTaskList(RequestContext requestContext) throws Exception { + JSONObject param = new JSONObject(); + User user = userRepository.query(requestContext.getTarget()); + param.put("userId", "1111"); + param.put("page", 1); + param.put("limit", Integer.MAX_VALUE); + String result = ykUtil.call(YkInfo.getTaskList, param, JSONArray.class); + JSONObject jsonObject = JSONArray.parseObject(result, JSONObject.class); + return jsonObject; + } + @Override public GeneralResult userDataStatic(RequestContext requestContext) { try { @@ -90,10 +95,17 @@ public class IndexServiceImpl implements IndexService { List userAppList = getUserAppList(requestContext); resultMap.put("userAppCount", userAppList.size()); - //获取用户信息 + + //获取运维任务申请表 + JSONObject taskJson = getTaskList(requestContext); + Integer total = taskJson.getInteger("total"); + resultMap.put("taskCount", total); + + + //获取用户数据权限申请数量 JSONObject userParam = new JSONObject(); userParam.put("userId", "1111"); - String userRolesStr = ykUtil.call(YkInfo.getUserRoles, userParam, JSONArray.class); + String userRolesStr = ykUtil.call(YkInfo.getUserDataJurisdiction, userParam, JSONArray.class); return new GeneralResult(true, resultMap, "查询成功"); @@ -117,12 +129,14 @@ public class IndexServiceImpl implements IndexService { JSONObject allAppJson = JSONObject.parseObject(result, JSONObject.class); List allAppList = JSONObject.parseObject(allAppJson.getString("list"), List.class); - List userAppList = getUserAppList(requestContext); List appIdList = userAppList.stream().map(jsonObject -> jsonObject.getString("appId")).collect(Collectors.toList()); for (JSONObject data : allAppList) { if(appIdList.contains(data.getString("appId"))){ data.put("enable", "1"); + }else{ + + data.put("enable", "0"); } } return new GeneralResult(true, allAppList, "查询成功"); diff --git a/bocloud.sms.storage/src/main/java/com/bocloud/sms/enums/YkInfo.java b/bocloud.sms.storage/src/main/java/com/bocloud/sms/enums/YkInfo.java index 53dd9ef..18bdc96 100644 --- a/bocloud.sms.storage/src/main/java/com/bocloud/sms/enums/YkInfo.java +++ b/bocloud.sms.storage/src/main/java/com/bocloud/sms/enums/YkInfo.java @@ -13,6 +13,8 @@ public enum YkInfo { getAllAppList("/system/sysapp/getAppList"), //获取用户角色信息 getUserRoles("/system/user/queryUserRoles"), + //用户数据权限信息查询接口 + getUserDataJurisdiction("/system/user/queryUserAuthres"), getTaskByUser("/system/task/countTaskByUser"); From 4dff1e3810de264a477a2b9067807e61cb5e0e74 Mon Sep 17 00:00:00 2001 From: guyuliang Date: Mon, 26 Aug 2024 20:19:25 +0800 Subject: [PATCH 25/31] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bocloud/sms/service/IndexServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 97a00a0..db10b8d 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 @@ -105,8 +105,11 @@ public class IndexServiceImpl implements IndexService { //获取用户数据权限申请数量 JSONObject userParam = new JSONObject(); userParam.put("userId", "1111"); - String userRolesStr = ykUtil.call(YkInfo.getUserDataJurisdiction, userParam, JSONArray.class); + String userDataAuthStr = ykUtil.call(YkInfo.getUserDataAuth, userParam, JSONArray.class); + List userDataJAuthJson = JSONObject.parseObject(userDataAuthStr, List.class); + List authResList = JSONObject.parseObject(userDataJAuthJson.get(0).getString("authRes"),List.class); + resultMap.put("userAuthList", authResList.size()); return new GeneralResult(true, resultMap, "查询成功"); } catch (Exception e) { From d6df932c761e83c6b900ba12be9646ee5b94c6b0 Mon Sep 17 00:00:00 2001 From: guyuliang Date: Mon, 26 Aug 2024 20:26:57 +0800 Subject: [PATCH 26/31] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/bocloud/sms/enums/YkInfo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bocloud.sms.storage/src/main/java/com/bocloud/sms/enums/YkInfo.java b/bocloud.sms.storage/src/main/java/com/bocloud/sms/enums/YkInfo.java index 18bdc96..bf5936e 100644 --- a/bocloud.sms.storage/src/main/java/com/bocloud/sms/enums/YkInfo.java +++ b/bocloud.sms.storage/src/main/java/com/bocloud/sms/enums/YkInfo.java @@ -14,7 +14,7 @@ public enum YkInfo { //获取用户角色信息 getUserRoles("/system/user/queryUserRoles"), //用户数据权限信息查询接口 - getUserDataJurisdiction("/system/user/queryUserAuthres"), + getUserDataAuth("/system/user/queryUserAuthres"), getTaskByUser("/system/task/countTaskByUser"); From 604817a1731aab2358a2104ec3fd8cd70af687fe Mon Sep 17 00:00:00 2001 From: guyuliang Date: Mon, 26 Aug 2024 20:30:26 +0800 Subject: [PATCH 27/31] =?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 --- .../src/main/java/com/bocloud/sms/service/IndexServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) 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 db10b8d..49b78e6 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 @@ -1,5 +1,6 @@ package com.bocloud.sms.service; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.bocloud.sms.entity.User; @@ -110,6 +111,7 @@ public class IndexServiceImpl implements IndexService { List authResList = JSONObject.parseObject(userDataJAuthJson.get(0).getString("authRes"),List.class); resultMap.put("userAuthList", authResList.size()); + log.info("resultMap:{}", JSON.toJSONString(resultMap)); return new GeneralResult(true, resultMap, "查询成功"); } catch (Exception e) { From 7d816e91b9de140920b1280e33d0d3db474c2f2d Mon Sep 17 00:00:00 2001 From: guyuliang Date: Tue, 27 Aug 2024 10:53:44 +0800 Subject: [PATCH 28/31] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bocloud/sms/service/IndexServiceImpl.java | 26 ++++----- .../java/com/bocloud/sms/enums/WarnInfo.java | 19 ++++++ .../java/com/bocloud/sms/enums/YkInfo.java | 2 + .../java/com/bocloud/sms/utils/WarnUtil.java | 58 +++++++++++++++++++ 4 files changed, 89 insertions(+), 16 deletions(-) create mode 100644 bocloud.sms.storage/src/main/java/com/bocloud/sms/enums/WarnInfo.java create mode 100644 bocloud.sms.storage/src/main/java/com/bocloud/sms/utils/WarnUtil.java 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 49b78e6..3a43c42 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 @@ -4,9 +4,11 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.bocloud.sms.entity.User; +import com.bocloud.sms.enums.WarnInfo; import com.bocloud.sms.enums.YkInfo; import com.bocloud.sms.interfaces.IndexService; import com.bocloud.sms.repository.UserRepository; +import com.bocloud.sms.utils.WarnUtil; import com.bocloud.sms.utils.YkUtil; import com.megatron.common.model.GeneralResult; import com.megatron.common.model.Pager; @@ -28,6 +30,8 @@ public class IndexServiceImpl implements IndexService { private YkUtil ykUtil; @Autowired private UserRepository userRepository; + @Autowired + private WarnUtil warnUtil; @Override public GeneralResult doneWorkOrder(Pager pager, RequestContext requestContext) { @@ -91,29 +95,19 @@ public class IndexServiceImpl implements IndexService { @Override public GeneralResult userDataStatic(RequestContext requestContext) { try { - Map resultMap = new HashMap<>(); - //查询当前用户授权应用 - List userAppList = getUserAppList(requestContext); - resultMap.put("userAppCount", userAppList.size()); - - - //获取运维任务申请表 - JSONObject taskJson = getTaskList(requestContext); - Integer total = taskJson.getInteger("total"); - resultMap.put("taskCount", total); - - //获取用户数据权限申请数量 JSONObject userParam = new JSONObject(); userParam.put("userId", "1111"); - String userDataAuthStr = ykUtil.call(YkInfo.getUserDataAuth, userParam, JSONArray.class); + String userDataAuthStr = ykUtil.call(YkInfo.getCountTaskByUser, userParam, JSONArray.class); List userDataJAuthJson = JSONObject.parseObject(userDataAuthStr, List.class); List authResList = JSONObject.parseObject(userDataJAuthJson.get(0).getString("authRes"),List.class); - resultMap.put("userAuthList", authResList.size()); - log.info("resultMap:{}", JSON.toJSONString(resultMap)); + String result = warnUtil.call(WarnInfo.get1DayWarnCount.getUrl(), "GET"); + log.info("result:"+result); - return new GeneralResult(true, resultMap, "查询成功"); +// log.info("resultMap:{}", JSON.toJSONString(resultMap)); + + return new GeneralResult(true, "查询成功"); } catch (Exception e) { log.info("查询失败", e); return new GeneralResult(false, "查询失败"); diff --git a/bocloud.sms.storage/src/main/java/com/bocloud/sms/enums/WarnInfo.java b/bocloud.sms.storage/src/main/java/com/bocloud/sms/enums/WarnInfo.java new file mode 100644 index 0000000..2d3a7f8 --- /dev/null +++ b/bocloud.sms.storage/src/main/java/com/bocloud/sms/enums/WarnInfo.java @@ -0,0 +1,19 @@ +package com.bocloud.sms.enums; + +public enum WarnInfo { + + //单日告警统计 + get1DayWarnCount("/alistar/api/v1/alarm/current/statistics/7d"), + //近7日告警趋势统计 + get7DayWarnTrend("/alistar/api/v1/alarm/current/today/all"); + + private String url; + + WarnInfo(String url) { + this.url = url; + } + + public String getUrl() { + return url; + } +} diff --git a/bocloud.sms.storage/src/main/java/com/bocloud/sms/enums/YkInfo.java b/bocloud.sms.storage/src/main/java/com/bocloud/sms/enums/YkInfo.java index bf5936e..b21507a 100644 --- a/bocloud.sms.storage/src/main/java/com/bocloud/sms/enums/YkInfo.java +++ b/bocloud.sms.storage/src/main/java/com/bocloud/sms/enums/YkInfo.java @@ -13,6 +13,8 @@ public enum YkInfo { getAllAppList("/system/sysapp/getAppList"), //获取用户角色信息 getUserRoles("/system/user/queryUserRoles"), + //数据展示 + getCountTaskByUser("/system/task/countTaskByUser"), //用户数据权限信息查询接口 getUserDataAuth("/system/user/queryUserAuthres"), diff --git a/bocloud.sms.storage/src/main/java/com/bocloud/sms/utils/WarnUtil.java b/bocloud.sms.storage/src/main/java/com/bocloud/sms/utils/WarnUtil.java new file mode 100644 index 0000000..c0ecaca --- /dev/null +++ b/bocloud.sms.storage/src/main/java/com/bocloud/sms/utils/WarnUtil.java @@ -0,0 +1,58 @@ +package com.bocloud.sms.utils; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.Base64; + +@Component +@Slf4j +public class WarnUtil { + + @Value("${warn.url:127.0.0.1:1234}") + private String url; + @Value("${warn.user:alistar}") + private String user; + @Value("${warn.password:alistarapi123}") + private String password; + + + public String call(String urlSuffix, String method) throws Exception { + URL obj = new URL(url + urlSuffix); + HttpURLConnection connection = (HttpURLConnection) obj.openConnection(); + + // 设置请求方法 + connection.setRequestMethod(method); + + // 添加Basic Auth鉴权头 + String auth = user + ":" + password; + String encodedAuth = Base64.getEncoder().encodeToString(auth.getBytes()); + String authHeaderValue = "Basic " + encodedAuth; + connection.setRequestProperty("Authorization", authHeaderValue); + + // 发起请求并获取响应码 + int responseCode = connection.getResponseCode(); + log.info("Response Code: " + responseCode); + + + // 读取响应数据 + BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream())); + String inputLine; + StringBuilder response = new StringBuilder(); + + while ((inputLine = in.readLine()) != null) { + response.append(inputLine); + } + in.close(); + + // 输出响应 + log.info("Response: " + response.toString()); + return response.toString(); + + } +} From 49501e1d1c1571a7cbb8f36017f183f0bd7fb8ef Mon Sep 17 00:00:00 2001 From: guyuliang Date: Tue, 27 Aug 2024 12:01:09 +0800 Subject: [PATCH 29/31] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bocloud/sms/service/IndexServiceImpl.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) 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 3a43c42..c8625da 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 @@ -98,16 +98,15 @@ public class IndexServiceImpl implements IndexService { //获取用户数据权限申请数量 JSONObject userParam = new JSONObject(); userParam.put("userId", "1111"); - String userDataAuthStr = ykUtil.call(YkInfo.getCountTaskByUser, userParam, JSONArray.class); - List userDataJAuthJson = JSONObject.parseObject(userDataAuthStr, List.class); - List authResList = JSONObject.parseObject(userDataJAuthJson.get(0).getString("authRes"),List.class); + String data = ykUtil.call(YkInfo.getCountTaskByUser, userParam, JSONArray.class); + List list = JSONObject.parseObject(data, List.class); String result = warnUtil.call(WarnInfo.get1DayWarnCount.getUrl(), "GET"); - log.info("result:"+result); + log.info("result:" + result); // log.info("resultMap:{}", JSON.toJSONString(resultMap)); - return new GeneralResult(true, "查询成功"); + return new GeneralResult(true, list, "查询成功"); } catch (Exception e) { log.info("查询失败", e); return new GeneralResult(false, "查询失败"); @@ -131,9 +130,9 @@ public class IndexServiceImpl implements IndexService { List userAppList = getUserAppList(requestContext); List appIdList = userAppList.stream().map(jsonObject -> jsonObject.getString("appId")).collect(Collectors.toList()); for (JSONObject data : allAppList) { - if(appIdList.contains(data.getString("appId"))){ + if (appIdList.contains(data.getString("appId"))) { data.put("enable", "1"); - }else{ + } else { data.put("enable", "0"); } From 370117aecc3c5faded8ed6b27f19e06216c95337 Mon Sep 17 00:00:00 2001 From: guyuliang Date: Tue, 27 Aug 2024 15:49:54 +0800 Subject: [PATCH 30/31] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../booter/controller/IndexDataController.java | 13 +++++++++++++ .../bocloud/sms/interfaces/IndexService.java | 2 ++ .../bocloud/sms/service/IndexServiceImpl.java | 17 +++++++++++++---- .../java/com/bocloud/sms/utils/WarnUtil.java | 5 +++++ 4 files changed, 33 insertions(+), 4 deletions(-) diff --git a/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/IndexDataController.java b/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/IndexDataController.java index dfcb42a..958b16d 100644 --- a/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/IndexDataController.java +++ b/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/IndexDataController.java @@ -63,6 +63,7 @@ public class IndexDataController { public GeneralResult userStatic(@Value(Common.REQ_CONTEXT) RequestContext requestContext) { return indexService.userDataStatic(requestContext); } + /** * 当前用户授权应用列表 * @param pager @@ -74,4 +75,16 @@ public class IndexDataController { public GeneralResult userAppList(@Value(Common.REQ_CONTEXT) RequestContext requestContext) { return indexService.userAppList(requestContext); } + + /** + * 近7日告警趋势 + * @param pager + * @param requestContext + * @return + */ + @GetMapping("/sevenDayWarnTrend") + @Operation(summary = "近7日告警趋势") + public GeneralResult sevenDayWarnTrend(@Value(Common.REQ_CONTEXT) RequestContext requestContext) { + return indexService.sevenDayWarnTrend(requestContext); + } } diff --git a/bocloud.sms.service/src/main/java/com/bocloud/sms/interfaces/IndexService.java b/bocloud.sms.service/src/main/java/com/bocloud/sms/interfaces/IndexService.java index 5081def..18cc0ce 100644 --- a/bocloud.sms.service/src/main/java/com/bocloud/sms/interfaces/IndexService.java +++ b/bocloud.sms.service/src/main/java/com/bocloud/sms/interfaces/IndexService.java @@ -15,4 +15,6 @@ public interface IndexService { GeneralResult userDataStatic(RequestContext requestContext); GeneralResult userAppList(RequestContext requestContext); + + GeneralResult sevenDayWarnTrend(RequestContext requestContext); } 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 c8625da..fc8dc34 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 @@ -101,10 +101,6 @@ public class IndexServiceImpl implements IndexService { String data = ykUtil.call(YkInfo.getCountTaskByUser, userParam, JSONArray.class); List list = JSONObject.parseObject(data, List.class); - String result = warnUtil.call(WarnInfo.get1DayWarnCount.getUrl(), "GET"); - log.info("result:" + result); - -// log.info("resultMap:{}", JSON.toJSONString(resultMap)); return new GeneralResult(true, list, "查询成功"); } catch (Exception e) { @@ -144,6 +140,19 @@ public class IndexServiceImpl implements IndexService { } } + @Override + public GeneralResult sevenDayWarnTrend(RequestContext requestContext) { + + try { + String result = warnUtil.call(WarnInfo.get7DayWarnTrend.getUrl(), "GET"); + log.info("result:"+result); + return new GeneralResult(true, "查询成功"); + } catch (Exception e) { + log.info("查询失败", e); + return new GeneralResult(false, "查询失败"); + } + } + private List getUserAppList(RequestContext requestContext) throws Exception { //查询当前用户授权应用 JSONObject param = new JSONObject(); diff --git a/bocloud.sms.storage/src/main/java/com/bocloud/sms/utils/WarnUtil.java b/bocloud.sms.storage/src/main/java/com/bocloud/sms/utils/WarnUtil.java index c0ecaca..70df1cb 100644 --- a/bocloud.sms.storage/src/main/java/com/bocloud/sms/utils/WarnUtil.java +++ b/bocloud.sms.storage/src/main/java/com/bocloud/sms/utils/WarnUtil.java @@ -21,6 +21,11 @@ public class WarnUtil { @Value("${warn.password:alistarapi123}") private String password; + public static void main(String[] args) { + String user = "alistar:alistarapi123"; + System.out.println(Base64.getEncoder().encodeToString(user.getBytes())); + } + public String call(String urlSuffix, String method) throws Exception { URL obj = new URL(url + urlSuffix); From 9eba1b9b1aef18d756b0806d19d85e508ad4b2ef Mon Sep 17 00:00:00 2001 From: guyuliang Date: Tue, 27 Aug 2024 15:52:11 +0800 Subject: [PATCH 31/31] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IndexDataController.java | 24 ++++++++++++++++++ .../bocloud/sms/interfaces/IndexService.java | 4 +++ .../bocloud/sms/service/IndexServiceImpl.java | 25 +++++++++++++++++++ .../java/com/bocloud/sms/enums/WarnInfo.java | 2 ++ 4 files changed, 55 insertions(+) diff --git a/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/IndexDataController.java b/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/IndexDataController.java index 958b16d..8f30234 100644 --- a/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/IndexDataController.java +++ b/bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/IndexDataController.java @@ -87,4 +87,28 @@ public class IndexDataController { public GeneralResult sevenDayWarnTrend(@Value(Common.REQ_CONTEXT) RequestContext requestContext) { return indexService.sevenDayWarnTrend(requestContext); } + + /** + * 单日告警统计 + * @param pager + * @param requestContext + * @return + */ + @GetMapping("/oneDayWarnCount") + @Operation(summary = "单日告警统计") + public GeneralResult oneDayWarnCount(@Value(Common.REQ_CONTEXT) RequestContext requestContext) { + return indexService.oneDayWarnCount(requestContext); + } + + /** + * 告警列表 + * @param pager + * @param requestContext + * @return + */ + @GetMapping("/warnList") + @Operation(summary = "告警列表") + public GeneralResult warnList(@Value(Common.REQ_CONTEXT) RequestContext requestContext) { + return indexService.warnList(requestContext); + } } diff --git a/bocloud.sms.service/src/main/java/com/bocloud/sms/interfaces/IndexService.java b/bocloud.sms.service/src/main/java/com/bocloud/sms/interfaces/IndexService.java index 18cc0ce..fbb8879 100644 --- a/bocloud.sms.service/src/main/java/com/bocloud/sms/interfaces/IndexService.java +++ b/bocloud.sms.service/src/main/java/com/bocloud/sms/interfaces/IndexService.java @@ -17,4 +17,8 @@ public interface IndexService { GeneralResult userAppList(RequestContext requestContext); GeneralResult sevenDayWarnTrend(RequestContext requestContext); + + GeneralResult oneDayWarnCount(RequestContext requestContext); + + GeneralResult warnList(RequestContext requestContext); } 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 fc8dc34..7d9e38e 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 @@ -153,6 +153,31 @@ public class IndexServiceImpl implements IndexService { } } + @Override + public GeneralResult oneDayWarnCount(RequestContext requestContext) { + + try { + String result = warnUtil.call(WarnInfo.get1DayWarnCount.getUrl(), "GET"); + log.info("result:"+result); + return new GeneralResult(true, "查询成功"); + } catch (Exception e) { + log.info("查询失败", e); + return new GeneralResult(false, "查询失败"); + } + } + + @Override + public GeneralResult warnList(RequestContext requestContext) { + try { + String result = warnUtil.call(WarnInfo.getWarnList.getUrl(), "GET"); + log.info("result:"+result); + return new GeneralResult(true, "查询成功"); + } catch (Exception e) { + log.info("查询失败", e); + return new GeneralResult(false, "查询失败"); + } + } + private List getUserAppList(RequestContext requestContext) throws Exception { //查询当前用户授权应用 JSONObject param = new JSONObject(); diff --git a/bocloud.sms.storage/src/main/java/com/bocloud/sms/enums/WarnInfo.java b/bocloud.sms.storage/src/main/java/com/bocloud/sms/enums/WarnInfo.java index 2d3a7f8..6ff59c7 100644 --- a/bocloud.sms.storage/src/main/java/com/bocloud/sms/enums/WarnInfo.java +++ b/bocloud.sms.storage/src/main/java/com/bocloud/sms/enums/WarnInfo.java @@ -4,6 +4,8 @@ public enum WarnInfo { //单日告警统计 get1DayWarnCount("/alistar/api/v1/alarm/current/statistics/7d"), + //告警列表 + getWarnList("/alistar/api/v1/alarm/current"), //近7日告警趋势统计 get7DayWarnTrend("/alistar/api/v1/alarm/current/today/all");