From 6a58a5a148c27c9ff66901bfbae6e52c1a56b5d2 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 04 七月 2024 17:17:53 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java | 83 ++++++++++++++++++-----------------------
1 files changed, 37 insertions(+), 46 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 914d3da..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,11 +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.PatArchiveReq;
-import com.smartor.domain.PatImportInfoVO;
-import com.smartor.domain.PatUpInfoVO;
+import com.smartor.domain.*;
import com.smartor.service.IPatArchiveService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -25,6 +23,8 @@
import javax.servlet.http.HttpServletResponse;
import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
/**
* 鎮ｈ�呮。妗圕ontroller
@@ -38,18 +38,18 @@
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);
+//}
/**
* 瀵煎嚭鎮ｈ�呮。妗堝垪琛�
@@ -69,32 +69,32 @@
*/
@ApiOperation("鑾峰彇鎮ｈ�呮。妗堣缁嗕俊鎭�")
@PreAuthorize("@ss.hasPermi('smartor:patarchive:query')")
- @GetMapping(value = "/{patid}")
+ @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));
}
/**
@@ -103,7 +103,7 @@
@ApiOperation("鍒犻櫎鎮ｈ�呮。妗�")
@PreAuthorize("@ss.hasPermi('smartor:patarchive:remove')")
@Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{patids}")
+ @GetMapping("/remove/{patids}")
@ApiImplicitParam(name = "patids", value = "鎮ｈ�卛d闆嗗悎", dataType = "long", dataTypeClass = Long.class)
public AjaxResult remove(@PathVariable Long[] patids) {
return toAjax(patArchiveService.deletePatArchiveByPatids(patids));
@@ -119,6 +119,7 @@
@PostMapping("/importFilehandle")
@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();
@@ -134,7 +135,8 @@
@ApiOperation("鎮ｈ�呬俊鎭鍏ユā鏉�")
@PostMapping("/patImportTemplate")
public void patImportTemplate(HttpServletResponse response) {
- ExcelUtil<PatImportInfoVO> util = new ExcelUtil<PatImportInfoVO>(PatImportInfoVO.class);
+// ExcelUtil<PatImportInfoVO> util = new ExcelUtil<PatImportInfoVO>(PatImportInfoVO.class);
+ ExcelUtil<PatArchive> util = new ExcelUtil<PatArchive>(PatArchive.class);
util.importTemplateExcel(response, "鎮ｈ�呬俊鎭鍏�");
}
@@ -157,20 +159,9 @@
@ApiOperation("鏌ヨ鎮ｈ�呭垪琛�")
@PostMapping("/patInfoByContion")
public TableDataInfo patInfoByCondition(@RequestBody PatArchiveReq patArchive) {
- startPage();
+ PageUtils.startPageByPost(patArchive.getPageNum(), patArchive.getPageSize());
return getDataTable(patArchiveService.patInfoByContion(patArchive));
}
-
-
-// /**
-// * 鎮ｈ�呮爣绛剧鐞�
-// */
-// @ApiOperation("鎮ｈ�呮爣绛剧鐞�")
-// @PostMapping("/patTagByContion")
-// public TableDataInfo patTagByContion(@RequestBody List<Long> tagids) {
-// startPage();
-// return getDataTable(patArchiveService.patTagByContion(tagids));
-// }
/**
--
Gitblit v1.9.3