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/service/impl/MdcTorqueConfigServiceImpl.java | 69 +++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 23 deletions(-)
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 324ab6b..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: 鎵煩閰嶇疆绠＄悊
@@ -27,7 +28,7 @@
* @Date: 2023-06-29
*/
@Service
-public class MdcTorqueConfigServiceImpl extends ServiceImpl<MdcTorqueConfigMapper, MdcTorqueConfig> implements IMdcTorqueConfigService{
+public class MdcTorqueConfigServiceImpl extends ServiceImpl<MdcTorqueConfigMapper, MdcTorqueConfig> implements IMdcTorqueConfigService {
@Autowired
private IMdcEquipmentService mdcEquipmentService;
@@ -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
@@ -59,38 +82,38 @@
@Override
public List<MdcTorqueConfig> findSpindleRunningCurve(float torqueValue, String equipmentId) {
- return this.baseMapper.findSpindleRunningCurve(torqueValue,equipmentId);
+ return this.baseMapper.findSpindleRunningCurve(torqueValue, equipmentId);
}
@Override
public IPage<MdcTorqueConfig> pageList(String userId, Page page, HttpServletRequest req, MdcTorqueConfig mdcTorqueConfig) {
- List<String> equipmentIds=new ArrayList<>();
- if (StringUtils.isNotEmpty(mdcTorqueConfig.getParentId())&&StringUtils.isEmpty(mdcTorqueConfig.getEquipmentId())){
- if ("2".equals(mdcTorqueConfig.getTypeTree())){
+ List<String> equipmentIds = new ArrayList<>();
+ if (StringUtils.isNotEmpty(mdcTorqueConfig.getParentId()) && StringUtils.isEmpty(mdcTorqueConfig.getEquipmentId())) {
+ if ("2".equals(mdcTorqueConfig.getTypeTree())) {
//閮ㄩ棬灞傜骇
- equipmentIds=mdcEquipmentService.getEquipmentIdsByDepart(userId,mdcTorqueConfig.getParentId());
- }else {
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, mdcTorqueConfig.getParentId());
+ } else {
//浜х嚎灞傜骇
- equipmentIds=mdcEquipmentService.getEquipmentIdsProduction(userId,mdcTorqueConfig.getParentId());
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, mdcTorqueConfig.getParentId());
}
- }else if (StringUtils.isNotEmpty(mdcTorqueConfig.getEquipmentId())){
+ } else if (StringUtils.isNotEmpty(mdcTorqueConfig.getEquipmentId())) {
//鍗曞彴璁惧淇℃伅
mdcTorqueConfig.setMdcSectionIds(Collections.singletonList(mdcTorqueConfig.getEquipmentId()));
- }else {
+ } else {
//鏌ヨ鐢ㄦ埛鎵�鎷ユ湁鐨勬墍鏈夎澶囦俊鎭�
- if ("2".equals(mdcTorqueConfig.getTypeTree())){
+ if ("2".equals(mdcTorqueConfig.getTypeTree())) {
//閮ㄩ棬灞傜骇
- equipmentIds=mdcEquipmentService.getEquipmentIdsByDepart(userId,null);
- }else {
- equipmentIds=mdcEquipmentService.getEquipmentIdsProduction(userId,null);
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
+ } else {
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
}
}
- if (mdcTorqueConfig.getMdcSectionIds()==null||mdcTorqueConfig.getMdcSectionIds().isEmpty()){
+ if (mdcTorqueConfig.getMdcSectionIds() == null || mdcTorqueConfig.getMdcSectionIds().isEmpty()) {
mdcTorqueConfig.setMdcSectionIds(equipmentIds);
}
- if (mdcTorqueConfig.getMdcSectionIds()==null||mdcTorqueConfig.getMdcSectionIds().isEmpty()){
+ if (mdcTorqueConfig.getMdcSectionIds() == null || mdcTorqueConfig.getMdcSectionIds().isEmpty()) {
return null;
}
- return this.baseMapper.pageList(page,mdcTorqueConfig);
+ return this.baseMapper.pageList(page, mdcTorqueConfig);
}
}
--
Gitblit v1.9.3