数采调整

Crunchy

2024-07-23 e07e0f836e64c5795a4819894a8c515f689ad535

 cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java

@@ -116,11 +116,6 @@
            String[] ids = device.getInsProductIds().split(",");
            for (String i : ids) {
                if (i.equals(id + "")) {
                    if (ObjectUtils.isEmpty(device.getFileType()) || ObjectUtils.isEmpty(device.getCollectUrl())) {
                        device.setIsItADataAcquisitionDevice(false);
                    } else {
                        device.setIsItADataAcquisitionDevice(true);
                    }
                    devices2.add(device);
                    break;
                }
@@ -138,7 +133,7 @@
    public Result<?> dataAcquisition(HttpServletRequest request, Integer id, String entrustCode, String sampleCode) {
        String ipAddress = request.getRemoteAddr();
        // 防止回环地址变为IPv6
        String ip = ipAddress.equals("0:0:0:0:0:0:0:1") ? "127.0.0.1" : ipAddress;
        String ip =  ipAddress.equals("0:0:0:0:0:0:0:1") ? "127.0.0.1" : ipAddress;
        List<Device> device = baseMapper.selectList(Wrappers.<Device>lambdaQuery()
                .eq(Device::getIp, ip));
        if (ObjectUtils.isEmpty(device)) {
@@ -156,6 +151,8 @@
                    .orderBy(false, false, DataConfig::getId));
            hashMap.putAll(DataAcquisition.dataAcquisitionEntrance(request, list, i, entrustCode, sampleCode, ip));
        });
        String frequency = DataAcquisition.createFrequency(entrustCode, sampleCode);
        hashMap.put("frequency", frequency);
        return Result.success(hashMap);
    }
}