From da0cb6ec9344641c5d1820e099131b58149b3fbc Mon Sep 17 00:00:00 2001
From: swb <jpy123456>
Date: Fri, 15 Nov 2024 08:44:30 +0800
Subject: [PATCH] fix:国控站显示提交
---
screen-job/src/main/java/com/moral/api/controller/PubController.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 49 insertions(+), 4 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/controller/PubController.java b/screen-job/src/main/java/com/moral/api/controller/PubController.java
index c1b1b4e..d6fab21 100644
--- a/screen-job/src/main/java/com/moral/api/controller/PubController.java
+++ b/screen-job/src/main/java/com/moral/api/controller/PubController.java
@@ -54,10 +54,18 @@
@Autowired
private DeviceService deviceService;
- private final EmailSpringUtil emailSpringUtil;
+ @Autowired
+ private ManageCoordinateDetailService manageCoordinateDetailService;
- public PubController(EmailSpringUtil emailSpringUtil) {
+ @Autowired
+ private HistorySecondCruiserService historySecondCruiserService;
+
+ private final EmailSpringUtil emailSpringUtil;
+ private final CityWeatherForecastService cityWeatherForecastService;
+
+ public PubController(EmailSpringUtil emailSpringUtil, CityWeatherForecastService cityWeatherForecastService) {
this.emailSpringUtil = emailSpringUtil;
+ this.cityWeatherForecastService = cityWeatherForecastService;
}
@GetMapping("insertHistoryDaily")
@@ -84,12 +92,23 @@
@GetMapping("dateInsertHistoryHourlyJKAvg")
@ApiOperation(value = "������������������������", notes = "������������������������")
public ResultMessage dateInsertHistoryHourlyJKAvg(String start,String end) {
+ Date ks = DateUtils.getDate(start,"yyyy-MM-dd HH:mm:ss");
+ Date js = DateUtils.getDate("2024-01-23 13:00:00","yyyy-MM-dd HH:mm:ss");
+ Date ends = DateUtils.getDate(end,"yyyy-MM-dd HH:mm:ss");
+ while (DateUtils.isTimeBefor(js,ks)){
+ String dateString = DateUtils.dateToDateString(ks);
+ String dateString1 = DateUtils.dateToDateString(ends);
+// historyHourlyService.dateInsertHistoryHourlyJKAvg(start, end);
+ historyHourlyService.dateInsertHistoryHourlyJKAvg(dateString, dateString1);
+ ks = DateUtils.getDateAddHour(ks,1);
+ ends = DateUtils.getDateAddHour(ends,1);
+ }
// String format = DateUtils.yyyy_MM_dd_HH_mm_EN;
// String start ="2023-11-19 09:00"
// String end ="2023-11-19 10:00";
// Date start1 = DateUtils.getDate(start,format);
// Date end1 = DateUtils.getDate(end,format);
- historyHourlyService.dateInsertHistoryHourlyJKAvg(start, end);
+
return new ResultMessage();
}
@@ -133,10 +152,35 @@
return new ResultMessage();
}
+ @GetMapping("insertCityWeatherForecast")
+ @ApiOperation(value = "������������������������", notes = "������������������������")
+ public ResultMessage insertCityWeatherForecast() {
+ cityWeatherForecastService.insertCityWeatherForecast();
+ return new ResultMessage();
+ }
+
@GetMapping("insertHistoryMonthly")
@ApiOperation(value = "���������", notes = "���������")
public ResultMessage insertHistoryMonthly() {
historyMonthlyService.insertHistoryMonthly();
+ return new ResultMessage();
+ }
+
+ @GetMapping("secondCruiserSort")
+ @ApiOperation(value = "���������������", notes = "���������������")
+ public ResultMessage secondCruiserSort() {
+ String startTime ="2024-06-06 00:07:01";
+ String endTime ="2024-06-06 23:07:01";
+ historySecondCruiserService.sort(startTime,endTime);
+ return new ResultMessage();
+ }
+
+ @GetMapping("insertCoordinateDetail")
+ @ApiOperation(value = "������������", notes = "������������")
+ public ResultMessage insertCoordinateDetail() {
+ String startTime ="2024-06-06 00:07:01";
+ String endTime ="2024-06-06 23:07:01";
+ manageCoordinateDetailService.insertCoordinateDetail(startTime,endTime);
return new ResultMessage();
}
@@ -177,7 +221,8 @@
public void excelDevice() throws IOException {
String startTime = DateUtils.dateToDateString(DateUtils.addDays(new Date(),-1),DateUtils.yyyy_MM_dd_EN);
List<DeviceExcelDTO> list = deviceService.ListDeviceExcel(startTime,null,72);
- String path = Objects.requireNonNull(this.getClass().getClassLoader().getResource("")).getPath();
+ // String path = this.getClass().getClassLoader().getResource("/data/file").getPath();
+ String path = System.getProperty("user.dir")+"/";
String fileName = String.format("%s������������������-%s.xlsx",path,startTime);
ByteArrayOutputStream out = null;
try {
--
Gitblit v1.8.0