From 11af23e0c7976eed1211ba2ca0beae3a12e19310 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期三, 12 三月 2025 15:37:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
cnas-require/src/main/java/com/ruoyi/requier/service/impl/DeviceFaultServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/cnas-require/src/main/java/com/ruoyi/requier/service/impl/DeviceFaultServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/requier/service/impl/DeviceFaultServiceImpl.java
index 503b005..3d780b1 100644
--- a/cnas-require/src/main/java/com/ruoyi/requier/service/impl/DeviceFaultServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/requier/service/impl/DeviceFaultServiceImpl.java
@@ -12,10 +12,13 @@
import com.ruoyi.requier.mapper.DeviceMapper;
import com.ruoyi.requier.pojo.*;
import com.ruoyi.requier.service.DeviceFaultService;
+import com.ruoyi.system.mapper.SysDictDataMapper;
+import com.ruoyi.system.mapper.SysDictTypeMapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
@@ -27,6 +30,9 @@
@Autowired
private QrShowServiceImpl qrShowService;
+
+ @Resource
+ private SysDictDataMapper sysDictDataMapper;
@Autowired
private DeviceMaintenanceMapper deviceMaintenanceMapper;
@@ -60,7 +66,8 @@
.eq(DeviceFaultOne::getDeviceId, device.getId())
.orderByDesc(DeviceFaultOne::getId))).orElse(new ArrayList<>());
//鏌ヨ璁惧鐘舵�佸瓧鍏�
- List<SysDictData> sysDictDataList = DictUtils.getDictCache("璁惧鐘舵��");
+ List<SysDictData> sysDictDataList = sysDictDataMapper.selectDictDataByType("device_status");
+// List<SysDictData> sysDictDataList = DictUtils.getDictCache("璁惧鐘舵��");
SysDictData findEnum = sysDictDataList.stream().filter(e-> Integer.parseInt(e.getDictValue()) ==device.getDeviceStatus()).findFirst().orElse(new SysDictData());
map.put("progress",qrShowService.calcDeviceNextCheckRatio(calibrate.getCalibrationDate(),calibrate.getNextCalibrationDate()));//璺濈涓嬫鏍″噯鏃ユ湡鐨勫ぉ鏁扮櫨鍒嗘瘮
map.put("deviceName",device.getDeviceName());//璁惧鍚嶇О
@@ -97,4 +104,4 @@
}
return map;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3