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/entity/MdcTorqueConfig.java                  |   19 ++++++
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcTorqueConfigService.java         |   15 ++++-
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcTorqueConfigVo.java                    |   25 ++++++++
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java    |   32 ++++++++--
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java |   35 +++++++++--
 5 files changed, 109 insertions(+), 17 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
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java
index 3b0b8bb..6676982 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java
@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -52,6 +53,24 @@
     private String equipmentName;
 
     /**
+     * 寮�濮嬫椂闂�
+     */
+    @Excel(name = "寮�濮嬫椂闂�", width = 15)
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("寮�濮嬫椂闂�")
+    private Date startTime;
+
+    /**
+     * 缁撴潫鏃堕棿
+     */
+    @Excel(name = "缁撴潫鏃堕棿", width = 15)
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("缁撴潫鏃堕棿")
+    private Date endTime;
+
+    /**
      * 鏃ユ湡
      */
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcTorqueConfigService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcTorqueConfigService.java
index 797db61..3634546 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcTorqueConfigService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcTorqueConfigService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.mdc.entity.MdcTorqueConfig;
+import org.jeecg.modules.mdc.vo.MdcTorqueConfigVo;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -17,20 +18,24 @@
 
     /**
      * 鏍规嵁id鏌ヨ
+     *
      * @param id
      * @return
      */
     MdcTorqueConfig queryById(String id);
 
+
     /**
-     * 鏂板鎵煩閰嶇疆
-     * @param mdcTorqueConfig
+     * 娣诲姞鎵煩閰嶇疆
+     *
+     * @param torqueVo
      * @return
      */
-    Boolean addTorque(MdcTorqueConfig mdcTorqueConfig);
+    Boolean addTorque(MdcTorqueConfigVo torqueVo);
 
     /**
      * 缂栬緫鎵煩閰嶇疆
+     *
      * @param mdcTorqueConfig
      * @return
      */
@@ -38,6 +43,7 @@
 
     /**
      * 鏍规嵁id鍒犻櫎
+     *
      * @param id
      * @return
      */
@@ -45,6 +51,7 @@
 
     /**
      * 鎵归噺鍒犻櫎
+     *
      * @param ids
      * @return
      */
@@ -52,6 +59,7 @@
 
     /**
      * 鐢熸垚涓昏酱杩愯鏇茬嚎
+     *
      * @param torqueValue
      * @return
      */
@@ -60,6 +68,7 @@
 
     /**
      * 鍒嗛〉鏌ヨ
+     *
      * @param userId
      * @param page
      * @param req
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java
index e029c30..970eb35 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java
@@ -1,5 +1,6 @@
 package org.jeecg.modules.mdc.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,19 +8,19 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.util.StringUtil;
+import org.jeecg.modules.mdc.entity.MdcEquipment;
 import org.jeecg.modules.mdc.entity.MdcTorqueConfig;
 import org.jeecg.modules.mdc.mapper.MdcTorqueConfigMapper;
 import org.jeecg.modules.mdc.service.IMdcEquipmentService;
 import org.jeecg.modules.mdc.service.IMdcTorqueConfigService;
+import org.jeecg.modules.mdc.util.DateUtils;
+import org.jeecg.modules.mdc.vo.MdcTorqueConfigVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
 /**
  * @Description: 鎵煩閰嶇疆绠＄悊
@@ -38,8 +39,30 @@
     }
 
     @Override
-    public Boolean addTorque(MdcTorqueConfig mdcTorqueConfig) {
-        return this.save(mdcTorqueConfig);
+    public Boolean addTorque(MdcTorqueConfigVo torqueVo) {
+        boolean result = false;
+        String[] equipmentIds = torqueVo.getEquipmentIds().split(",");
+        List<MdcTorqueConfig> mdcTorqueConfigList = new ArrayList<>();
+        for (String equipmentId : equipmentIds) {
+            Date startTime = DateUtils.getFormatDate(torqueVo.getStartTime(), DateUtils.STR_DATE_TIME_SMALL);
+            Date endTime = DateUtils.getFormatDate(torqueVo.getEndTime(), DateUtils.STR_DATE_TIME_SMALL);
+            MdcEquipment mdcEquipment = mdcEquipmentService.findEquipmentNameByEquipmentId(equipmentId);
+            //鏍规嵁Id鏌ヨ姝よ澶囦俊鎭�
+            LambdaQueryWrapper<MdcTorqueConfig> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(MdcTorqueConfig::getEquipmentId, equipmentId);
+            queryWrapper.orderByAsc(MdcTorqueConfig::getStartTime);
+            List<MdcTorqueConfig> mdcTorqueConfigs = this.baseMapper.selectList(queryWrapper);
+            MdcTorqueConfig mdcTorqueConfig = new MdcTorqueConfig();
+            mdcTorqueConfig.setStartTime(startTime);
+            mdcTorqueConfig.setEndTime(endTime);
+            mdcTorqueConfig.setEquipmentId(equipmentId);
+            mdcTorqueConfig.setEquipmentName(mdcEquipment.getEquipmentName());
+            boolean b = super.save(mdcTorqueConfig);
+            if (b) {
+                result = true;
+            }
+        }
+        return result;
     }
 
     @Override
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcTorqueConfigVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcTorqueConfigVo.java
new file mode 100644
index 0000000..3607a0e
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcTorqueConfigVo.java
@@ -0,0 +1,25 @@
+package org.jeecg.modules.mdc.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+public class MdcTorqueConfigVo {
+    private String id;
+    private String startTime;
+    /*缁撴潫鏃堕棿*/
+    private String endTime;
+    private String equipmentId;
+    /*璁惧鍚嶇О*/
+    private String equipmentName;
+    /*璁惧缁�*/
+    private String equipmentIds;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date torqueDate;
+    private float torqueValue;
+}

--
Gitblit v1.9.3