30546 运行趋势页签接口开发bug

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/EquipTrendResultVo.java

@@ -4,11 +4,50 @@ import lombok.Data;
 
 import java.util.List;
 
-@Data
 public class EquipTrendResultVo {
     private List<String> legends;
     private String yAxisName;
     private List<String> xAxisData;
     private List<List<String>> yAxisData;
     private List<List<String>> threshold;
+
+    public List<String> getLegends() {
+        return legends;
+    }
+
+    public void setLegends(List<String> legends) {
+        this.legends = legends;
+    }
+
+    public String getyAxisName() {
+        return yAxisName;
+    }
+
+    public void setyAxisName(String yAxisName) {
+        this.yAxisName = yAxisName;
+    }
+
+    public List<String> getxAxisData() {
+        return xAxisData;
+    }
+
+    public void setxAxisData(List<String> xAxisData) {
+        this.xAxisData = xAxisData;
+    }
+
+    public List<List<String>> getyAxisData() {
+        return yAxisData;
+    }
+
+    public void setyAxisData(List<List<String>> yAxisData) {
+        this.yAxisData = yAxisData;
+    }
+
+    public List<List<String>> getThreshold() {
+        return threshold;
+    }
+
+    public void setThreshold(List<List<String>> threshold) {
+        this.threshold = threshold;
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -2280,7 +2280,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
             maxMinInfo.add(equipInfo.getMaxNum());
             threshold.add(maxMinInfo);
             legends.add(equipInfo.getName());
-            equipTrendResultVo.setYAxisName(equipInfo.getUnit());
+            equipTrendResultVo.setyAxisName(equipInfo.getUnit());
 
             //iot数据查询组装
             String prefix = null;
@@ -2337,9 +2337,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
 
             }
             yaxisList.add(values);
-            equipTrendResultVo.setXAxisData(allTimeListNew);
+            equipTrendResultVo.setxAxisData(allTimeListNew);
         }
-        equipTrendResultVo.setYAxisData(yaxisList);
+        equipTrendResultVo.setyAxisData(yaxisList);
         return equipTrendResultVo;
     }
 
@@ -2369,7 +2369,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
             maxMinInfo.add(equipInfo.getMaxNum());
             threshold.add(maxMinInfo);
             legends.add(equipInfo.getName());
-            equipTrendResultVo.setYAxisName(equipInfo.getUnit());
+            equipTrendResultVo.setyAxisName(equipInfo.getUnit());
 
             //iot数据查询组装
             String prefix = null;
@@ -2394,15 +2394,17 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
                     if (mapList.containsKey(indexKey)) {
                         long countNum = allTimeList.stream().filter(item -> mapList.get("time").contains(item)).count();
                         values.add(String.valueOf(countNum));
+                    } else {
+                        values.add("0");
                     }
                 }
                 yaxisList.add(values);
             }
         }
-        equipTrendResultVo.setXAxisData(allTimeList);
+        equipTrendResultVo.setxAxisData(allTimeList);
         equipTrendResultVo.setLegends(legends);
         equipTrendResultVo.setThreshold(threshold);
-        equipTrendResultVo.setYAxisData(yaxisList);
+        equipTrendResultVo.setyAxisData(yaxisList);
         return equipTrendResultVo;
     }