From 0b64efc97ee0594a84f28d23c847f738d68eae6d Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期一, 17 七月 2023 17:09:55 +0800
Subject: [PATCH] 加工数量

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java |   49 +++++++++++++++++++++++++++++++++++--------------
 1 files changed, 35 insertions(+), 14 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..7981de8 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
@@ -1,16 +1,19 @@
 package org.jeecg.modules.mdc.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -49,7 +52,7 @@
     }
 
     /**
-     * 鏂板
+     * 鎵煩閰嶇疆绠＄悊-鏂板
      *
      * @param mdcTorqueConfig
      * @return
@@ -57,9 +60,15 @@
     @AutoLog(value = "鎵煩閰嶇疆绠＄悊-鏂板")
     @ApiOperation(value = "鎵煩閰嶇疆绠＄悊-鏂板", notes = "鎵煩閰嶇疆绠＄悊-鏂板")
     @PostMapping("/addMdcTorqueConfig")
-    public Result<?> addMdcTorqueConfig(@RequestBody MdcTorqueConfig mdcTorqueConfig) {
-        boolean flag = mdcTorqueConfigService.addTorque(mdcTorqueConfig);
-        return flag ? Result.ok("鏂板鎴愬姛") : Result.error("鏂板澶辫触");
+    public Result addMdcTorqueConfig(@RequestBody MdcTorqueConfig mdcTorqueConfig) {
+        if (StringUtils.isBlank(mdcTorqueConfig.getEquipmentIds())) {
+            return Result.error("鏈�夋嫨璁惧锛岃鎺掓煡");
+        }
+        boolean result = mdcTorqueConfigService.addTorque(mdcTorqueConfig);
+        if (!result) {
+            return Result.error("鏃堕棿娈垫暟鎹凡瀛樺湪锛岃鎺掓煡");
+        }
+        return Result.OK("鏂板鎴愬姛");
     }
 
     /**
@@ -112,9 +121,13 @@
      * @param mdcTorqueConfig
      * @return
      */
+    @AutoLog(value = "鎵煩閰嶇疆绠＄悊-瀵煎嚭")
+    @ApiOperation(value = "鎵煩閰嶇疆绠＄悊-瀵煎嚭", notes = "鎵煩閰嶇疆绠＄悊-瀵煎嚭")
     @RequestMapping("/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, MdcTorqueConfig mdcTorqueConfig) {
-        return super.exportXls(request, mdcTorqueConfig, MdcTorqueConfig.class, "鎵煩閰嶇疆绠＄悊瀵煎嚭");
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String userId = user.getId();
+        return this.mdcTorqueConfigService.exportXls(userId, mdcTorqueConfig);
     }
 
     /**
@@ -124,6 +137,8 @@
      * @param response
      * @return
      */
+    @AutoLog(value = "鎵煩閰嶇疆绠＄悊-瀵煎叆")
+    @ApiOperation(value = "鎵煩閰嶇疆绠＄悊-瀵煎叆", notes = "鎵煩閰嶇疆绠＄悊-瀵煎叆")
     @RequestMapping("/importExcel")
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, MdcTorqueConfig.class);
@@ -146,6 +161,7 @@
 
     /**
      * 鍒嗛〉鏌ヨ
+     *
      * @param mdcTorqueConfig
      * @param pageNo
      * @param pageSize
@@ -153,14 +169,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