From af4cd17b9851e940dd1dc8a43b3b21fbdd452f76 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 23 九月 2022 17:09:54 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightReportErrorService.java | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 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 73c5b22..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,9 +1,11 @@
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;
+import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.bo.LightReportErrorBo;
import com.sandu.ximon.dao.domain.LightReportError;
import com.sandu.ximon.dao.mapper.LightReportErrorMapper;
@@ -25,15 +27,45 @@
save(lightReportError);
}
- public List<LightReportErrorBo> listReportError(int pageNo, int pageSize, String keyword) {
- PageHelper.startPage(pageNo,pageSize);
- List<LightReportErrorBo> lightReportErrorBos = baseMapper.listReportError(keyword);
+ public List<LightReportErrorBo> listReportError(int pageNo, int pageSize, String keyword, Integer error_code) {
+ PageHelper.startPage(pageNo, pageSize);
+ List<LightReportErrorBo> lightReportErrorBos;
+ //涓簄ull鐨勮瘽鏄秴绠�
+ if (SecurityUtils.getClientId() == null) {
+ lightReportErrorBos = baseMapper.listReportError(keyword, error_code, null);
+ } else {
+ lightReportErrorBos = baseMapper.listReportError(keyword, error_code, SecurityUtils.getUserId());
+ }
+
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){
+ 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());
}
}
@@ -41,4 +73,5 @@
}
return lightReportErrorBos;
}
+
}
--
Gitblit v1.9.3