fix

zhanzhiqin

2022-04-14 2eb56d50dee12232f65ed6bd569f5b76c7d96119

fix

 ximon-admin/src/main/java/com/sandu/ximon/admin/dto/WaterQualityDataDto.java

@@ -15,6 +15,7 @@
    private String code;
    private String msg;
    private String did;
    private Integer state;
    private List<WaterQualityBean> data;



 ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java

@@ -211,8 +211,8 @@
     *
     * @return
     */
    public C3mCharging getByC3Mac(String c3Mac) {
        C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac));
    public C3mCharging getByC3Mac(String udid) {
        C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, udid));
        String s = RedisUtils.getBean().get(C3mRedisConstant.C3_STATUS.getCode() + one.getC3Mac());
        if (s != null) {
            one.setStatusBit(1);

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java

@@ -646,7 +646,7 @@
            } else if (poleBinding.getDeviceType() == 3) {//大气
                bindVO.setAirMonitoring(SpringContextHolder.getBean(AirEquipmentService.class).getAirEquipment(poleBinding.getDeviceCode()));
            } else if (poleBinding.getDeviceType() == 4) {//水质
                 bindVO.setWaterMonitoring(SpringContextHolder.getBean(WaterQualityDataService.class).getWaterQualityDataInfo(poleBinding.getDeviceCode()));
                bindVO.setWaterMonitoring(SpringContextHolder.getBean(WaterQualityDataService.class).getWaterQualityDataInfo(poleBinding.getDeviceCode()));
            } else if (poleBinding.getDeviceType() == 5) {//音柱
                bindVO.setIpVolume(SpringContextHolder.getBean(IpVolumeService.class).getIpTerminalDetail(Integer.valueOf(poleBinding.getDeviceCode())));
            } else if (poleBinding.getDeviceType() == 6) {//LCD

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityDataService.java

@@ -70,6 +70,12 @@
                }
            }
            waterQualityData.setWaterQualityEquipmentCode(waterQualityDataDto.getDid());
            //设置水质设备状态
            if (waterQualityDataDto != null) {
                waterQualityDataDto.setState(1);
            } else {
                waterQualityDataDto.setState(0);
            }
            save(waterQualityData);
        } catch (Exception e) {
            e.printStackTrace();