fix

zhanzhiqin

2022-07-22 470403ef72013ee9be80af41658b520faff103af

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

@@ -44,6 +44,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.text.SimpleDateFormat;
import java.util.*;
@@ -140,7 +141,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 +175,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 +192,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 +204,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());

@@ -222,7 +223,7 @@

        //充电桩
        number = 0;
        List<C3ChargingBo> c3mChargings = SpringContextHolder.getBean(C3ChargingService.class).getC3ChargingListByKeyword(null, null);
        List<C3ChargingBo> c3mChargings = SpringContextHolder.getBean(C3ChargingService.class).getC3ChargingList();
        for (C3ChargingBo c3ChargingBo : c3mChargings) {
            if (c3ChargingBo.getStatusBit() != 0) {
                number++;
@@ -277,8 +278,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());
@@ -568,10 +569,10 @@
     */
    public boolean poleReset(Long id) {
        Pole byId = getById(id);
        String deviceName = byId.getDeviceCode();
        if (byId == null) {
            throw new BusinessException("未找到该灯杆");
        }
        String deviceName = byId.getDeviceCode();
        if (deviceName.isEmpty()) {
            throw new BusinessException("该灯杆Mca为空");
        }
@@ -605,9 +606,9 @@
    /**
     * 给灯杆注册三元码
     */
    public boolean setMac(String baseMac) {
        boolean setMac = false;
        //String baseMac = "baseDevice";
    @Transactional(rollbackFor = Exception.class)
    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);
        //存储振记录
@@ -677,10 +678,6 @@
        StoreOperationRecordsUtils.storeInnerFrameData(baseMac, "重启设备", build4, rebootFrame);

        if ("00".equals(rebootFrame.getPayload())) {
            //  pole.setDeviceCode(uniqueMac);

            // setMac = updateById(pole);

            System.out.println("重启成功");
        }

@@ -689,11 +686,8 @@
        if (pole == null) {
            pole = new Pole();
        }
      /*  String type = uniqueMac.substring(uniqueMac.length() - 2, uniqueMac.length());
        String Code = uniqueMac.substring(0, uniqueMac.length() - 2);*/
        pole.setDeviceCode(uniqueMac);
        pole.setPoleName(uniqueMac);
        /*  int i = Integer.parseInt(strm);*/
        if ("00".equals(a1DeviceMacRespInnerFrame.getType())) {
            pole.setDeviceType(0);
        } else if ("01".equals(a1DeviceMacRespInnerFrame.getType())) {
@@ -701,9 +695,15 @@
        }

        pole.setPoleCode(generatePoleCode());
//        setMac = save(pole);

        boolean result = saveOrUpdate(pole);

        if (result) {
            Light light = new Light();
            light.setDeviceCode(uniqueMac);
            light.setLightCount(2);
            SpringContextHolder.getBean(LightService.class).save(light);
        }

        /**
         * 实体灯杆注册日志记录开始
@@ -713,8 +713,14 @@
        /**
         * 实体灯杆注册日志记录结束
         */
        Map map = new HashMap();
        if (true) {
            map.put("mac", uniqueMac);
        } else {
            map.put("mac", -1);
        }

        return result;
        return map;
    }

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