From 1ffc844e3483cd3ac7cc73b5fb17c62e09d1ff2f Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期五, 30 八月 2024 10:54:34 +0800 Subject: [PATCH] 工单取图像查询工单范围调整、分页图片查询 --- ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java | 61 +++++++++++++++++++++--------- 1 files changed, 43 insertions(+), 18 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java b/ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java index f3559f7..4c754bf 100644 --- a/ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java +++ b/ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java @@ -1,27 +1,24 @@ package com.ycl.platform.controller; -import com.ycl.platform.domain.entity.Report; -import com.ycl.platform.domain.entity.TMonitor; -import com.ycl.platform.domain.vo.ReportVO; -import com.ycl.platform.domain.vo.TMonitorVO; -import com.ycl.system.domain.group.Update; -import com.ycl.system.domain.group.Add; -import com.ycl.utils.poi.ExcelUtil; -import jakarta.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import lombok.RequiredArgsConstructor; -import java.util.List; -import org.springframework.validation.annotation.Validated; -import jakarta.validation.constraints.NotEmpty; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import com.ycl.platform.service.ReportService; -import com.ycl.system.Result; +import com.ycl.platform.domain.form.ReportAuditingForm; import com.ycl.platform.domain.form.ReportForm; import com.ycl.platform.domain.query.ReportQuery; +import com.ycl.platform.domain.vo.ReportVO; +import com.ycl.platform.service.ReportService; +import com.ycl.system.Result; +import com.ycl.system.domain.group.Add; +import com.ycl.system.domain.group.Update; +import com.ycl.utils.poi.ExcelUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 鎶ュ 鍓嶇鎺у埗鍣� @@ -43,6 +40,20 @@ @PreAuthorize("@ss.hasPermi('system:report:add')") public Result add(@RequestBody @Validated(Add.class) ReportForm form) { return reportService.add(form); + } + + @PostMapping("/import") + @ApiOperation(value = "瀵煎叆", notes = "瀵煎叆") + @PreAuthorize("@ss.hasPermi('system:report:add')") + public Result importData(ReportForm form) { + return reportService.importData(form); + } + + @PostMapping("/importTemplate") + @ApiOperation(value = "瀵煎叆妯℃澘", notes = "瀵煎叆妯℃澘") + @PreAuthorize("@ss.hasPermi('system:report:add')") + public void importTemplate(HttpServletResponse response) { + reportService.importTemplate(response); } @PutMapping @@ -87,6 +98,20 @@ return reportService.all(); } + @GetMapping("/auditing/record/{id}") + @ApiOperation(value = "瀹℃牳璁板綍", notes = "瀹℃牳璁板綍") + @PreAuthorize("@ss.hasPermi('system:report:record')") + public Result auditingRecord(@PathVariable("id") Integer id) { + return reportService.auditingRecord(id); + } + + @PostMapping("/auditing") + @ApiOperation(value = "瀹℃牳", notes = "瀹℃牳") + @PreAuthorize("@ss.hasPermi('system:report:auditing')") + public Result auditing(@RequestBody @Validated ReportAuditingForm form) { + return reportService.auditing(form); + } + @PostMapping("/export") @ApiOperation(value = "瀵煎嚭", notes = "瀵煎嚭") @PreAuthorize("@ss.hasPermi('system:report:export')") -- Gitblit v1.8.0