From 6fe040e3e2805c28442090221e9a4597381830d9 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 12 十月 2022 18:07:49 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ErrorMsgService.java | 37 +++++++++++++++----------------------
1 files changed, 15 insertions(+), 22 deletions(-)
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 8c557ae..6592c64 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
@@ -3,16 +3,13 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.domain.CommonPage;
-import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.ximon.admin.dto.ErrorMsgDto;
-import com.sandu.ximon.admin.utils.ListPagingUtils;
import com.sandu.ximon.dao.bo.C3ReportErrorBo;
import com.sandu.ximon.dao.bo.LightReportErrorBo;
import com.sandu.ximon.dao.domain.C3mCharging;
import com.sandu.ximon.dao.domain.Light;
import lombok.AllArgsConstructor;
-import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -41,6 +38,7 @@
* @return
*/
public CommonPage lightListMsg(BaseConditionVO baseConditionVO) {
+ List<ErrorMsgDto> errorMsgDtoList = new ArrayList<>();
//鍗曠伅鏁呴殰鏁版嵁
CommonPage commonPage = lightReportErrorService.queryErrorCode(baseConditionVO);
if (!commonPage.getList().isEmpty()) {
@@ -52,11 +50,16 @@
errorMsgDto.setErrorTime(lightReportError.getCreateTime());
errorMsgDto.setDeviceType(1);
Light one = lightService.getOne(Wrappers.lambdaQuery(Light.class).eq(Light::getDeviceCode, lightReportError.getDeviceCode()));
+ System.out.println(lightReportError.getDeviceCode() + " ---code ");
if (one != null) {
errorMsgDto.setDeviceJson(JSON.toJSONString(one));
+ } else {
+ errorMsgDto.setDeviceJson("绯荤粺鏈壘鍒拌澶囨暟鎹�");
}
+ errorMsgDtoList.add(errorMsgDto);
}
}
+ commonPage.setList(errorMsgDtoList);
return commonPage;
}
@@ -87,25 +90,15 @@
}
return errorMsgDtoList;
}
-// break;
-// case "鍏呯數妗╂晠闅�":
-//
-// break;
-// case "澶ф皵鏁呴殰":
-// //澶ф皵鏁呴殰鏁版嵁 todo 鏆傛棤
-//
-// break;
-// default:
-// throw new BusinessException("绫诲瀷涓嶆纭紝璇风‘璁わ紒");
-// }
-//
-//
-// //瀵筫rrorMsgDtos鎸夊垱寤烘椂闂村�掑彊
-// errorMsgDtos.sort((a, b) -> b.getErrorTime().compareTo(a.getErrorTime()));
-// //鎵嬪姩鍒嗛〉 baseConditionVO.getPageNo() 褰撳墠椤� baseConditionVO.getPageSize() 姣忛〉鏉℃暟
-//// return errorMsgDtos.subList((baseConditionVO.getPageNo() - 1) * baseConditionVO.getPageSize(), baseConditionVO.getPageNo() * baseConditionVO.getPageSize());
-// ListPagingUtils.pages(errorMsgDtos, baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
-
+ /**
+ * 澶ф皵
+ *
+ * @param baseConditionVO
+ * @return
+ */
+ public List<ErrorMsgDto> atmosphereListMsg(BaseConditionVO baseConditionVO) {
+ return new ArrayList<>();
+ }
}
--
Gitblit v1.9.3