数采bug调整

Crunchy

2024-07-25 2de0bc2174bbec2a48db059d3850f0529c0539fc

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

@@ -22,6 +22,7 @@
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
@@ -66,8 +67,11 @@
        return deviceMapper.deleteById(id);
    }

    @Transactional(rollbackFor = Exception.class)
    @Override
    public int upDeviceParameter(Device itemParameter) {
        // 删除数采集配置数据
        dataConfigService.deleteDataConfig();
        return deviceMapper.updateById(itemParameter);
    }

@@ -131,13 +135,16 @@

    @Override
    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 = DataAcquisition.getIp(request);
        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 + "配置设备，无法进行数采！");