From 10aaa035f5be0312304d20f022bdb714a8f4900a Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 11 十二月 2024 22:16:23 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveImportController.java |   66 ++++++++++++++++----------------
 1 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveImportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveImportController.java
index 98a636d..9632c3b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveImportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveImportController.java
@@ -1,37 +1,27 @@
 package com.ruoyi.web.controller.smartor;
 
-import java.util.List;
-
-import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.file.FileUtils;
-import com.smartor.domain.SvyLibScriptRes;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.http.MediaType;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.github.pagehelper.ISelect;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
+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.file.FileUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.smartor.domain.PatArchiveImport;
 import com.smartor.service.IPatArchiveImportService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * Excel瀵煎叆鎮ｈ�呮。妗圕ontroller
@@ -50,12 +40,20 @@
      * 鏌ヨExcel瀵煎叆鎮ｈ�呮。妗堝垪琛�
      */
     @ApiOperation("鏌ヨExcel瀵煎叆鎮ｈ�呮。妗堝垪琛�")
-    //@PreAuthorize("@ss.hasPermi('smartor:import:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(PatArchiveImport patArchiveImport) {
-        startPage();
+    @PostMapping("/list")
+    public TableDataInfo list(@RequestBody PatArchiveImport patArchiveImport) {
+        PageUtils.startPageByPost(patArchiveImport.getPageNum(), patArchiveImport.getPageSize());
         List<PatArchiveImport> list = patArchiveImportService.selectPatArchiveImportList(patArchiveImport);
-        return getDataTable(list);
+        //鑾峰彇total
+        long total = PageUtils.count(new ISelect() {
+            @Override
+            public void doSelect() {
+                patArchiveImport.setPageNum(null);
+                patArchiveImport.setPageSize(null);
+                patArchiveImportService.selectPatArchiveImportList(patArchiveImport);
+            }
+        });
+        return getDataTable2(total, list);
     }
 
     /**
@@ -106,7 +104,7 @@
      * @param response
      */
     @ApiOperation("鑾峰彇瀵煎叆鎮ｈ�呮ā鏉�")
-    @GetMapping("/getImportPatTemplate")
+    @PostMapping("/getImportPatTemplate")
     public void getImportPatTemplate(HttpServletResponse response) {
         ExcelUtil<PatArchiveImport> util = new ExcelUtil<PatArchiveImport>(PatArchiveImport.class);
         util.importTemplateExcel(response, "瀵煎叆鎮ｈ��");
@@ -128,7 +126,9 @@
     @ApiOperation("瀵煎叆Excel鎮ｈ�呬俊鎭�")
     //@PreAuthorize("@ss.hasPermi('smartor:import:list')")
     @PostMapping("/importPatInfo")
-    public TableDataInfo importPatInfo(MultipartFile multipartFile) {
-        return getDataTable(patArchiveImportService.importPatInfo(multipartFile));
+    public TableDataInfo importPatInfo(MultipartFile file) {
+        LoginUser loginUser = getLoginUser();
+        SysUser user = loginUser.getUser();
+        return getDataTable(patArchiveImportService.importPatInfo(file, user));
     }
 }

--
Gitblit v1.9.3