数采调整

zouyu

2025-10-17 c65ab218b14e87489f1594b2d932f7bd54b3ba11

 cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java

@@ -17,6 +17,8 @@
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.RedisUtil;
import com.ruoyi.device.constant.DCResistanceMqttConstants;
import com.ruoyi.device.dto.*;
import com.ruoyi.device.mapper.CollectBridgeMapper;
import com.ruoyi.device.mapper.DeviceMaintenanceMapper;
@@ -35,6 +37,7 @@
import lombok.AllArgsConstructor;
import org.apache.logging.log4j.util.Strings;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -48,6 +51,7 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;

/**
@@ -194,6 +198,8 @@
    @Override
    public Result<?> dataAcquisition(HttpServletRequest request, DeviceCollectionDto dto) {



        // 查询检验项
        List<Integer> itemIds = dto.getItemIds();
        if (CollectionUtils.isEmpty(itemIds)) {
@@ -234,7 +240,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());
            String ip = device.getIp();

            // 根据检验项获取config
            List<DataConfig> list = dataConfigService.list(Wrappers.<DataConfig>lambdaQuery()
                    .in(DataConfig::getStructureItemParameterId, itemParameterIds)
@@ -244,16 +256,26 @@
            // 判断设备是否是数字直桥JCZX-ZB-ER02022
            if (device.getManagementNumber().equals("JCZX-ZB-ER02022")) {
                map.putAll(dataCollectBridge(list, device, dto.getEntrustCode()));
//                list：包含设备配置信息的 DataConfig 列表。
//                device：当前的设备对象。
//                dto.getEntrustCode()：从 DeviceCollectionDto 对象中获取的委托编码
            } else {
                map.putAll(DataAcquisition.dataAcquisitionEntrance(list, device, dto.getEntrustCode(), dto.getEntrustCode(), ip, insProducts.get(0).getCableTag()));
//                list：包含设备配置信息的 DataConfig 列表。
//                device：当前的设备对象。
//                dto.getEntrustCode()：委托编码，此处传入两次。
//                ip：当前设备的 IP 地址。
//                insProducts.get(0).getCableTag()：从 insProducts 列表的第一个元素中获取的电缆标签
            }else if(device.getFileType().equals(".mqtt")){
                //如果文件类型是mqtt,则不走采集器采集
                Map<String, List<DataConfig>> userMap = list.stream()
                        .peek(i -> {
                            String itemName = i.getInspectionItem();
                            if (StringUtils.isNotBlank(i.getInspectionItemClass())) {
                                itemName += "@" + i.getInspectionItemClass();
                            }
                            String name = i.getInspectionItem().equals(i.getInspectionItemSubclass()) ? itemName + "," : itemName + "," + i.getInspectionItemSubclass();

                            // 添加检验项名称
                            i.setInsProductItem(name);
                        })
                        .collect(Collectors.groupingBy(DataConfig::getInsProductItem));
                map.putAll(getActualResistanceValueAsMap(userMap, device,dto.getEntrustCode()));
            }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));
            }
        }

@@ -265,6 +287,46 @@
        } else {
            return Result.success(null);
        }
    }

    /**
     * 从 Redis 中获取实际电阻值，并以键值对形式返回
     * @param dataConfig 数据配置信息
     * @param device 设备信息
     * @return 包含实际电阻值处理结果的键值对；若未获取到有效数据则返回空 Map
     */
    public Map<String, Object> getActualResistanceValueAsMap(Map<String, List<DataConfig>> dataConfig, Device device,String entrustCode) {
        Map<String, Object> map = new HashMap<>();
        if (ObjectUtils.isEmpty(dataConfig)) {
            return map;
        }
        dataConfig.forEach((k, v) -> {
            AtomicInteger numberOfDataEntries = new AtomicInteger();
            List<Object> list = new ArrayList<>();
            for (int config = 0; config < v.size(); config++) {
                String refery = DataAcquisition.getRefer(v.get(config).getRefery());
                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"));
                    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(2,collectBridge.getCollectValue());//实际电阻值
                }else {
                    // 从 Redis 中获取列表数据
                    List<?> objectList = RedisUtil.lGet(refery, 0, -1);
                    list.addAll(objectList);
                }
                numberOfDataEntries.getAndIncrement();
            }
            // 进行公式计算
            Object resultValue = DataAcquisition.calculationFormula(list, v.get(0), k, device);
            map.put(k, resultValue);
        });
        return map;
    }

    /**
@@ -288,21 +350,21 @@

        Map<String, Object> map = new HashMap<>();

        userMap.forEach((k, v) -> {
            List<String> resultValue = new ArrayList<>();
            // 查询直桥电流电阻数采值
            List<CollectBridge> collectBridges = collectBridgeMapper.selectList(Wrappers.<CollectBridge>lambdaQuery()
                    .like(CollectBridge::getEntrustCode, entrustCode)
                    .orderByAsc(CollectBridge::getCollectDate));

            resultValue = collectBridges.stream().map(CollectBridge::getCollectValue).collect(Collectors.toList());

            Map<String, Object> hashMap = new HashMap<>();
            hashMap.put("equipName", device.getDeviceName());
            hashMap.put("equipValue", device.getManagementNumber());
            hashMap.put("result", resultValue);
            map.put(k, hashMap);
        });
//        userMap.forEach((k, v) -> {
//            List<String> resultValue = new ArrayList<>();
//            // 查询直桥电流电阻数采值
//            List<CollectBridge> collectBridges = collectBridgeMapper.selectList(Wrappers.<CollectBridge>lambdaQuery()
//                    .like(CollectBridge::getEntrustCode, entrustCode)
//                    .orderByAsc(CollectBridge::getCollectDate));
//
//            resultValue = collectBridges.stream().map(CollectBridge::getCollectValue).collect(Collectors.toList());
//
//            Map<String, Object> hashMap = new HashMap<>();
//            hashMap.put("equipName", device.getDeviceName());
//            hashMap.put("equipValue", device.getManagementNumber());
//            hashMap.put("result", resultValue);
//            map.put(k, hashMap);
//        });
        return map;
    }