From 8cbb4e01b9226b32797a48489c5e1b30da3e2110 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 13 四月 2026 15:01:32 +0800
Subject: [PATCH] 数采调整&人员考勤导出开发
---
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
index 3b67be8..65fdff7 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
@@ -197,9 +197,6 @@
@Override
public Result<?> dataAcquisition(HttpServletRequest request, DeviceCollectionDto dto) {
-
-
-
// 鏌ヨ妫�楠岄」
List<Integer> itemIds = dto.getItemIds();
if (CollectionUtils.isEmpty(itemIds)) {
@@ -240,11 +237,13 @@
// 鏁伴噰杩斿洖淇℃伅
Map<String, Object> map = new HashMap<>();
for (Device device : deviceList) {
-
Device device1 = deviceMapper.selectById(device.getId());
dto.setDbUserName(device1.getDbUserName());
dto.setDbPassword(device1.getDbPassword());
- dto.setDbTable(device1.getDbTable());
+ //NS-YL3141:鍝戦搩鐗囧叏鑷姩妫�娴嬪疄楠屽
+ if(!StringUtils.equals(device1.getManagementNumber(),"NS-YL3141")){
+ dto.setDbTable(device1.getDbTable());
+ }
String ip = device.getIp();
// 鏍规嵁妫�楠岄」鑾峰彇config
@@ -307,23 +306,24 @@
String refery = DataAcquisition.getRefer(v.get(config).getRefery());
if (refery.equals(DCResistanceMqttConstants.NSDQCS_DQCS_DZZ)){
// 鏌ヨ瀵瑰簲濮旀墭缂栧彿鐨勬暟鎹�
-// Object value = RedisUtil.get(refery);
String[] splits = entrustCode.split("-");
String newEntrustCode = splits.length>1 ?splits[1]:"";
CollectBridge collectBridge = collectBridgeMapper.selectOne(Wrappers.<CollectBridge>lambdaQuery()
- .eq(CollectBridge::getEntrustCode,newEntrustCode)
+ .eq(CollectBridge::getDeviceCode,device.getManagementNumber())
+ .and(i->
+ i.eq(CollectBridge::getEntrustCode,newEntrustCode)
.or()
- .eq(CollectBridge::getEntrustCode,lotBatchNo)
+ .eq(CollectBridge::getEntrustCode,lotBatchNo))
.last("limit 1"));
if(Objects.isNull(collectBridge)){
- throw new ErrorException("鐩存祦鐢甸樆鏁伴噰寮傚父锛氭病鏈夋壘鍒板鎵樼紪鍙蜂负銆�"+entrustCode+"銆戠殑鏁版嵁");
+ throw new ErrorException("璁惧"+device.getManagementNumber()+"鏁伴噰寮傚父锛氭病鏈夋壘鍒癝N鍙蜂负銆�"+entrustCode+"鎴�"+lotBatchNo+"銆戠殑鏁版嵁");
}
list.add(0,1);//娴嬭瘯闀垮害锛岄粯璁�1
list.add(1,Objects.isNull(collectBridge.getCollectTemperature())?0.0:collectBridge.getCollectTemperature());
list.add(2,collectBridge.getCollectValue());//瀹為檯鐢甸樆鍊�
}else {
// 浠� Redis 涓幏鍙栧垪琛ㄦ暟鎹�
- Set<Object> objectList = RedisUtil.getZSetRange(refery, 0, -1,"DESC");
+ Set<Object> objectList = RedisUtil.getZSetRange(refery+"."+device.getManagementNumber(), 0, -1,"DESC");
list.addAll(objectList);
}
numberOfDataEntries.getAndIncrement();
--
Gitblit v1.9.3