From 78b0e909aa6ece787091e5d81450c8927ef2599e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 15 十二月 2023 17:03:12 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java |   37 +++++++++++++++++++++++++------------
 1 files changed, 25 insertions(+), 12 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..6f6c85b 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
@@ -44,8 +44,8 @@
      */
     @ApiOperation("鏌ヨ鎮ｈ�呮。妗堝垪琛�")
     @PreAuthorize("@ss.hasPermi('smartor:patarchive:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(PatArchive patArchive) {
+   @PostMapping("/list")
+    public TableDataInfo list(@RequestBody PatArchive patArchive) {
         startPage();
         List<PatArchive> list = patArchiveService.selectPatArchiveList(patArchive);
         return getDataTable(list);
@@ -69,7 +69,7 @@
      */
     @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));
@@ -81,7 +81,7 @@
     @ApiOperation("鏂板鎮ｈ�呮。妗�")
     @PreAuthorize("@ss.hasPermi('smartor:patarchive:add')")
     @Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping("/add")
     public AjaxResult add(@RequestBody PatArchive patArchive) {
         return toAjax(patArchiveService.insertPatArchive(patArchive));
     }
@@ -92,7 +92,7 @@
     @ApiOperation("淇敼鎮ｈ�呮。妗�")
     @PreAuthorize("@ss.hasPermi('smartor:patarchive:edit')")
     @Log(title = "鎮ｈ�呮。妗�", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/edit")
     public AjaxResult edit(@RequestBody PatArchive patArchive) {
         return toAjax(patArchiveService.updatePatArchive(patArchive));
     }
@@ -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,7 +159,7 @@
     @ApiOperation("鏌ヨ鎮ｈ�呭垪琛�")
     @PostMapping("/patInfoByContion")
     public TableDataInfo patInfoByCondition(@RequestBody PatArchiveReq patArchive) {
-        startPage();
+        PageUtils.startPageByPost(patArchive.getPageNum(),patArchive.getPageSize());
         return getDataTable(patArchiveService.patInfoByContion(patArchive));
     }
 
@@ -190,4 +192,15 @@
         util.exportExcel(response, patArchives, "鎮ｈ�呮。妗堟暟鎹�");
     }
 
+    /**
+     * 鑾峰彇鐢ㄦ埛璇婄枟淇℃伅锛堝尰鐤楁。妗堬級
+     *
+     * @return
+     */
+    @ApiOperation("鑾峰彇鐢ㄦ埛璇婄枟淇℃伅锛堝尰鐤楁。妗�")
+    @PostMapping("/getUserTreatmentInfo")
+    public AjaxResult getUserTreatmentInfo(@RequestParam("pid") String pid,@RequestParam("type") String type) {
+        return null;
+    }
+
 }

--
Gitblit v1.9.3