影像仪数采调整

zouyu

2025-11-20 319e76c080c6c2b34dd01ba0d6cc49023d7bfda8

 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();