From b2a193c00bc97bf98d5db2d831b470af7e7449cf Mon Sep 17 00:00:00 2001
From: yangman <15045099937@qq.com>
Date: 星期三, 05 七月 2023 14:42:40 +0800
Subject: [PATCH] 修改扭矩配置管理mapper
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 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..e029c30 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
@@ -9,13 +9,16 @@
import org.apache.poi.util.StringUtil;
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.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;
/**
@@ -24,8 +27,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) {
@@ -54,18 +59,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