From fb5aa087eaf6a68cf7ea8114beb270551016e7dd Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 29 七月 2025 11:27:45 +0800
Subject: [PATCH] 添加定型指派设备
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 119 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 98 insertions(+), 21 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
index b8a21ff..c2ec226 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
@@ -4,6 +4,7 @@
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;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
@@ -24,6 +25,7 @@
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.tree.FindsEquipmentProductionUtil;
import org.jeecg.modules.eam.vo.EamEquipmentTree;
+import org.jeecg.modules.eam.vo.EquipmentSearchResult;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.service.IMdcProductionService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,7 +42,7 @@
/**
* @Description: 璁惧鍙拌处
* @Author: jeecg-boot
- * @Date: 2025-03-19
+ * @Date: 2025-03-19
* @Version: V1.0
*/
@Service
@@ -101,68 +103,143 @@
@Override
public IPage<EamEquipment> queryPageList(IPage<EamEquipment> page, EamEquipmentQuery eamEquipment) {
QueryWrapper<EamEquipment> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("e.del_flag", CommonConstant.DEL_FLAG_0);
//鐢ㄦ埛鏁版嵁鏉冮檺
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- if(sysUser == null){
+ if (sysUser == null) {
return page;
}
- if(StringUtils.isNotBlank(sysUser.getEquipmentIds())){
+ if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
//閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
queryWrapper.in("e.equipment_code", equipArr);
- }else {
+ } else {
//娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id", sysUser.getId());
}
//鏌ヨ鏉′欢杩囨护
- if(eamEquipment != null){
- if(StringUtils.isNotBlank(eamEquipment.getEquipmentCode())){
+ if (eamEquipment != null) {
+ if (StringUtils.isNotBlank(eamEquipment.getEquipmentCode())) {
queryWrapper.like("e.equipment_code", eamEquipment.getEquipmentCode());
}
- if(StringUtils.isNotBlank(eamEquipment.getEquipmentName())){
+ if (StringUtils.isNotBlank(eamEquipment.getEquipmentName())) {
queryWrapper.like("e.equipment_name", eamEquipment.getEquipmentName());
}
- if(StringUtils.isNotBlank(eamEquipment.getEquipmentImportance())){
+ if (StringUtils.isNotBlank(eamEquipment.getEquipmentImportance())) {
queryWrapper.eq("e.equipment_importance", eamEquipment.getEquipmentImportance());
}
- if(StringUtils.isNotBlank(eamEquipment.getAssetStatus())){
+ if (StringUtils.isNotBlank(eamEquipment.getAssetStatus())) {
queryWrapper.like("e.asset_status", eamEquipment.getAssetStatus());
}
- if(StringUtils.isNotBlank(eamEquipment.getTechnologyStatus())){
+ if (StringUtils.isNotBlank(eamEquipment.getTechnologyStatus())) {
queryWrapper.like("e.technology_status", eamEquipment.getTechnologyStatus());
}
- if(StringUtils.isNotBlank(eamEquipment.getOperationSystem())){
+ if (StringUtils.isNotBlank(eamEquipment.getOperationSystem())) {
queryWrapper.like("e.operation_system", eamEquipment.getOperationSystem());
}
- if(StringUtils.isNotBlank(eamEquipment.getOrgId())){
- queryWrapper.like("e.org_id", eamEquipment.getOrgId());
+ if (StringUtils.isNotBlank(eamEquipment.getOrgId())) {
+ //杞﹂棿缂栫爜涓嶄负绌�
+ List<String> productIds = mdcProductionService.recursionChildren(eamEquipment.getOrgId());
+ if (CollectionUtil.isNotEmpty(productIds)) {
+ //涓嶅仛绛涢��
+ queryWrapper.in("e.org_id", productIds);
+ }
}
- if(StringUtils.isNotBlank(eamEquipment.getEquipmentCategory())){
+ if (StringUtils.isNotBlank(eamEquipment.getEquipmentCategory())) {
queryWrapper.like("e.equipment_category", eamEquipment.getEquipmentCategory());
}
+ if (StringUtils.isNotBlank(eamEquipment.getId())) {
+ queryWrapper.eq("e.id", eamEquipment.getId());
+ }
//鎺掑簭
- if(StringUtils.isNotBlank(eamEquipment.getColumn()) && StringUtils.isNotBlank(eamEquipment.getOrder())){
+ if (StringUtils.isNotBlank(eamEquipment.getColumn()) && StringUtils.isNotBlank(eamEquipment.getOrder())) {
//queryWrapper.like("column", eamEquipment.getColumn());
String column = eamEquipment.getColumn();
- if(column.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) {
+ if (column.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) {
column = column.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX));
}
- if(DataBaseConstant.SQL_ASC.equalsIgnoreCase(eamEquipment.getOrder())){
+ if (DataBaseConstant.SQL_ASC.equalsIgnoreCase(eamEquipment.getOrder())) {
queryWrapper.orderByAsc("e." + oConvertUtils.camelToUnderline(column));
- }else {
+ } else {
queryWrapper.orderByDesc("e." + oConvertUtils.camelToUnderline(column));
}
- }else {
+ } else {
queryWrapper.orderByDesc("e.create_time");
}
- }else {
+ } else {
queryWrapper.orderByDesc("e.create_time");
}
- IPage<EamEquipment> ipage = eamEquipmentMapper.queryPageList(page, queryWrapper);
+ IPage<EamEquipment> ipage = eamEquipmentMapper.queryPageList(page, queryWrapper);
return ipage;
}
+ @Override
+ public List<EquipmentSearchResult> asyncLoadEquipment(String keyword, Integer pageSize, String id) {
+ if (StringUtils.isNotBlank(id)) {
+ EamEquipment eamEquipment = eamEquipmentMapper.selectById(id);
+ if (eamEquipment != null) {
+ List<EquipmentSearchResult> resultList = new ArrayList<>();
+ resultList.add(new EquipmentSearchResult(eamEquipment));
+ return resultList;
+ }
+ }
+ IPage<EamEquipment> page = new Page<>(1, pageSize);
+ QueryWrapper<EamEquipment> queryWrapper = new QueryWrapper<>();
+ //鐢ㄦ埛鏁版嵁鏉冮檺
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ return Collections.emptyList();
+ }
+ if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
+ //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
+ List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
+ queryWrapper.in("equipment_code", equipArr);
+ } else {
+ //娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
+ queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=org_id", sysUser.getId());
+ }
+ if (StringUtils.isNotBlank(keyword)) {
+ queryWrapper.like("equipment_code", keyword);
+ queryWrapper.or().like("equipment_name", keyword);
+ }
+ queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
+ IPage<EamEquipment> pageResult = eamEquipmentMapper.queryPageList(page, queryWrapper);
+ if (pageResult != null && CollectionUtil.isNotEmpty(pageResult.getRecords())) {
+ List<EquipmentSearchResult> resultList = new ArrayList<>();
+ pageResult.getRecords().forEach((record) -> {
+ resultList.add(new EquipmentSearchResult(record));
+ });
+ return resultList;
+ }
+ return Collections.emptyList();
+ }
+
+ @Override
+ public EamEquipment selectByEquipmentCode(String equipmentCode) {
+ if (StringUtils.isBlank(equipmentCode)) {
+ return null;
+ }
+ QueryWrapper<EamEquipment> queryWrapper = new QueryWrapper<>();
+ //鐢ㄦ埛鏁版嵁鏉冮檺
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ return null;
+ }
+ if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
+ //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
+ List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
+ queryWrapper.in("equipment_code", equipArr);
+ } else {
+ //娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
+ queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=org_id", sysUser.getId());
+ }
+ queryWrapper.eq("equipment_code", equipmentCode);
+ queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
+
+ return eamEquipmentMapper.selectOne(queryWrapper);
+ }
+
/**
* 鑾峰彇鎵�鏈夌殑浜х嚎id锛堝寘鍚墍鏈変笂绾э級
*/
--
Gitblit v1.9.3