修改代码

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

@@ -93,7 +93,7 @@ public class IdxBizFanPointProcessVariableClassificationDto  {
     private String pointName;
 
     @TableField("GATEWAY_ID")
-    private Long gatewayId;
+    private String gatewayId;
 
     @ApiModelProperty(value = "点表地址")
     @TableField("INDEX_ADDRESS")
@@ -103,4 +103,12 @@ public class IdxBizFanPointProcessVariableClassificationDto  {
     @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/resources/mapper/cluster/IdxBizFanPointProcessVariableClassificationMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jxiop.biz.mapper2.IdxBizFanPointProcessVariableClassificationMapper">
-    <select id="getInfluxDBData" resultType="com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanPointProcessVariableClassification">
+    <select id="getInfluxDBData" resultType="com.yeejoin.amos.boot.module.jxiop.biz.dto.IdxBizFanPointProcessVariableClassificationDto">
         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
+               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_uxfv uxfv
-        WHERE uxfv.SEQUENCE_NBR IN (
-        SELECT PROCESS_POINT1_ID
-        FROM `idx_biz_fan_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_fan_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_fan_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_fan_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_fan_point_var_central_value ibfpvcv
+                 SELECT *
+                 FROM idx_biz_fan_point_process_variable_classification uxfv
+                 WHERE uxfv.SEQUENCE_NBR IN (
+                     SELECT PROCESS_POINT1_ID
+                     FROM `idx_biz_fan_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_fan_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_fan_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_fan_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_fan_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.PROCESS_POINT2_ID
+           OR b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT3_ID
         GROUP BY b.SEQUENCE_NBR
     </select>