From daf5a28d644cece1e19972521f0d6f19dfef20a4 Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期五, 07 七月 2023 09:57:01 +0800
Subject: [PATCH] 率参数标签接口
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java | 75 ++++++++++++++++++++++++++++---------
1 files changed, 56 insertions(+), 19 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 1adec07..56756e0 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,22 +1,22 @@
package org.jeecg.modules.mdc.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
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.List;
+import java.util.*;
/**
* @Description: 鎵煩閰嶇疆绠＄悊
@@ -24,8 +24,10 @@
* @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;
@Override
public MdcTorqueConfig queryById(String id) {
@@ -33,8 +35,23 @@
}
@Override
- public Boolean addTorque(MdcTorqueConfig mdcTorqueConfig) {
- return this.save(mdcTorqueConfig);
+ public Boolean addTorque(MdcTorqueConfigVo torqueVo) {
+ boolean result = false;
+ String[] equipmentIds = torqueVo.getEquipmentIds().split(",");
+ for (String equipmentId : equipmentIds) {
+ MdcEquipment mdcEquipment = mdcEquipmentService.findEquipmentNameByEquipmentId(equipmentId);
+ MdcTorqueConfig mdcTorqueConfig = new MdcTorqueConfig();
+ mdcTorqueConfig.setEquipmentId(equipmentId);
+ mdcTorqueConfig.setEquipmentName(mdcEquipment.getEquipmentName());
+ mdcTorqueConfig.setTorqueDate(torqueVo.getTorqueDate());
+ mdcTorqueConfig.setTorqueValue(torqueVo.getTorqueValue());
+ mdcTorqueConfig.setNotes(torqueVo.getNotes());
+ boolean b = super.save(mdcTorqueConfig);
+ if (b) {
+ result = true;
+ }
+ }
+ return result;
}
@Override
@@ -54,18 +71,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> queryPageList(Page page, HttpServletRequest req) {
- QueryWrapper<MdcTorqueConfig> queryWrapper=new QueryWrapper();
- //妫�鏌ヨ姹備綋涓槸鍚︽湁璁惧缂栧彿瀛楁锛屽瓨鍦ㄥ垯杩斿洖true
- if (req.getParameterMap().containsKey("equipmentId")){
- //鑾峰彇璁惧缂栧彿鐨勫�硷紝涓嶄负绌哄垯娣诲姞鍒版煡璇�
- String equipmentId=req.getParameterMap().get("equipmentId")[0];
- queryWrapper.eq(StringUtils.isNotBlank(equipmentId),"equipment_id",equipmentId);
+ 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())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, mdcTorqueConfig.getParentId());
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, mdcTorqueConfig.getParentId());
+ }
+ } else if (StringUtils.isNotEmpty(mdcTorqueConfig.getEquipmentId())) {
+ //鍗曞彴璁惧淇℃伅
+ mdcTorqueConfig.setMdcSectionIds(Collections.singletonList(mdcTorqueConfig.getEquipmentId()));
+ } else {
+ //鏌ヨ鐢ㄦ埛鎵�鎷ユ湁鐨勬墍鏈夎澶囦俊鎭�
+ if ("2".equals(mdcTorqueConfig.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
+ } else {
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
+ }
}
- return this.page(page,queryWrapper);
+ if (mdcTorqueConfig.getMdcSectionIds() == null || mdcTorqueConfig.getMdcSectionIds().isEmpty()) {
+ mdcTorqueConfig.setMdcSectionIds(equipmentIds);
+ }
+ if (mdcTorqueConfig.getMdcSectionIds() == null || mdcTorqueConfig.getMdcSectionIds().isEmpty()) {
+ return null;
+ }
+ return this.baseMapper.pageList(page, mdcTorqueConfig);
}
}
--
Gitblit v1.9.3