diff --git a/src/main/java/com/southern/power/grid/controller/DnerController.java b/src/main/java/com/southern/power/grid/controller/DnerController.java index 5e617ca..f64fa3a 100644 --- a/src/main/java/com/southern/power/grid/controller/DnerController.java +++ b/src/main/java/com/southern/power/grid/controller/DnerController.java @@ -5,8 +5,6 @@ import com.southern.power.grid.entity.*; import com.southern.power.grid.service.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.io.Resource; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -37,9 +35,6 @@ public class DnerController { @Autowired private IRegionalWeatherDataService regionalWeatherDataService; - @Autowired - private DnerEventAttachmentService dnerEventAttachmentService; - @PostMapping("/area-tree/query") public Result> queryAreaTree(@RequestBody @Valid AreaTreeReq req) { return Result.success(dnerSiteAreaConfigurationService.queryAreaTree(req)); @@ -80,18 +75,6 @@ public class DnerController { orgCode, startDate, endDate, eventId)); } - /** - * 下载附件 - * - * @param attachmentId 附件ID - * @return 响应体 - */ - @GetMapping("/excel/download/{attachmentId}") - public ResponseEntity downloadExcel(@PathVariable Long attachmentId) { - return dnerEventAttachmentService.downloadExcel(attachmentId); - } - - /** * 同步区域气象数据 * diff --git a/src/main/java/com/southern/power/grid/controller/DnerEventController.java b/src/main/java/com/southern/power/grid/controller/DnerEventController.java index 65ca835..0745cf0 100644 --- a/src/main/java/com/southern/power/grid/controller/DnerEventController.java +++ b/src/main/java/com/southern/power/grid/controller/DnerEventController.java @@ -3,6 +3,7 @@ package com.southern.power.grid.controller; import com.southern.power.grid.common.Result; import com.southern.power.grid.entity.DnerEvent; import com.southern.power.grid.entity.DnerEventVO; +import com.southern.power.grid.service.DnerEventAttachmentService; import com.southern.power.grid.service.DnerEventService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.Resource; @@ -26,6 +27,9 @@ public class DnerEventController { @Autowired private DnerEventService dnerEventService; + @Autowired + private DnerEventAttachmentService dnerEventAttachmentService; + /** * 新增事件 */ @@ -98,4 +102,15 @@ public class DnerEventController { public ResponseEntity downloadTemplate() { return dnerEventService.downloadTemplate(); } + + /** + * 下载附件 + * + * @param attachmentId 附件ID + * @return 响应体 + */ + @GetMapping("/excel/download/{attachmentId}") + public ResponseEntity downloadExcel(@PathVariable Long attachmentId) { + return dnerEventAttachmentService.downloadExcel(attachmentId); + } } diff --git a/src/main/resources/sql/20260313-DDL-002.sql b/src/main/resources/sql/20260313-DDL-002.sql index a3c603d..d97fc2f 100644 --- a/src/main/resources/sql/20260313-DDL-002.sql +++ b/src/main/resources/sql/20260313-DDL-002.sql @@ -1,2 +1,3 @@ ALTER TABLE pmds_qxj_city_weather - MODIFY COLUMN `prediction_time` int COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '预报时效,小时'; \ No newline at end of file + MODIFY COLUMN `prediction_time` int COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '预报时效,小时'; +ALTER TABLE pmds_qxj_city_weather COMMENT = '地区天气预报表'; \ No newline at end of file