From a0d2c6cd651c547fd07fb3639a23ca700d3b2091 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 28 九月 2022 17:03:39 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ErrorMsgService.java | 115 +++++++++++++++++++++-----------------
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ErrorMsgController.java | 13 +++-
2 files changed, 73 insertions(+), 55 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ErrorMsgController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ErrorMsgController.java
index e263b60..37545a1 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ErrorMsgController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ErrorMsgController.java
@@ -24,9 +24,16 @@
private final ErrorMsgService errorMsgService;
@AnonymousAccess
- @GetMapping("/listMsg")
- public ResponseVO<Object> list(BaseConditionVO conditionVO, @RequestParam(value = "type", required = false) String type) {
+ @GetMapping("/lightListMsg")
+ public ResponseVO<Object> lightListMsg(BaseConditionVO conditionVO) {
- return ResponseUtil.success(errorMsgService.listMsg(conditionVO, type));
+ return ResponseUtil.success(errorMsgService.lightListMsg(conditionVO));
+ }
+
+ @AnonymousAccess
+ @GetMapping("/C3ListMsg")
+ public ResponseVO<Object> C3ListMsg(BaseConditionVO conditionVO) {
+
+ return ResponseUtil.success(errorMsgService.C3ListMsg(conditionVO));
}
}
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 f138605..8c557ae 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
@@ -34,58 +34,71 @@
private final C3ChargingService c3ChargingService;
- public CommonPage listMsg(BaseConditionVO baseConditionVO, String type) {
- if (StringUtils.isEmpty(type)) {
- throw new BusinessException("璁惧鏁呴殰绫诲瀷涓嶈兘涓虹┖锛�");
- }
- CommonPage commonPage = null;
- switch (type) {
- case "鍗曠伅鏁呴殰":
- //鍗曠伅鏁呴殰鏁版嵁
- commonPage = lightReportErrorService.queryErrorCode(baseConditionVO);
- if (!commonPage.getList().isEmpty()) {
- for (LightReportErrorBo lightReportError : (List<LightReportErrorBo>) commonPage.getList()) {
- ErrorMsgDto errorMsgDto = new ErrorMsgDto();
- errorMsgDto.setMac(lightReportError.getDeviceCode());
- errorMsgDto.setErrorCode(lightReportError.getErrorCode());
- errorMsgDto.setErrorDesc(lightReportError.getErrorMsg());
- errorMsgDto.setErrorTime(lightReportError.getCreateTime());
- errorMsgDto.setDeviceType(1);
- Light one = lightService.getOne(Wrappers.lambdaQuery(Light.class).eq(Light::getDeviceCode, lightReportError.getDeviceCode()));
- if (one != null) {
- errorMsgDto.setDeviceJson(JSON.toJSONString(one));
- }
- }
+ /**
+ * 鍗曠伅
+ *
+ * @param baseConditionVO
+ * @return
+ */
+ public CommonPage lightListMsg(BaseConditionVO baseConditionVO) {
+ //鍗曠伅鏁呴殰鏁版嵁
+ CommonPage commonPage = lightReportErrorService.queryErrorCode(baseConditionVO);
+ if (!commonPage.getList().isEmpty()) {
+ for (LightReportErrorBo lightReportError : (List<LightReportErrorBo>) commonPage.getList()) {
+ ErrorMsgDto errorMsgDto = new ErrorMsgDto();
+ errorMsgDto.setMac(lightReportError.getDeviceCode());
+ errorMsgDto.setErrorCode(lightReportError.getErrorCode());
+ errorMsgDto.setErrorDesc(lightReportError.getErrorMsg());
+ errorMsgDto.setErrorTime(lightReportError.getCreateTime());
+ errorMsgDto.setDeviceType(1);
+ Light one = lightService.getOne(Wrappers.lambdaQuery(Light.class).eq(Light::getDeviceCode, lightReportError.getDeviceCode()));
+ if (one != null) {
+ errorMsgDto.setDeviceJson(JSON.toJSONString(one));
}
- break;
- case "鍏呯數妗╂晠闅�":
- //鍏呯數妗╂晠闅滄暟鎹�
- List<C3ReportErrorBo> c3ReportErrorBos = c3mReportErrorService.listReportError(baseConditionVO);
- if (!c3ReportErrorBos.isEmpty()) {
- List<C3ReportErrorBo> list = c3ReportErrorBos;
- list.forEach(c3ReportError -> {
- ErrorMsgDto errorMsgDto = new ErrorMsgDto();
- errorMsgDto.setMac(c3ReportError.getC3Mac());
- 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));
- }
- });
- commonPage = new CommonPage();
- commonPage.setList(c3ReportErrorBos);
- }
-
- break;
- case "澶ф皵鏁呴殰":
- //澶ф皵鏁呴殰鏁版嵁 todo 鏆傛棤
-
- break;
- default:
- throw new BusinessException("绫诲瀷涓嶆纭紝璇风‘璁わ紒");
+ }
}
+ return commonPage;
+ }
+
+ /**
+ * 鍏呯數妗�
+ *
+ * @param baseConditionVO
+ * @return
+ */
+ public List<ErrorMsgDto> C3ListMsg(BaseConditionVO baseConditionVO) {
+ List<ErrorMsgDto> errorMsgDtoList = new ArrayList<>();
+ //鍏呯數妗╂晠闅滄暟鎹�
+ List<C3ReportErrorBo> c3ReportErrorBos = c3mReportErrorService.listReportError(baseConditionVO);
+ if (!c3ReportErrorBos.isEmpty()) {
+ List<C3ReportErrorBo> list = c3ReportErrorBos;
+ list.forEach(c3ReportError -> {
+ ErrorMsgDto errorMsgDto = new ErrorMsgDto();
+ errorMsgDto.setMac(c3ReportError.getC3Mac());
+ 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));
+ }
+ errorMsgDtoList.add(errorMsgDto);
+ });
+ }
+ return errorMsgDtoList;
+ }
+// break;
+// case "鍏呯數妗╂晠闅�":
+
+//
+// break;
+// case "澶ф皵鏁呴殰":
+// //澶ф皵鏁呴殰鏁版嵁 todo 鏆傛棤
+//
+// break;
+// default:
+// throw new BusinessException("绫诲瀷涓嶆纭紝璇风‘璁わ紒");
+// }
//
//
// //瀵筫rrorMsgDtos鎸夊垱寤烘椂闂村�掑彊
@@ -93,8 +106,6 @@
// //鎵嬪姩鍒嗛〉 baseConditionVO.getPageNo() 褰撳墠椤� baseConditionVO.getPageSize() 姣忛〉鏉℃暟
//// return errorMsgDtos.subList((baseConditionVO.getPageNo() - 1) * baseConditionVO.getPageSize(), baseConditionVO.getPageNo() * baseConditionVO.getPageSize());
// ListPagingUtils.pages(errorMsgDtos, baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- return commonPage;
- }
}
--
Gitblit v1.9.3