From b7f9a6a04d8677ed1ebd2b21ad088300a7db3d96 Mon Sep 17 00:00:00 2001 From: duwenyuan <15600000461@163.com> Date: Tue, 30 Dec 2025 17:18:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E9=82=AE?= =?UTF-8?q?=E4=BB=B6=E5=A4=84=E7=90=86=E7=BB=93=E6=9E=9C=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysEmailController.java | 566 +++++++++--------- 1 file changed, 283 insertions(+), 283 deletions(-) diff --git a/jeecg-module-large-screen/src/main/java/org/jeecg/sysEmail/controller/SysEmailController.java b/jeecg-module-large-screen/src/main/java/org/jeecg/sysEmail/controller/SysEmailController.java index 0987085..d411fc4 100644 --- a/jeecg-module-large-screen/src/main/java/org/jeecg/sysEmail/controller/SysEmailController.java +++ b/jeecg-module-large-screen/src/main/java/org/jeecg/sysEmail/controller/SysEmailController.java @@ -44,37 +44,37 @@ public class SysEmailController { String apiUrl = url + "sysEmail/sourceList"; Map getHeaders = Map.of("Authorization", ""); - //String apiResult = HttpClientUtil.doGet(apiUrl, getHeaders, true); // 启用 SSL + String getResult = HttpClientUtil.doGet(apiUrl, getHeaders, true); // 启用 SSL //region - String getResult = "{\n" + - " \"success\": true,\n" + - " \"message\": \"\",\n" + - " \"code\": 200,\n" + - " \"result\": [\n" + - " {\n" + - " \"sourceId\": \"1002\",\n" + - " \"sourceName\": \"15210169137\",\n" + - " \"hostId\": null,\n" + - " \"cpuUsedItemId\": null,\n" + - " \"enabled\": 1\n" + - " },\n" + - " {\n" + - " \"sourceId\": \"1001\",\n" + - " \"sourceName\": \"15210169137@139.com\",\n" + - " \"hostId\": null,\n" + - " \"cpuUsedItemId\": null,\n" + - " \"enabled\": 1\n" + - " },\n" + - " {\n" + - " \"sourceId\": \"1999017699534446594\",\n" + - " \"sourceName\": \"test0002\",\n" + - " \"hostId\": null,\n" + - " \"cpuUsedItemId\": null,\n" + - " \"enabled\": 1\n" + - " }\n" + - " ],\n" + - " \"timestamp\": 1765456465367\n" + - "}"; +// String getResult = "{\n" + +// " \"success\": true,\n" + +// " \"message\": \"\",\n" + +// " \"code\": 200,\n" + +// " \"result\": [\n" + +// " {\n" + +// " \"sourceId\": \"1002\",\n" + +// " \"sourceName\": \"15210169137\",\n" + +// " \"hostId\": null,\n" + +// " \"cpuUsedItemId\": null,\n" + +// " \"enabled\": 1\n" + +// " },\n" + +// " {\n" + +// " \"sourceId\": \"1001\",\n" + +// " \"sourceName\": \"15210169137@139.com\",\n" + +// " \"hostId\": null,\n" + +// " \"cpuUsedItemId\": null,\n" + +// " \"enabled\": 1\n" + +// " },\n" + +// " {\n" + +// " \"sourceId\": \"1999017699534446594\",\n" + +// " \"sourceName\": \"test0002\",\n" + +// " \"hostId\": null,\n" + +// " \"cpuUsedItemId\": null,\n" + +// " \"enabled\": 1\n" + +// " }\n" + +// " ],\n" + +// " \"timestamp\": 1765456465367\n" + +// "}"; //endregion try { ObjectMapper objectMapper = new ObjectMapper(); @@ -102,152 +102,152 @@ public class SysEmailController { String url = hostProperties.getArmdHost(); String apiUrl = url + "sysEmailLog/getRecentEmailDatas" + "?emailId=" + URLEncoder.encode(emailId, "UTF-8"); Map getHeaders = Map.of("Authorization", ""); - //String apiResult = HttpClientUtil.doGet(apiUrl, getHeaders, true); // 启用 SSL + String apiResult = HttpClientUtil.doGet(apiUrl, getHeaders, true); // 启用 SSL //region 测试数据 - String resultStr = "{\n" + - "\t\"success\": true,\n" + - "\t\"message\": \"\",\n" + - "\t\"code\": 200,\n" + - "\t\"result\": {\n" + - "\t\t\"categories\": [\n" + - "\t\t\t\"00:00\",\n" + - "\t\t\t\"01:00\",\n" + - "\t\t\t\"02:00\",\n" + - "\t\t\t\"03:00\",\n" + - "\t\t\t\"04:00\",\n" + - "\t\t\t\"05:00\",\n" + - "\t\t\t\"06:00\",\n" + - "\t\t\t\"07:00\",\n" + - "\t\t\t\"08:00\",\n" + - "\t\t\t\"09:00\",\n" + - "\t\t\t\"10:00\",\n" + - "\t\t\t\"11:00\",\n" + - "\t\t\t\"12:00\",\n" + - "\t\t\t\"13:00\",\n" + - "\t\t\t\"14:00\",\n" + - "\t\t\t\"15:00\",\n" + - "\t\t\t\"16:00\",\n" + - "\t\t\t\"17:00\",\n" + - "\t\t\t\"18:00\",\n" + - "\t\t\t\"19:00\",\n" + - "\t\t\t\"20:00\",\n" + - "\t\t\t\"21:00\",\n" + - "\t\t\t\"22:00\",\n" + - "\t\t\t\"23:00\"\n" + - "\t\t],\n" + - "\t\t\"series\": {\n" + - "\t\t\t\"todayAlarm\": [\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0\n" + - "\t\t\t],\n" + - "\t\t\t\"todayProcess\": [\n" + - "\t\t\t\t52,\n" + - "\t\t\t\t41,\n" + - "\t\t\t\t46,\n" + - "\t\t\t\t36,\n" + - "\t\t\t\t50,\n" + - "\t\t\t\t44,\n" + - "\t\t\t\t71,\n" + - "\t\t\t\t43,\n" + - "\t\t\t\t47,\n" + - "\t\t\t\t41,\n" + - "\t\t\t\t48,\n" + - "\t\t\t\t34,\n" + - "\t\t\t\t50,\n" + - "\t\t\t\t43,\n" + - "\t\t\t\t46,\n" + - "\t\t\t\t42,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0\n" + - "\t\t\t],\n" + - "\t\t\t\"yesterdayAlarm\": [\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0,\n" + - "\t\t\t\t0\n" + - "\t\t\t],\n" + - "\t\t\t\"yesterdayProcess\": [\n" + - "\t\t\t\t48,\n" + - "\t\t\t\t41,\n" + - "\t\t\t\t43,\n" + - "\t\t\t\t41,\n" + - "\t\t\t\t47,\n" + - "\t\t\t\t53,\n" + - "\t\t\t\t55,\n" + - "\t\t\t\t52,\n" + - "\t\t\t\t46,\n" + - "\t\t\t\t44,\n" + - "\t\t\t\t48,\n" + - "\t\t\t\t38,\n" + - "\t\t\t\t46,\n" + - "\t\t\t\t44,\n" + - "\t\t\t\t44,\n" + - "\t\t\t\t43,\n" + - "\t\t\t\t44,\n" + - "\t\t\t\t49,\n" + - "\t\t\t\t55,\n" + - "\t\t\t\t47,\n" + - "\t\t\t\t48,\n" + - "\t\t\t\t47,\n" + - "\t\t\t\t52,\n" + - "\t\t\t\t35\n" + - "\t\t\t]\n" + - "\t\t}\n" + - "\t},\n" + - "\t\"timestamp\": 1765785723917\n" + - "}"; +// String apiResult = "{\n" + +// "\t\"success\": true,\n" + +// "\t\"message\": \"\",\n" + +// "\t\"code\": 200,\n" + +// "\t\"result\": {\n" + +// "\t\t\"categories\": [\n" + +// "\t\t\t\"00:00\",\n" + +// "\t\t\t\"01:00\",\n" + +// "\t\t\t\"02:00\",\n" + +// "\t\t\t\"03:00\",\n" + +// "\t\t\t\"04:00\",\n" + +// "\t\t\t\"05:00\",\n" + +// "\t\t\t\"06:00\",\n" + +// "\t\t\t\"07:00\",\n" + +// "\t\t\t\"08:00\",\n" + +// "\t\t\t\"09:00\",\n" + +// "\t\t\t\"10:00\",\n" + +// "\t\t\t\"11:00\",\n" + +// "\t\t\t\"12:00\",\n" + +// "\t\t\t\"13:00\",\n" + +// "\t\t\t\"14:00\",\n" + +// "\t\t\t\"15:00\",\n" + +// "\t\t\t\"16:00\",\n" + +// "\t\t\t\"17:00\",\n" + +// "\t\t\t\"18:00\",\n" + +// "\t\t\t\"19:00\",\n" + +// "\t\t\t\"20:00\",\n" + +// "\t\t\t\"21:00\",\n" + +// "\t\t\t\"22:00\",\n" + +// "\t\t\t\"23:00\"\n" + +// "\t\t],\n" + +// "\t\t\"series\": {\n" + +// "\t\t\t\"todayAlarm\": [\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0\n" + +// "\t\t\t],\n" + +// "\t\t\t\"todayProcess\": [\n" + +// "\t\t\t\t52,\n" + +// "\t\t\t\t41,\n" + +// "\t\t\t\t46,\n" + +// "\t\t\t\t36,\n" + +// "\t\t\t\t50,\n" + +// "\t\t\t\t44,\n" + +// "\t\t\t\t71,\n" + +// "\t\t\t\t43,\n" + +// "\t\t\t\t47,\n" + +// "\t\t\t\t41,\n" + +// "\t\t\t\t48,\n" + +// "\t\t\t\t34,\n" + +// "\t\t\t\t50,\n" + +// "\t\t\t\t43,\n" + +// "\t\t\t\t46,\n" + +// "\t\t\t\t42,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0\n" + +// "\t\t\t],\n" + +// "\t\t\t\"yesterdayAlarm\": [\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0,\n" + +// "\t\t\t\t0\n" + +// "\t\t\t],\n" + +// "\t\t\t\"yesterdayProcess\": [\n" + +// "\t\t\t\t48,\n" + +// "\t\t\t\t41,\n" + +// "\t\t\t\t43,\n" + +// "\t\t\t\t41,\n" + +// "\t\t\t\t47,\n" + +// "\t\t\t\t53,\n" + +// "\t\t\t\t55,\n" + +// "\t\t\t\t52,\n" + +// "\t\t\t\t46,\n" + +// "\t\t\t\t44,\n" + +// "\t\t\t\t48,\n" + +// "\t\t\t\t38,\n" + +// "\t\t\t\t46,\n" + +// "\t\t\t\t44,\n" + +// "\t\t\t\t44,\n" + +// "\t\t\t\t43,\n" + +// "\t\t\t\t44,\n" + +// "\t\t\t\t49,\n" + +// "\t\t\t\t55,\n" + +// "\t\t\t\t47,\n" + +// "\t\t\t\t48,\n" + +// "\t\t\t\t47,\n" + +// "\t\t\t\t52,\n" + +// "\t\t\t\t35\n" + +// "\t\t\t]\n" + +// "\t\t}\n" + +// "\t},\n" + +// "\t\"timestamp\": 1765785723917\n" + +// "}"; //endregion try { ObjectMapper objectMapper = new ObjectMapper(); - Result> result = objectMapper.readValue(resultStr, new TypeReference<>() { + Result> result = objectMapper.readValue(apiResult, new TypeReference<>() { }); if (result.getCode() == 200) { return result; @@ -274,123 +274,123 @@ public class SysEmailController { String fullUrl = apiUrl + "?emailId=" + URLEncoder.encode(emailId, "UTF-8") + "&startDate=" + startDate.toString() // LocalDate的toString()默认就是yyyy-MM-dd格式 + "&endDate=" + endDate.toString(); - // String apiResult = HttpClientUtil.doGet(fullUrl, getHeaders, true); + String apiResult = HttpClientUtil.doGet(fullUrl, getHeaders, true); //region - String DataResult = " {\n" + - " \"success\": true,\n" + - " \"message\": \"\",\n" + - " \"code\": 200,\n" + - " \"result\": {\n" + - " \"categories\": [\n" + - " \"11-12\",\n" + - " \"11-13\",\n" + - " \"11-14\",\n" + - " \"11-15\",\n" + - " \"11-16\",\n" + - " \"11-17\",\n" + - " \"11-18\",\n" + - " \"11-19\",\n" + - " \"11-20\",\n" + - " \"11-21\",\n" + - " \"11-22\",\n" + - " \"11-23\",\n" + - " \"11-24\",\n" + - " \"11-25\",\n" + - " \"11-26\",\n" + - " \"11-27\",\n" + - " \"11-28\",\n" + - " \"11-29\",\n" + - " \"11-30\",\n" + - " \"12-01\",\n" + - " \"12-02\",\n" + - " \"12-03\",\n" + - " \"12-04\",\n" + - " \"12-05\",\n" + - " \"12-06\",\n" + - " \"12-07\",\n" + - " \"12-08\",\n" + - " \"12-09\",\n" + - " \"12-10\",\n" + - " \"12-11\",\n" + - " \"12-12\"\n" + - " ],\n" + - " \"series\": {\n" + - " \"alarm\": [\n" + - " 52,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 1,\n" + - " 32,\n" + - " 52,\n" + - " 0\n" + - " ],\n" + - " \"process\": [\n" + - " 2900,\n" + - " 1673,\n" + - " 1060,\n" + - " 2030,\n" + - " 2364,\n" + - " 2060,\n" + - " 2325,\n" + - " 1438,\n" + - " 1116,\n" + - " 1138,\n" + - " 1173,\n" + - " 1134,\n" + - " 1123,\n" + - " 1158,\n" + - " 1097,\n" + - " 1102,\n" + - " 1203,\n" + - " 1124,\n" + - " 1137,\n" + - " 1201,\n" + - " 1125,\n" + - " 1138,\n" + - " 1200,\n" + - " 1275,\n" + - " 1133,\n" + - " 1255,\n" + - " 1288,\n" + - " 1083,\n" + - " 1167,\n" + - " 1212,\n" + - " 768\n" + - " ]\n" + - " }\n" + - " },\n" + - " \"timestamp\": 1765531641598\n" + - "}";//HttpClientUtil.doGet(getUrl, getHeaders, true); // 启用 SSL +// String apiResult = " {\n" + +// " \"success\": true,\n" + +// " \"message\": \"\",\n" + +// " \"code\": 200,\n" + +// " \"result\": {\n" + +// " \"categories\": [\n" + +// " \"11-12\",\n" + +// " \"11-13\",\n" + +// " \"11-14\",\n" + +// " \"11-15\",\n" + +// " \"11-16\",\n" + +// " \"11-17\",\n" + +// " \"11-18\",\n" + +// " \"11-19\",\n" + +// " \"11-20\",\n" + +// " \"11-21\",\n" + +// " \"11-22\",\n" + +// " \"11-23\",\n" + +// " \"11-24\",\n" + +// " \"11-25\",\n" + +// " \"11-26\",\n" + +// " \"11-27\",\n" + +// " \"11-28\",\n" + +// " \"11-29\",\n" + +// " \"11-30\",\n" + +// " \"12-01\",\n" + +// " \"12-02\",\n" + +// " \"12-03\",\n" + +// " \"12-04\",\n" + +// " \"12-05\",\n" + +// " \"12-06\",\n" + +// " \"12-07\",\n" + +// " \"12-08\",\n" + +// " \"12-09\",\n" + +// " \"12-10\",\n" + +// " \"12-11\",\n" + +// " \"12-12\"\n" + +// " ],\n" + +// " \"series\": {\n" + +// " \"alarm\": [\n" + +// " 52,\n" + +// " 0,\n" + +// " 0,\n" + +// " 0,\n" + +// " 0,\n" + +// " 0,\n" + +// " 0,\n" + +// " 0,\n" + +// " 0,\n" + +// " 0,\n" + +// " 0,\n" + +// " 0,\n" + +// " 0,\n" + +// " 0,\n" + +// " 0,\n" + +// " 0,\n" + +// " 0,\n" + +// " 0,\n" + +// " 0,\n" + +// " 0,\n" + +// " 0,\n" + +// " 0,\n" + +// " 0,\n" + +// " 0,\n" + +// " 0,\n" + +// " 0,\n" + +// " 0,\n" + +// " 1,\n" + +// " 32,\n" + +// " 52,\n" + +// " 0\n" + +// " ],\n" + +// " \"process\": [\n" + +// " 2900,\n" + +// " 1673,\n" + +// " 1060,\n" + +// " 2030,\n" + +// " 2364,\n" + +// " 2060,\n" + +// " 2325,\n" + +// " 1438,\n" + +// " 1116,\n" + +// " 1138,\n" + +// " 1173,\n" + +// " 1134,\n" + +// " 1123,\n" + +// " 1158,\n" + +// " 1097,\n" + +// " 1102,\n" + +// " 1203,\n" + +// " 1124,\n" + +// " 1137,\n" + +// " 1201,\n" + +// " 1125,\n" + +// " 1138,\n" + +// " 1200,\n" + +// " 1275,\n" + +// " 1133,\n" + +// " 1255,\n" + +// " 1288,\n" + +// " 1083,\n" + +// " 1167,\n" + +// " 1212,\n" + +// " 768\n" + +// " ]\n" + +// " }\n" + +// " },\n" + +// " \"timestamp\": 1765531641598\n" + +// "}";//HttpClientUtil.doGet(getUrl, getHeaders, true); // 启用 SSL //endregion try { ObjectMapper objectMapper = new ObjectMapper(); - Result> result = objectMapper.readValue(DataResult, new TypeReference<>() { + Result> result = objectMapper.readValue(apiResult, new TypeReference<>() { }); if (result.getCode() == 200) {