diff --git a/04.系统编码/Backend/src/main/java/com/userinformation/backend/controller/TLogPController.java b/04.系统编码/Backend/src/main/java/com/userinformation/backend/controller/TLogPController.java index b22f281..5eec852 100644 --- a/04.系统编码/Backend/src/main/java/com/userinformation/backend/controller/TLogPController.java +++ b/04.系统编码/Backend/src/main/java/com/userinformation/backend/controller/TLogPController.java @@ -22,7 +22,7 @@ public class TLogPController { } @RequestMapping("findLater") - public String findLater(@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime startTime, @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime endTime){ - return tLogPService.findLater(startTime, endTime.plusSeconds(1)); + public String findLater(@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime startTime, @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime endTime, String station){ + return tLogPService.findLater(startTime, endTime.plusSeconds(1), station); } } diff --git a/04.系统编码/Backend/src/main/java/com/userinformation/backend/service/TLogPService.java b/04.系统编码/Backend/src/main/java/com/userinformation/backend/service/TLogPService.java index fdeaadd..dcde44e 100644 --- a/04.系统编码/Backend/src/main/java/com/userinformation/backend/service/TLogPService.java +++ b/04.系统编码/Backend/src/main/java/com/userinformation/backend/service/TLogPService.java @@ -33,8 +33,8 @@ public class TLogPService { private static final DateTimeFormatter COMMON_TIME_FORMAT = DateTimeFormatter.ofPattern("yyyy/yyyyMM/yyyyMMdd"); private static final DateTimeFormatter FILE_FORMAT = DateTimeFormatter.ofPattern("yyyyMMddHHmm"); - public String findLater(LocalDateTime startTime, LocalDateTime endTime){ - String path = "%s/picture/weibo/jiangning/T-logP/%s".formatted(parentPath, endTime.format(COMMON_TIME_FORMAT)); + public String findLater(LocalDateTime startTime, LocalDateTime endTime, String station){ + String path = "%s/picture/weibo/%s/T-logP/%s".formatted(parentPath, station, endTime.format(COMMON_TIME_FORMAT)); File file = new File(path); if (file.exists()){ File[] files = file.listFiles((File dir, String name) -> name.startsWith("T_logP_") && name.toLowerCase(Locale.ROOT).endsWith(".png")); @@ -50,7 +50,22 @@ public class TLogPService { if (endTime.getDayOfMonth() == startTime.getDayOfMonth()){ return null; } - return findLater(startTime.minusMinutes(Duration.between(startTime, endTime).toMinutes()), startTime); + return findLater(startTime.minusMinutes(Duration.between(startTime, endTime).toMinutes()), startTime, station); + } + + private String getStationNameByStationId(String stationId){ + switch (stationId){ + case "58238": + return "jiangning"; + case "58339": + return "gaochun"; + case "58340": + return "lishui"; + case "58237": + return "pukou"; + default: + return "luhe"; + } } private boolean isAfter(LocalDateTime startTime, LocalDateTime endTime, String name){ diff --git a/04.系统编码/Backend/src/main/resources/application.yml b/04.系统编码/Backend/src/main/resources/application.yml index f9998a7..0dcf5ff 100644 --- a/04.系统编码/Backend/src/main/resources/application.yml +++ b/04.系统编码/Backend/src/main/resources/application.yml @@ -28,7 +28,7 @@ custom: # host: 192.168.0.112 # username: xiaowuler@163.com # password: a7758a58 - path: /home/project/NJEnvironmentPlatform/html/product + path: /home/product parent-url: http://10.124.102.10 quality-path: /share/win ftp: diff --git a/04.系统编码/Frontend/src/components/MicrowaveRadiation.vue b/04.系统编码/Frontend/src/components/MicrowaveRadiation.vue index 52e1f34..0e5f50b 100644 --- a/04.系统编码/Frontend/src/components/MicrowaveRadiation.vue +++ b/04.系统编码/Frontend/src/components/MicrowaveRadiation.vue @@ -26,16 +26,16 @@