解决小BUG 全厂孪生

jjt-admin/src/test/java/com/jjt/data/PrintingTest.java

@@ -45,10 +45,10 @@ public class PrintingTest {
         for (int i = 0; i < lines.length; i++) {
             String table = "root.tl.suxi.yhj_line" + lines[i] + "_PLC1";
             lists[i] = new ArrayList<>();
-            String st = "2025-02-28";
+            String st = "2025-03-03";
             LocalDate localDate = LocalDate.parse(st);
-            LocalDateTime start = LocalDateTime.of(localDate, LocalTime.MIN).plusHours(19);
-            LocalDateTime end = start.plusHours(11);
+            LocalDateTime start = LocalDateTime.of(localDate, LocalTime.MIN).plusHours(7);
+            LocalDateTime end = start.plusHours(23);
             do {
                 LocalDateTime startTime = start;
                 LocalDateTime endTime = start.plusHours(1);

jjt-admin/src/test/java/com/jjt/ep/EnvPowerTest.java

@@ -20,7 +20,7 @@ public class EnvPowerTest {
     public static void main(String[] args) throws Exception {
         System.err.println(System.getProperty("java.net.preferIPv4Stack"));
         String uri = "http://192.168.79.21:18080/truelove/energy/manage/monthlyFinancialStatement";
-        String date = "2025-02-15";
+        String date = "2025-03-03";
         JSONObject object = new JSONObject();
         object.set("selectTime", date);
         object.set("timeType", "DAY");

jjt-biz/src/main/java/com/jjt/biz/service/impl/ApiAllServiceImpl.java

@@ -93,6 +93,7 @@ public class ApiAllServiceImpl implements IApiAllService {
         do {
             ProdTradeVO vo = new ProdTradeVO();
             vo.setDate(week(start));
+            vo.setTips(start.toString());
             vo.mock();
             list.add(vo);
             start = start.plusDays(1);
@@ -108,6 +109,7 @@ public class ApiAllServiceImpl implements IApiAllService {
         do {
             EnergyTradeVO vo = new EnergyTradeVO();
             vo.setDate(start.getDayOfMonth() + "");
+            vo.setTips(start.toString());
             vo.mock();
             list.add(vo);
             start = start.plusDays(1);

jjt-biz/src/main/java/com/jjt/biz/vo/EnergyTradeVO.java

@@ -19,24 +19,54 @@ import java.util.Random;
 public class EnergyTradeVO {
     @ApiModelProperty("时间")
     private String date;
-    @ApiModelProperty("电")
-    private BigDecimal electricity;
-    @ApiModelProperty("汽")
-    private BigDecimal steam;
-    @ApiModelProperty("水")
-    private BigDecimal water;
-    @ApiModelProperty("价格")
-    private BigDecimal price;
+    @ApiModelProperty("原始时间")
+    private String tips;
+    @ApiModelProperty("经编能耗趋势")
+    private JB jb;
+    @ApiModelProperty("染整能耗趋势")
+    private RZ rz;
+
+    @Data
+    public static class JB {
+        @ApiModelProperty("电")
+        private BigDecimal electricity;
+        @ApiModelProperty("汽")
+        private BigDecimal steam;
+        @ApiModelProperty("水")
+        private BigDecimal water;
+        @ApiModelProperty("价格")
+        private BigDecimal price;
+    }
+    @Data
+    public static class RZ {
+        @ApiModelProperty("电")
+        private BigDecimal electricity;
+        @ApiModelProperty("汽")
+        private BigDecimal steam;
+        @ApiModelProperty("水")
+        private BigDecimal water;
+        @ApiModelProperty("价格")
+        private BigDecimal price;
+    }
+
+    public EnergyTradeVO() {
+        this.jb = new JB();
+        this.rz = new RZ();
+    }
 
     public void mock() {
         Random random = new Random();
         double price = 2.0 + random.nextDouble();
-        this.price = BigDecimal.valueOf(price).setScale(1, RoundingMode.HALF_UP);
+        this.jb.price = BigDecimal.valueOf(price).setScale(1, RoundingMode.HALF_UP);
+        price = 2.0 + random.nextDouble();
+        this.rz.price = BigDecimal.valueOf(price).setScale(1, RoundingMode.HALF_UP);
         double electricity = 50000 + 10000 * random.nextDouble();
-        this.electricity = BigDecimal.valueOf(electricity).setScale(1, RoundingMode.HALF_UP);
+        this.rz.electricity = BigDecimal.valueOf(electricity).setScale(1, RoundingMode.HALF_UP);
+        electricity = 5000 + 1000 * random.nextDouble();
+        this.jb.electricity = BigDecimal.valueOf(electricity).setScale(1, RoundingMode.HALF_UP);
         double steam = 400 + 200 * random.nextDouble();
-        this.steam = BigDecimal.valueOf(steam).setScale(1, RoundingMode.HALF_UP);
+        this.rz.steam = BigDecimal.valueOf(steam).setScale(1, RoundingMode.HALF_UP);
         double water = 400 + 200 * random.nextDouble();
-        this.water = BigDecimal.valueOf(water).setScale(1, RoundingMode.HALF_UP);
+        this.rz.water = BigDecimal.valueOf(water).setScale(1, RoundingMode.HALF_UP);
     }
 }

jjt-biz/src/main/java/com/jjt/biz/vo/ProdTradeVO.java

@@ -18,6 +18,9 @@ import java.util.Random;
 public class ProdTradeVO {
     @ApiModelProperty("时间")
     private String date;
+
+    @ApiModelProperty("原始时间")
+    private String tips;
     @ApiModelProperty("经编米数")
     private BigDecimal jbLength;
     @ApiModelProperty("染整米数")