From 3cf3656f3d69a6021226c794e5d9e69d091f48c3 Mon Sep 17 00:00:00 2001
From: yangman <15045099937@qq.com>
Date: 星期二, 04 七月 2023 11:21:28 +0800
Subject: [PATCH] 修改扭矩配置管理3
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java | 20 ++++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcTorqueConfigService.java | 5 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java | 15 +++++--
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcTorqueConfigMapper.java | 5 +-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml | 12 ++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcTorqueConfigServiceImpl.java | 41 ++++++++++++++++----
6 files changed, 83 insertions(+), 15 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 151f8ce..7a1ad30 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
@@ -5,9 +5,11 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
+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;
@@ -154,13 +156,18 @@
*/
@AutoLog(value = "鎵煩閰嶇疆绠＄悊-鍒嗛〉鏌ヨ")
@ApiOperation(value = "鎵煩閰嶇疆绠＄悊-鍒嗛〉鏌ヨ",notes = "鎵煩閰嶇疆绠＄悊-鍒嗛〉鏌ヨ")
- @GetMapping("/queryWrapper")
- public Result<?> queryWrapper(MdcTorqueConfig mdcTorqueConfig,
+ @GetMapping("/pageList")
+ public Result pageList(MdcTorqueConfig mdcTorqueConfig,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
- Page<MdcTorqueConfig> page=new Page<>(pageNo,pageSize);
- IPage<MdcTorqueConfig> mdcTorqueConfigIPage= mdcTorqueConfigService.queryPageList(page,req);
+ if (mdcTorqueConfig==null){
+ return Result.error("璇蜂紶閫掓湁鏁堝弬鏁�");
+ }
+ LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId= user.getId();
+ Page page=new Page(pageNo,pageSize);
+ IPage<MdcTorqueConfig> mdcTorqueConfigIPage= mdcTorqueConfigService.pageList(userId,page,req,mdcTorqueConfig);
return Result.ok(mdcTorqueConfigIPage);
}
}
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 4e1dcd0..8615f0b 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
@@ -1,6 +1,7 @@
package org.jeecg.modules.mdc.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -14,6 +15,7 @@
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
* @Description: 鎵煩閰嶇疆绠＄悊
@@ -100,4 +102,22 @@
@Excel(name = "鏇存柊浜�",width = 15)
@ApiModelProperty("鏇存柊浜�")
private String updateBy;
+
+ /**
+ * 鍓嶅彴浼犲叆锛屽垽鏂瘡涓猧d
+ */
+ @TableField(exist = false)
+ private String parentId;
+
+ /**
+ * 鍓嶅彴浼犲叆 杞﹂棿灞傜骇锛�1锛岄儴闂ㄥ眰绾э細2
+ */
+ @TableField(exist = false)
+ private String typeTree;
+
+ /**
+ * 閮ㄩ棬parentId 鍏宠仈瀛愰泦id
+ */
+ @TableField(exist = false)
+ private List<String> mdcSectionIds;
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcTorqueConfigMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcTorqueConfigMapper.java
index c1f3430..800ca49 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcTorqueConfigMapper.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcTorqueConfigMapper.java
@@ -23,11 +23,12 @@
*/
List<MdcTorqueConfig> findSpindleRunningCurve(@Param("torqueValue") float torqueValue,@Param("equipmentId") String equipmentId);
+
/**
* 鍒嗛〉鏌ヨ
* @param pageData
- * @param equipmentId
+ * @param mdcTorqueConfig
* @return
*/
- IPage<MdcTorqueConfig> pageList(IPage<MdcTorqueConfig> pageData,@Param("equipmentId") String equipmentId);
+ IPage<MdcTorqueConfig> pageList(IPage<MdcTorqueConfig> pageData,@Param("mdcTorqueConfig") MdcTorqueConfig mdcTorqueConfig);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml
index 260ec55..5274841 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml
@@ -7,5 +7,17 @@
</select>
<select id="pageList" resultType="org.jeecg.modules.mdc.entity.MdcTorqueConfig">
select mtc.* from mdc_torque_config mtc,mdc_equipment me where mtc.equipment_id=me.equipment_id
+ <if test="mdcTorqueConfig.equipmentName !=null and mdcTorqueConfig.equipmentName !='' ">
+ and mtc.equipment_name like concat(concat('%',#{mdcTorqueConfig.equipmentName}),'%')
+ </if>
+ <if test="mdcTorqueConfig.equipmentId !=null and mdcTorqueConfig.equipmentId !='' ">
+ and mtc.equipment_id like concat(concat('%',#{mdcTorqueConfig.equipmentId}),'%')
+ </if>
+ <if test="mdcTorqueConfig.mdcSectionIds !=null || mdcTorqueConfig.mdcSectionIds.size() > 0 ">
+ and mtc.equipment_id in
+ <foreach collection="mdcTorqueConfig.mdcSectionIds" item="id" index="index" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+ </if>
</select>
</mapper>
\ No newline at end of file
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 ea9f9bb..46e50c7 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
@@ -57,11 +57,14 @@
*/
List<MdcTorqueConfig> findSpindleRunningCurve(float torqueValue,String equipmentId);
+
/**
* 鍒嗛〉鏌ヨ
+ * @param userId
* @param page
* @param req
+ * @param mdcTorqueConfig
* @return
*/
- IPage<MdcTorqueConfig> queryPageList(Page page,HttpServletRequest req);
+ IPage<MdcTorqueConfig> pageList(String userId,Page page,HttpServletRequest req,MdcTorqueConfig mdcTorqueConfig);
}
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..324ab6b 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;
/**
@@ -26,6 +29,8 @@
@Service
public class MdcTorqueConfigServiceImpl extends ServiceImpl<MdcTorqueConfigMapper, MdcTorqueConfig> implements IMdcTorqueConfigService{
+ @Autowired
+ private IMdcEquipmentService mdcEquipmentService;
@Override
public MdcTorqueConfig queryById(String id) {
@@ -58,14 +63,34 @@
}
@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