From 2a53365575128e1161f4376b4be902049de38a82 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 25 三月 2025 14:59:24 +0800
Subject: [PATCH] art: 设备台账-用户数据权限过滤
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 74 ++++++++++++++++++++++++++++++++++++
1 files changed, 73 insertions(+), 1 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 59a388c..e77f582 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
@@ -2,9 +2,15 @@
import cn.hutool.core.collection.CollectionUtil;
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.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.constant.DataBaseConstant;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
import org.jeecg.modules.eam.constant.AssetStatusEnum;
import org.jeecg.modules.eam.constant.EquipmentMaintenanceStatus;
@@ -13,6 +19,7 @@
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamEquipmentExtend;
import org.jeecg.modules.eam.mapper.EamEquipmentMapper;
+import org.jeecg.modules.eam.request.EamEquipmentQuery;
import org.jeecg.modules.eam.service.IEamEquipmentExtendService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.tree.FindsEquipmentProductionUtil;
@@ -66,7 +73,7 @@
equipmentExtendService.save(eamEquipmentExtend);
- //鎻掑叆璁惧灞ュ巻 TODO
+ //鎻掑叆璁惧灞ュ巻 @EquipmentHistoryLog
return eamEquipment;
}
@@ -91,6 +98,71 @@
return treeList;
}
+ @Override
+ public IPage<EamEquipment> queryPageList(IPage<EamEquipment> page, EamEquipmentQuery eamEquipment) {
+ QueryWrapper<EamEquipment> queryWrapper = new QueryWrapper<>();
+ //鐢ㄦ埛鏉冮檺
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if(sysUser == null){
+ return page;
+ }
+ if(StringUtils.isNotBlank(sysUser.getEquipmentIds())){
+ //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
+ List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
+ queryWrapper.in("e.equipment_code", equipArr);
+ }else {
+ //娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
+ queryWrapper.exists("select 1 from mdc_user_production t where t.user_id=? and t.pro_id=e.org_id", sysUser.getId());
+ }
+ //鏌ヨ鏉′欢杩囨护
+ if(eamEquipment != null){
+ if(StringUtils.isNotBlank(eamEquipment.getEquipmentCode())){
+ queryWrapper.like("e.equipment_code", eamEquipment.getEquipmentCode());
+ }
+ if(StringUtils.isNotBlank(eamEquipment.getEquipmentName())){
+ queryWrapper.like("e.equipment_name", eamEquipment.getEquipmentName());
+ }
+ if(StringUtils.isNotBlank(eamEquipment.getEquipmentImportance())){
+ queryWrapper.eq("e.equipment_importance", eamEquipment.getEquipmentImportance());
+ }
+ if(StringUtils.isNotBlank(eamEquipment.getAssetStatus())){
+ queryWrapper.like("e.asset_status", eamEquipment.getAssetStatus());
+ }
+ if(StringUtils.isNotBlank(eamEquipment.getTechnologyStatus())){
+ queryWrapper.like("e.technology_status", eamEquipment.getTechnologyStatus());
+ }
+ 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.getEquipmentCategory())){
+ queryWrapper.like("e.equipment_category", eamEquipment.getEquipmentCategory());
+ }
+ //鎺掑簭
+ 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)) {
+ column = column.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX));
+ }
+ if(DataBaseConstant.SQL_ASC.equalsIgnoreCase(eamEquipment.getOrder())){
+ queryWrapper.orderByAsc("e." + oConvertUtils.camelToUnderline(column));
+ }else {
+ queryWrapper.orderByDesc("e." + oConvertUtils.camelToUnderline(column));
+ }
+ }else {
+ queryWrapper.orderByDesc("e.create_time");
+ }
+ }else {
+ queryWrapper.orderByDesc("e.create_time");
+ }
+
+ IPage<EamEquipment> ipage = eamEquipmentMapper.queryPageList(page, queryWrapper);
+ return ipage;
+ }
+
/**
* 鑾峰彇鎵�鏈夌殑浜х嚎id锛堝寘鍚墍鏈変笂绾э級
*/
--
Gitblit v1.9.3