Merge branch 'master' into feature-management-2021-9-16

fiveep-model/src/main/java/com/bizmatics/model/RtAnalogData.java

@@ -1,15 +1,15 @@
 package com.bizmatics.model;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  * 
@@ -401,13 +401,13 @@ public class RtAnalogData implements Serializable {
      * 冻结时间
      */
     @TableField("freezingTime")
-    private LocalDate freezingTime;
+    private Date freezingTime;
 
     /**
      * 上报时间
      */
     @TableField("dataTime")
-    private LocalDateTime dataTime;
+    private Date dataTime;
 
 
 }

fiveep-service/src/main/java/com/bizmatics/service/impl/RtAnalogDataServiceImpl.java

@@ -148,6 +148,9 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
         List<Double> checkList = new ArrayList<>();
         Integer score = 0;
         RealScoreVO realScoreVo = BeanMapperUtils.map(rtAnalogData, RealScoreVO.class);
+        if (null == realScoreVo.getCos()){
+            realScoreVo.setCos(0.00);
+        }
         checkList.add(realScoreVo.getIa());
         checkList.add(realScoreVo.getIb());
         checkList.add(realScoreVo.getIc());

fiveep-service/src/main/java/com/bizmatics/service/vo/RealScoreVO.java

@@ -2,6 +2,8 @@ package com.bizmatics.service.vo;
 
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 实时评分
  * @author yq
@@ -85,4 +87,8 @@ public class RealScoreVO {
      */
     private String loop;
 
+    /**
+     * 时间
+     */
+    private Date dataTime;
 }