优化

liuhaonan

2022-07-28 8901dfad20797c5696abf51995c41f3f5e3352ca

优化

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

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

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;

/**
 * å¤§æ°”设备故障数据列表
 * @TableName air_report_error
 */
@TableName(value ="air_report_error")
@Data
public class AirReportError implements Serializable {
    /**
     * id
     */
    @TableId(type = IdType.AUTO)
    private Long airErrorId;

    /**
     * è®¾å¤‡ç 
     */
    private String airMac;

    /**
     * æ•…障码
     */
    private Integer errorCode;

    /**
     * åˆ›å»ºæ—¶é—´
     */
    private Date createTime;

    /**
     * æ›´æ–°æ—¶é—´
     */
    private Date updateTime;

    /**
     * æ•…障信息
     */
    private String errorMsg;

    @TableField(exist = false)
    private static final long serialVersionUID = 1L;
}

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

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
import lombok.Data;

@@ -34,12 +35,12 @@
    /**
     * åˆ›å»ºæ—¶é—´
     */
    private Date createTime;
    private LocalDateTime createTime;

    /**
     * æ›´æ–°æ—¶é—´
     */
    private Date updateTime;
    private LocalDateTime updateTime;

    /**
     * æ•…障信息

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

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

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

/**
 * @author Administrator
 * @description é’ˆå¯¹è¡¨ã€air_report_error(大气设备故障数据列表)】的数据库操作Mapper
 * @createDate 2022-07-28 11:30:01
 * @Entity com.sandu.ximon.dao.domain.AirReportError
 */
@Mapper
public interface AirReportErrorMapper extends BaseMapper<AirReportError> {

}





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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
<?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.AirReportErrorMapper">

    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.AirReportError">
            <id property="airErrorId" column="air_error_id" jdbcType="BIGINT"/>
            <result property="airMac" column="air_mac" 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"/>
            <result property="errorMsg" column="error_msg" jdbcType="VARCHAR"/>
    </resultMap>

    <sql id="Base_Column_List">
        air_error_id,air_mac,error_code,
        create_time,update_time,error_msg
    </sql>
</mapper>

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

@@ -33,9 +33,12 @@
    private LocalDateTime ErrorTime;

    /**
     * è®¾å¤‡ç±»åž‹   0：单灯  1：充电桩 2：大气
     * è®¾å¤‡ç±»åž‹   1-单灯、2-大气、3-充电桩
     */
    private Integer DeviceType;

    /**
     * è®¾å¤‡çš„json格式信息
     */
    private String DeviceJson;
}

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

@@ -47,12 +47,13 @@
    }

    public List<C3ReportErrorBo> listReportError(BaseConditionVO baseConditionVO) {
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        List<C3ReportErrorBo> c3ReportErrorBos;
        //为null的话是超管
        if (SecurityUtils.getClientId() == null) {
            PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
            c3ReportErrorBos = baseMapper.listReportError(null);
        } else {
            PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
            c3ReportErrorBos = baseMapper.listReportError(SecurityUtils.getUserId());
        }


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

@@ -4,7 +4,9 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.ximon.admin.dto.ErrorMsgDto;
import com.sandu.ximon.dao.bo.C3ReportErrorBo;
import com.sandu.ximon.dao.bo.LightReportErrorBo;
import com.sandu.ximon.dao.domain.C3mCharging;
import com.sandu.ximon.dao.domain.Light;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
@@ -23,8 +25,9 @@


    private final LightReportErrorService lightReportErrorService;
    private final C3mReportErrorService c3mReportErrorService;
    private final LightService lightService;
    private final C3mReportErrorService c3mReportErrorService;
    private final C3ChargingService c3ChargingService;


    public List<ErrorMsgDto> listMsg(BaseConditionVO baseConditionVO) {
@@ -38,7 +41,7 @@
                errorMsgDto.setErrorCode(lightReportError.getErrorCode());
                errorMsgDto.setErrorDesc(lightReportError.getErrorMsg());
                errorMsgDto.setErrorTime(lightReportError.getCreateTime());
                errorMsgDto.setDeviceType(0);
                errorMsgDto.setDeviceType(1);
                Light one = lightService.getOne(Wrappers.lambdaQuery(Light.class).eq(Light::getDeviceCode, lightReportError.getDeviceCode()));
                if (one != null) {
                    errorMsgDto.setDeviceJson(JSON.toJSONString(one));
@@ -48,7 +51,24 @@
        }

        //充电桩故障数据
        List<C3ReportErrorBo> c3ReportErrorBos = c3mReportErrorService.listReportError(baseConditionVO);
        if (!c3ReportErrorBos.isEmpty()) {
            c3ReportErrorBos.forEach(c3ReportError -> {
                ErrorMsgDto errorMsgDto = new ErrorMsgDto();
                errorMsgDto.setMac(c3ReportError.getC3Mac());
                errorMsgDto.setErrorCode(c3ReportError.getErrorCode());
                errorMsgDto.setErrorDesc(c3ReportError.getErrorMsg());
                errorMsgDto.setErrorTime(c3ReportError.getCreateTime());
                errorMsgDto.setDeviceType(3);
                C3mCharging one = c3ChargingService.getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3ReportError.getC3Mac()));
                if (one != null) {
                    errorMsgDto.setDeviceJson(JSON.toJSONString(one));
                }
                errorMsgDtos.add(errorMsgDto);
            });
        }

        //大气故障数据

        //对errorMsgDtos按创建时间倒叙
        errorMsgDtos.sort((a, b) -> b.getErrorTime().compareTo(a.getErrorTime()));