监控统计

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java

@@ -5,6 +5,7 @@ import com.google.common.collect.ImmutableMap;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.sql.Timestamp;
 import java.time.*;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -280,4 +281,15 @@ public class DateUtils {
         LocalDate date = LocalDate.parse(dateStr, DateTimeFormatter.ISO_LOCAL_DATE);
         return date.atTime(LocalTime.MAX);
     }
+
+    public static Timestamp generateTimestamp(String dateStr) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+        // 解析字符串为LocalDateTime
+        LocalDateTime localDateTime = LocalDateTime.parse(dateStr, formatter);
+
+        // 转换为java.sql.Timestamp
+        Timestamp timestamp = Timestamp.valueOf(localDateTime);
+        return timestamp;
+    }
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/plan/vo/IotInspectPlanRespVO.java

@@ -62,6 +62,9 @@ public class IotInspectPlanRespVO {
     @Schema(description = "开始执行时间")
     private String beginCreateTime;
 
+    @Schema(description = "开始执行时间")
+    private String lastCreateTime;
+
     private List<String> charges;
 
     private String createName;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/stat/IotStaticController.java

@@ -5,7 +5,6 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.Pms;
 import cn.iocoder.yudao.framework.common.util.date.DateUtils;
-import cn.iocoder.yudao.module.pms.controller.admin.DeviceHistoryParam;
 import cn.iocoder.yudao.module.pms.controller.admin.failure.vo.IotFailureReportPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.inspect.order.vo.IotInspectOrderPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmainworkorder.vo.IotMainWorkOrderPageReqVO;
@@ -41,12 +40,8 @@ import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO;
 import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import cn.iocoder.yudao.module.system.service.dict.DictDataService;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
@@ -368,10 +363,9 @@ public class IotStaticController {
         if (StringUtils.isBlank(identifier)) {
             return null;
         }
-        long current = System.currentTimeMillis();
-        Timestamp start = new Timestamp(current - 1440 * 60 * 1000);
-        Timestamp end = new Timestamp(current);
-        List<DeviceVO> deviceVOS = tdDeviceMapper.selectAllBtTimeAndIdentifier(deviceName.toLowerCase(), identifier, start, end);
+        Timestamp start1 = generateTimestamp(beginTime);
+        Timestamp end1 = generateTimestamp(endTime);
+        List<DeviceVO> deviceVOS = tdDeviceMapper.selectAllBtTimeAndIdentifier(deviceName.toLowerCase(), identifier, start1, end1);
         deviceVOS.forEach(deviceVO->{
             deviceVO.setTimestamp(deviceVO.getTs().getTime());
             deviceVO.setValue(Double.valueOf(deviceVO.getLogValue()));