From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 九月 2024 21:55:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java | 52 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 34 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..bf5d5ef 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;
/**
* 鎶ュ 鍓嶇鎺у埗鍣�
@@ -46,6 +42,26 @@
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
@ApiOperation(value = "淇敼", notes = "淇敼")
@PreAuthorize("@ss.hasPermi('system:report:edit')")
--
Gitblit v1.8.0