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 403dc1a..fd0b0d3 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 @@ -78,7 +78,7 @@ public class SysEmailController { //endregion try { ObjectMapper objectMapper = new ObjectMapper(); - Result> result = objectMapper.readValue(getResult, new TypeReference<>() { + Result> result = objectMapper.readValue(apiResult, new TypeReference<>() { }); if (result.getCode() == 200) { return result; @@ -97,159 +97,16 @@ public class SysEmailController { * @return */ @Operation(summary = "获取昨天和今天的邮件信息") - @GetMapping("/getRecentAlarms") - public Result> getRecentAlarms() throws IOException { + @GetMapping("/getRecentEmailDatas") + public Result> getRecentEmailDatas(@RequestParam("emailId") String emailId) throws IOException { String url = hostProperties.getArmdHost(); - String apiUrl = url + "sysEmailLog/getRecentAlarms"; + String apiUrl = url + "sysEmailLog/getRecentEmailDatas"+ "?emailId=" + URLEncoder.encode(emailId, "UTF-8"); Map getHeaders = Map.of("Authorization", ""); String apiResult= HttpClientUtil.doGet(apiUrl, getHeaders, true); // 启用 SSL - //region - String toDayResult = " {\n" + - " \"success\": true,\n" + - " \"message\": \"\",\n" + - " \"code\": 200,\n" + - " \"result\": {\n" + - " \"categories\": [\n" + - " \"00:00\",\n" + - " \"01:00\",\n" + - " \"02:00\",\n" + - " \"03:00\",\n" + - " \"04:00\",\n" + - " \"05:00\",\n" + - " \"06:00\",\n" + - " \"07:00\",\n" + - " \"08:00\",\n" + - " \"09:00\",\n" + - " \"10:00\",\n" + - " \"11:00\",\n" + - " \"12:00\",\n" + - " \"13:00\",\n" + - " \"14:00\",\n" + - " \"15:00\",\n" + - " \"16:00\",\n" + - " \"17:00\",\n" + - " \"18:00\",\n" + - " \"19:00\",\n" + - " \"20:00\",\n" + - " \"21:00\",\n" + - " \"22:00\",\n" + - " \"23:00\"\n" + - " ],\n" + - " \"series\": {\n" + - " \"todayAlarm\": [\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" + - " ],\n" + - " \"todayProcess\": [\n" + - " 54,\n" + - " 41,\n" + - " 46,\n" + - " 40,\n" + - " 48,\n" + - " 48,\n" + - " 66,\n" + - " 49,\n" + - " 47,\n" + - " 44,\n" + - " 47,\n" + - " 39,\n" + - " 50,\n" + - " 43,\n" + - " 45,\n" + - " 40,\n" + - " 21,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0\n" + - " ],\n" + - " \"yesterdayAlarm\": [\n" + - " 3,\n" + - " 4,\n" + - " 4,\n" + - " 4,\n" + - " 4,\n" + - " 3,\n" + - " 4,\n" + - " 4,\n" + - " 4,\n" + - " 3,\n" + - " 4,\n" + - " 4,\n" + - " 4,\n" + - " 3,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0,\n" + - " 0\n" + - " ],\n" + - " \"yesterdayProcess\": [\n" + - " 49,\n" + - " 52,\n" + - " 52,\n" + - " 56,\n" + - " 58,\n" + - " 50,\n" + - " 80,\n" + - " 38,\n" + - " 69,\n" + - " 39,\n" + - " 66,\n" + - " 31,\n" + - " 50,\n" + - " 60,\n" + - " 51,\n" + - " 37,\n" + - " 60,\n" + - " 40,\n" + - " 55,\n" + - " 41,\n" + - " 50,\n" + - " 42,\n" + - " 52,\n" + - " 34\n" + - " ]\n" + - " }\n" + - " },\n" + - " \"timestamp\": 1765528894649\n" + - "}"; - - //endregion try { ObjectMapper objectMapper = new ObjectMapper(); - Result> result = objectMapper.readValue(toDayResult, new TypeReference<>() { + Result> result = objectMapper.readValue(apiResult, new TypeReference<>() { }); if (result.getCode() == 200) { return result; @@ -264,135 +121,23 @@ public class SysEmailController { } - @GetMapping("/getMonthly") + @GetMapping("/getDashboardDailyStats") @Operation(summary = "获取一月的邮件信息") - public Result> getMonthly(@RequestParam("emailId") String emailId, + public Result> getDashboardDailyStats(@RequestParam("emailId") String emailId, @RequestParam("startDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate startDate, @RequestParam("endDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate endDate) throws URISyntaxException, IOException { String url = hostProperties.getArmdHost(); - String apiUrl = url + "sysEmailLog/getYesterdayAndToday"; + String apiUrl = url + "sysEmailLog/getDashboardDailyStats"; Map getHeaders = Map.of("Authorization", ""); 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); - //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 - - //endregion try { ObjectMapper objectMapper = new ObjectMapper(); - Result> result = objectMapper.readValue(DataResult, new TypeReference<>() { + Result> result = objectMapper.readValue(apiResult, new TypeReference<>() { }); if (result.getCode() == 200) {