Merge remote-tracking branch 'origin/master'

liuhaonan

2022-05-11 e14c003f6ff4e78740359828c39674507f134c45

Merge remote-tracking branch 'origin/master'

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

@@ -288,6 +288,7 @@
            }
            equipmentInfo.setEquipmentCreateTime(one.getUpdateTime());
            equipmentInfo.setEquipmentMac(one.getMcuUdid());
            equipmentInfo.setEquipmentName(one.getC3Name());
        }
        return equipmentInfo;
    }

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

@@ -66,7 +66,6 @@
                b.setStreetlightId(0L);
                b.setExist(1);
                save(b);
//                broadcastTerminalV2EntityMapper.insert(b);
            }
        });
    }
@@ -201,7 +200,11 @@
        if (id == null || id.trim().length() == 0) {
            return equipmentInfo;
        }
        equipmentInfo.setEquipmentMac(id);
        BroadcastTerminalV2Entity one = getOne(Wrappers.lambdaQuery(BroadcastTerminalV2Entity.class).eq(BroadcastTerminalV2Entity::getId, id));
        if (one != null) {
            equipmentInfo.setEquipmentMac(id);
            equipmentInfo.setEquipmentName(one.getTerminalName());
        }
        TerminalVO terminalInfo = TerminalAPIUtils.getTerminalInfo(Integer.valueOf(id));
        if (terminalInfo != null) {
            //空闲 1、   工作中 2 或者 4、     断线 0，    报 错 8

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

@@ -78,6 +78,7 @@
        LedPlayerEntity one = getOne(Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::getSn, sn));
        if (one != null) {
            equipmentInfo.setEquipmentMac(one.getSn());
            equipmentInfo.setEquipmentName(one.getName());
        }

        return equipmentInfo;

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

@@ -225,6 +225,7 @@
        if (one != null) {
            equipmentInfo.setEquipmentCreateTime(one.getAddTime());
            equipmentInfo.setEquipmentMac(one.getDeviceSerial());
            equipmentInfo.setEquipmentName(one.getDeviceName());
        }

        String token = getAccessToken();

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

@@ -153,6 +153,7 @@
        if (xiXun != null) {
            equipmentInfo.setEquipmentCreateTime(xiXun.getCreateTime());
            equipmentInfo.setEquipmentMac(xiXun.getLightemitControlCode());
            equipmentInfo.setEquipmentName(xiXun.getLightemitName());
        }
        boolean isScreenOpen = lightemitUtils.getLedOnLine(xiXun.getLightemitControlCode());
        if (isScreenOpen) {

 ximon-admin/src/main/java/com/sandu/ximon/admin/vo/EquipmentInfomation.java

@@ -13,5 +13,6 @@
    private String EquipmentType;
    private String EquipmentMac;
    private String EquipmentState;
    private String EquipmentName;
    private LocalDateTime EquipmentCreateTime;
}