细节调整

liuhaonan

2021-12-13 e99a7c85fa0864e7b326b8d3ae7234d228f5cdb1

细节调整

 dao/src/main/java/com/sandu/ximon/dao/domain/LampPost.java

@@ -1,6 +1,8 @@
package com.sandu.ximon.dao.domain;

import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

@@ -41,6 +43,7 @@
    private String onLineState;

    /*机器码*/
    @TableField(updateStrategy = FieldStrategy.IGNORED )
    private String macCode;

    /*分组*/

 dao/src/main/java/com/sandu/ximon/dao/enums/LampPostTypeEnums.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
package com.sandu.ximon.dao.enums;

public enum LampPostTypeEnums {
    /**
     * Entity light pole
     * Virtual light pole
     */
    ENTITY_LIGHT_POLE(1),
    VIRTUAL_LIGHT_POLE(0)
    ;

    private final Integer code;

    LampPostTypeEnums(Integer code) {
        this.code = code;
    }


    public Integer getCode() {
        return code;
    }
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java

@@ -10,6 +10,9 @@
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

/**
 *客户模块
 */
@RestController
@AllArgsConstructor
@RequestMapping("v1/client")

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GroupController.java

@@ -7,6 +7,9 @@
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

/**
 * åˆ†ç»„列表功能
 */
@RestController
@AllArgsConstructor
@RequestMapping("/v1/group")

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java

@@ -10,6 +10,9 @@
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

/**
 * led节目
 */
@RestController
@AllArgsConstructor
@RequestMapping("/v1/LEDProgram")

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LampMissionController.java

@@ -7,6 +7,9 @@
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

/**
 * è·¯ç¯ä»»åŠ¡
 */
@RestController
@AllArgsConstructor
@RequestMapping("v1/lampMission")

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LampPostController.java

@@ -1,11 +1,16 @@
package com.sandu.ximon.admin.controller;

import cn.hutool.core.util.RadixUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.GroupParam;
import com.sandu.ximon.admin.param.LampPostParam;
import com.sandu.ximon.admin.param.ReceiveParam;
import com.sandu.ximon.admin.service.LampPostService;
import com.sandu.ximon.dao.domain.LampPost;
import lombok.AllArgsConstructor;
@@ -13,6 +18,9 @@

import java.util.List;

/**
 * ç¯æ†æ¨¡å—以及设置分组到对应灯杆
 */
@RestController
@AllArgsConstructor
@RequestMapping("/v1/LampPost")
@@ -30,6 +38,12 @@
        return ResponseUtil.success( lampPostService.updateLamp(id,lampPostParam));
    }

    @GetMapping("/delete/{id}")
    public ResponseVO<Object> deleteLampPost(@PathVariable Long id){
        return ResponseUtil.success(lampPostService.deleteLampPost(id));
    }



    @PostMapping("/setGroup")
    public ResponseVO<Object> setGroup(@RequestBody GroupParam groupParam){
@@ -45,9 +59,38 @@
        //return ResponseUtil.success(lampPostService.listLamp());
    }*/

    /**
     * æŸ¥è¯¢ç¯æ†åˆ—表并携带在线状态
     * @return
     */
    @PostMapping("/list")
    public ResponseVO<Object> listLamp(){
        return ResponseUtil.success(lampPostService.queryStates());
    }

    /**
     * æ¢å¤å‡ºåŽ‚设置
     * @param id
     * @return
     */
    @GetMapping("/lightReset/{id}")
    public ResponseVO<Object> LightReset(@PathVariable Long id){
        return ResponseUtil.success(lampPostService.LightReset(id));
    }



    @GetMapping("/lsitLike")
    public ResponseVO<Object> list( @RequestBody ReceiveParam receiveParam){
        LambdaQueryWrapper<LampPost> wrapper = Wrappers.lambdaQuery(LampPost.class);
        if(receiveParam.getKeyWord()!=null){
            wrapper.like(LampPost::getLampId,receiveParam.getKeyWord())
                    .or(lampPostLambdaQueryWrapper -> {
                        lampPostLambdaQueryWrapper.like(LampPost::getName,receiveParam.getKeyWord());
                    });
        }
        List<LampPost> lsit=lampPostService.list(wrapper);
        return ResponseUtil.success(lsit);
    }

}

 ximon-admin/src/main/java/com/sandu/ximon/admin/param/LampPostParam.java

