数采bug调整

Crunchy

2024-07-25 2de0bc2174bbec2a48db059d3850f0529c0539fc

数采bug调整

 cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java

@@ -8,7 +8,6 @@
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.DataConfigDto;
import com.yuanchu.mom.dto.DeviceDto;
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.pojo.DataConfig;
import com.yuanchu.mom.pojo.Device;
import com.yuanchu.mom.service.DataConfigService;
@@ -198,11 +197,6 @@
    @PostMapping("/saveDataAcquisitionConfiguration")
    public Result<?> saveDataAcquisitionConfiguration(@RequestParam(value = "deviceId") Integer deviceId, @RequestBody DataConfigDto dataConfigList) {
        if (dataConfigList.getIsDevice()) {
            Device one = deviceService.getOne(Wrappers.<Device>lambdaQuery()
                    .eq(Device::getIp, dataConfigList.getIp()));
            if (ObjectUtils.isNotEmpty(one)) {
                throw new ErrorException("该IP：" + dataConfigList.getIp() + "已经绑定了设备：" + one.getDeviceName());
            }
            Device device = new Device();
            device.setId(deviceId);
            device.setCollectUrl(dataConfigList.getCollectUrl());

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

@@ -140,7 +140,11 @@
        List<Device> device = baseMapper.selectList(Wrappers.<Device>lambdaQuery()
                .eq(Device::getIp, ip));
        if(device.size() > 1) {
            throw new ErrorException("IP：" + ip + "配置了设备多个设备，无法进行数采！");
            String str = "";
            for (Device device1 : device) {
                str += device1.getDeviceName() + "，";
            }
            throw new ErrorException("IP：" + ip + "配置了设备多个设备：" + str + "，无法进行数采！");
        }
        if (ObjectUtils.isEmpty(device)) {
            throw new ErrorException("未给该IP：" + ip + "配置设备，无法进行数采！");