Merge remote-tracking branch 'origin/master'

liuhaonan

2022-08-12 798400ebc4769a6afec56ebbf8198e87e6c1a683

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/ErrorMsgService.java

@@ -56,7 +56,6 @@
            c3ReportErrorBos.forEach(c3ReportError -> {
                ErrorMsgDto errorMsgDto = new ErrorMsgDto();
                errorMsgDto.setMac(c3ReportError.getC3Mac());
                errorMsgDto.setErrorCode(c3ReportError.getErrorCode());
                errorMsgDto.setErrorDesc(c3ReportError.getErrorMsg());
                errorMsgDto.setErrorTime(c3ReportError.getCreateTime());
                errorMsgDto.setDeviceType(3);
@@ -68,7 +67,7 @@
            });
        }

        //大气故障数据
        //大气故障数据  todo 暂无

        //对errorMsgDtos按创建时间倒叙
        errorMsgDtos.sort((a, b) -> b.getErrorTime().compareTo(a.getErrorTime()));