From 23eb9c9a21afc8ed065706f0e6494ee998a217b5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 04 三月 2026 16:35:27 +0800
Subject: [PATCH] fix:1.班次页面：月度统计时间调整为上月26到本月25；班次支持右键添加批注 2.外购下单：KJNS域订单免检自动更新批次属性；外购下单-全部页新增【更新IFS批次属性】按钮，支持更新已提交订单的批次属性 3.资源要求-设备：设备核查计划：核查负责人回显问题修复；设备使用授权：检验项目导出数据错误问题修复
---
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 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 69a54bf..9e786ce 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
@@ -276,10 +276,6 @@
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.getLotBatchNo(),dto.getLotBatchNo(), ip, insProducts.get(0).getCableTag(),dbUserName,dbPassword,dbTable));
- if(StringUtils.equals(".mysql",device.getFileType())){
-
- }else{
- }
}
}
@@ -311,23 +307,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);
+ Set<Object> objectList = RedisUtil.getZSetRange(refery+"."+device.getManagementNumber(), 0, -1,"DESC");
list.addAll(objectList);
}
numberOfDataEntries.getAndIncrement();
--
Gitblit v1.9.3