From b14531e3b850fe6d2fa916ba7b88b3e2bd2ff30a Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 11 九月 2024 16:47:48 +0800 Subject: [PATCH] OSD加标签 --- ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java | 59 +++++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 41 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 4f85e46..197de36 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,28 +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.form.ReportAuditingForm; -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.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; /** * 鎶ュ 鍓嶇鎺у埗鍣� @@ -44,6 +40,26 @@ @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); + } + + @GetMapping("/getTogether/{pid}") + @ApiOperation(value = "鑾峰彇鍚屼竴鎵规鐨勬姤澶�", notes = "鑾峰彇鍚屼竴鎵规鐨勬姤澶�") + public Result getTogether(@PathVariable("pid") String pid) { + return reportService.getTogether(pid); + } + + @PostMapping("/importTemplate") + @ApiOperation(value = "瀵煎叆妯℃澘", notes = "瀵煎叆妯℃澘") + @PreAuthorize("@ss.hasPermi('system:report:add')") + public void importTemplate(HttpServletResponse response) { + reportService.importTemplate(response); } @PutMapping @@ -111,4 +127,11 @@ ExcelUtil<ReportVO> util = new ExcelUtil<>(ReportVO.class); util.exportExcel(response, list, "杩愮淮鍗曚綅"); } + + @GetMapping("/list/{gb}") + @ApiOperation(value = "鏍规嵁鍥芥爣鐮佹煡鎶ュ", notes = "鏍规嵁鍥芥爣鐮佹煡鎶ュ") + public Result getListByGb(@PathVariable("gb") String gb) + { + return reportService.getListByGb(gb); + } } -- Gitblit v1.8.0