From 01a79d5b431b71cc79cf5f6cc92cd4f3432781dd Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 30 四月 2024 12:39:54 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java | 126 +++++++++++++++++++++++++++--------------
1 files changed, 83 insertions(+), 43 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
index 645746b..8b37ba3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
@@ -7,9 +7,9 @@
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.smartor.domain.PatArchive;
-import com.smartor.domain.PatUpInfoVO;
+import com.smartor.domain.*;
import com.smartor.service.IPatArchiveService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -17,11 +17,14 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
/**
* 鎮ｈ�呮。妗圕ontroller
@@ -29,24 +32,24 @@
* @author smartor
* @date 2023-03-04
*/
-@Api("鎮ｈ�呮。妗�")
+@Api(description = "鎮ｈ�呮。妗�")
@RestController
@RequestMapping("/smartor/patarchive")
public class PatArchiveController extends BaseController {
@Autowired
private IPatArchiveService patArchiveService;
-
- /**
- * 鏌ヨ鎮ｈ�呮。妗堝垪琛�
- */
- @ApiOperation("鏌ヨ鎮ｈ�呮。妗堝垪琛�")
- @PreAuthorize("@ss.hasPermi('smartor:patarchive:list')")
- @GetMapping("/list")
- public TableDataInfo list(PatArchive patArchive) {
- startPage();
- List<PatArchive> list = patArchiveService.selectPatArchiveList(patArchive);
- return getDataTable(list);
- }
+//
+// /**
+// * 鏌ヨ鎮ｈ�呮。妗堝垪琛�
+// */
+// @ApiOperation("鏌ヨ鎮ｈ�呮。妗堝垪琛�")
+// @PreAuthorize("@ss.hasPermi('smartor:patarchive:list')")
+// @PostMapping("/list")
+// public TableDataInfo list(@RequestBody PatArchive patArchive) {
+// startPage();
+// List<PatArchive> list = patArchiveService.selectPatArchiveList(patArchive);
+// return getDataTable(list);
+//}
/**
* 瀵煎嚭鎮ｈ�呮。妗堝垪琛�
@@ -66,32 +69,32 @@
*/
@ApiOperation("鑾峰彇鎮ｈ�呮。妗堣缁嗕俊鎭�")
@PreAuthorize("@ss.hasPermi('smartor:patarchive:query')")
- @GetMapping(value = "/{patid}")
- @ApiImplicitParam(name = "patid",value = "鎮ｈ�卛d")
+ @GetMapping(value = "/getInfo/{patid}")
+ @ApiImplicitParam(name = "patid", value = "鎮ｈ�卛d")
public AjaxResult getInfo(@PathVariable(name = "patid") Long patid) {
return success(patArchiveService.selectPatArchiveByPatid(patid));
}
- /**
- * 鏂板鎮ｈ�呮。妗�
- */
- @ApiOperation("鏂板鎮ｈ�呮。妗�")
- @PreAuthorize("@ss.hasPermi('smartor:patarchive:add')")
- @Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody PatArchive patArchive) {
- return toAjax(patArchiveService.insertPatArchive(patArchive));
- }
+// /**
+// * 鏂板鎮ｈ�呮。妗�
+// */
+// @ApiOperation("鏂板鎮ｈ�呮。妗�")
+// @PreAuthorize("@ss.hasPermi('smartor:patarchive:add')")
+// @Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.INSERT)
+// @PostMapping("/add")
+// public AjaxResult add(@RequestBody PatArchive patArchive) {
+// return toAjax(patArchiveService.insertPatArchive(patArchive));
+// }
/**
- * 淇敼鎮ｈ�呮。妗�
+ * 鏂板鎴栦慨鏀规偅鑰呮。淇℃伅
*/
- @ApiOperation("淇敼鎮ｈ�呮。妗�")
+ @ApiOperation("鏂板鎴栦慨鏀规偅鑰呮。淇℃伅")
@PreAuthorize("@ss.hasPermi('smartor:patarchive:edit')")
@Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody PatArchive patArchive) {
- return toAjax(patArchiveService.updatePatArchive(patArchive));
+ @PostMapping("/saveOrUpdatePatInfo")
+ public AjaxResult saveOrUpdatePatInfo(@RequestBody PatArchiveVO patArchiveVO) {
+ return toAjax(patArchiveService.saveOrUpdatePatInfo(patArchiveVO));
}
/**
@@ -100,8 +103,8 @@
@ApiOperation("鍒犻櫎鎮ｈ�呮。妗�")
@PreAuthorize("@ss.hasPermi('smartor:patarchive:remove')")
@Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{patids}")
- @ApiImplicitParam(name = "patids",value = "鎮ｈ�卛d闆嗗悎", dataType = "long", dataTypeClass = Long.class)
+ @GetMapping("/remove/{patids}")
+ @ApiImplicitParam(name = "patids", value = "鎮ｈ�卛d闆嗗悎", dataType = "long", dataTypeClass = Long.class)
public AjaxResult remove(@PathVariable Long[] patids) {
return toAjax(patArchiveService.deletePatArchiveByPatids(patids));
}
@@ -114,18 +117,27 @@
*/
@ApiOperation("瀵煎叆鎮ｈ�呮枃浠跺鐞�")
@PostMapping("/importFilehandle")
-
- @ApiImplicitParams({
- @ApiImplicitParam(name = "tags", value = "鏍囩"),
- @ApiImplicitParam(name = "multipartFile", value = "涓婁紶鏂囦欢")
- })
+ @ApiImplicitParams({@ApiImplicitParam(name = "tags", value = "鏍囩"), @ApiImplicitParam(name = "multipartFile", value = "涓婁紶鏂囦欢")})
public AjaxResult importFilehandle(@RequestParam("tags") String tags, @RequestParam("multipartFile") MultipartFile multipartFile) {
+ Executor executor = Executors.newFixedThreadPool(3);
//鑾峰彇褰撳墠鐧婚檰浜�
LoginUser loginUser = getLoginUser();
SysUser user = loginUser.getUser();
PatUpInfoVO patUpInfoVO = patArchiveService.importFilehandle(user, tags, multipartFile);
-
return success(patUpInfoVO);
+ }
+
+ /**
+ * 瀵煎叆鎮ｈ�呬俊鎭ā鏉�
+ *
+ * @param response
+ */
+ @ApiOperation("鎮ｈ�呬俊鎭鍏ユā鏉�")
+ @PostMapping("/patImportTemplate")
+ public void patImportTemplate(HttpServletResponse response) {
+// ExcelUtil<PatImportInfoVO> util = new ExcelUtil<PatImportInfoVO>(PatImportInfoVO.class);
+ ExcelUtil<PatArchive> util = new ExcelUtil<PatArchive>(PatArchive.class);
+ util.importTemplateExcel(response, "鎮ｈ�呬俊鎭鍏�");
}
/**
@@ -134,11 +146,39 @@
* @param patArchiveList
*/
@ApiOperation("瀵煎嚭鎮ｈ�呴敊璇俊鎭�")
- @PostMapping("/exportErrPatInfo")
- public AjaxResult exportErrPatInfo(@RequestBody List<PatArchive> patArchiveList) {
+ @PostMapping(value = "/exportErrPatInfo")
+ public void exportErrPatInfo(HttpServletResponse response, @RequestBody List<PatImportInfoVO> patArchiveList) {
- return success(patArchiveService.exportErrPatInfo(patArchiveList));
+ ExcelUtil<PatImportInfoVO> util = new ExcelUtil<PatImportInfoVO>(PatImportInfoVO.class);
+ util.exportExcel(response, patArchiveList, "瀵煎嚭鎮ｈ�呴敊璇俊鎭�");
}
+ /**
+ * 鏌ヨ鎮ｈ�呭垪琛�
+ */
+ @ApiOperation("鏌ヨ鎮ｈ�呭垪琛�")
+ @PostMapping("/patInfoByContion")
+ public TableDataInfo patInfoByCondition(@RequestBody PatArchiveReq patArchive) {
+ PageUtils.startPageByPost(patArchive.getPageNum(), patArchive.getPageSize());
+ return getDataTable(patArchiveService.patInfoByContion(patArchive));
+ }
+
+
+ /**
+ * 瀵煎嚭鎮ｈ�呭垪琛ㄦ牴鎹潯浠�
+ */
+ @ApiOperation("瀵煎嚭鎮ｈ�呭垪琛ㄦ牴鎹潯浠�")
+ @PostMapping("/exportPatInfo")
+ public void exportPpatInfo(HttpServletResponse response, @RequestBody PatArchiveReq patArchive) {
+ startPage();
+ List<PatArchive> patArchives = patArchiveService.patInfoByContion(patArchive);
+ if (!CollectionUtils.isEmpty(patArchives)) {
+ for (int i = 0; i < patArchives.size(); i++) {
+ patArchives.get(i).setTag(patArchives.get(i).getTagList().toString());
+ }
+ }
+ ExcelUtil<PatArchive> util = new ExcelUtil<PatArchive>(PatArchive.class);
+ util.exportExcel(response, patArchives, "鎮ｈ�呮。妗堟暟鎹�");
+ }
}
--
Gitblit v1.9.3