From 6d156569c85713ebf70e70a32ce2a7e9b4221536 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 27 七月 2022 17:39:31 +0800
Subject: [PATCH] 充电桩故障存储
---
dao/src/main/java/com/sandu/ximon/dao/bo/C3ReportErrorBo.java | 14 +++++++
dao/src/main/resources/mapper/C3mReportErrorMapper.xml | 30 ++++++++++++---
dao/src/main/java/com/sandu/ximon/dao/mapper/C3mReportErrorMapper.java | 14 ++++--
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mReportErrorController.java | 12 ++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mReportErrorService.java | 21 ++++++++++
5 files changed, 80 insertions(+), 11 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/bo/C3ReportErrorBo.java b/dao/src/main/java/com/sandu/ximon/dao/bo/C3ReportErrorBo.java
new file mode 100644
index 0000000..6b15485
--- /dev/null
+++ b/dao/src/main/java/com/sandu/ximon/dao/bo/C3ReportErrorBo.java
@@ -0,0 +1,14 @@
+package com.sandu.ximon.dao.bo;
+
+import com.sandu.ximon.dao.domain.C3mReportError;
+import lombok.Data;
+
+/**
+ * @author ZZQ
+ * @date 2022/7/27 16:52
+ */
+@Data
+public class C3ReportErrorBo extends C3mReportError {
+ private String poleId;
+ private String poleName;
+}
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/C3mReportErrorMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/C3mReportErrorMapper.java
index 4ba2dfb..c900da3 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/C3mReportErrorMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/C3mReportErrorMapper.java
@@ -1,18 +1,22 @@
package com.sandu.ximon.dao.mapper;
+import com.sandu.ximon.dao.bo.C3ReportErrorBo;
import com.sandu.ximon.dao.domain.C3mReportError;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
+
/**
-* @author Administrator
-* @description 閽堝琛ㄣ�恈3m_report_error(c3鏁呴殰鏁版嵁鍒楄〃)銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2022-07-27 14:27:33
-* @Entity com.sandu.ximon.dao.domain.C3mReportError
-*/
+ * @author Administrator
+ * @description 閽堝琛ㄣ�恈3m_report_error(c3鏁呴殰鏁版嵁鍒楄〃)銆戠殑鏁版嵁搴撴搷浣淢apper
+ * @createDate 2022-07-27 14:27:33
+ * @Entity com.sandu.ximon.dao.domain.C3mReportError
+ */
@Mapper
public interface C3mReportErrorMapper extends BaseMapper<C3mReportError> {
+ List<C3ReportErrorBo> listReportError(Long userid);
}
diff --git a/dao/src/main/resources/mapper/C3mReportErrorMapper.xml b/dao/src/main/resources/mapper/C3mReportErrorMapper.xml
index 07306ce..67b9abe 100644
--- a/dao/src/main/resources/mapper/C3mReportErrorMapper.xml
+++ b/dao/src/main/resources/mapper/C3mReportErrorMapper.xml
@@ -5,12 +5,30 @@
<mapper namespace="com.sandu.ximon.dao.mapper.C3mReportErrorMapper">
<resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.C3mReportError">
- <id property="c3mErrorId" column="c3m_error_id" jdbcType="BIGINT"/>
- <result property="c3Mac" column="c3_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"/>
+ <id property="c3mErrorId" column="c3m_error_id" jdbcType="BIGINT"/>
+ <result property="c3Mac" column="c3_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>
+ <select id="listReportError" resultType="com.sandu.ximon.dao.bo.C3ReportErrorBo">
+ SELECT
+ t1.*,
+ t4.pole_name as pole_name,
+ t4.id as pole_id
+ FROM
+ c3m_report_error t1
+ LEFT JOIN c3m_charging t2 ON t1.c3_mac = t2.c3_mac
+ LEFT JOIN pole_binding t3 ON t2.mcu_udid = t3.device_code
+ AND t3.device_type = 2
+ LEFT JOIN pole t4 ON t4.id = t3.pole_id
+ <where>
+ <if test="userid != null">
+ AND (t4.user_id = #{userid} OR t4.client_id = #{userid})
+ </if>
+ </where>
+ </select>
+
</mapper>
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mReportErrorController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mReportErrorController.java
index f759786..8e2dbfe 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mReportErrorController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mReportErrorController.java
@@ -1,6 +1,11 @@
package com.sandu.ximon.admin.controller;
+import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.object.BaseConditionVO;
+import com.sandu.common.util.ResponseUtil;
+import com.sandu.ximon.admin.service.C3mReportErrorService;
import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -12,4 +17,11 @@
@AllArgsConstructor
@RequestMapping("/v1/c3mError")
public class C3mReportErrorController {
+ private C3mReportErrorService c3mReportErrorService;
+
+ @GetMapping("/list")
+ public ResponseVO<Object> listReportError(BaseConditionVO conditionVO){
+ return ResponseUtil.success(c3mReportErrorService.listReportError(conditionVO));
+ }
+
}
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 419af4e..34c2f0a 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
@@ -1,12 +1,20 @@
package com.sandu.ximon.admin.service;
+import com.github.pagehelper.PageHelper;
+import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3ErrorCodeReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3ErrorEnum;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.LightErrorEnum;
+import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.dao.bo.C3ReportErrorBo;
+import com.sandu.ximon.dao.bo.LightReportErrorBo;
import com.sandu.ximon.dao.domain.C3mReportError;
import com.sandu.ximon.dao.mapper.C3mReportErrorMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* @author LiuHaoNan
@@ -37,4 +45,17 @@
c3MReportError.setErrorMsg(sb.toString());
save(c3MReportError);
}
+
+ public List<C3ReportErrorBo> listReportError(BaseConditionVO baseConditionVO) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ List<C3ReportErrorBo> c3ReportErrorBos;
+ //涓簄ull鐨勮瘽鏄秴绠�
+ if (SecurityUtils.getClientId() == null) {
+ c3ReportErrorBos = baseMapper.listReportError(null);
+ } else {
+ c3ReportErrorBos = baseMapper.listReportError(SecurityUtils.getUserId());
+ }
+
+ return c3ReportErrorBos;
+ }
}
--
Gitblit v1.9.3