From 9e28453dba6ecf93c6c2234ba38def7c41cf12f0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 20 一月 2025 18:25:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/controller/ProjectInfoController.java | 66 ++++++++++++++++++++++++++++++---
1 files changed, 60 insertions(+), 6 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/ProjectInfoController.java b/business/src/main/java/com/ycl/controller/ProjectInfoController.java
index 768ed26..ee060f8 100644
--- a/business/src/main/java/com/ycl/controller/ProjectInfoController.java
+++ b/business/src/main/java/com/ycl/controller/ProjectInfoController.java
@@ -1,13 +1,16 @@
package com.ycl.controller;
import com.ycl.common.base.Result;
+import com.ycl.common.exception.base.BaseException;
import com.ycl.common.group.Add;
import com.ycl.common.group.Update;
import com.ycl.common.utils.ProjectCodeGenerator;
import com.ycl.common.utils.excel.OutputExcelUtils;
import com.ycl.domain.excel.ProjectExcelTemplate;
import com.ycl.domain.form.DocumentInfoForm;
+import com.ycl.domain.form.ProjectForm;
import com.ycl.domain.form.ProjectInfoForm;
+import com.ycl.domain.query.ProjectExportQuery;
import com.ycl.domain.query.ProjectInfoQuery;
import com.ycl.service.ProjectInfoService;
import io.swagger.annotations.Api;
@@ -15,10 +18,12 @@
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotEmpty;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -42,12 +47,14 @@
public Result add(@RequestBody @Validated(Add.class) ProjectInfoForm form) {
return projectInfoService.add(form);
}
+
@PostMapping("/document")
@ApiOperation(value = "娣诲姞鐩稿叧鏂囦欢", notes = "娣诲姞鐩稿叧鏂囦欢")
// @PreAuthorize("hasAuthority('projectInfo:add')")
public Result addDoc(@RequestBody @Validated(Add.class) DocumentInfoForm form) {
return projectInfoService.addDoc(form);
}
+
@PutMapping
@ApiOperation(value = "淇敼", notes = "淇敼")
// @PreAuthorize("hasAuthority('projectInfo:edit')")
@@ -58,7 +65,7 @@
@DeleteMapping("/{id}")
@ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
// @PreAuthorize("hasAuthority('projectInfo:del')")
- public Result removeById(@PathVariable("id") String id) {
+ public Result removeById(@PathVariable("id") Long id) {
return projectInfoService.removeById(id);
}
@@ -82,12 +89,14 @@
public Result detail(@PathVariable("id") Integer id) {
return projectInfoService.detail(id);
}
+
@GetMapping("/document/{id}")
@ApiOperation(value = "鐩稿叧鏂囦欢璇︽儏", notes = "鐩稿叧鏂囦欢璇︽儏")
// @PreAuthorize("hasAuthority('projectInfo:detail')")
public Result docDetail(@PathVariable("id") Integer id) {
return projectInfoService.docDetail(id);
}
+
@GetMapping("/list")
// @PreAuthorize("hasAuthority('projectInfo:list')")
@ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
@@ -97,12 +106,18 @@
/**
* 鐢熸垚椤圭洰缂栧彿
+ *
* @return 椤圭洰缂栧彿
*/
@GetMapping("/getProjectCode")
public Result generateProjectCode() {
return Result.ok().data(ProjectCodeGenerator.generateProjectCode());
- };
+ }
+
+ @GetMapping("/searchByKey")
+ public Result searchByKey(@RequestParam(required = false) String wordKey) {
+ return projectInfoService.searchByKey(wordKey);
+ }
@GetMapping("/getManagerFlag/{recordId}")
public Result getManagerFlag(@PathVariable("recordId") Integer recordId) {
@@ -111,14 +126,53 @@
/**
* 瀵煎嚭妯℃澘
+ *
* @param response
* @return
*/
@PostMapping("/export/template")
- public void exportTemplate(HttpServletResponse response,
- @RequestBody List<String> fieldList
- ) throws IOException {
- OutputExcelUtils.export(response, "瀵煎叆妯℃澘", "椤圭洰淇℃伅", null, ProjectExcelTemplate.class ,fieldList);
+ public void exportTemplate(HttpServletResponse response) throws IOException {
+ List<String> fieldList = new ArrayList<>();
+ OutputExcelUtils.export(response, "瀵煎叆妯℃澘", "椤圭洰淇℃伅", null, ProjectExcelTemplate.class, fieldList);
}
+ /**
+ * 椤圭洰瀵煎嚭
+ *
+ * @param response
+ * @throws IOException
+ */
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, ProjectExportQuery query) throws IOException {
+ projectInfoService.export(response, query);
+ }
+
+ @PutMapping("usedStatus/{id}/{usedStatus}")
+ @ApiOperation(value = "淇敼浣跨敤鐘舵��", notes = "淇敼浣跨敤鐘舵��")
+// @PreAuthorize("hasAuthority('projectInfo:edit')")
+ public Result updateUsedStatus(@PathVariable Integer id, @PathVariable Integer usedStatus) {
+ return projectInfoService.updateUsedStatus(id, usedStatus);
+ }
+
+ /**
+ * 椤圭洰瀵煎叆
+ * @param file
+ * @return
+ */
+ @PostMapping("/import")
+ public Result importProject(MultipartFile file) {
+ if (file.getSize() > 100 * 1024 * 1024) {
+ throw new BaseException("鏂囦欢杩囧ぇ锛屾枃浠朵笉寰楄秴杩�100MB");
+ }
+ projectInfoService.importProject(file);
+ return Result.ok();
+ }
+
+ @PostMapping("/editProject")
+ public Result editProject(@RequestBody ProjectForm form) {
+ return projectInfoService.editProject(form);
+ }
+
+
+
}
--
Gitblit v1.8.0