灯模块

chenjiantian

2021-12-17 a0587b1f268b8535ed660fbc521d341d9268340a

灯模块

 dao/src/main/java/com/sandu/ximon/dao/bo/LightBo.java

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

import com.sandu.ximon.dao.domain.Light;
import lombok.Data;

import java.time.LocalDateTime;

/**
 * @author chenjiantian
 * @date 2021/12/17 14:51
 * è·¯ç¯åˆ—表实体类
 */
@Data
public class LightBo extends Light {

    private Long poleId;
    private String poleCode;
    private String poleName;
    private String taskName;
    private LocalDateTime reportTime;

}

 dao/src/main/java/com/sandu/ximon/dao/bo/LightReportDataBo.java

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

import com.sandu.ximon.dao.domain.LightReportData;
import lombok.Data;

/**
 * @author chenjiantian
 * @date 2021/12/17 16:51
 */
@Data
public class LightReportDataBo extends LightReportData {

    private String poleName;
}

 dao/src/main/java/com/sandu/ximon/dao/bo/LightReportErrorBo.java

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

import com.sandu.ximon.dao.domain.LightReportError;
import lombok.Data;

/**
 * @author chenjiantian
 * @date 2021/12/17 16:51
 */
@Data
public class LightReportErrorBo extends LightReportError {

    private String poleName;
    private String errorMsg;
}

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

ÎļþÃû´Ó dao/src/main/java/com/sandu/ximon/dao/domain/LightRemark.java ÐÞ¸Ä
@@ -9,22 +9,22 @@
import lombok.Data;

/**
 * è·¯ç¯å¤‡æ³¨è¡¨
 * @TableName light_remark
 * è·¯ç¯è¡¨
 * @TableName light
 */
@TableName(value ="light_remark")
@TableName(value ="light")
@Data
public class LightRemark implements Serializable {
public class Light implements Serializable {
    /**
     * 
     */
    @TableId(type = IdType.AUTO)
    private Long id;
    private Long lightId;

    /**
     * è®¾å¤‡è¯†åˆ«ç 
     */
    private String deviceMac;
    private String deviceCode;

    /**
     * å¤‡æ³¨ä¿¡æ¯

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

@@ -24,7 +24,7 @@
    /**
     * è®¾å¤‡mac
     */
    private String deviceMac;
    private String deviceCode;

    /**
     * å¸‚电电压
@@ -57,11 +57,16 @@
    private Double reactivePower;

    /**
     * äº®åº¦ç™¾åˆ†æ¯”，0-100
     * ç¯1亮度百分比，0-100
     */
    private Integer lightPercent;

    /**
     * ç¯2亮度百分比
     */
    private Integer light2Percent;

    /**
     * æœ€è¿‘一次亮灯时间
     */
    private Long recentlyLightSec;

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

copy from dao/src/main/java/com/sandu/ximon/dao/domain/LightRemark.java
copy to dao/src/main/java/com/sandu/ximon/dao/domain/LightReportError.java
Îļþ´Ó dao/src/main/java/com/sandu/ximon/dao/domain/LightRemark.java ¸´ÖÆ
@@ -9,27 +9,27 @@
import lombok.Data;

/**
 * è·¯ç¯å¤‡æ³¨è¡¨
 * @TableName light_remark
 * ç¯ä¸ŠæŠ¥æ•…障码表
 * @TableName light_report_error
 */
@TableName(value ="light_remark")
@TableName(value ="light_report_error")
@Data
public class LightRemark implements Serializable {
public class LightReportError implements Serializable {
    /**
     * 
     */
    @TableId(type = IdType.AUTO)
    private Long id;
    private Long lightReportErrorId;

    /**
     * è®¾å¤‡è¯†åˆ«ç 
     * è®¾å¤‡mac
     */
    private String deviceMac;
    private String deviceCode;

    /**
     * å¤‡æ³¨ä¿¡æ¯
     * æ•…障码
     */
    private String remark;
    private Integer errorCode;

    /**
     * åˆ›å»ºæ—¶é—´

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

@@ -32,9 +32,9 @@
    private String deviceName;

    /**
     * ç»‘定设备mac
     * ç»‘定设备码
     */
    private String deviceMac;
    private String deviceCode;

    /**
     * è®¾å¤‡ç±»åž‹ï¼Œ0路灯，1led屏幕，2充电桩，3大气监测，4水质监测，5ip音柱，6lcd广告机，7摄像头，8杆体倾测，9一键救助

 dao/src/main/java/com/sandu/ximon/dao/mapper/LightMapper.java

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

import com.sandu.ximon.dao.bo.LightBo;
import com.sandu.ximon.dao.domain.Light;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.sandu.ximon.dao.domain.LightReportData;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

/**
 * @Entity com.sandu.ximon.dao.domain.Light
 */
@Mapper
public interface LightMapper extends BaseMapper<Light> {

