From 319e76c080c6c2b34dd01ba0d6cc49023d7bfda8 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 20 十一月 2025 13:06:57 +0800
Subject: [PATCH] 影像仪数采调整
---
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 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 6e9bc72..69a54bf 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
@@ -270,12 +270,16 @@
i.setInsProductItem(name);
})
.collect(Collectors.groupingBy(DataConfig::getInsProductItem));
- map.putAll(getActualResistanceValueAsMap(userMap, device,dto.getEntrustCode()));
+ map.putAll(getActualResistanceValueAsMap(userMap, device,dto.getEntrustCode(),dto.getLotBatchNo()));
}else {
String dbUserName = StringUtils.isNotBlank(dto.getDbUserName())?dto.getDbUserName():"";
String dbPassword = StringUtils.isNotBlank(dto.getDbPassword())?dto.getDbPassword():"";
String dbTable = StringUtils.isNotBlank(dto.getDbTable())?dto.getDbTable():"";
- map.putAll(DataAcquisition.dataAcquisitionEntrance(list, device, dto.getEntrustCode(), dto.getEntrustCode(), ip, insProducts.get(0).getCableTag(),dbUserName,dbPassword,dbTable));
+ map.putAll(DataAcquisition.dataAcquisitionEntrance(list, device, dto.getEntrustCode(), dto.getLotBatchNo(),dto.getLotBatchNo(), ip, insProducts.get(0).getCableTag(),dbUserName,dbPassword,dbTable));
+ if(StringUtils.equals(".mysql",device.getFileType())){
+
+ }else{
+ }
}
}
@@ -295,7 +299,7 @@
* @param device 璁惧淇℃伅
* @return 鍖呭惈瀹為檯鐢甸樆鍊煎鐞嗙粨鏋滅殑閿�煎锛涜嫢鏈幏鍙栧埌鏈夋晥鏁版嵁鍒欒繑鍥炵┖ Map
*/
- public Map<String, Object> getActualResistanceValueAsMap(Map<String, List<DataConfig>> dataConfig, Device device,String entrustCode) {
+ public Map<String, Object> getActualResistanceValueAsMap(Map<String, List<DataConfig>> dataConfig, Device device,String entrustCode,String lotBatchNo) {
Map<String, Object> map = new HashMap<>();
if (ObjectUtils.isEmpty(dataConfig)) {
return map;
@@ -308,16 +312,22 @@
if (refery.equals(DCResistanceMqttConstants.NSDQCS_DQCS_DZZ)){
// 鏌ヨ瀵瑰簲濮旀墭缂栧彿鐨勬暟鎹�
// Object value = RedisUtil.get(refery);
- CollectBridge collectBridge = collectBridgeMapper.selectOne(Wrappers.<CollectBridge>lambdaQuery().eq(CollectBridge::getEntrustCode,entrustCode).last("limit 1"));
+ String[] splits = entrustCode.split("-");
+ String newEntrustCode = splits.length>1 ?splits[1]:"";
+ CollectBridge collectBridge = collectBridgeMapper.selectOne(Wrappers.<CollectBridge>lambdaQuery()
+ .eq(CollectBridge::getEntrustCode,newEntrustCode)
+ .or()
+ .eq(CollectBridge::getEntrustCode,lotBatchNo)
+ .last("limit 1"));
if(Objects.isNull(collectBridge)){
throw new ErrorException("鐩存祦鐢甸樆鏁伴噰寮傚父锛氭病鏈夋壘鍒板鎵樼紪鍙蜂负銆�"+entrustCode+"銆戠殑鏁版嵁");
}
list.add(0,1);//娴嬭瘯闀垮害锛岄粯璁�1
- list.add(1,Objects.isNull(collectBridge.getCollectTemperature())?0.0:collectBridge.getCollectTemperature());//todo:娓╁害锛屾殏鏃舵湭閲囬泦鍒板��
+ list.add(1,Objects.isNull(collectBridge.getCollectTemperature())?0.0:collectBridge.getCollectTemperature());
list.add(2,collectBridge.getCollectValue());//瀹為檯鐢甸樆鍊�
}else {
// 浠� Redis 涓幏鍙栧垪琛ㄦ暟鎹�
- List<?> objectList = RedisUtil.lGet(refery, 0, -1);
+ Set<Object> objectList = RedisUtil.getZSetRange(refery, 0, -1);
list.addAll(objectList);
}
numberOfDataEntries.getAndIncrement();
--
Gitblit v1.9.3