设备修改bug修复

jinpengyong

2021-10-09 73f40e24c8900d8d7616b44515c965ce0ef20763

 screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java

@@ -12,6 +12,7 @@
import com.moral.api.service.DeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

import com.moral.api.service.OrganizationService;
import com.moral.api.service.SysDictDataService;
import com.moral.api.util.CacheUtils;
import com.moral.api.util.AdjustDataUtils;
@@ -39,6 +40,7 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;

import javax.servlet.http.HttpServletRequest;

@@ -75,8 +77,6 @@
    @Autowired
    private SysDictDataService sysDictDataService;

    @Autowired
    private LogUtils logUtils;

    @Autowired
    private RedisTemplate redisTemplate;
@@ -92,6 +92,9 @@

    @Autowired
    private AdjustDataUtils adjustDataUtils;

    @Autowired
    private OrganizationService organizationService;

    /*
     * 从redis获取设备信息
@@ -135,7 +138,7 @@
        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
        StringBuilder content = new StringBuilder();
        content.append("添加了设备：").append(device.getName()).append(":").append("mac：").append(mac);
        logUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE);
        LogUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE);
    }

    @Override
@@ -158,7 +161,7 @@
        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
        StringBuilder content = new StringBuilder();
        content.append("删除了设备：").append(device.getName()).append(";").append("mac：").append(mac);
        logUtils.saveOperationForManage(request, content.toString(), Constants.DELETE_OPERATE_TYPE);
        LogUtils.saveOperationForManage(request, content.toString(), Constants.DELETE_OPERATE_TYPE);
    }

    @Override
@@ -218,7 +221,7 @@
            }

        }
        logUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
        LogUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
    }

    @Override
@@ -242,8 +245,14 @@

    @Override
    public List<Map<String, Object>> selectMonitorsByOrgId(Integer orgId) {
        //获取所有子组织
        List<Organization> organizations = organizationService.getAllChildrenOrganization(orgId);
        List<Integer> orgIds = organizations.stream().map(Organization::getId).collect(Collectors.toList());
        orgIds.add(orgId);
        QueryWrapper<MonitorPoint> queryWrapper = new QueryWrapper<>();
        queryWrapper.select("id", "name").eq("organization_id", orgId).eq("is_delete", Constants.NOT_DELETE);
        queryWrapper.select("id", "name")
                .eq("is_delete", Constants.NOT_DELETE)
                .in("organization_id", orgIds);
        return monitorPointMapper.selectMaps(queryWrapper);
    }

@@ -269,9 +278,13 @@
        Object orgId = parameters.get("organizationId");
        Object mpId = parameters.get("monitorPointId");

        //查询某组织下所有设备
        //查询某组织下所有设备,包括子组织
        if (orgId != null) {
            queryWrapper.eq("organization_id", orgId);
            //查询所有子组织
            List<Organization> organizations = organizationService.getAllChildrenOrganization(Integer.parseInt(orgId.toString()));
            List<Integer> orgIds = organizations.stream().map(Organization::getId).collect(Collectors.toList());
            orgIds.add(Integer.parseInt(orgId.toString()));
            queryWrapper.in("organization_id", orgIds);
        }

        //查询某站点下所有设备
@@ -391,6 +404,16 @@
        mpInfo.put("provinceCode", monitorPoint.getProvinceCode());
        deviceInfo.put("monitorPoint", mpInfo);

        //国控站点
        Map<String, Object> govMpInfo = new LinkedHashMap<>();

        govMpInfo.put("guid", null);
        govMpInfo.put("name", null);
        if (device.getGovMonitorPoint() != null) {
            govMpInfo.put("guid", device.getGovMonitorPoint().getGuid());
            govMpInfo.put("name", device.getGovMonitorPoint().getName());
        }
        deviceInfo.put("govMonitorPoint", govMpInfo);
        setDeviceInfoToRedis(mac, deviceInfo);
        return deviceInfo;
    }
@@ -431,13 +454,11 @@
        Map<String, Object> adjustFormula = redisTemplate.opsForHash().entries(RedisConstants.ADJUST + "_" + mac);
        if (!ObjectUtils.isEmpty(adjustFormula)) {
            Map<String, Object> deviceInfo = getDeviceByMac(mac);
            Map<String, Object> monitorPoint = (Map<String, Object>) deviceInfo.get("monitorPoint");
            String areaCode = monitorPoint.get("areaCode").toString();
            String cityCode = monitorPoint.get("cityCode").toString();

            Map<String, Object> aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, areaCode);
            if (ObjectUtils.isEmpty(aqiMap)) {
                aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, cityCode);
            //获取设备绑定的国控站信息
            Map<String, Object> govMpInfo = (Map<String, Object>) deviceInfo.get("govMonitorPoint");
            Map<String, Object> aqiMap = null;
            if (govMpInfo.get("guid") != null) {
                aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, govMpInfo.get("guid").toString());
            }
            return adjustDataUtils.adjust(deviceData, adjustFormula, ObjectUtils.isEmpty(aqiMap) ? null : aqiMap);
        }
@@ -518,12 +539,12 @@
    }

    /**
    * @Description: 判断组织是否含有该设备的型号，如果没有则添加到组织型号关系表中
            * @Param: [orgId, versionId]
            * @return: void
            * @Author: 陈凯裕
            * @Date: 2021/9/6
            */
     * @Description: 判断组织是否含有该设备的型号，如果没有则添加到组织型号关系表中
     * @Param: [orgId, versionId]
     * @return: void
     * @Author: 陈凯裕
     * @Date: 2021/9/6
     */
    private void insertOrganizationUnitAlarm(Integer orgId, Integer versionId) {
        //查询是否含有该型号
        QueryWrapper<OrganizationUnitAlarm> queryOrganizationVersionWrapper = new QueryWrapper<>();
@@ -546,7 +567,7 @@
                    String sensorCode = versionSensorUnit.getSensorCode();
                    //设置默认报警值
                    SysDictData alarm = sensorAlarms.get(sensorCode);
                    if(alarm!=null)
                    if (alarm != null)
                        organizationUnitAlarm.setAlarmLevel(alarm.getDataValue());
                    organizationUnitAlarm.setOrganizationId(orgId);
                    organizationUnitAlarm.setVersionId(versionId);
@@ -560,12 +581,12 @@
    }

    /**
    * @Description: 删除设备后，如果该组织没有这个设备型号其他的设备了，则删除组织型号关系表中该型号的信息。
            * @Param: [orgId, versionId]
            * @return: void
            * @Author: 陈凯裕
            * @Date: 2021/9/6
            */
     * @Description: 删除设备后，如果该组织没有这个设备型号其他的设备了，则删除组织型号关系表中该型号的信息。
     * @Param: [orgId, versionId]
     * @return: void
     * @Author: 陈凯裕
     * @Date: 2021/9/6
     */
    private void deleteOrganizationUnitAlarm(Integer orgId, Integer versionId) {
        QueryWrapper<Device> queryOrganizationVersionWrapper = new QueryWrapper<>();
        queryOrganizationVersionWrapper.eq("organization_id", orgId);