@@ -3,6 +3,7 @@
import lombok.Data;

import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;

@Data
@@ -15,8 +16,11 @@
    @NotEmpty
    private String address;

    @NotNull(message = "设备类型不能为空")
    private Integer deviceType;   //  0 è™šæ‹Ÿç¯æ†   1 å®žä½“灯杆

   // private String macCode;

    // private String macCode;

    
    /*所属客户*/

 ximon-admin/src/main/java/com/sandu/ximon/admin/param/ReceiveParam.java

@@ -10,4 +10,6 @@
   private String name;

   private Integer kind;

   private String keyWord;
}

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

@@ -7,6 +7,9 @@
import lombok.Data;
import org.springframework.stereotype.Service;

/**
 * ç¯æ†è®¡æ•°ä½¿ç”¨
 */
@Service
@Data
public class LampCountService extends BaseServiceImpl<LampCountMapper, LampCount> {

 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();
        lampPost.setUserId(userId);
        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,75 +66,81 @@
        } else {
            lampPost.setMacCode(lampPostParam.getMacCode());
        }*/
        String baseMac = "baseDevice";
        A1Frame a1Frame = new A1Frame(A1OrderEnum.REQUEST_READ_DEVICE_UNIQUE_MAC.getCode(), new EmptyRequestInnerFrame());
        CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance()
                .sendRRPC(baseMac, a1Frame);
        if(commonFrame == null){
            throw new BusinessException("读取设备唯一ID失败");
        }
        A1DeviceMacRespInnerFrame a1DeviceMacRespInnerFrame = new A1DeviceMacRespInnerFrame().transformFrame(commonFrame.getPayload());
        log.info(commonFrame.toString());
        String uniqueMac = a1DeviceMacRespInnerFrame.getMac();
        uniqueMac = uniqueMac.toLowerCase();
        log.info("唯一码{}",uniqueMac);

        // 2  ä»Žé˜¿é‡Œæ³¨å†Œ
        MainBoardInvokeSyncService.getInstance().registerDevice(uniqueMac);
        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()
                    .sendRRPC(baseMac, a1Frame);
            if(commonFrame == null){
                throw new BusinessException("读取设备唯一ID失败");
            }
            A1DeviceMacRespInnerFrame a1DeviceMacRespInnerFrame = new A1DeviceMacRespInnerFrame().transformFrame(commonFrame.getPayload());
            log.info(commonFrame.toString());
            String uniqueMac = a1DeviceMacRespInnerFrame.getMac();
            uniqueMac = uniqueMac.toLowerCase();
            log.info("唯一码{}",uniqueMac);

        // 3  èŽ·å–设备详情
        QueryDeviceDetailResponse.Data deviceDetail = MainBoardInvokeSyncService.getInstance().queryDeviceDetail(uniqueMac, null);
        if(deviceDetail == null){
            throw new BusinessException("注册失败");
        }
        log.info(deviceDetail.toString());
            // 2  ä»Žé˜¿é‡Œæ³¨å†Œ
            MainBoardInvokeSyncService.getInstance().registerDevice(uniqueMac);

        // 4   é…ç½®Mac①
        WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> productKeyResp = MainBoardInvokeSyncService.getInstance()
                .sendRRPC(baseMac,
                        FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(MainBoardInvokeSyncService.getInstance().getProductKey()))
                                .orderType(A1OrderEnum.REQUEST_SET_PRODUCT_KEY.getCode()).build(),
                        A1TernaryCodeRespInnerFrame.class);
        A1TernaryCodeRespInnerFrame responseInnerFrame = productKeyResp.getResponseInnerFrame();
        if(!MainBoardInvokeSyncService.getInstance().getProductKey().equals(responseInnerFrame.getTernaryCode())){
            throw new BusinessException("设备配置ProductKey失败");
        }
            // 3  èŽ·å–设备详情
            QueryDeviceDetailResponse.Data deviceDetail = MainBoardInvokeSyncService.getInstance().queryDeviceDetail(uniqueMac, null);
            if(deviceDetail == null){
                throw new BusinessException("注册失败");
            }
            log.info(deviceDetail.toString());

        // 5   é…ç½®Mac②
        WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> responseCommonFrame = MainBoardInvokeSyncService.getInstance()
                .sendRRPC(baseMac,
                        FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(uniqueMac))
                                .orderType(A1OrderEnum.REQUEST_SET_DEVICE_NAME.getCode()).build(),
                        A1TernaryCodeRespInnerFrame.class);
        A1TernaryCodeRespInnerFrame deviceNameFrame = responseCommonFrame.getResponseInnerFrame();
        if(!uniqueMac.equals(deviceNameFrame.getTernaryCode())){
            throw new BusinessException("设备配置名失败");
        }
            // 4   é…ç½®Mac①
            WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> productKeyResp = MainBoardInvokeSyncService.getInstance()
                    .sendRRPC(baseMac,
                            FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(MainBoardInvokeSyncService.getInstance().getProductKey()))
                                    .orderType(A1OrderEnum.REQUEST_SET_PRODUCT_KEY.getCode()).build(),
                            A1TernaryCodeRespInnerFrame.class);
            A1TernaryCodeRespInnerFrame responseInnerFrame = productKeyResp.getResponseInnerFrame();
            if(!MainBoardInvokeSyncService.getInstance().getProductKey().equals(responseInnerFrame.getTernaryCode())){
                throw new BusinessException("设备配置ProductKey失败");
            }

        // 6  é…ç½®Mac③
        WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> wrapResponseCommonFrame = MainBoardInvokeSyncService.getInstance()
                .sendRRPC(baseMac,
                        FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(deviceDetail.getDeviceSecret()))
                                .orderType(A1OrderEnum.REQUEST_SET_DEVICE_SECRET.getCode()).build(),
                        A1TernaryCodeRespInnerFrame.class);
        A1TernaryCodeRespInnerFrame deviceSecretFrame = wrapResponseCommonFrame.getResponseInnerFrame();
        if (!deviceDetail.getDeviceSecret().equals(deviceSecretFrame.getTernaryCode())) {
            throw new BusinessException("设备密钥失败");
        }
            // 5   é…ç½®Mac②
            WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> responseCommonFrame = MainBoardInvokeSyncService.getInstance()
                    .sendRRPC(baseMac,
                            FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(uniqueMac))
                                    .orderType(A1OrderEnum.REQUEST_SET_DEVICE_NAME.getCode()).build(),
                            A1TernaryCodeRespInnerFrame.class);
            A1TernaryCodeRespInnerFrame deviceNameFrame = responseCommonFrame.getResponseInnerFrame();
            if(!uniqueMac.equals(deviceNameFrame.getTernaryCode())){
                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")) {
            lampPost.setMacCode(uniqueMac);
            save= save(lampPost);
            // 6  é…ç½®Mac③
            WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> wrapResponseCommonFrame = MainBoardInvokeSyncService.getInstance()
                    .sendRRPC(baseMac,
                            FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(deviceDetail.getDeviceSecret()))
                                    .orderType(A1OrderEnum.REQUEST_SET_DEVICE_SECRET.getCode()).build(),
                            A1TernaryCodeRespInnerFrame.class);
            A1TernaryCodeRespInnerFrame deviceSecretFrame = wrapResponseCommonFrame.getResponseInnerFrame();
            if (!deviceDetail.getDeviceSecret().equals(deviceSecretFrame.getTernaryCode())) {
                throw new BusinessException("设备密钥失败");
            }

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

            // 7  é‡å¯è®¾å¤‡  å¹¶ä½¿ç”¨æ–°çš„Mac
            CommonFrame rebootFrame = MainBoardInvokeSyncService.getInstance()
                    .sendRRPC(baseMac,
                            FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
                                    .orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());
            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;
    }






}

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

@@ -6,6 +6,9 @@
import com.sandu.ximon.dao.mapper.LightAdjustMapper;
import org.springframework.stereotype.Service;

/**
 * è·¯ç¯å®šæ—¶ä»»åŠ¡ç±»
 */
@Service
public class LightAdjustService extends BaseServiceImpl<LightAdjustMapper, LightAdjust> {


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

@@ -10,6 +10,9 @@
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

/**
 * æ’­æ”¾è®¡åˆ’
 */
@Service
@AllArgsConstructor
public class PlayPlanService extends BaseServiceImpl<PlayPlanMapper, PlayPlan> {

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

@@ -7,6 +7,9 @@
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

/**
 * å•ç¯æ•°æ®
 */
@Service
@AllArgsConstructor
public class SingleLampDataService extends BaseServiceImpl<SingleLampDataMapper, SingleLampData> {