From 617124fe75e853a0ab844669c891287bfa13b8fa Mon Sep 17 00:00:00 2001
From: yangman <15045099937@qq.com>
Date: 星期三, 05 七月 2023 14:53:11 +0800
Subject: [PATCH] 修改扭矩配置管理控制器

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java |   35 +++++++++++++++++++----------------
 1 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java
index 151f8ce..96e49be 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java
@@ -5,9 +5,11 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.mdc.entity.MdcTorqueConfig;
 import org.jeecg.modules.mdc.service.IMdcTorqueConfigService;
 import org.jeecg.modules.mdc.service.impl.MdcTorqueConfigServiceImpl;
@@ -35,7 +37,6 @@
 
     /**
      * 鏍规嵁id鏌ヨ
-     *
      * @param id
      * @return
      */
@@ -50,7 +51,6 @@
 
     /**
      * 鏂板
-     *
      * @param mdcTorqueConfig
      * @return
      */
@@ -64,7 +64,6 @@
 
     /**
      * 淇敼
-     *
      * @param mdcTorqueConfig
      * @return
      */
@@ -78,7 +77,6 @@
 
     /**
      * 鏍规嵁id鍒犻櫎鎵煩閰嶇疆
-     *
      * @param id
      * @return
      */
@@ -92,7 +90,6 @@
 
     /**
      * 鎵归噺鍒犻櫎
-     *
      * @param ids
      * @return
      */
@@ -107,11 +104,12 @@
 
     /**
      * 瀵煎嚭excel
-     *
      * @param request
      * @param mdcTorqueConfig
      * @return
      */
+    @AutoLog(value = "鎵煩閰嶇疆绠＄悊-瀵煎嚭")
+    @ApiOperation(value = "鎵煩閰嶇疆绠＄悊-瀵煎嚭",notes = "鎵煩閰嶇疆绠＄悊-瀵煎嚭")
     @RequestMapping("/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, MdcTorqueConfig mdcTorqueConfig) {
         return super.exportXls(request, mdcTorqueConfig, MdcTorqueConfig.class, "鎵煩閰嶇疆绠＄悊瀵煎嚭");
@@ -119,11 +117,12 @@
 
     /**
      * 瀵煎叆excel
-     *
      * @param request
      * @param response
      * @return
      */
+    @AutoLog(value = "鎵煩閰嶇疆绠＄悊-瀵煎叆")
+    @ApiOperation(value = "鎵煩閰嶇疆绠＄悊-瀵煎叆",notes = "鎵煩閰嶇疆绠＄悊-瀵煎叆")
     @RequestMapping("/importExcel")
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, MdcTorqueConfig.class);
@@ -131,7 +130,6 @@
 
     /**
      * 鏍规嵁鎵煩鍊肩敓鎴愪富杞磋繍琛屾洸绾�
-     *
      * @param torqueValue
      * @return
      */
@@ -153,14 +151,19 @@
      * @return
      */
     @AutoLog(value = "鎵煩閰嶇疆绠＄悊-鍒嗛〉鏌ヨ")
-    @ApiOperation(value = "鎵煩閰嶇疆绠＄悊-鍒嗛〉鏌ヨ",notes = "鎵煩閰嶇疆绠＄悊-鍒嗛〉鏌ヨ")
-    @GetMapping("/queryWrapper")
-    public Result<?> queryWrapper(MdcTorqueConfig mdcTorqueConfig,
-                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                  HttpServletRequest req) {
-        Page<MdcTorqueConfig> page=new Page<>(pageNo,pageSize);
-        IPage<MdcTorqueConfig> mdcTorqueConfigIPage= mdcTorqueConfigService.queryPageList(page,req);
+    @ApiOperation(value = "鎵煩閰嶇疆绠＄悊-鍒嗛〉鏌ヨ", notes = "鎵煩閰嶇疆绠＄悊-鍒嗛〉鏌ヨ")
+    @GetMapping("/pageList")
+    public Result pageList(MdcTorqueConfig mdcTorqueConfig,
+                           @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                           HttpServletRequest req) {
+        if (mdcTorqueConfig == null) {
+            return Result.error("璇蜂紶閫掓湁鏁堝弬鏁�");
+        }
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String userId = user.getId();
+        Page page = new Page(pageNo, pageSize);
+        IPage<MdcTorqueConfig> mdcTorqueConfigIPage = mdcTorqueConfigService.pageList(userId, page, req, mdcTorqueConfig);
         return Result.ok(mdcTorqueConfigIPage);
     }
 }

--
Gitblit v1.9.3