From cfb17d6e329f3cc7afe3018d6cc8784ebafd5965 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 14 九月 2022 16:08:57 +0800
Subject: [PATCH] changes

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportErrorService.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportErrorService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportErrorService.java
index f5e9d3e..113438f 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportErrorService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportErrorService.java
@@ -1,6 +1,7 @@
 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.A5LightErrorCodeReportInnerFrame;
 import com.sandu.ximon.admin.manager.iot.rrpc.enums.LightErrorEnum;
@@ -42,6 +43,29 @@
             LightErrorEnum[] values = LightErrorEnum.values();
             for (LightErrorEnum value : values) {
                 if ((value.getCode() & errorCode) > 0) {
+                    sb.append(value.getMessage() + ";");
+                }
+            }
+            lightReportErrorBo.setErrorMsg(sb.toString());
+        }
+        return lightReportErrorBos;
+    }
+
+    /**
+     * 鏌ヨ鏁呭父鏁版嵁
+     *
+     * @return
+     */
+    public List<LightReportErrorBo> queryErrorCode(BaseConditionVO baseConditionVO) {
+
+        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+        List<LightReportErrorBo> lightReportErrorBos = baseMapper.listError(SecurityUtils.getClientId());
+        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());
                 }
             }
@@ -49,4 +73,5 @@
         }
         return lightReportErrorBos;
     }
+
 }

--
Gitblit v1.9.3