    /**
     * æœåŠ¡å™¨èŽ·å–路灯列表
     *
     * @param clientId å®¢æˆ·id
     * @param keyword å…³é”®å­—
     * @return è·¯ç¯åˆ—表
     */
    List<LightBo> listLight(Long clientId, String keyword);

}





 dao/src/main/java/com/sandu/ximon/dao/mapper/LightRemarkMapper.java

ÎļþÒÑɾ³ý

 dao/src/main/java/com/sandu/ximon/dao/mapper/LightReportDataMapper.java

@@ -1,8 +1,11 @@
package com.sandu.ximon.dao.mapper;

import com.sandu.ximon.dao.bo.LightReportDataBo;
import com.sandu.ximon.dao.domain.LightReportData;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

/**
 * @Entity com.sandu.ximon.dao.domain.LightReportData
@@ -10,6 +13,21 @@
@Mapper
public interface LightReportDataMapper extends BaseMapper<LightReportData> {

    /**
     * èŽ·å–指定设备吗最新上报的一条数据
     * @param deviceCodeList æŒ‡å®šè®¾å¤‡ç 
     * @return ä¸ŠæŠ¥æ•°æ®
     */
    List<LightReportData> getNewestReportByDeviceCode(List<String> deviceCodeList);


    /**
     * èŽ·å–上报数据列表
     * @param keyword å…³é”®è¯
     * @param deviceCode è®¾å¤‡ç 
     * @return ä¸ŠæŠ¥æ•°æ®
     */
    List<LightReportDataBo> listReportData(String keyword, String deviceCode);
}



 dao/src/main/java/com/sandu/ximon/dao/mapper/LightReportErrorMapper.java

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

import com.sandu.ximon.dao.bo.LightReportErrorBo;
import com.sandu.ximon.dao.domain.LightReportError;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

/**
 * @Entity com.sandu.ximon.dao.domain.LightReportError
 */
@Mapper
public interface LightReportErrorMapper extends BaseMapper<LightReportError> {

    /**
     * èŽ·å–故障码列表
     * @param keyword å…³é”®è¯
     * @return æ•…障码列表
     */
    List<LightReportErrorBo> listReportError(String keyword);
}





 dao/src/main/resources/mapper/LightMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sandu.ximon.dao.mapper.LightMapper">

    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.Light">
        <id property="lightId" column="light_id" jdbcType="BIGINT"/>
        <result property="deviceCode" column="device_code" jdbcType="VARCHAR"/>
        <result property="remark" column="remark" jdbcType="VARCHAR"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
    </resultMap>

    <resultMap id="listLight" type="com.sandu.ximon.dao.bo.LightBo" extends="BaseResultMap">
        <result property="poleId" column="pole_id" jdbcType="BIGINT"/>
        <result property="poleCode" column="pole_code" jdbcType="VARCHAR"/>
        <result property="poleName" column="pole_name" jdbcType="VARCHAR"/>
        <result property="taskName" column="task_name" jdbcType="VARCHAR"/>
    </resultMap>


