AGC接口添加新选项卡限电时间格式转换

runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/agc/AgcDeviateController.java

@@ -11,6 +11,7 @@ import com.gyee.runeconomy.config.GyeeConfig;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.mapper.PowerLossesMapper;
 import com.gyee.runeconomy.model.PowerLosses;
+import com.gyee.runeconomy.model.PowerLossesDTO;
 import com.gyee.runeconomy.model.StatusTime;
 import com.gyee.runeconomy.model.auto.PointInfo;
 import com.gyee.runeconomy.model.auto.ProBasicEquipment;
@@ -26,6 +27,10 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 import java.util.concurrent.ConcurrentHashMap;
@@ -83,10 +88,22 @@ public class AgcDeviateController {
      * @return
      */
     @GetMapping("/xdloss")
-    public List<PowerLosses> getxdData() {
+    public List<PowerLossesDTO> getxdData() {
         QueryWrapper<PowerLosses> queryWrapper = new QueryWrapper<>();
         List<PowerLosses> powerLosses = powerLossesMapper.selectList(queryWrapper);
-        return powerLosses;
+        List<PowerLossesDTO> dtos = new ArrayList<>();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
+        for (PowerLosses pl : powerLosses) {
+            PowerLossesDTO dto = new PowerLossesDTO();
+            dto.setId(pl.getId());
+            dto.setId(dto.getId());
+            dto.setStartTime(pl.getStartTime().format(formatter));
+            dto.setEndTime(pl.getEndTime().format(formatter));
+            dto.setXdss(pl.getXdss());
+            dto.setRecordDate(pl.getRecordDate());
+            dtos.add(dto);
+        }
+        return dtos;
     }
     /**
      * 获取配置

runeconomy-xk/src/main/java/com/gyee/runeconomy/model/PowerLossesDTO.java

@@ -0,0 +1,51 @@
+package com.gyee.runeconomy.model;
+
+import java.time.LocalDate;
+
+public class PowerLossesDTO {
+    private Integer id;
+    private String startTime;
+    private String endTime;
+    private String xdss;
+    private LocalDate recordDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getXdss() {
+        return xdss;
+    }
+
+    public void setXdss(String xdss) {
+        this.xdss = xdss;
+    }
+
+    public LocalDate getRecordDate() {
+        return recordDate;
+    }
+
+    public void setRecordDate(LocalDate recordDate) {
+        this.recordDate = recordDate;
+    }
+}

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/WindDirection/WindALG.java

@@ -391,7 +391,7 @@ public class WindALG {
             PowerPointData item = list.get(i);
             double dfwc = 0;
             if (equipments.size()>0) {
-                dfwc = Math.abs(item.getDfwc()) *  57.2958;
+                dfwc = Math.abs(item.getDfwc()) * 57.2958;
                 dfwcls.add(dfwc);
             } else {
                 dfwc = Math.abs(item.getDfwc());

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/WindDirection/WindDirectionService.java

@@ -88,7 +88,7 @@ public class WindDirectionService {
             PowerPointData data = new PowerPointData();
             data.setTime(DateUtils.formatTimestamp(ts));
             if (fxData.getDoubleValue() < 0) {
-                data.setFx(fxData.getDoubleValue() + 360);
+                data.setFx(Math.abs(fxData.getDoubleValue()));//风向为负取绝对值
             } else {
                 data.setFx(fxData.getDoubleValue());
             }
@@ -324,7 +324,7 @@ public class WindDirectionService {
             PowerPointData data = new PowerPointData();
             data.setTime(DateUtils.formatTimestamp(ts));
             if (fxData.getDoubleValue() < 0) {
-                data.setFx(fxData.getDoubleValue() + 360);
+                data.setFx(Math.abs(fxData.getDoubleValue()));
             } else {
                 data.setFx(fxData.getDoubleValue());
             }