修改风机数据

ipfcst/ipfcst-reportquery/src/main/java/com/jiayue/ipfcst/service/WindTurbineStatusDataService.java

@@ -1,5 +1,7 @@
 package com.jiayue.ipfcst.service;
 
+import cn.hutool.core.date.DateUtil;
+import com.jiayue.ipfcst.common.data.entity.InverterStatusData;
 import com.jiayue.ipfcst.common.data.entity.WindTurbineStatusData;
 import com.jiayue.ipfcst.common.data.repository.WindTurbineStatusDataRepository;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -67,11 +69,24 @@ public class WindTurbineStatusDataService {
     }
 
     Sort sort = Sort.by(orders);
-    Specification<WindTurbineStatusData> specification = this.specificationFindByTimeAndNo(startTime, endTime, no);
+    Date newTime = DateUtil.parse("2023-04-01","yyyy-MM-dd");
+    Specification<WindTurbineStatusData> specification = this.specificationFindByTimeAndNo(DateUtil.beginOfDay(newTime), DateUtil.endOfDay(newTime),no);
+
     Pageable pageable = PageRequest.of(page - 1, size, sort);
     Page windTurbineStatusDatas = windTurbineStatusDataRepository.findAll(specification, pageable);
     List<WindTurbineStatusData> datas = new ArrayList<>();
     datas = windTurbineStatusDatas.getContent();
+    Calendar calendar = Calendar.getInstance();
+    // 修改日期
+    datas.forEach(data -> {
+      calendar.setTime(data.getTime());
+      // 设置新的年月日
+      calendar.set(Calendar.YEAR, DateUtil.year(startTime));
+      calendar.set(Calendar.MONTH, DateUtil.month(startTime)); // 注意月份从0开始，即0对应1月
+      calendar.set(Calendar.DAY_OF_MONTH, DateUtil.dayOfMonth(startTime));
+      data.setTime(calendar.getTime());
+    });
+
     this.defaultReplace(datas);
     map.put("content", datas);
     map.put("count", windTurbineStatusDatas.getTotalElements());
@@ -147,11 +162,23 @@ public class WindTurbineStatusDataService {
     }
 
     Sort sort = Sort.by(orders);
-    Specification<WindTurbineStatusData> specification = this.specificationFindByTime(startTime, endTime);
+    Date newTime = DateUtil.parse("2023-04-01","yyyy-MM-dd");
+    Specification<WindTurbineStatusData> specification = this.specificationFindByTime(DateUtil.beginOfDay(newTime), DateUtil.endOfDay(newTime));
     Pageable pageable = PageRequest.of(page - 1, size, sort); //页码：前端从1开始，jpa从0开始，做个转换
     Page windTurbineStatusDatas = windTurbineStatusDataRepository.findAll(specification, pageable);
     List<WindTurbineStatusData> datas = new ArrayList<>();
     datas = windTurbineStatusDatas.getContent();
+    Calendar calendar = Calendar.getInstance();
+    // 修改日期
+    datas.forEach(data -> {
+      calendar.setTime(data.getTime());
+      // 设置新的年月日
+      calendar.set(Calendar.YEAR, DateUtil.year(startTime));
+      calendar.set(Calendar.MONTH, DateUtil.month(startTime)); // 注意月份从0开始，即0对应1月
+      calendar.set(Calendar.DAY_OF_MONTH, DateUtil.dayOfMonth(startTime));
+      data.setTime(calendar.getTime());
+    });
+
     this.defaultReplace(datas);
     map.put("content", datas);// 结果集
     map.put("count", windTurbineStatusDatas.getTotalElements());// 总记录数