From ef03ece67bb7b7248edb492749a53f60ff7ffa66 Mon Sep 17 00:00:00 2001
From: yangman <15045099937@qq.com>
Date: 星期四, 06 七月 2023 11:46:08 +0800
Subject: [PATCH] 修改扭矩配置管理

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java |   32 ++++++++++++++++++++++++--------
 1 files changed, 24 insertions(+), 8 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 96e49be..bd70b6f 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,6 +1,7 @@
 package org.jeecg.modules.mdc.controller;
 
 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;
@@ -12,7 +13,7 @@
 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.jeecg.modules.mdc.vo.MdcTorqueConfigVo;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -37,6 +38,7 @@
 
     /**
      * 鏍规嵁id鏌ヨ
+     *
      * @param id
      * @return
      */
@@ -50,20 +52,28 @@
     }
 
     /**
-     * 鏂板
-     * @param mdcTorqueConfig
+     * 鎵煩閰嶇疆绠＄悊-鏂板
+     *
+     * @param torqueVo
      * @return
      */
     @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 MdcTorqueConfigVo torqueVo) {
+        if (StringUtils.isBlank(torqueVo.getEquipmentIds())) {
+            return Result.error("鏈�夋嫨璁惧锛岃鎺掓煡");
+        }
+        boolean result = mdcTorqueConfigService.addTorque(torqueVo);
+        if (!result) {
+            return Result.error("鏃堕棿娈垫暟鎹凡瀛樺湪锛岃鎺掓煡");
+        }
+        return Result.OK("鏂板鎴愬姛");
     }
 
     /**
      * 淇敼
+     *
      * @param mdcTorqueConfig
      * @return
      */
@@ -77,6 +87,7 @@
 
     /**
      * 鏍规嵁id鍒犻櫎鎵煩閰嶇疆
+     *
      * @param id
      * @return
      */
@@ -90,6 +101,7 @@
 
     /**
      * 鎵归噺鍒犻櫎
+     *
      * @param ids
      * @return
      */
@@ -104,12 +116,13 @@
 
     /**
      * 瀵煎嚭excel
+     *
      * @param request
      * @param mdcTorqueConfig
      * @return
      */
     @AutoLog(value = "鎵煩閰嶇疆绠＄悊-瀵煎嚭")
-    @ApiOperation(value = "鎵煩閰嶇疆绠＄悊-瀵煎嚭",notes = "鎵煩閰嶇疆绠＄悊-瀵煎嚭")
+    @ApiOperation(value = "鎵煩閰嶇疆绠＄悊-瀵煎嚭", notes = "鎵煩閰嶇疆绠＄悊-瀵煎嚭")
     @RequestMapping("/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, MdcTorqueConfig mdcTorqueConfig) {
         return super.exportXls(request, mdcTorqueConfig, MdcTorqueConfig.class, "鎵煩閰嶇疆绠＄悊瀵煎嚭");
@@ -117,12 +130,13 @@
 
     /**
      * 瀵煎叆excel
+     *
      * @param request
      * @param response
      * @return
      */
     @AutoLog(value = "鎵煩閰嶇疆绠＄悊-瀵煎叆")
-    @ApiOperation(value = "鎵煩閰嶇疆绠＄悊-瀵煎叆",notes = "鎵煩閰嶇疆绠＄悊-瀵煎叆")
+    @ApiOperation(value = "鎵煩閰嶇疆绠＄悊-瀵煎叆", notes = "鎵煩閰嶇疆绠＄悊-瀵煎叆")
     @RequestMapping("/importExcel")
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, MdcTorqueConfig.class);
@@ -130,6 +144,7 @@
 
     /**
      * 鏍规嵁鎵煩鍊肩敓鎴愪富杞磋繍琛屾洸绾�
+     *
      * @param torqueValue
      * @return
      */
@@ -144,6 +159,7 @@
 
     /**
      * 鍒嗛〉鏌ヨ
+     *
      * @param mdcTorqueConfig
      * @param pageNo
      * @param pageSize

--
Gitblit v1.9.3