逆变器数据时间修改

ipfcst/ipfcst-console/src/main/frontend/views/console/windTurbineInfo/index.vue

@@ -80,18 +80,7 @@
               title="风机型号"
               :edit-render="{name:'$input',attrs:{type:'text'}}"
             />
-            <vxe-table-column
-              field="divideIntoDifferentPeriod"
-              width="10%"
-              title="分期"
-              :edit-render="{name:'$input',attrs:{type:'text'}}"
-            />
-            <vxe-table-column
-              field="backupB"
-              width="10%"
-              title="额定功率"
-              :edit-render="{name:'$input',attrs:{type:'text'}}"
-            />
+
             <vxe-table-column
               field="manufacturer"
               width="10%"
@@ -248,17 +237,29 @@
               :edit-render="{name:'$input',attrs:{type:'number'}}"
             />
             <vxe-table-column
-              field="powerCurveFunction"
+              field="divideIntoDifferentPeriod"
               width="10%"
-              title="曲线函数"
+              title="分期"
               :edit-render="{name:'$input',attrs:{type:'text'}}"
             />
             <vxe-table-column
-              field="correctState"
+              field="backupB"
               width="10%"
-              title="状态码"
-              :edit-render="{name:'$input',attrs:{type:'number'}}"
+              title="额定功率"
+              :edit-render="{name:'$input',attrs:{type:'text'}}"
             />
+<!--            <vxe-table-column-->
+<!--              field="powerCurveFunction"-->
+<!--              width="10%"-->
+<!--              title="曲线函数"-->
+<!--              :edit-render="{name:'$input',attrs:{type:'text'}}"-->
+<!--            />-->
+<!--            <vxe-table-column-->
+<!--              field="correctState"-->
+<!--              width="10%"-->
+<!--              title="状态码"-->
+<!--              :edit-render="{name:'$input',attrs:{type:'number'}}"-->
+<!--            />-->
             <vxe-table-column
               field="interval"
               title="入库间隔（单位s）"

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

@@ -1,5 +1,7 @@
 package com.jiayue.ipfcst.service;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.jiayue.ipfcst.common.data.entity.InverterStatusData;
 import com.jiayue.ipfcst.common.data.repository.InverterStatusDataRepository;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -68,11 +70,24 @@ public class InverterStatusDataService {
         }
 
         Sort sort = Sort.by(orders);
-        Specification<InverterStatusData> specification = this.specificationFindByTimeAndNo(startTime, endTime,no);
+        Date newTime = DateUtil.parse("2023-04-01","yyyy-MM-dd");
+
+        Specification<InverterStatusData> specification = this.specificationFindByTimeAndNo(DateUtil.beginOfDay(newTime), DateUtil.endOfDay(newTime),no);
         Pageable pageable = PageRequest.of(page - 1, size, sort);
         Page inverterStatusDatas = inverterStatusDataRepository.findAll(specification,pageable);
         List<InverterStatusData> datas = new ArrayList<>();
         datas = inverterStatusDatas.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", inverterStatusDatas.getTotalElements());
@@ -152,18 +167,25 @@ public class InverterStatusDataService {
         }
 
         Sort sort = Sort.by(orders);
-        Specification<InverterStatusData> specification = this.specificationFindByTime(startTime, endTime);
+        Date newTime = DateUtil.parse("2023-04-01","yyyy-MM-dd");
+        Specification<InverterStatusData> specification = this.specificationFindByTime(DateUtil.beginOfDay(newTime), DateUtil.endOfDay(newTime));
         Pageable pageable = PageRequest.of(page - 1, size, sort); //页码：前端从1开始，jpa从0开始，做个转换
         Page inverterStatusDatas = inverterStatusDataRepository.findAll(specification,pageable);
         List<InverterStatusData> datas = new ArrayList<>();
         datas = inverterStatusDatas.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", inverterStatusDatas.getTotalElements());// 总记录数
-
-
-
-
         return map;
     }