bug修复

liuhaonan

2022-06-21 dc3bcb72bc0e69202911908782ba24eeec8ab305

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

@@ -140,7 +140,7 @@
        StringBuilder sb = new StringBuilder();
        String date = new SimpleDateFormat("yyMMdd").format(new Date());
        sb.append(date);
        String key = LightKey.POLE_SN.key(null);
        String key = LightKey.POLE_SN.key(date);
        Long increment = redisService.incr(key, 1);
        String incrementStr = increment.toString();
        if (incrementStr.length() <= 4) {
@@ -174,7 +174,7 @@
        result.put("poleTotalCount", list.size());

        //诺瓦
        List<LedPlayerEntity> ledPlayerEntities = SpringContextHolder.getBean(LedPlayerEntityService.class).ledPlayerEntityList(null, null);
        List<LedPlayerEntity> ledPlayerEntities = SpringContextHolder.getBean(LedPlayerEntityService.class).ledPlayerEntityList(null, null, null, null);
        int number = 0;
        for (LedPlayerEntity bean : ledPlayerEntities) {
            if (bean.getOnlineStatus() == 1) {
@@ -191,7 +191,7 @@
        broadcastTerminalV2Param.setWorkState(2);
        List<BroadcastTerminalV2EntityBo> broadcastTerminalList = SpringContextHolder.getBean(IpVolumeService.class).getBroadcastTerminalList(null, null, null, broadcastTerminalV2Param);
        for (BroadcastTerminalV2EntityBo bean : broadcastTerminalList) {
            if (bean.getStatus() == 1 || bean.getStatus() == 0) {
            if (bean.getStatus() != 0) {
                number++;
            }
        }
@@ -203,9 +203,9 @@
        MonitorParam monitorParam = new MonitorParam();
        monitorParam.setEquipmentState(2);
        monitorParam.setBindingState(2);
        List<MonitorBo> monitorBos = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null,null,null, monitorParam).getList();
        List<MonitorBo> monitorBos = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null, null, null, monitorParam).getList();
        monitorParam.setEquipmentState(1);
        List<MonitorBo> online = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null,null,null, monitorParam).getList();
        List<MonitorBo> online = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null, null, null, monitorParam).getList();
        result.put("monitorOnlineCount", online.size());
        result.put("monitorTotalCount", monitorBos.size());

@@ -277,8 +277,8 @@
        result.put("LightPoleHeelingTotalCount", lightPoleHeelings.size());

        //熙讯
        List<PoleLightemitEntity> poleLightemitEntities = SpringContextHolder.getBean(PoleLightemitService.class).listLed(null, false);
        List<PoleLightemitEntity> poleLightemitEntityOnlineList = SpringContextHolder.getBean(PoleLightemitService.class).listLed(null, true);
        List<PoleLightemitEntity> poleLightemitEntities = SpringContextHolder.getBean(PoleLightemitService.class).listLed(null, null, null, false);
        List<PoleLightemitEntity> poleLightemitEntityOnlineList = SpringContextHolder.getBean(PoleLightemitService.class).listLed(null, null, null, true);

        result.put("XiXunOnlineCount", poleLightemitEntityOnlineList.size());
        result.put("XiXunTotalCount", poleLightemitEntities.size());
@@ -605,9 +605,8 @@
    /**
     * 给灯杆注册三元码
     */
    public boolean setMac(String baseMac) {
        boolean setMac = false;
        //String baseMac = "baseDevice";
    public Map setMac(String baseMac) {

        A1Frame a1Frame = new A1Frame(A1OrderEnum.REQUEST_READ_DEVICE_UNIQUE_MAC.getCode(), new EmptyRequestInnerFrame());
        CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(baseMac, a1Frame);
        //存储振记录
@@ -713,8 +712,14 @@
        /**
         * 实体灯杆注册日志记录结束
         */
        Map map = new HashMap();
        if (result) {
            map.put("mac", uniqueMac);
        } else {
            map.put("mac", -1);
        }

        return result;
        return map;
    }

    public List<String> listDeviceCodeByIds(List<Long> poleIdList) {