From b353cecfa4181d281243df5a70d1de5cc373e35d Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 06 九月 2022 15:51:44 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportErrorService.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 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 55528e2..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;
@@ -26,7 +27,7 @@
save(lightReportError);
}
- public List<LightReportErrorBo> listReportError(int pageNo, int pageSize, String keyword, int error_code) {
+ public List<LightReportErrorBo> listReportError(int pageNo, int pageSize, String keyword, Integer error_code) {
PageHelper.startPage(pageNo, pageSize);
List<LightReportErrorBo> lightReportErrorBos;
//涓簄ull鐨勮瘽鏄秴绠�
@@ -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