From 8901dfad20797c5696abf51995c41f3f5e3352ca Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 28 七月 2022 11:31:46 +0800
Subject: [PATCH] 优化
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ErrorMsgService.java | 24 +++++++
dao/src/main/java/com/sandu/ximon/dao/mapper/AirReportErrorMapper.java | 20 ++++++
dao/src/main/java/com/sandu/ximon/dao/domain/C3mReportError.java | 5 +
ximon-admin/src/main/java/com/sandu/ximon/admin/dto/ErrorMsgDto.java | 5 +
dao/src/main/resources/mapper/AirReportErrorMapper.xml | 20 ++++++
dao/src/main/java/com/sandu/ximon/dao/domain/AirReportError.java | 51 +++++++++++++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mReportErrorService.java | 3
7 files changed, 122 insertions(+), 6 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/AirReportError.java b/dao/src/main/java/com/sandu/ximon/dao/domain/AirReportError.java
new file mode 100644
index 0000000..10b8ffe
--- /dev/null
+++ b/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;
+}
\ No newline at end of file
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/C3mReportError.java b/dao/src/main/java/com/sandu/ximon/dao/domain/C3mReportError.java
index d5ae9d6..9529bdc 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/C3mReportError.java
+++ b/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;
/**
* 鏁呴殰淇℃伅
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/AirReportErrorMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/AirReportErrorMapper.java
new file mode 100644
index 0000000..5fbd7bd
--- /dev/null
+++ b/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 閽堝琛ㄣ�恆ir_report_error(澶ф皵璁惧鏁呴殰鏁版嵁鍒楄〃)銆戠殑鏁版嵁搴撴搷浣淢apper
+ * @createDate 2022-07-28 11:30:01
+ * @Entity com.sandu.ximon.dao.domain.AirReportError
+ */
+@Mapper
+public interface AirReportErrorMapper extends BaseMapper<AirReportError> {
+
+}
+
+
+
+
diff --git a/dao/src/main/resources/mapper/AirReportErrorMapper.xml b/dao/src/main/resources/mapper/AirReportErrorMapper.xml
new file mode 100644
index 0000000..d13dd83
--- /dev/null
+++ b/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>
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/ErrorMsgDto.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/ErrorMsgDto.java
index 143c1fb..6931129 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/ErrorMsgDto.java
+++ b/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;
+ /**
+ * 璁惧鐨刯son鏍煎紡淇℃伅
+ */
private String DeviceJson;
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mReportErrorService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mReportErrorService.java
index 34c2f0a..6004160 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mReportErrorService.java
+++ b/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;
//涓簄ull鐨勮瘽鏄秴绠�
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());
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ErrorMsgService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ErrorMsgService.java
index 2d25ffd..e784c19 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ErrorMsgService.java
+++ b/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);
+ });
+ }
+ //澶ф皵鏁呴殰鏁版嵁
//瀵筫rrorMsgDtos鎸夊垱寤烘椂闂村�掑彊
errorMsgDtos.sort((a, b) -> b.getErrorTime().compareTo(a.getErrorTime()));
--
Gitblit v1.9.3