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 | 18 ++++++++++++++----
cnas-device/src/main/java/com/ruoyi/device/service/impl/CollectBridgeServiceImpl.java | 4 ++--
cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java | 4 +++-
cnas-device/src/main/java/com/ruoyi/device/dto/DeviceCollectionDto.java | 6 ++++++
4 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/dto/DeviceCollectionDto.java b/cnas-device/src/main/java/com/ruoyi/device/dto/DeviceCollectionDto.java
index aad7fe3..8109ec0 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/dto/DeviceCollectionDto.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/dto/DeviceCollectionDto.java
@@ -25,12 +25,18 @@
@ApiModelProperty(value = "閲囬泦鐨勬楠岄」id")
private List<Integer> itemIds;
+
//鏁版嵁搴撶敤鎴峰悕
@ApiModelProperty(value = "鏁版嵁搴撶敤鎴峰悕")
private String dbUserName;
+
//鏁版嵁搴撳瘑鐮�
@ApiModelProperty(value = "鏁版嵁搴撳瘑鐮�")
private String dbPassword;
+
@ApiModelProperty(value = "鏁版嵁搴撹〃")
private String dbTable;
+
+ @ApiModelProperty(value = "鎵规鍙�")
+ private String lotBatchNo;
}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/CollectBridgeServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/CollectBridgeServiceImpl.java
index 14b64fe..5968267 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/CollectBridgeServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/CollectBridgeServiceImpl.java
@@ -174,8 +174,8 @@
*/
private void processMultipleValueDataStream(List<DeviceMqttVO> dataList, String dataStream,int maxSize,Double minVal){
// 绛涢�夊嚭褰撳墠鏁版嵁娴佸搴旂殑鏁版嵁
-// Double value = Double.parseDouble(getValueByDataStream(dataList, dataStream));
- Double value = BigDecimal.valueOf(Math.random()*100).setScale(7, RoundingMode.HALF_EVEN).doubleValue();
+ Double value = Double.parseDouble(getValueByDataStream(dataList, dataStream));
+// Double value = BigDecimal.valueOf(Math.random()*100).setScale(7, RoundingMode.HALF_EVEN).doubleValue();
//濡傛灉鏈�灏忓�间笉涓虹┖涓斾笉涓�-1锛岃幏鍙栧埌鐨勫�煎皬浜庢渶灏忓�煎垯璺宠繃涓嶅仛澶勭悊
if(Objects.nonNull(minVal)&&minVal!=-1&&value<minVal){
return;
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 94fa69d..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,7 +312,13 @@
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+"銆戠殑鏁版嵁");
}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java b/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java
index ebe5dd4..622525b 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java
@@ -51,7 +51,7 @@
* @param device
* @return
*/
- public static Map<String, Object> dataAcquisitionEntrance(List<DataConfig> dataConfig, Device device, String entrustCode, String sampleCode, String ip, String cableTag, String dbUserName, String dbPassword,String dbTable) {
+ public static Map<String, Object> dataAcquisitionEntrance(List<DataConfig> dataConfig, Device device, String entrustCode,String lotBatchNo, String sampleCode, String ip, String cableTag, String dbUserName, String dbPassword,String dbTable) {
// 鍒ゆ柇鏄惁鏄奖鍍忔祴閲忎华
if (device.getManagementNumber().equals("JCZX-ZB-OP07001")) {
if (device.getFileType().equals(".xlsx")) {
@@ -90,6 +90,8 @@
"&dbFileName=" + dbFileName +
"&dbUserName=" + dbUserName +
"&dbPassword=" + dbPassword +
+ "&lotBatchNo=" + lotBatchNo +
+ "&cableTag=" + cableTag +
"&dbTable=" + dbTable;
System.out.println("璇锋眰鐨� URL: " + http);
String result = null;
--
Gitblit v1.9.3