增加光伏接口

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/IdxBizPvPointProcessVariableClassificationDto.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -29,7 +30,7 @@ public class IdxBizPvPointProcessVariableClassificationDto  {
     private String record;
 
     @TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     @TableField("REC_USER_ID")
     private String recUserId;
@@ -92,7 +93,7 @@ public class IdxBizPvPointProcessVariableClassificationDto  {
     private String subarray;
 
     @TableField("GATEWAY_ID")
-    private Integer gatewayId;
+    private String gatewayId;
 
     @ApiModelProperty(value = "点表地址")
     @TableField("INDEX_ADDRESS")
@@ -102,4 +103,11 @@ public class IdxBizPvPointProcessVariableClassificationDto  {
     @TableField("KKS")
     private String kks;
 
+ private Double currentValue;
+
+ private String pointOneId;
+ private String pointTwoId;
+ private String pointThreeId;
+
+ private String analysVariableId;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizFanHealthIndex.java

@@ -2,12 +2,11 @@ package com.yeejoin.amos.boot.module.jxiop.biz.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDateTime;
+import java.util.Date;
+
 
 /**
  * 
@@ -38,7 +37,7 @@ public class IdxBizFanHealthIndex {
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 
@@ -68,7 +67,7 @@ public class IdxBizFanHealthIndex {
      * 分析维度seq
      */
 	@TableField("ANALYSIS_OBJ_SEQ")
-    private Integer analysisObjSeq;
+    private String analysisObjSeq;
 
     /**
      * 
@@ -98,13 +97,13 @@ public class IdxBizFanHealthIndex {
      * 
      */
 	@TableField("ANALYSIS_START_TIME")
-    private LocalDateTime analysisStartTime;
+    private Date analysisStartTime;
 
     /**
      * 
      */
 	@TableField("ANALYSIS_END_TIME")
-    private LocalDateTime analysisEndTime;
+    private Date analysisEndTime;
 
     /**
      * 片区
@@ -148,4 +147,8 @@ public class IdxBizFanHealthIndex {
 	@TableField("INDEX_ADDRESS")
     private String indexAddress;
 
+
+    @TableField("ANOMALY")
+    private Double ANOMALY;
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvHealthIndex.java

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 
@@ -39,7 +40,7 @@ public class IdxBizPvHealthIndex{
      * 
      */
 	@TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     /**
      * 
@@ -69,7 +70,7 @@ public class IdxBizPvHealthIndex{
      * 分析维度seq
      */
 	@TableField("ANALYSIS_OBJ_SEQ")
-    private Integer analysisObjSeq;
+    private String analysisObjSeq;
 
     /**
      * 
@@ -141,7 +142,7 @@ public class IdxBizPvHealthIndex{
      * 网关ID
      */
 	@TableField("GATEWAY_ID")
-    private Integer gatewayId;
+    private String gatewayId;
 
     /**
      * 点表地址
@@ -155,4 +156,8 @@ public class IdxBizPvHealthIndex{
 	@TableField("EQUIPMENT_NAME")
     private String equipmentName;
 
+
+	@TableField("ANOMALY")
+    private Double ANOMALY;
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvPointVarCentralValue.java

@@ -147,6 +147,14 @@ public class IdxBizPvPointVarCentralValue{
 	@TableField("PROCESS3_MIN")
     private Double process3Min;
 
+    @TableField("PROCESS1_MAX")
+    private Double process1Max;
+
+    /**
+     *
+     */
+    @TableField("PROCESS1_MIN")
+    private Double process1Min;
     /**
      * 
      */

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizPvPointProcessVariableClassificationMapper.java

 package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizFanPointProcessVariableClassificationDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvPointProcessVariableClassificationDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvPointProcessVariableClassification;
 
 import java.util.List;
@@ -13,4 +15,7 @@ import java.util.List;
  */
 public interface IdxBizPvPointProcessVariableClassificationMapper extends BaseMapper<IdxBizPvPointProcessVariableClassification> {
     List<String> gateWayIdListPv();
+
+    List<IdxBizPvPointProcessVariableClassificationDto> getInfluxDBData();
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizPvPointProcessVariableClassificationMapper.xml

@@ -4,4 +4,54 @@
     <select id="gateWayIdListPv" resultType="java.lang.String">
         select GATEWAY_ID from idx_biz_pv_point_process_variable_classification group by GATEWAY_ID;
     </select>
+
+    <select id="getInfluxDBData" resultType="com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizPvPointProcessVariableClassificationDto">
+        SELECT b.*,
+               ibfpvcv.PROCESS_POINT1_ID as pointOneId,
+               ibfpvcv.PROCESS_POINT2_ID as pointTwoId,
+               ibfpvcv.PROCESS_POINT3_ID as pointThreeId,
+               ibfpvcv.ANALYSIS_POINT_ID as pointId
+        FROM (
+                 SELECT *
+                 FROM idx_biz_pv_point_process_variable_classification uxfv
+                 WHERE uxfv.SEQUENCE_NBR IN (
+                     SELECT PROCESS_POINT1_ID
+                     FROM `idx_biz_pv_point_var_central_value`
+                     WHERE ANALYSIS_POINT_ID IS NOT NULL
+                     GROUP BY ANALYSIS_POINT_ID,
+                              PROCESS_POINT1_ID,
+                              PROCESS_POINT3_ID,
+                              PROCESS_POINT2_ID
+                     UNION ALL
+                     SELECT PROCESS_POINT2_ID
+                     FROM `idx_biz_pv_point_var_central_value`
+                     WHERE ANALYSIS_POINT_ID IS NOT NULL
+                     GROUP BY ANALYSIS_POINT_ID,
+                              PROCESS_POINT1_ID,
+                              PROCESS_POINT3_ID,
+                              PROCESS_POINT2_ID
+                     UNION ALL
+                     SELECT PROCESS_POINT3_ID
+                     FROM `idx_biz_pv_point_var_central_value`
+                     WHERE ANALYSIS_POINT_ID IS NOT NULL
+                     GROUP BY ANALYSIS_POINT_ID,
+                              PROCESS_POINT1_ID,
+                              PROCESS_POINT3_ID,
+                              PROCESS_POINT2_ID
+                     UNION ALL
+                     SELECT ANALYSIS_POINT_ID
+                     FROM `idx_biz_pv_point_var_central_value`
+                     WHERE ANALYSIS_POINT_ID IS NOT NULL
+                     GROUP BY ANALYSIS_POINT_ID,
+                              PROCESS_POINT1_ID,
+                              PROCESS_POINT3_ID,
+                              PROCESS_POINT2_ID
+                 )) AS b,
+             idx_biz_pv_point_var_central_value ibfpvcv
+        WHERE b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT1_ID
+           OR b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT2_ID
+           OR b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT3_ID
+           OR b.SEQUENCE_NBR = ibfpvcv.ANALYSIS_POINT_ID
+        GROUP BY b.SEQUENCE_NBR
+    </select>
 </mapper>