|
@@ -1,5 +1,6 @@
|
|
|
package com.sckw.slope.detection.service;
|
|
package com.sckw.slope.detection.service;
|
|
|
|
|
|
|
|
|
|
+import cn.hutool.core.date.DateTime;
|
|
|
import com.alibaba.fastjson2.JSONObject;
|
|
import com.alibaba.fastjson2.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
@@ -45,6 +46,7 @@ import java.math.RoundingMode;
|
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.time.LocalDate;
|
|
import java.time.LocalDate;
|
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
|
|
|
+import java.time.format.DateTimeFormatter;
|
|
|
import java.util.*;
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
@@ -1345,8 +1347,9 @@ public class ProjectService {
|
|
|
deviceOnlineRate = new BigDecimal(deviceOnline).divide(new BigDecimal(deviceCount), 2, RoundingMode.HALF_UP).multiply(new BigDecimal("100.00"));
|
|
deviceOnlineRate = new BigDecimal(deviceOnline).divide(new BigDecimal(deviceCount), 2, RoundingMode.HALF_UP).multiply(new BigDecimal("100.00"));
|
|
|
}
|
|
}
|
|
|
vo.setDeviceOnlineRate(deviceOnlineRate);
|
|
vo.setDeviceOnlineRate(deviceOnlineRate);
|
|
|
- LocalDateTime localDateTimeEnd = DateUtil.localDateToLocalDateTimeEnd(LocalDate.now());
|
|
|
|
|
- LocalDateTime localDateTimeStart = DateUtil.localDateToLocalDateTimeStart(LocalDate.now());
|
|
|
|
|
|
|
+ Date now = new Date();
|
|
|
|
|
+ LocalDateTime localDateTimeEnd = LocalDateTime.now();
|
|
|
|
|
+ LocalDateTime localDateTimeStart = LocalDateTime.now().plusHours(-24);
|
|
|
KwsProject project = null;
|
|
KwsProject project = null;
|
|
|
if (org.apache.commons.lang3.StringUtils.isNotBlank(projectId)) {
|
|
if (org.apache.commons.lang3.StringUtils.isNotBlank(projectId)) {
|
|
|
project = projectMapper.selectById(projectId);
|
|
project = projectMapper.selectById(projectId);
|