细节调整

liuhaonan

2021-12-13 e99a7c85fa0864e7b326b8d3ae7234d228f5cdb1

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

@@ -7,7 +7,9 @@
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.manager.iot.frame.A1Frame;
import com.sandu.ximon.admin.manager.iot.frame.FrameBuilder;
import com.sandu.ximon.admin.manager.iot.frame.IRequestFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.request.A1TernaryCodeReqInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.request.A5LightResetReqInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.request.EmptyRequestInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.response.A1DeviceMacRespInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.response.A1TernaryCodeRespInnerFrame;
@@ -15,12 +17,15 @@
import com.sandu.ximon.admin.manager.iot.rrpc.dto.WrapResponseCommonFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A1OrderEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A2OrderEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.param.LampPostParam;
import com.sandu.ximon.admin.security.CountSet;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.LampCount;
import com.sandu.ximon.dao.domain.LampPost;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.enums.LampPostTypeEnums;
import com.sandu.ximon.dao.mapper.ClientMapper;
import com.sandu.ximon.dao.mapper.LampPostMapper;
import lombok.AllArgsConstructor;
@@ -43,7 +48,10 @@
        LampPost lampPost = new LampPost();
        // lampPost.setId(snowflake.nextId());
        Long userId = SecurityUtils.getUserId();
        if(AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getClientId())){
        lampPost.setUserId(userId);
        }
        boolean save=true;
        lampPost.setLampId(countSet.aVoid());
        lampPost.setName(lampPostParam.getName());
        lampPost.setAddress(lampPostParam.getAddress());
@@ -58,6 +66,8 @@
        } else {
            lampPost.setMacCode(lampPostParam.getMacCode());
        }*/

        if(LampPostTypeEnums.ENTITY_LIGHT_POLE.getCode().equals(lampPostParam.getDeviceType())){
        String baseMac = "baseDevice";
        A1Frame a1Frame = new A1Frame(A1OrderEnum.REQUEST_READ_DEVICE_UNIQUE_MAC.getCode(), new EmptyRequestInnerFrame());
        CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance()
@@ -114,19 +124,23 @@
            throw new BusinessException("设备密钥失败");
        }

        boolean save=true;

        // 7  重启设备  并使用新的Mac
        CommonFrame rebootFrame = MainBoardInvokeSyncService.getInstance()
                .sendRRPC(baseMac,
                        FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
                                .orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());
        if (rebootFrame.getPayload().equals("00")) {
            if ("00".equals(rebootFrame.getPayload())) {
            lampPost.setMacCode(uniqueMac);
            save= save(lampPost);

            System.out.println("重启成功");
        }
        }/*else if(LampPostTypeEnums.VIRTUAL_LIGHT_POLE.getCode().equals(lampPostParam.getDeviceType())){lampPost.setMacCode(uniqueMac);

        }*/

        save= save(lampPost);


        //boolean save = save(lampPost);
@@ -161,6 +175,20 @@
            lampPost.setMacCode(lampPostParam.getMacCode());
        }*/
        return updateById(lampPost);
    }


    /**
     * 删除灯杆
     * @param id
     * @return
     */
    public boolean deleteLampPost(Long id){
        LampPost byId = getById(id);
        if (byId == null) {
            throw new BusinessException("未找到该灯杆");
        }
        return removeById(id);
    }


@@ -208,5 +236,47 @@
        return list;
    }

    public boolean  LightReset(Long id){
        LampPost byId = getById(id);
        String deviceName = byId.getMacCode();
        if (byId == null) {
            throw new BusinessException("未找到该灯杆");
        }
        if(byId.getMacCode().isEmpty()){
            throw new BusinessException("该灯杆Mca为空");
        }
        IRequestFrame build = FrameBuilder.builderA5()
                .orderType(A5OrderEnum.REQUEST_LIGHT_DATA.getCode())
                .innerFrame(new A5LightResetReqInnerFrame())
                .build();
        CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance()
                .sendRRPC(deviceName, build);
        System.out.println(commonFrame.toString());
        CommonFrame rebootFrame = MainBoardInvokeSyncService.getInstance()
                .sendRRPC(deviceName,
                        FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
                                .orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());
        if ("00".equals(rebootFrame.getPayload())) {
            System.out.println("重启成功");
        }

        CommonFrame result = MainBoardInvokeSyncService.getInstance()
                .sendRRPC(deviceName,
                        FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
                                .orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());

        boolean b=false;
        if ("00".equals(result.getPayload())) {
            byId.setMacCode(null);
             b = updateById(byId);
            System.out.println("重启成功");
        }
        return b;
    }






}