From cc0e9036de6e922e8fe254fef01d8de9996024b7 Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期四, 17 七月 2025 18:16:03 +0800
Subject: [PATCH] 获取报警描述修改
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceManagementServiceImpl.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceManagementServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceManagementServiceImpl.java
index 4a56a91..bd5c852 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceManagementServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceManagementServiceImpl.java
@@ -5,7 +5,9 @@
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.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.dnc.entity.DeviceManagement;
import org.jeecg.modules.dnc.entity.DeviceType;
import org.jeecg.modules.dnc.exception.ExceptionCast;
@@ -25,6 +27,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -142,10 +145,13 @@
*/
@Override
public Result<?> query(DeviceManagement deviceManagement, Integer pageNo, Integer pageSize){
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ List<String> productIdList = Arrays.asList(user.getProductionIds().split(","));
QueryWrapper<DeviceManagement> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(StrUtil.isNotEmpty(deviceManagement.getProductionId()),"production_id",deviceManagement.getProductionId());
queryWrapper.like(StrUtil.isNotEmpty(deviceManagement.getDeviceManagementName()),"device_management_name",deviceManagement.getDeviceManagementName());
queryWrapper.like(StrUtil.isNotEmpty(deviceManagement.getDeviceManagementCode()),"device_management_code",deviceManagement.getDeviceManagementCode());
+ queryWrapper.in("production_id",productIdList);
queryWrapper.orderByDesc("create_time");
Page<DeviceManagement> page = new Page<>(pageNo, pageSize);
IPage<DeviceManagement> pageList = super.page(page, queryWrapper);
@@ -218,4 +224,21 @@
queryWrapper.orderByDesc("create_time");
return super.list(queryWrapper);
}
+
+ /**
+ * 閫氳繃id鏌ヨ璁惧鍒楄〃淇℃伅
+ * @param id
+ * @return
+ */
+ @Override
+ public List<MdcEquipment> getEquipmentListById(String id){
+ DeviceManagement deviceManagement = super.getById(id);
+ if (deviceManagement == null) {
+ return null;
+ }else {
+ List<String> equipmentIds = Arrays.asList(deviceManagement.getEquipmentIds().split(","));
+ return equipmentService.list(new QueryWrapper<MdcEquipment>()
+ .in("equipment_id", equipmentIds));
+ }
+ }
}
--
Gitblit v1.9.3