    <select id="listLight" resultMap="listLight">
        SELECT
        t1.*,
        t2.id AS pole_id,
        t2.pole_code,
        t2.pole_name,
        t4.task_name
        FROM
        light t1
        LEFT JOIN pole t2 USING ( device_code )
        LEFT JOIN light_task_pole_relation t3 ON t3.pole_id = t2.id
        LEFT JOIN light_task t4 ON t3.task_id = t4.task_id
        <where>
            <if test="clientId != null">
                AND t2.client_id = #{clientId}
            </if>
            <if test="keyword != null and keyword != ''">
                AND (
                t1.device_code LIKE CONCAT('%', #{keyword},'%')
                OR t2.pole_name LIKE CONCAT('%', #{keyword},'%')
                )
            </if>
        </where>
    </select>
</mapper>

 dao/src/main/resources/mapper/LightRemarkMapper.xml

ÎļþÒÑɾ³ý

 dao/src/main/resources/mapper/LightReportDataMapper.xml

@@ -6,7 +6,7 @@

    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.LightReportData">
            <id property="lightReportDataId" column="light_report_data_id" jdbcType="BIGINT"/>
            <result property="deviceMac" column="device_mac" jdbcType="VARCHAR"/>
            <result property="deviceCode" column="device_code" jdbcType="VARCHAR"/>
            <result property="voltage" column="voltage" jdbcType="FLOAT"/>
            <result property="electricCurrent" column="electric_current" jdbcType="FLOAT"/>
            <result property="deviceTemperature" column="device_temperature" jdbcType="FLOAT"/>
@@ -14,6 +14,7 @@
            <result property="activePower" column="active_power" jdbcType="FLOAT"/>
            <result property="reactivePower" column="reactive_power" jdbcType="FLOAT"/>
            <result property="lightPercent" column="light_percent" jdbcType="INTEGER"/>
            <result property="light2Percent" column="light2_percent" jdbcType="INTEGER"/>
            <result property="recentlyLightSec" column="recently_light_sec" jdbcType="BIGINT"/>
            <result property="totalLightSec" column="total_light_sec" jdbcType="BIGINT"/>
            <result property="recentlyUsingPower" column="recently_using_power" jdbcType="DOUBLE"/>
@@ -22,11 +23,44 @@
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
    </resultMap>

    <sql id="Base_Column_List">
        light_report_data_id,device_mac,voltage,
        electric_current,device_temperature,power_factor,
        active_power,reactive_power,light_percent,
        recently_light_sec,total_light_sec,recently_using_power,
        total_using_power,create_time,update_time
    </sql>
    <resultMap id="listReportData" type="com.sandu.ximon.dao.bo.LightReportDataBo" extends="BaseResultMap">
        <result property="poleName" column="pole_name" jdbcType="VARCHAR"/>
    </resultMap>

    <select id="getNewestReportByDeviceCode" resultMap="BaseResultMap">
        SELECT
        t1.*
        FROM
        light_report_data t1
        JOIN (
        SELECT
        MAX( light_report_data_id ) AS light_report_data_id
        FROM
        light_report_data
        WHERE device_code IN
        <foreach collection="deviceCodeList" open="(" close=")" separator="," item="deviceCode">
            #{deviceCode}
        </foreach>
        GROUP BY device_code
        ) AS t2 USING ( light_report_data_id )
    </select>
    <select id="listReportData" resultMap="listReportData">
        SELECT
            t1.* ,t2.pole_name
        FROM
            light_report_data t1
                LEFT JOIN pole t2 USING ( device_code )
        <where>
            <if test="keyword != null and keyword != ''">
                AND (
                t1.device_code LIKE CONCAT('%', #{keyword},'%')
                OR t2.pole_name LIKE CONCAT('%', #{keyword},'%')
                )
            </if>
            <if test="deviceCode != null and keyword != ''">
                AND t1.device_code = #{deviceCode}
            </if>
        </where>
        ORDER BY t1.light_report_data_id DESC
    </select>
</mapper>

 dao/src/main/resources/mapper/LightReportErrorMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sandu.ximon.dao.mapper.LightReportErrorMapper">

    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.LightReportError">
            <id property="lightReportErrorId" column="light_report_error_id" jdbcType="BIGINT"/>
            <result property="deviceCode" column="device_code" jdbcType="VARCHAR"/>
            <result property="errorCode" column="error_code" jdbcType="INTEGER"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
    </resultMap>
    <resultMap id="listReportError" type="com.sandu.ximon.dao.bo.LightReportErrorBo" extends="BaseResultMap">
        <result property="poleName" column="pole_name" jdbcType="INTEGER"/>
    </resultMap>

    <select id="listReportError" resultMap="listReportError">
        SELECT
            t1.*,
            t2.pole_name
        FROM
            light_report_error t1
                LEFT JOIN pole t2 USING ( device_code )
        <where>
            <if test="keyword != null and keyword != ''">
                AND (
                t1.device_code LIKE CONCAT('%', #{keyword},'%')
                OR t2.pole_name LIKE CONCAT('%', #{keyword},'%')
                )
            </if>
        </where>
        ORDER BY t1.light_report_error_id DESC
    </select>
</mapper>

 dao/src/main/resources/mapper/PoleBindingMapper.xml

@@ -8,7 +8,7 @@
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="poleId" column="pole_id" jdbcType="BIGINT"/>
            <result property="deviceName" column="device_name" jdbcType="VARCHAR"/>
            <result property="deviceMac" column="device_mac" jdbcType="VARCHAR"/>
            <result property="deviceCode" column="device_code" jdbcType="VARCHAR"/>
            <result property="deviceType" column="device_type" jdbcType="INTEGER"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
@@ -16,7 +16,7 @@

    <sql id="Base_Column_List">
        id,pole_id,device_name,
        device_mac,device_type,create_time,
        device_code,device_type,create_time,
        update_time
    </sql>
</mapper>

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

@@ -1,19 +1,18 @@
package com.sandu.ximon.admin.controller;

import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.dto.LightDataDto;
import com.sandu.ximon.admin.param.LightRemarkParam;
import com.sandu.ximon.admin.service.LightReportDataService;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.admin.service.LightReportErrorService;
import com.sandu.ximon.admin.service.LightService;
import com.sandu.ximon.dao.bo.LightBo;
import com.sandu.ximon.dao.bo.LightReportDataBo;
import com.sandu.ximon.dao.bo.LightReportErrorBo;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@@ -27,13 +26,42 @@
@RequestMapping("/v1/light")
public class LightController {

    private final LightService lightService;
    private final LightReportDataService lightReportDataService;
    private final LightReportErrorService lightReportErrorService;


    @GetMapping("/list")
    public ResponseVO<Object> listLight(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword) {
        List<LightDataDto> list = lightReportDataService.listLight(conditionVO.getPageNo(),conditionVO.getPageSize(),keyword);
        List<LightBo> list = lightService.listLight(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword);
        return ResponseUtil.success(list);
    }

    @PostMapping("/remark")
    public ResponseVO<Object> addRemark(@RequestBody @Validated LightRemarkParam param) {
        boolean result = lightService.addRemark(param);
        if (result) {
            return ResponseUtil.success("添加成功");
        } else {
            return ResponseUtil.fail("添加失败");
        }
    }

    /**
     * èŽ·å–上报数据
     *
     * @param conditionVO
     * @return
     */
    @GetMapping("/report/list")
    public ResponseVO<Object> listReportData(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword, @RequestParam(required = false) String deviceCode) {
        List<LightReportDataBo> list = lightReportDataService.listReportData(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, deviceCode);
        return ResponseUtil.success(list);
    }

    @GetMapping("/error/list")
    public ResponseVO<Object> listReportError(BaseConditionVO conditionVO, @RequestParam(required = false) String keyword) {
        List<LightReportErrorBo> list = lightReportErrorService.listReportError(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword);
        return ResponseUtil.success(list);
    }
}

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

@@ -54,7 +54,7 @@

    @PostMapping("/update/{taskId}")
    public ResponseVO<Object> updateLightTask(@PathVariable Long taskId, @RequestBody @Validated LightTaskParam param) {
        boolean result = lightTaskService.updateLightTask(taskId,param);
        boolean result = lightTaskService.updateLightTask(taskId, param);
        if (result) {
            return ResponseUtil.success("编辑成功");
        } else {

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

@@ -1,10 +1,13 @@
package com.sandu.ximon.admin.controller;

import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.dto.DeviceStatus;
import com.sandu.ximon.admin.param.PoleBindingParam;
import com.sandu.ximon.admin.param.PoleParam;
import com.sandu.ximon.admin.service.PoleService;
@@ -13,6 +16,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.util.Arrays;
import java.util.List;

/**
@@ -92,5 +96,14 @@
        }
    }

    @PostMapping("/listStatusByDeviceCode")
    public ResponseVO<Object> getStatusById(@RequestBody String[] deviceCodeList){
        if(ArrayUtil.isEmpty(deviceCodeList)) {
            return ResponseUtil.fail("参数不能为空");
        }
        List<DeviceStatus> statusList = poleService.listStatusByDeviceCode(CollectionUtil.toList(deviceCodeList));
        return ResponseUtil.success(statusList);
    }


}

 ximon-admin/src/main/java/com/sandu/ximon/admin/dto/DeviceStatus.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
package com.sandu.ximon.admin.dto;

import lombok.Data;

/**
 * @author chenjiantian
 * @date 2021/12/17 15:55
 * é˜¿é‡Œäº‘设备状态
 */
@Data
public class DeviceStatus {

    private String deviceCode;
    /**
     *     0 ä¸‹çº¿
     *     1 ä¸Šçº¿
     *     2 æœªæ¿€æ´»
     *     3 ä¸å¯ç”¨
     */
    private Integer status;
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/InitAmqpListener.java

@@ -13,12 +13,12 @@
@AllArgsConstructor
public class InitAmqpListener {

   private final MqttMainBoardConfig mqttMainBoardConfig;
    private final MqttMainBoardConfig mqttMainBoardConfig;

  /*  @PostConstruct
    public void initListener() throws Exception {
        new AmqpClient(
                mqttMainBoardConfig
        ).execute();
    }*/
//    @PostConstruct
//    public void initListener() throws Exception {
//        new AmqpClient(
//                mqttMainBoardConfig
//        ).execute();
//    }
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/LightDataProcessor.java

@@ -7,9 +7,9 @@
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5LightReportEnum;
import com.sandu.ximon.admin.service.LightReportDataService;
import com.sandu.ximon.admin.service.LightReportErrorService;
import com.sandu.ximon.admin.service.LightService;
import lombok.extern.slf4j.Slf4j;

import java.util.ArrayList;

/**
 * @author chenjiantian
@@ -37,20 +37,20 @@
        if (A5LightReportEnum.HeartBeat_Data.getCode().equals(functionCode)) {
            log.info("心跳相应");
            A5LightHeartbeatReportInnerFrame heartbeatReportInnerFrame = new A5LightHeartbeatReportInnerFrame().transformFrame(frame.getPayload());
            log.info(heartbeatReportInnerFrame.toString());

            SpringContextHolder.getBean(LightReportDataService.class).saveReportData(deviceName,heartbeatReportInnerFrame.getHeartBeatDataPackage());

//            SpringContextHolder.getBean(LightService.class).saveLight(deviceName,heartbeatReportInnerFrame.getHeartBeatDataPackage());
            SpringContextHolder.getBean(LightReportDataService.class).saveReportData(deviceName, heartbeatReportInnerFrame.getHeartBeatDataPackage());
            SpringContextHolder.getBean(LightService.class).saveLight(deviceName);

        } else if (A5LightReportEnum.Time_Synchronized.getCode().equals(functionCode)) {
//            log.info("请求时间同步");
            A5LightTimeSyncReportInnerFrame syncRespInnerFrame = new A5LightTimeSyncReportInnerFrame().transformFrame(frame.getPayload());
//            log.info(syncRespInnerFrame.toString());
        } else if (A5LightReportEnum.Error_Code.getCode().equals(functionCode)) {
//            log.info("故障码上报");
            log.info("故障码上报");
            A5LightErrorCodeReportInnerFrame codeRespInnerFrame = new A5LightErrorCodeReportInnerFrame().transformFrame(frame.getPayload());
//            log.info(codeRespInnerFrame.toString());
            if (codeRespInnerFrame.getErrorCode() != 0) {
                SpringContextHolder.getBean(LightReportErrorService.class).saveReportError(deviceName, codeRespInnerFrame);
            }
        }
    }
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightErrorCodeReportInnerFrame.java

@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.manager.iot.frame.inner.report;

import cn.hutool.core.util.HexUtil;
import cn.hutool.core.util.StrUtil;
import com.sandu.ximon.admin.manager.iot.frame.inner.BaseResponseInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.util.CRC32Utils;
@@ -23,7 +24,7 @@
    /**
     * æ•…障码
     */
    private String errorCode;
    private int errorCode;

    @Override
    public A5LightErrorCodeReportInnerFrame transformFrame(String hex) {
@@ -39,7 +40,10 @@

        setDestinationAddress(hex.substring(8, 12));

        setErrorCode(hex.substring(12, 16));
        String errorCodeHex = hex.substring(12, 16);
        errorCode = HexUtil.hexToInt(errorCodeHex);
        System.out.println("故障码："+ errorCodeHex +" - " + errorCode);

        setCrc32(hex.substring(hex.length() - 8));
        //  æ ¡éªŒCRC32
        String frame = getFunctionCode() + getPayloadLength() + getDestinationAddress() + getErrorCode();

 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightHeartbeatReportInnerFrame.java

@@ -69,7 +69,7 @@
        private Integer sec;
        //  è®¾å¤‡æ¸©åº¦ 2  1字节整数1字节小数
        private Double deviceTemperature;
        //  äº®åº¦ç™¾åˆ†æ¯” 1
        //  ç¯1亮度百分比 1
        private Integer lightPercent;
        //  ç”µç½‘电压 2 1字节整数1字节小数
        private Double voltage;
@@ -91,6 +91,8 @@
        private Double recentlyUsingPower;
        //  ç´¯è®¡ç”¨ç”µç”µé‡ 4
        private Double totalUsingPower;
        //  ç¯2亮度百分比 1
        private Integer light2Percent;
        //  ä¿ç•™ 11
        private String retain;
        //  åŽŸå¸§
@@ -118,13 +120,10 @@
            this.totalLightSec = HexUtil.hexToLong(hex.substring(50, 58));
            this.recentlyUsingPower = NumberUtil.round(HexUtil.hexToInt(hex.substring(58, 66)) * (double) 0.001, 3).doubleValue();
            this.totalUsingPower = NumberUtil.round(HexUtil.hexToInt(hex.substring(66, 74)) * (double) 0.001, 3).doubleValue();
            this.retain = hex.substring(74, 96);
            this.light2Percent = HexUtil.hexToInt(hex.substring(74, 76));
            this.retain = hex.substring(76, 96);
            return this;
        }
    }

    public static void main(String[] args) {
        System.out.println(HexUtil.hexToLong("F64D020F"));
        System.out.println(5 * (float) 0.001);
    }
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/DeviceStateEnum.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,44 @@
package com.sandu.ximon.admin.manager.iot.rrpc.enums;

import com.sandu.common.enums.ResponseStatusEnums;

/**
 * @author chenjiantian
 * é˜¿é‡Œäº‘设备状态枚举
 */
public enum DeviceStateEnum {

     /*
    ON_LINE è®¾å¤‡åœ¨çº¿ã€‚
    OFFLINE  è®¾å¤‡ç¦»çº¿
    UNACTIVE  è®¾å¤‡æœªæ¿€æ´»
    DISABLE  è®¾å¤‡å·²ç¦ç”¨
    */

    OFFLINE(0),
    ONLINE(1),
    UNACTIVE(2),
    DISABLE(3);


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

    private final Integer code;

    public Integer getCode() {
        return code;
    }


    public static Integer getCode(String name) {
        for (DeviceStateEnum ut : DeviceStateEnum.values()) {
            if (ut.name().equals(name)) {
                return ut.getCode();
            }
        }
        return null;
    }

}

 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/LampPostOnLineState.java

ÎļþÒÑɾ³ý

 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/LightErrorEnum.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,61 @@
package com.sandu.ximon.admin.manager.iot.rrpc.enums;

/**
 * @author chenjiantian
 * å•ç¯é”™è¯¯ä¸ŠæŠ¥ç 
 * "故障码：（用二进制表示）
 * 0x0000,二进制即为[bit15:bit0]。
 * å¯¹åº”æ•…éšœbit位置1，正常置0"        bit15    bit14    bit13    bit12    bit11    bit10    bit9    bit8    bit7    bit6    bit5    bit4    bit3    bit2    bit1    bit0
 * 0    0    0    0    0    0    0    0    æ—¥åŽ†æ—¶é—´é”™è¯¯    å¸‚电电压过低(110V)    å¸‚电电压过高(250V)    è¾“出漏电    åŠŸçŽ‡è¿‡è½½    è®¾å¤‡æ¸©åº¦è¿‡é«˜    æ— ç”µæµ    æ— ç”µåŽ‹
 */
public enum LightErrorEnum {

    /**
     * æ— ç”µåŽ‹
     */
    NO_VOL(1,"无电压"),
    /**
     * æ— ç”µæµ
     */
    NO_CUR(2,"无电流"),
    /**
     * è®¾å¤‡æ¸©åº¦è¿‡é«˜
     */
    DEVICE_TEMPERATURE_HIGHER(4,"设备温度过高"),
    /**
     * åŠŸçŽ‡è¿‡è½½
     */
    OVER_POWER(8,"功率过载"),
    /**
     * è¾“出漏电
     */
    OUTPUT_ELE_LEAKAGE(16,"输出漏电"),
    /**
     * å¸‚电电压过高(250V)
     */
    OVER_VOL(32,"市电电压过高(250V)"),
    /**
     * å¸‚电电压过低(110V)
     */
    LOWER_VOL(64,"市电电压过低(110V)"),
    /**
     * æ—¥åŽ†æ—¶é—´é”™è¯¯
     */
    CALENDAR_ERROR(128,"日历时间错误");

    private final Integer code;
    private final String message;

    LightErrorEnum(Integer code, String message) {
        this.code = code;
        this.message = message;
    }

    public String getMessage() {
        return message;
    }

    public Integer getCode() {
        return code;
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
package com.sandu.ximon.admin.param;

import lombok.Data;

import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;

/**
 * @author chenjiantian
 */
@Data
public class LightRemarkParam {

    @NotNull(message = "路灯id不能为空")
    private Long lightId;
    @NotEmpty(message = "备注不能为空")
    private String remark;


}

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

@@ -13,8 +13,8 @@
@Data
public class PoleBindingParam {

    @NotBlank(message = "设备Mac不能为空")
    private String deviceMac;
    @NotBlank(message = "设备码不能为空")
    private String deviceCode;
    @NotNull(message = "设备类型不能为空")
    private Integer deviceType;


 ximon-admin/src/main/java/com/sandu/ximon/admin/redis/LightKey.java

@@ -21,8 +21,11 @@
    /**
     * å•ç¯ä¸ŠæŠ¥çš„mac，如果有说明该上报的单灯以前已经上报过
     */
    public static LightKey REPORT_MAC = new LightKey(0, "ReportMac");
    public static LightKey REPORT_MAC = new LightKey(3600, "ReportMac");

    /**
     * ç¯æ†ç¼–号后缀每天从1开始递增，定时任务0点重置
     */
    public static LightKey POLE_SN = new LightKey(300, "PoleSn");

}

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

ÎļþÒÑɾ³ý

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

@@ -4,6 +4,8 @@
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.dto.LightDataDto;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5LightHeartbeatReportInnerFrame;
import com.sandu.ximon.dao.bo.LightBo;
import com.sandu.ximon.dao.bo.LightReportDataBo;
import com.sandu.ximon.dao.domain.LightReportData;
import com.sandu.ximon.dao.mapper.LightReportDataMapper;
import org.springframework.beans.BeanUtils;
@@ -19,27 +21,36 @@
@Service
public class LightReportDataService extends BaseServiceImpl<LightReportDataMapper, LightReportData> {


    /**
     * ä¿å­˜ä¸ŠæŠ¥çš„灯心跳数据
     *
     * @return æ˜¯å¦æˆåŠŸ
     */
    public boolean saveReportData(String deviceName, A5LightHeartbeatReportInnerFrame.HeartBeatDataPackage heartBeatDataPackage) {

        LightReportData lightReportData = new LightReportData();
        BeanUtils.copyProperties(heartBeatDataPackage, lightReportData);
        lightReportData.setDeviceMac(deviceName);
        lightReportData.setDeviceCode(deviceName);

        return save(lightReportData);
    }

    /**
     * èŽ·å–路灯列表
     * @return è¿”回组合数据dto
     * èŽ·å–指定设备码最新的一天上报数据
     * @param deviceCodeList è®¾å¤‡ç åˆ—表
     * @return ä¸ŠæŠ¥æ•°æ®
     */
    public List<LightDataDto> listLight(int pageNo, int pageSize, String keyword) {
        PageHelper.startPage(pageNo,pageSize);
    public List<LightReportData> getNewestReportByDeviceCode(List<String> deviceCodeList) {
        return baseMapper.getNewestReportByDeviceCode(deviceCodeList);
    }

        return null;
    /**
     * èŽ·å–上报数据
     * @param keyword å…³é”®è¯
     * @param deviceCode è®¾å¤‡ç 
     */
    public List<LightReportDataBo> listReportData(int pageNo, int pageSize, String keyword, String deviceCode) {
        PageHelper.startPage(pageNo,pageSize);
        return baseMapper.listReportData(keyword,deviceCode);
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,44 @@
package com.sandu.ximon.admin.service;

import com.github.pagehelper.PageHelper;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5LightErrorCodeReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.LightErrorEnum;
import com.sandu.ximon.dao.bo.LightReportErrorBo;
import com.sandu.ximon.dao.domain.LightReportError;
import com.sandu.ximon.dao.mapper.LightReportErrorMapper;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * @author chenjiantian
 * @date 2021/12/17 17:47
 */
@Service
public class LightReportErrorService extends BaseServiceImpl<LightReportErrorMapper, LightReportError> {

    public void saveReportError(String deviceName, A5LightErrorCodeReportInnerFrame codeRespInnerFrame) {
        LightReportError lightReportError = new LightReportError();
        lightReportError.setDeviceCode(deviceName);
        lightReportError.setErrorCode(codeRespInnerFrame.getErrorCode());
        save(lightReportError);
    }

    public List<LightReportErrorBo> listReportError(int pageNo, int pageSize, String keyword) {
        PageHelper.startPage(pageNo,pageSize);
        List<LightReportErrorBo> lightReportErrorBos = baseMapper.listReportError(keyword);
        for (LightReportErrorBo lightReportErrorBo : lightReportErrorBos) {
            Integer errorCode = lightReportErrorBo.getErrorCode();
            StringBuilder sb = new StringBuilder();
            LightErrorEnum[] values = LightErrorEnum.values();
            for (LightErrorEnum value : values) {
                if((value.getCode() & errorCode) > 0){
                    sb.append(value.getMessage());
                }
            }
            lightReportErrorBo.setErrorMsg(sb.toString());
        }
        return lightReportErrorBos;
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,96 @@
package com.sandu.ximon.admin.service;

import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.redis.RedisService;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.dto.LightDataDto;
import com.sandu.ximon.admin.param.LightRemarkParam;
import com.sandu.ximon.admin.redis.LightKey;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.bo.LightBo;
import com.sandu.ximon.dao.domain.Light;
import com.sandu.ximon.dao.domain.LightReportData;
import com.sandu.ximon.dao.mapper.LightMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.stream.Collectors;

/**
 * @author chenjiantian
 * @date 2021/12/13 16:00
 * ç¯è®¾å¤‡service
 */
@Service
@Slf4j
@AllArgsConstructor
public class LightService extends BaseServiceImpl<LightMapper, Light> {

    private final RedisService redisService;
    private final LightReportDataService lightReportDataService;

    /**
     * å½•å…¥å½“前设备码的路灯数据
     * @param deviceName mac
     */
    public void saveLight(String deviceName) {
        Boolean hasKey = redisService.hasKey(LightKey.REPORT_MAC.key(deviceName));
        if(!hasKey){
            int count = count(Wrappers.lambdaQuery(Light.class).eq(Light::getDeviceCode, deviceName));
            log.info("redis查不到路灯数据{}={}",count,deviceName);
            // å½“前路灯表没有录入设备吗
            if(count == 0){
                Light light = new Light();
                light.setDeviceCode(deviceName);
                save(light);
            }
            redisService.set(LightKey.REPORT_MAC.key(deviceName),1,LightKey.REPORT_MAC.expireSeconds());
        }
    }

    /**
     * èŽ·å–路灯列表
     *
     * @return è¿”回组合数据dto
     */
    public List<LightBo> listLight(int pageNo, int pageSize, String keyword) {
        Long clientId = SecurityUtils.getClientId();

        PageHelper.startPage(pageNo, pageSize);

        List<LightBo> listLight = baseMapper.listLight(clientId,keyword);

        // èŽ·å–最近的上报时间
        List<String> deviceCodeList = listLight.stream().map(Light::getDeviceCode).collect(Collectors.toList());
        if(CollectionUtil.isNotEmpty(deviceCodeList)){
            List<LightReportData> reportDataList =  lightReportDataService.getNewestReportByDeviceCode(deviceCodeList);
            for (LightBo lightBo : listLight) {
                for (LightReportData lightReportData : reportDataList) {
                    if(StrUtil.equals(lightBo.getDeviceCode(),lightReportData.getDeviceCode())){
                        lightBo.setReportTime(lightReportData.getCreateTime());
                        break;
                    }
                }
            }
        }

        return listLight;
    }

    public boolean addRemark(LightRemarkParam param) {
        Light light = getById(param.getLightId());
        if(light == null){
            throw new BusinessException("找不到路灯");
        }
        Light update = new Light();
        update.setLightId(param.getLightId());
        update.setRemark(param.getRemark());
        return updateById(update);
    }
}

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

@@ -20,15 +20,15 @@

    public boolean bindPole(Long poleId, PoleBindingParam param) {
        Integer deviceType = param.getDeviceType();
        if (PoleBindingEnums.LIGHT.getCode().equals(deviceType)) {
            PoleBinding poleBinding = new PoleBinding();
            poleBinding.setPoleId(poleId);
            poleBinding.setDeviceType(deviceType);
            poleBinding.setDeviceName(param.getDeviceName());
            poleBinding.setDeviceMac(param.getDeviceMac());
            return save(poleBinding);
        }
//        if (PoleBindingEnums.LIGHT.getCode().equals(deviceType)) {
//        }
        PoleBinding poleBinding = new PoleBinding();
        poleBinding.setPoleId(poleId);
        poleBinding.setDeviceType(deviceType);
        poleBinding.setDeviceName(param.getDeviceName());
        poleBinding.setDeviceCode(param.getDeviceCode());
        return save(poleBinding);

        return false;
//        return false;
    }
}

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

@@ -8,6 +8,7 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.redis.RedisService;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.dto.DeviceStatus;
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;
@@ -21,6 +22,7 @@
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.enums.DeviceStateEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.param.PoleBindingParam;
import com.sandu.ximon.admin.param.PoleParam;
@@ -288,4 +290,27 @@
        return list(Wrappers.lambdaQuery(Pole.class).in(Pole::getId, poleIdList).select(Pole::getDeviceCode))
                .stream().map(Pole::getDeviceCode).filter(StrUtil::isNotEmpty).collect(Collectors.toList());
    }

    /**
     * æ‰¹é‡èŽ·å–阿里云设备的状态
     * @param deviceCodeList é˜¿é‡Œäº‘设备码
     * @return è®¾å¤‡çŠ¶æ€åˆ—表
     */
    public List<DeviceStatus> listStatusByDeviceCode(ArrayList<String> deviceCodeList) {
        // æœ€å¤§åªèƒ½æŸ¥50个
        List<List<String>> split = CollectionUtil.split(deviceCodeList, 50);
        List<DeviceStatus> statusList = new ArrayList<>();
        for (List<String> list : split) {
            List<BatchGetDeviceStateResponse.DeviceStatus> deviceStatuses = MainBoardInvokeSyncService.getInstance().batchGetDeviceState(list);
            if(CollectionUtil.isNotEmpty(deviceStatuses)){
                for (BatchGetDeviceStateResponse.DeviceStatus d : deviceStatuses) {
                    DeviceStatus deviceStatus = new DeviceStatus();
                    deviceStatus.setDeviceCode(d.getDeviceName());
                    deviceStatus.setStatus(DeviceStateEnum.getCode(d.getStatus()));
                    statusList.add(deviceStatus);
                }
            }
        }
        return statusList;
    }
}