配电图相关接口开发调整1

fiveep-controller/src/main/java/com/bizmatics/controller/web/HookupController.java

@@ -5,6 +5,7 @@ import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.model.Device;
 import com.bizmatics.model.DeviceAnalogVariableList;
 import com.bizmatics.model.DeviceAttribute;
+import com.bizmatics.model.Hookup;
 import com.bizmatics.model.vo.HookupComponentCompleteOneVo;
 import com.bizmatics.model.vo.HookupComponentCompleteVo;
 import com.bizmatics.model.vo.HookupOneVo;

fiveep-controller/src/main/java/com/bizmatics/controller/web/MybatisGeneratorUtils.java

@@ -43,10 +43,10 @@ public class MybatisGeneratorUtils {
         //2、数据源配置
         //修改数据源
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://124.71.145.219:3306/smart_electricity?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
-        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setUrl("jdbc:mysql://124.70.160.158:3306/smart_electricity?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
+        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
-        dsc.setPassword("Wjzn2021Db");
+        dsc.setPassword("Y48hD&Eg");
         mpg.setDataSource(dsc);
 
         // 3、包配置
@@ -70,7 +70,7 @@ public class MybatisGeneratorUtils {
         // strategy.setTablePrefix("t_"); // 表名前缀
         strategy.setEntityLombokModel(true); //使用lombok
         //修改自己想要生成的表
-        strategy.setInclude(new String[]{"site_archives"});  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude(new String[]{"rt_analog_173_data"});  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

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

@@ -77,4 +77,16 @@ public class Hookup implements Serializable {
     private LocalDateTime createTime;
 
 
+    @TableField("dataType")
+    private String dataType;
+    @TableField("createType")
+    private String createType;
+    @TableField("echartsOption")
+    private String echartsOption;
+    @TableField("svgLineSelectval")
+    private String svgLineSelectval;
+    @TableField("elementBool")
+    private String elementBool;
+
+
 }

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

@@ -148,5 +148,13 @@ public class HookupComponentComplete implements Serializable {
      */
     private LocalDateTime createTime;
 
+    @TableField("createType")
+    private String createType;
+    @TableField("mPoint")
+    private String mPoint;
+    @TableField("echartsOption")
+    private String echartsOption;
+    @TableField("svgLineSelectval")
+    private String svgLineSelectval;
 
 }

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

@@ -0,0 +1,167 @@
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2022-03-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class RtAnalog171Data implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 伍继电力hz171消费组模拟量实时数据表ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 阿里云平台设备名称
+     */
+    @TableField("deviceName")
+    private String deviceName;
+
+    /**
+     * A相电压
+     */
+    @TableField("voltageA")
+    private Double voltageA;
+
+    /**
+     * B相电压
+     */
+    @TableField("voltageB")
+    private Double voltageB;
+
+    /**
+     * C相电压
+     */
+    @TableField("voltageC")
+    private Double voltageC;
+
+    /**
+     * AB线电压
+     */
+    @TableField("voltageAB")
+    private Double voltageAB;
+
+    /**
+     * BC线电压
+     */
+    @TableField("voltageBC")
+    private Double voltageBC;
+
+    /**
+     * CA线电压
+     */
+    @TableField("voltageCA")
+    private Double voltageCA;
+
+    /**
+     * 频率
+     */
+    private Double frequency;
+
+    /**
+     * 直流遥测1
+     */
+    private Double analog1;
+
+    /**
+     * 直流遥测2
+     */
+    private Double analog2;
+
+    /**
+     * 直流遥测3
+     */
+    private Double analog3;
+
+    /**
+     * 直流遥测4
+     */
+    private Double analog4;
+
+    /**
+     * 直流遥测5
+     */
+    private Double analog5;
+
+    /**
+     * A相电压THD
+     */
+    @TableField("voltageATHD")
+    private Double voltageATHD;
+
+    /**
+     * B相电压THD
+     */
+    @TableField("voltageBTHD")
+    private Double voltageBTHD;
+
+    /**
+     * C相电压THD
+     */
+    @TableField("voltageCTHD")
+    private Double voltageCTHD;
+
+    /**
+     * 电压暂降次数
+     */
+    @TableField("voltageSagTimes")
+    private Integer voltageSagTimes;
+
+    /**
+     * 电压暂升次数
+     */
+    @TableField("voltageSwellTimes")
+    private Integer voltageSwellTimes;
+
+    /**
+     * 电压中断次数
+     */
+    @TableField("voltageInterruptionTimes")
+    private Integer voltageInterruptionTimes;
+
+    /**
+     * 电压不平衡度
+     */
+    @TableField("voltageUnbalanceFactor")
+    private Double voltageUnbalanceFactor;
+
+    /**
+     * 遥测备用
+     */
+    @TableField("analogReserved")
+    private Double analogReserved;
+
+    /**
+     * 冻结时间
+     */
+    @TableField("freezingTime")
+    private LocalDate freezingTime;
+
+    /**
+     * 上报时间
+     */
+    @TableField("dataTime")
+    private LocalDateTime dataTime;
+
+
+}

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

@@ -0,0 +1,383 @@
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2022-03-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class RtAnalog173Data implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 伍继电力hz173消费组模拟量实时数据表ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 阿里云平台设备名称
+     */
+    @TableField("deviceName")
+    private String deviceName;
+
+    /**
+     * 三相功率因数
+     */
+    @TableField("COS")
+    private Double cos;
+
+    /**
+     * A相功率因数
+     */
+    @TableField("COSa")
+    private Double COSa;
+
+    /**
+     * B相功率因数
+     */
+    @TableField("COSb")
+    private Double COSb;
+
+    /**
+     * C相功率因数
+     */
+    @TableField("COSc")
+    private Double COSc;
+
+    /**
+     * 实时有功需量
+     */
+    @TableField("Demand")
+    private Double Demand;
+
+    /**
+     * 三相反向有功电度
+     */
+    @TableField("Epn")
+    private Double Epn;
+
+    /**
+     * 尖段反向有功电度
+     */
+    @TableField("Epn1")
+    private Double Epn1;
+
+    /**
+     * 峰段反向有功电度
+     */
+    @TableField("Epn2")
+    private Double Epn2;
+
+    /**
+     * 平段反向有功电度
+     */
+    @TableField("Epn3")
+    private Double Epn3;
+
+    /**
+     * 谷段反向有功电度
+     */
+    @TableField("Epn4")
+    private Double Epn4;
+
+    /**
+     * 三相正向有功电度
+     */
+    @TableField("Epp")
+    private Double Epp;
+
+    /**
+     * 尖段正向有功电度
+     */
+    @TableField("Epp1")
+    private Double Epp1;
+
+    /**
+     * 峰段正向有功电度
+     */
+    @TableField("Epp2")
+    private Double Epp2;
+
+    /**
+     * 平段正向有功电度
+     */
+    @TableField("Epp3")
+    private Double Epp3;
+
+    /**
+     * 谷段正向有功电度
+     */
+    @TableField("Epp4")
+    private Double Epp4;
+
+    /**
+     * 三相反向无功电度
+     */
+    @TableField("Eqn")
+    private Double Eqn;
+
+    /**
+     * 三相正向无功电度
+     */
+    @TableField("Eqp")
+    private Double Eqp;
+
+    /**
+     * 频率
+     */
+    @TableField("F")
+    private Double f;
+
+    /**
+     * A相总谐波电流
+     */
+    @TableField("IHa")
+    private Double IHa;
+
+    /**
+     * B相总谐波电流
+     */
+    @TableField("IHb")
+    private Double IHb;
+
+    /**
+     * C相总谐波电流
+     */
+    @TableField("IHc")
+    private Double IHc;
+
+    /**
+     * A相电流
+     */
+    @TableField("Ia")
+    private Double Ia;
+
+    /**
+     * B相电流
+     */
+    @TableField("Ib")
+    private Double Ib;
+
+    /**
+     * C相电流
+     */
+    @TableField("Ic")
+    private Double Ic;
+
+    /**
+     * 剩余电流
+     */
+    @TableField("Ir")
+    private Double Ir;
+
+    /**
+     * 三相总有功功率
+     */
+    @TableField("P")
+    private Double p;
+
+    /**
+     * A相有功功率
+     */
+    @TableField("Pa")
+    private Double Pa;
+
+    /**
+     * B相有功功率
+     */
+    @TableField("Pb")
+    private Double Pb;
+
+    /**
+     * C相有功功率
+     */
+    @TableField("Pc")
+    private Double Pc;
+
+    /**
+     * 三相总无功功率
+     */
+    @TableField("Q")
+    private Double q;
+
+    /**
+     * A相无功功率
+     */
+    @TableField("Qa")
+    private Double Qa;
+
+    /**
+     * B相无功功率
+     */
+    @TableField("Qb")
+    private Double Qb;
+
+    /**
+     * C相无功功率
+     */
+    @TableField("Qc")
+    private Double Qc;
+
+    /**
+     * 第1路温度
+     */
+    @TableField("T1")
+    private Double t1;
+
+    /**
+     * 第2路温度
+     */
+    @TableField("T2")
+    private Double t2;
+
+    /**
+     * 第3路温度
+     */
+    @TableField("T3")
+    private Double t3;
+
+    /**
+     * A相电压THD
+     */
+    @TableField("THDUa")
+    private Double THDUa;
+
+    /**
+     * B相电压THD
+     */
+    @TableField("THDUb")
+    private Double THDUb;
+
+    /**
+     * C相电压THD
+     */
+    @TableField("THDUc")
+    private Double THDUc;
+
+    /**
+     * A相电压
+     */
+    @TableField("Ua")
+    private Double Ua;
+
+    /**
+     * AB线电压
+     */
+    @TableField("Uab")
+    private Double Uab;
+
+    /**
+     * B相电压
+     */
+    @TableField("Ub")
+    private Double Ub;
+
+    /**
+     * BC线电压
+     */
+    @TableField("Ubc")
+    private Double Ubc;
+
+    /**
+     * C相电压
+     */
+    @TableField("Uc")
+    private Double Uc;
+
+    /**
+     * CA线电压
+     */
+    @TableField("Uca")
+    private Double Uca;
+
+    /**
+     * 电压暂降次数
+     */
+    @TableField("Udt")
+    private Integer Udt;
+
+    /**
+     * 线路侧电压
+     */
+    @TableField("Ul")
+    private Double Ul;
+
+    /**
+     * 电压暂升次数
+     */
+    @TableField("Upt")
+    private Integer Upt;
+
+    /**
+     * 电压短时中断次数
+     */
+    @TableField("Ust")
+    private Integer Ust;
+
+    /**
+     * 不平衡电流
+     */
+    @TableField("unbalanceCurrent")
+    private Double unbalanceCurrent;
+
+    /**
+     * 不平衡电压
+     */
+    @TableField("unbalanceVoltage")
+    private Double unbalanceVoltage;
+
+    /**
+     * 遥测备用1
+     */
+    @TableField("analogReserved1")
+    private Double analogReserved1;
+
+    /**
+     * 遥测备用2
+     */
+    @TableField("analogReserved2")
+    private Double analogReserved2;
+
+    /**
+     * 遥测备用3
+     */
+    @TableField("analogReserved3")
+    private Double analogReserved3;
+
+    /**
+     * 遥测备用4
+     */
+    @TableField("analogReserved4")
+    private Double analogReserved4;
+
+    /**
+     * 冻结时间
+     */
+    @TableField("freezingTime")
+    private LocalDate freezingTime;
+
+    /**
+     * 上报时间
+     */
+    @TableField("dataTime")
+    private LocalDateTime dataTime;
+
+
+}

fiveep-model/src/main/java/com/bizmatics/model/vo/DeviceTypeVo.java

@@ -0,0 +1,27 @@
+package com.bizmatics.model.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author ya
+ * @since 2021-10-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DeviceTypeVo {
+
+    private String variableCoding;
+
+    private String deviceCode;
+
+    private Integer deviceType;
+
+
+}

fiveep-model/src/main/java/com/bizmatics/model/vo/HookupComponentCompleteOneVo.java

@@ -149,4 +149,10 @@ public class HookupComponentCompleteOneVo implements Serializable {
     private LocalDateTime createTime;
 
 
+    private String createType;
+    private String mPoint;
+    private String echartsOption;
+    private String svgLineSelectval;
+
+
 }

fiveep-model/src/main/java/com/bizmatics/model/vo/HookupComponentCompleteTowVo.java

@@ -0,0 +1,163 @@
+package com.bizmatics.model.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2022-03-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class HookupComponentCompleteTowVo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 接线图元器件详细数据关联表ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 类别
+     */
+    private Integer sort;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 内部类型
+     */
+    @TableField("innerType")
+    private String innerType;
+
+    /**
+     * 类型名称
+     */
+    @TableField("typeName")
+    private String typeName;
+
+    /**
+     * 元器件颜色
+     */
+    @TableField("svgColor")
+    private String svgColor;
+
+    /**
+     * 元器件X坐标
+     */
+    @TableField("svgPositionX")
+    private Integer svgPositionX;
+
+    /**
+     * 元器件Y坐标
+     */
+    @TableField("svgPositionY")
+    private Integer svgPositionY;
+
+    /**
+     * 大小
+     */
+    private Integer size;
+
+    /**
+     * 高度
+     */
+    private Integer height;
+
+    /**
+     * 宽度
+     */
+    private Integer width;
+
+    /**
+     * 字体大小
+     */
+    @TableField("fontSize")
+    private Integer fontSize;
+
+    /**
+     * 元器件描述
+     */
+    @TableField("svgText")
+    private String svgText;
+
+    /**
+     * 角度
+     */
+    private Integer angle;
+
+    /**
+     * 表行数
+     */
+    @TableField("tableRowCount")
+    private Integer tableRowCount;
+
+    /**
+     * 表列数
+     */
+    @TableField("tableColCount")
+    private Integer tableColCount;
+
+    /**
+     * 表数据
+     */
+    @TableField("tableData")
+    private String tableData;
+
+    @TableField("elementBool")
+    private String elementBool;
+
+    /**
+     * 所属站点ID
+     */
+    private Integer siteId;
+
+    /**
+     * 所属设备ID
+     */
+    private Integer deviceId;
+
+    /**
+     * 所属变量ID
+     */
+    private Integer variableId;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 变量名称
+     */
+    @TableField("variable_coding")
+    private String variableCoding;
+
+    private String createType;
+    private String mPoint;
+    private String echartsOption;
+    private String svgLineSelectval;
+
+}

fiveep-model/src/main/java/com/bizmatics/model/vo/HookupComponentCompleteVo.java

@@ -8,7 +8,6 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -137,4 +136,14 @@ public class HookupComponentCompleteVo implements Serializable {
      * 所属变量ID
      */
     private Integer variableId;
+
+    /**
+     * 采集值
+     */
+    private String variableValue;
+
+    private String createType;
+    private Object mPoint;
+    private Object echartsOption;
+    private String svgLineSelectval;
 }

fiveep-model/src/main/java/com/bizmatics/model/vo/HookupOneVo.java

@@ -55,5 +55,15 @@ public class HookupOneVo implements Serializable {
      */
     private HookupComponentBasicsVo array;
 
+    private String dataType;
+
+    private String createType;
+
+    private Object echartsOption;
+
+    private String svgLineSelectval;
+
+    private String elementBool;
+
 
 }

fiveep-model/src/main/java/com/bizmatics/model/vo/RtAnalogDataOneVo.java

@@ -0,0 +1,569 @@
+package com.bizmatics.model.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2021-07-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class RtAnalogDataOneVo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 伍继电力test_183消费组模拟量数据表ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 阿里云平台设备名称
+     */
+    @TableField("deviceName")
+    private String deviceName;
+
+    /**
+     * 母线停电次数
+     */
+    @TableField("Busot")
+    private Integer Busot;
+
+    /**
+     * 三相功率因数
+     */
+    @TableField("COS")
+    private Double cos;
+
+    /**
+     * A相功率因数
+     */
+    @TableField("COSa")
+    private Double COSa;
+
+    /**
+     * B相功率因数
+     */
+    @TableField("COSb")
+    private Double COSb;
+
+    /**
+     * C相功率因数
+     */
+    @TableField("COSc")
+    private Double COSc;
+
+    /**
+     * 实时有功需量
+     */
+    @TableField("Demand")
+    private Double Demand;
+
+    /**
+     * 设备复位次数
+     */
+    @TableField("DevResetTimes")
+    private Integer DevResetTimes;
+
+    /**
+     * 设备温度
+     */
+    @TableField("DeviceTemp")
+    private Double DeviceTemp;
+
+    /**
+     * 三相反向有功电度
+     */
+    @TableField("Epn")
+    private Double Epn;
+
+    /**
+     * 尖段反向有功电度
+     */
+    @TableField("Epn1")
+    private Double Epn1;
+
+    /**
+     * 峰段反向有功电度
+     */
+    @TableField("Epn2")
+    private Double Epn2;
+
+    /**
+     * 平段反向有功电度
+     */
+    @TableField("Epn3")
+    private Double Epn3;
+
+    /**
+     * 谷段反向有功电度
+     */
+    @TableField("Epn4")
+    private Double Epn4;
+
+    /**
+     * 三相正向有功电度
+     */
+    @TableField("Epp")
+    private Double Epp;
+
+    /**
+     * 尖段正向有功电度
+     */
+    @TableField("Epp1")
+    private Double Epp1;
+
+    /**
+     * 峰段正向有功电度
+     */
+    @TableField("Epp2")
+    private Double Epp2;
+
+    /**
+     * 平段正向有功电度
+     */
+    @TableField("Epp3")
+    private Double Epp3;
+
+    /**
+     * 谷段正向有功电度
+     */
+    @TableField("Epp4")
+    private Double Epp4;
+
+    /**
+     * 三相反向无功电度
+     */
+    @TableField("Eqn")
+    private Double Eqn;
+
+    /**
+     * 三相正向无功电度
+     */
+    @TableField("Eqp")
+    private Double Eqp;
+
+    /**
+     * 频率
+     */
+    @TableField("F")
+    private Double f;
+
+    /**
+     * 零序电流
+     */
+    @TableField("I0")
+    private Double i0;
+
+    /**
+     * 负序电流
+     */
+    @TableField("I2")
+    private Double i2;
+
+    /**
+     * A相总谐波电流
+     */
+    @TableField("IHa")
+    private Double IHa;
+
+    /**
+     * B相总谐波电流
+     */
+    @TableField("IHb")
+    private Double IHb;
+
+    /**
+     * C相总谐波电流
+     */
+    @TableField("IHc")
+    private Double IHc;
+
+    /**
+     * A相电流
+     */
+    @TableField("Ia")
+    private Double Ia;
+
+    /**
+     * B相电流
+     */
+    @TableField("Ib")
+    private Double Ib;
+
+    /**
+     * C相电流
+     */
+    @TableField("Ic")
+    private Double Ic;
+
+    /**
+     * 剩余电流
+     */
+    @TableField("Ir")
+    private Double Ir;
+
+    /**
+     * 昨日有功最大需量
+     */
+    @TableField("LastDayMD")
+    private Double LastDayMD;
+
+    /**
+     * 昨日有功最大需量发生时间
+     */
+    @TableField("LastDayMDt")
+    private Double LastDayMDt;
+
+    /**
+     * 三相总有功功率
+     */
+    @TableField("P")
+    private Double p;
+
+    /**
+     * A相有功功率
+     */
+    @TableField("Pa")
+    private Double Pa;
+
+    /**
+     * B相有功功率
+     */
+    @TableField("Pb")
+    private Double Pb;
+
+    /**
+     * C相有功功率
+     */
+    @TableField("Pc")
+    private Double Pc;
+
+    /**
+     * 三相总无功功率
+     */
+    @TableField("Q")
+    private Double q;
+
+    /**
+     * A相无功功率
+     */
+    @TableField("Qa")
+    private Double Qa;
+
+    /**
+     * B相无功功率
+     */
+    @TableField("Qb")
+    private Double Qb;
+
+    /**
+     * C相无功功率
+     */
+    @TableField("Qc")
+    private Double Qc;
+
+    /**
+     * 信号强度
+     */
+    @TableField("SignalIntensity")
+    private Double SignalIntensity;
+
+    /**
+     * 第1路温度
+     */
+    @TableField("T1")
+    private Double t1;
+
+    /**
+     * 第2路温度
+     */
+    @TableField("T2")
+    private Double t2;
+
+    /**
+     * 第3路温度
+     */
+    @TableField("T3")
+    private Double t3;
+
+    /**
+     * 第4路温度
+     */
+    @TableField("T4")
+    private Double t4;
+
+    /**
+     * A相电压THD
+     */
+    @TableField("THDUa")
+    private Double THDUa;
+
+    /**
+     * B相电压THD
+     */
+    @TableField("THDUb")
+    private Double THDUb;
+
+    /**
+     * C相电压THD
+     */
+    @TableField("THDUc")
+    private Double THDUc;
+
+    /**
+     * A相电压
+     */
+    @TableField("Ua")
+    private Double Ua;
+
+    /**
+     * AB线电压
+     */
+    @TableField("Uab")
+    private Double Uab;
+
+    /**
+     * B相电压
+     */
+    @TableField("Ub")
+    private Double Ub;
+
+    /**
+     * BC线电压
+     */
+    @TableField("Ubc")
+    private Double Ubc;
+
+    /**
+     * 零序电压不平衡度
+     */
+    @TableField("UblU0")
+    private Double UblU0;
+
+    /**
+     * 负序电压不平衡度
+     */
+    @TableField("UblU2")
+    private Double UblU2;
+
+    /**
+     * C相电压
+     */
+    @TableField("Uc")
+    private Double Uc;
+
+    /**
+     * CA线电压
+     */
+    @TableField("Uca")
+    private Double Uca;
+
+    /**
+     * 电压暂降次数
+     */
+    @TableField("Udt")
+    private Integer Udt;
+
+    /**
+     * 线路侧电压
+     */
+    @TableField("Ul")
+    private Double Ul;
+
+    /**
+     * 电压暂升次数
+     */
+    @TableField("Upt")
+    private Integer Upt;
+
+    /**
+     * 电压短时中断次数
+     */
+    @TableField("Ust")
+    private Integer Ust;
+
+    /**
+     * 冻结时间
+     */
+    @TableField("freezingTime")
+    private Date freezingTime;
+
+    /**
+     * 上报时间
+     */
+    @TableField("dataTime")
+    private Date dataTime;
+
+    /**
+     * 变量名称
+     */
+    @TableField("variable_coding")
+    private String variableCoding;
+
+    /**
+     * A相电压
+     */
+    @TableField("voltageA")
+    private Double voltageA;
+
+    /**
+     * B相电压
+     */
+    @TableField("voltageB")
+    private Double voltageB;
+
+    /**
+     * C相电压
+     */
+    @TableField("voltageC")
+    private Double voltageC;
+
+    /**
+     * AB线电压
+     */
+    @TableField("voltageAB")
+    private Double voltageAB;
+
+    /**
+     * BC线电压
+     */
+    @TableField("voltageBC")
+    private Double voltageBC;
+
+    /**
+     * CA线电压
+     */
+    @TableField("voltageCA")
+    private Double voltageCA;
+
+    /**
+     * 频率
+     */
+    private Double frequency;
+
+    /**
+     * 直流遥测1
+     */
+    private Double analog1;
+
+    /**
+     * 直流遥测2
+     */
+    private Double analog2;
+
+    /**
+     * 直流遥测3
+     */
+    private Double analog3;
+
+    /**
+     * 直流遥测4
+     */
+    private Double analog4;
+
+    /**
+     * 直流遥测5
+     */
+    private Double analog5;
+
+    /**
+     * A相电压THD
+     */
+    @TableField("voltageATHD")
+    private Double voltageATHD;
+
+    /**
+     * B相电压THD
+     */
+    @TableField("voltageBTHD")
+    private Double voltageBTHD;
+
+    /**
+     * C相电压THD
+     */
+    @TableField("voltageCTHD")
+    private Double voltageCTHD;
+
+    /**
+     * 电压暂降次数
+     */
+    @TableField("voltageSagTimes")
+    private Integer voltageSagTimes;
+
+    /**
+     * 电压暂升次数
+     */
+    @TableField("voltageSwellTimes")
+    private Integer voltageSwellTimes;
+
+    /**
+     * 电压中断次数
+     */
+    @TableField("voltageInterruptionTimes")
+    private Integer voltageInterruptionTimes;
+
+    /**
+     * 电压不平衡度
+     */
+    @TableField("voltageUnbalanceFactor")
+    private Double voltageUnbalanceFactor;
+
+    /**
+     * 遥测备用
+     */
+    @TableField("analogReserved")
+    private Double analogReserved;
+
+    /**
+     * 不平衡电流
+     */
+    @TableField("unbalanceCurrent")
+    private Double unbalanceCurrent;
+
+    /**
+     * 不平衡电压
+     */
+    @TableField("unbalanceVoltage")
+    private Double unbalanceVoltage;
+
+    /**
+     * 遥测备用1
+     */
+    @TableField("analogReserved1")
+    private Double analogReserved1;
+
+    /**
+     * 遥测备用2
+     */
+    @TableField("analogReserved2")
+    private Double analogReserved2;
+
+    /**
+     * 遥测备用3
+     */
+    @TableField("analogReserved3")
+    private Double analogReserved3;
+
+    /**
+     * 遥测备用4
+     */
+    @TableField("analogReserved4")
+    private Double analogReserved4;
+}

fiveep-model/src/main/java/com/bizmatics/model/vo/RtAnalogDataVo.java

@@ -0,0 +1,418 @@
+package com.bizmatics.model.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+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>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2021-07-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class RtAnalogDataVo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 伍继电力test_183消费组模拟量数据表ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 阿里云平台设备名称
+     */
+    @TableField("deviceName")
+    private String deviceName;
+
+    /**
+     * 母线停电次数
+     */
+    @TableField("Busot")
+    private Integer Busot;
+
+    /**
+     * 三相功率因数
+     */
+    @TableField("COS")
+    private Double cos;
+
+    /**
+     * A相功率因数
+     */
+    @TableField("COSa")
+    private Double COSa;
+
+    /**
+     * B相功率因数
+     */
+    @TableField("COSb")
+    private Double COSb;
+
+    /**
+     * C相功率因数
+     */
+    @TableField("COSc")
+    private Double COSc;
+
+    /**
+     * 实时有功需量
+     */
+    @TableField("Demand")
+    private Double Demand;
+
+    /**
+     * 设备复位次数
+     */
+    @TableField("DevResetTimes")
+    private Integer DevResetTimes;
+
+    /**
+     * 设备温度
+     */
+    @TableField("DeviceTemp")
+    private Double DeviceTemp;
+
+    /**
+     * 三相反向有功电度
+     */
+    @TableField("Epn")
+    private Double Epn;
+
+    /**
+     * 尖段反向有功电度
+     */
+    @TableField("Epn1")
+    private Double Epn1;
+
+    /**
+     * 峰段反向有功电度
+     */
+    @TableField("Epn2")
+    private Double Epn2;
+
+    /**
+     * 平段反向有功电度
+     */
+    @TableField("Epn3")
+    private Double Epn3;
+
+    /**
+     * 谷段反向有功电度
+     */
+    @TableField("Epn4")
+    private Double Epn4;
+
+    /**
+     * 三相正向有功电度
+     */
+    @TableField("Epp")
+    private Double Epp;
+
+    /**
+     * 尖段正向有功电度
+     */
+    @TableField("Epp1")
+    private Double Epp1;
+
+    /**
+     * 峰段正向有功电度
+     */
+    @TableField("Epp2")
+    private Double Epp2;
+
+    /**
+     * 平段正向有功电度
+     */
+    @TableField("Epp3")
+    private Double Epp3;
+
+    /**
+     * 谷段正向有功电度
+     */
+    @TableField("Epp4")
+    private Double Epp4;
+
+    /**
+     * 三相反向无功电度
+     */
+    @TableField("Eqn")
+    private Double Eqn;
+
+    /**
+     * 三相正向无功电度
+     */
+    @TableField("Eqp")
+    private Double Eqp;
+
+    /**
+     * 频率
+     */
+    @TableField("F")
+    private Double f;
+
+    /**
+     * 零序电流
+     */
+    @TableField("I0")
+    private Double i0;
+
+    /**
+     * 负序电流
+     */
+    @TableField("I2")
+    private Double i2;
+
+    /**
+     * A相总谐波电流
+     */
+    @TableField("IHa")
+    private Double IHa;
+
+    /**
+     * B相总谐波电流
+     */
+    @TableField("IHb")
+    private Double IHb;
+
+    /**
+     * C相总谐波电流
+     */
+    @TableField("IHc")
+    private Double IHc;
+
+    /**
+     * A相电流
+     */
+    @TableField("Ia")
+    private Double Ia;
+
+    /**
+     * B相电流
+     */
+    @TableField("Ib")
+    private Double Ib;
+
+    /**
+     * C相电流
+     */
+    @TableField("Ic")
+    private Double Ic;
+
+    /**
+     * 剩余电流
+     */
+    @TableField("Ir")
+    private Double Ir;
+
+    /**
+     * 昨日有功最大需量
+     */
+    @TableField("LastDayMD")
+    private Double LastDayMD;
+
+    /**
+     * 昨日有功最大需量发生时间
+     */
+    @TableField("LastDayMDt")
+    private Double LastDayMDt;
+
+    /**
+     * 三相总有功功率
+     */
+    @TableField("P")
+    private Double p;
+
+    /**
+     * A相有功功率
+     */
+    @TableField("Pa")
+    private Double Pa;
+
+    /**
+     * B相有功功率
+     */
+    @TableField("Pb")
+    private Double Pb;
+
+    /**
+     * C相有功功率
+     */
+    @TableField("Pc")
+    private Double Pc;
+
+    /**
+     * 三相总无功功率
+     */
+    @TableField("Q")
+    private Double q;
+
+    /**
+     * A相无功功率
+     */
+    @TableField("Qa")
+    private Double Qa;
+
+    /**
+     * B相无功功率
+     */
+    @TableField("Qb")
+    private Double Qb;
+
+    /**
+     * C相无功功率
+     */
+    @TableField("Qc")
+    private Double Qc;
+
+    /**
+     * 信号强度
+     */
+    @TableField("SignalIntensity")
+    private Double SignalIntensity;
+
+    /**
+     * 第1路温度
+     */
+    @TableField("T1")
+    private Double t1;
+
+    /**
+     * 第2路温度
+     */
+    @TableField("T2")
+    private Double t2;
+
+    /**
+     * 第3路温度
+     */
+    @TableField("T3")
+    private Double t3;
+
+    /**
+     * 第4路温度
+     */
+    @TableField("T4")
+    private Double t4;
+
+    /**
+     * A相电压THD
+     */
+    @TableField("THDUa")
+    private Double THDUa;
+
+    /**
+     * B相电压THD
+     */
+    @TableField("THDUb")
+    private Double THDUb;
+
+    /**
+     * C相电压THD
+     */
+    @TableField("THDUc")
+    private Double THDUc;
+
+    /**
+     * A相电压
+     */
+    @TableField("Ua")
+    private Double Ua;
+
+    /**
+     * AB线电压
+     */
+    @TableField("Uab")
+    private Double Uab;
+
+    /**
+     * B相电压
+     */
+    @TableField("Ub")
+    private Double Ub;
+
+    /**
+     * BC线电压
+     */
+    @TableField("Ubc")
+    private Double Ubc;
+
+    /**
+     * 零序电压不平衡度
+     */
+    @TableField("UblU0")
+    private Double UblU0;
+
+    /**
+     * 负序电压不平衡度
+     */
+    @TableField("UblU2")
+    private Double UblU2;
+
+    /**
+     * C相电压
+     */
+    @TableField("Uc")
+    private Double Uc;
+
+    /**
+     * CA线电压
+     */
+    @TableField("Uca")
+    private Double Uca;
+
+    /**
+     * 电压暂降次数
+     */
+    @TableField("Udt")
+    private Integer Udt;
+
+    /**
+     * 线路侧电压
+     */
+    @TableField("Ul")
+    private Double Ul;
+
+    /**
+     * 电压暂升次数
+     */
+    @TableField("Upt")
+    private Integer Upt;
+
+    /**
+     * 电压短时中断次数
+     */
+    @TableField("Ust")
+    private Integer Ust;
+
+    /**
+     * 冻结时间
+     */
+    @TableField("freezingTime")
+    private Date freezingTime;
+
+    /**
+     * 上报时间
+     */
+    @TableField("dataTime")
+    private Date dataTime;
+
+    /**
+     * 变量名称
+     */
+    @TableField("variable_coding")
+    private String variableCoding;
+
+}

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/HookupMapper.java

@@ -2,6 +2,10 @@ package com.bizmatics.persistence.mapper;
 
 import com.bizmatics.common.mvc.base.CrudMapper;
 import com.bizmatics.model.Hookup;
+import com.bizmatics.model.vo.*;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,6 +16,14 @@ import com.bizmatics.model.Hookup;
  * @since 2022-03-07
  */
 public interface HookupMapper extends CrudMapper<Hookup> {
+    List<DeviceTypeVo> getDevidetype(@Param("siteId") Integer siteId);
+
+    List<RtAnalogDataOneVo> getVariable(@Param("siteId") Integer siteId);
+
+    List<RtAnalogDataOneVo> getVariable171(@Param("siteId") Integer siteId);
+
+    List<RtAnalogDataOneVo> getVariable173(@Param("siteId") Integer siteId);
 
+    List<HookupComponentCompleteTowVo> getHookupComponentComplete(@Param("siteId") Integer siteId);
 
 }

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/RtAnalog171DataMapper.java

@@ -0,0 +1,16 @@
+package com.bizmatics.persistence.mapper;
+
+import com.bizmatics.model.RtAnalog171Data;
+import com.bizmatics.common.mvc.base.CrudMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-03-10
+ */
+public interface RtAnalog171DataMapper extends CrudMapper<RtAnalog171Data> {
+
+}

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/RtAnalog173DataMapper.java

@@ -0,0 +1,16 @@
+package com.bizmatics.persistence.mapper;
+
+import com.bizmatics.model.RtAnalog173Data;
+import com.bizmatics.common.mvc.base.CrudMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-03-10
+ */
+public interface RtAnalog173DataMapper extends CrudMapper<RtAnalog173Data> {
+
+}

fiveep-persistence/src/main/resources/mapper/mysql/HookupComponentCompleteMapper.xml

@@ -27,6 +27,11 @@
         <result column="variable_id" property="variableId" />
         <result column="creator" property="creator" />
         <result column="create_time" property="createTime" />
+        <result column="createType" property="createType" />
+        <result column="mPoint" property="mPoint" />
+        <result column="echartsOption" property="echartsOption" />
+        <result column="svgLineSelectval" property="svgLineSelectval" />
+
     </resultMap>
 
 </mapper>

fiveep-persistence/src/main/resources/mapper/mysql/HookupMapper.xml

@@ -4,16 +4,104 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.bizmatics.model.Hookup">
-        <id column="id" property="id" />
-        <result column="outerType" property="outerType" />
-        <result column="title" property="title" />
-        <result column="template" property="template" />
-        <result column="props" property="props" />
-        <result column="default_color" property="defaultColor" />
-        <result column="priview_img" property="priviewImg" />
-        <result column="site_id" property="siteId" />
-        <result column="creator" property="creator" />
-        <result column="create_time" property="createTime" />
+        <id column="id" property="id"/>
+        <result column="outerType" property="outerType"/>
+        <result column="title" property="title"/>
+        <result column="template" property="template"/>
+        <result column="props" property="props"/>
+        <result column="default_color" property="defaultColor"/>
+        <result column="priview_img" property="priviewImg"/>
+        <result column="site_id" property="siteId"/>
+        <result column="creator" property="creator"/>
+        <result column="create_time" property="createTime"/>
+        <result column="dataType" property="dataType"/>
+        <result column="createType" property="createType"/>
+        <result column="echartsOption" property="echartsOption"/>
+        <result column="svgLineSelectval" property="svgLineSelectval"/>
+        <result column="elementBool" property="elementBool"/>
     </resultMap>
 
+    <select id="getDevidetype" resultType="com.bizmatics.model.vo.DeviceTypeVo">
+        SELECT
+        b.variable_coding,
+        c.device_code,
+        c.device_type
+        FROM
+        hookup_component_complete AS a
+        JOIN device_analog_variable_list AS b ON a.variable_id = b.id
+        JOIN device AS c ON b.communication_equipment = c.id
+        <where>
+            <if test="siteId != null and siteId != 0">
+                a.site_id = #{siteId}
+            </if>
+        </where>
+    </select>
+
+    <select id="getVariable" resultType="com.bizmatics.model.vo.RtAnalogDataOneVo">
+        SELECT
+        b.variable_coding,
+        d.*
+        FROM
+        hookup_component_complete AS a
+        JOIN device_analog_variable_list AS b ON a.variable_id = b.id
+        JOIN device AS c ON b.communication_equipment = c.id
+        JOIN rt_analog_data AS d ON c.device_code = d.deviceName
+        <where>
+            <if test="siteId != null and siteId != 0">
+                a.site_id = #{siteId}
+            </if>
+        </where>
+        GROUP BY
+        b.variable_coding
+    </select>
+
+    <select id="getVariable171" resultType="com.bizmatics.model.vo.RtAnalogDataOneVo">
+        SELECT
+        b.variable_coding,
+        d.*
+        FROM
+        hookup_component_complete AS a
+        JOIN device_analog_variable_list AS b ON a.variable_id = b.id
+        JOIN device AS c ON b.communication_equipment = c.id
+        JOIN ht_analog_171_data AS d ON c.device_code = d.deviceName
+        <where>
+            <if test="siteId != null and siteId != 0">
+                a.site_id = #{siteId}
+            </if>
+        </where>
+        GROUP BY
+        b.variable_coding
+    </select>
+
+    <select id="getVariable173" resultType="com.bizmatics.model.vo.RtAnalogDataOneVo">
+        SELECT
+        b.variable_coding,
+        d.*
+        FROM
+        hookup_component_complete AS a
+        JOIN device_analog_variable_list AS b ON a.variable_id = b.id
+        JOIN device AS c ON b.communication_equipment = c.id
+        JOIN ht_analog_173_data AS d ON c.device_code = d.deviceName
+        <where>
+            <if test="siteId != null and siteId != 0">
+                a.site_id = #{siteId}
+            </if>
+        </where>
+        GROUP BY
+        b.variable_coding
+    </select>
+
+    <select id="getHookupComponentComplete" resultType="com.bizmatics.model.vo.HookupComponentCompleteTowVo">
+        SELECT
+        a.*, b.variable_coding
+        FROM
+        hookup_component_complete AS a
+        JOIN device_analog_variable_list AS b ON a.variable_id = b.id
+        <where>
+            <if test="siteId != null and siteId != 0">
+                a.site_id = #{siteId}
+            </if>
+        </where>
+    </select>
+
 </mapper>

fiveep-persistence/src/main/resources/mapper/mysql/RtAnalog171DataMapper.xml

@@ -0,0 +1,33 @@
+<?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.bizmatics.persistence.mapper.RtAnalog171DataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.bizmatics.model.RtAnalog171Data">
+        <id column="id" property="id" />
+        <result column="deviceName" property="deviceName" />
+        <result column="voltageA" property="voltageA" />
+        <result column="voltageB" property="voltageB" />
+        <result column="voltageC" property="voltageC" />
+        <result column="voltageAB" property="voltageAB" />
+        <result column="voltageBC" property="voltageBC" />
+        <result column="voltageCA" property="voltageCA" />
+        <result column="frequency" property="frequency" />
+        <result column="analog1" property="analog1" />
+        <result column="analog2" property="analog2" />
+        <result column="analog3" property="analog3" />
+        <result column="analog4" property="analog4" />
+        <result column="analog5" property="analog5" />
+        <result column="voltageATHD" property="voltageATHD" />
+        <result column="voltageBTHD" property="voltageBTHD" />
+        <result column="voltageCTHD" property="voltageCTHD" />
+        <result column="voltageSagTimes" property="voltageSagTimes" />
+        <result column="voltageSwellTimes" property="voltageSwellTimes" />
+        <result column="voltageInterruptionTimes" property="voltageInterruptionTimes" />
+        <result column="voltageUnbalanceFactor" property="voltageUnbalanceFactor" />
+        <result column="analogReserved" property="analogReserved" />
+        <result column="freezingTime" property="freezingTime" />
+        <result column="dataTime" property="dataTime" />
+    </resultMap>
+
+</mapper>

fiveep-persistence/src/main/resources/mapper/mysql/RtAnalog173DataMapper.xml

@@ -0,0 +1,68 @@
+<?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.bizmatics.persistence.mapper.RtAnalog173DataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.bizmatics.model.RtAnalog173Data">
+        <id column="id" property="id" />
+        <result column="deviceName" property="deviceName" />
+        <result column="COS" property="cos" />
+        <result column="COSa" property="COSa" />
+        <result column="COSb" property="COSb" />
+        <result column="COSc" property="COSc" />
+        <result column="Demand" property="Demand" />
+        <result column="Epn" property="Epn" />
+        <result column="Epn1" property="Epn1" />
+        <result column="Epn2" property="Epn2" />
+        <result column="Epn3" property="Epn3" />
+        <result column="Epn4" property="Epn4" />
+        <result column="Epp" property="Epp" />
+        <result column="Epp1" property="Epp1" />
+        <result column="Epp2" property="Epp2" />
+        <result column="Epp3" property="Epp3" />
+        <result column="Epp4" property="Epp4" />
+        <result column="Eqn" property="Eqn" />
+        <result column="Eqp" property="Eqp" />
+        <result column="F" property="f" />
+        <result column="IHa" property="IHa" />
+        <result column="IHb" property="IHb" />
+        <result column="IHc" property="IHc" />
+        <result column="Ia" property="Ia" />
+        <result column="Ib" property="Ib" />
+        <result column="Ic" property="Ic" />
+        <result column="Ir" property="Ir" />
+        <result column="P" property="p" />
+        <result column="Pa" property="Pa" />
+        <result column="Pb" property="Pb" />
+        <result column="Pc" property="Pc" />
+        <result column="Q" property="q" />
+        <result column="Qa" property="Qa" />
+        <result column="Qb" property="Qb" />
+        <result column="Qc" property="Qc" />
+        <result column="T1" property="t1" />
+        <result column="T2" property="t2" />
+        <result column="T3" property="t3" />
+        <result column="THDUa" property="THDUa" />
+        <result column="THDUb" property="THDUb" />
+        <result column="THDUc" property="THDUc" />
+        <result column="Ua" property="Ua" />
+        <result column="Uab" property="Uab" />
+        <result column="Ub" property="Ub" />
+        <result column="Ubc" property="Ubc" />
+        <result column="Uc" property="Uc" />
+        <result column="Uca" property="Uca" />
+        <result column="Udt" property="Udt" />
+        <result column="Ul" property="Ul" />
+        <result column="Upt" property="Upt" />
+        <result column="Ust" property="Ust" />
+        <result column="unbalanceCurrent" property="unbalanceCurrent" />
+        <result column="unbalanceVoltage" property="unbalanceVoltage" />
+        <result column="analogReserved1" property="analogReserved1" />
+        <result column="analogReserved2" property="analogReserved2" />
+        <result column="analogReserved3" property="analogReserved3" />
+        <result column="analogReserved4" property="analogReserved4" />
+        <result column="freezingTime" property="freezingTime" />
+        <result column="dataTime" property="dataTime" />
+    </resultMap>
+
+</mapper>

fiveep-service/src/main/java/com/bizmatics/service/RtAnalog171DataService.java

@@ -0,0 +1,16 @@
+package com.bizmatics.service;
+
+import com.bizmatics.model.RtAnalog171Data;
+import com.bizmatics.common.mvc.base.CrudService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-03-10
+ */
+public interface RtAnalog171DataService extends CrudService<RtAnalog171Data> {
+
+}

fiveep-service/src/main/java/com/bizmatics/service/RtAnalog173DataService.java

@@ -0,0 +1,16 @@
+package com.bizmatics.service;
+
+import com.bizmatics.model.RtAnalog173Data;
+import com.bizmatics.common.mvc.base.CrudService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-03-10
+ */
+public interface RtAnalog173DataService extends CrudService<RtAnalog173Data> {
+
+}

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

@@ -1,18 +1,20 @@
 package com.bizmatics.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.bizmatics.common.core.exception.BusinessException;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
-import com.bizmatics.model.*;
+import com.bizmatics.model.DeviceAnalogVariableList;
+import com.bizmatics.model.DeviceAttribute;
+import com.bizmatics.model.Hookup;
+import com.bizmatics.model.HookupComponentComplete;
 import com.bizmatics.model.system.SysUser;
-import com.bizmatics.model.vo.HookupComponentBasicsVo;
-import com.bizmatics.model.vo.HookupComponentCompleteOneVo;
-import com.bizmatics.model.vo.HookupComponentCompleteVo;
-import com.bizmatics.model.vo.HookupOneVo;
+import com.bizmatics.model.vo.*;
 import com.bizmatics.persistence.mapper.HookupMapper;
 import com.bizmatics.service.*;
+import com.bizmatics.service.util.FieldEscapeUtils;
 import com.bizmatics.service.util.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -71,97 +73,154 @@ public class HookupServiceImpl extends AbstractCrudService<HookupMapper, Hookup>
             queryWrapper.eq(Hookup::getSiteId, siteId);
         }
         List<Hookup> hookupList = this.list(queryWrapper);
-        LambdaQueryWrapper<HookupComponentBasics> queryWrapperOne = Wrappers.lambdaQuery();
-        if (siteId != 0) {
-            queryWrapperOne.eq(HookupComponentBasics::getSiteId, siteId);
-        }
-        List<HookupComponentBasics> hookupComponentBasicsList = hookupComponentBasicsService.list(queryWrapperOne);
-        List<HookupOneVo> hookupOneVoList = new ArrayList<HookupOneVo>();
-//        List<HookupComponentBasicsVo> hookupComponentBasicsVoList = new ArrayList<HookupComponentBasicsVo>();
-        if (hookupList.size() > 0) {
+        List<HookupOneVo> hookupListlist = new ArrayList<>();
+        if (hookupList.size()>0){
             for (int i = 0; i < hookupList.size(); i++) {
-                HookupOneVo hookupOneVo = new HookupOneVo();
-                hookupOneVo.setType(hookupList.get(i).getOuterType());
-                hookupOneVo.setTemplate(hookupList.get(i).getTemplate());
-                hookupOneVo.setProps(hookupList.get(i).getProps().split(","));
-                hookupOneVo.setDefaultColor(hookupList.get(i).getDefaultColor());
-                hookupOneVo.setPriviewImg(hookupList.get(i).getPriviewImg());
-                for (int j = 0; j < hookupComponentBasicsList.size(); j++) {
-                    if (hookupList.get(i).getId() == hookupComponentBasicsList.get(j).getHookupId()) {
-                        HookupComponentBasicsVo hookupComponentBasicsVo = new HookupComponentBasicsVo();
-                        hookupComponentBasicsVo.setSort(hookupComponentBasicsList.get(i).getSort());
-                        hookupComponentBasicsVo.setTitle(hookupComponentBasicsList.get(i).getTitle());
-                        hookupComponentBasicsVo.setType(hookupComponentBasicsList.get(i).getInnerType());
-                        hookupComponentBasicsVo.setTypeName(hookupComponentBasicsList.get(i).getTypeName());
-                        hookupComponentBasicsVo.setSvgColor(hookupComponentBasicsList.get(i).getSvgColor());
-                        hookupComponentBasicsVo.setSvgPositionX(hookupComponentBasicsList.get(i).getSvgPositionX());
-                        hookupComponentBasicsVo.setSvgPositionY(hookupComponentBasicsList.get(i).getSvgPositionY());
-                        hookupComponentBasicsVo.setSize(hookupComponentBasicsList.get(i).getSize());
-                        hookupComponentBasicsVo.setHeight(hookupComponentBasicsList.get(i).getHeight());
-                        hookupComponentBasicsVo.setWidth(hookupComponentBasicsList.get(i).getWidth());
-                        hookupComponentBasicsVo.setFontSize(hookupComponentBasicsList.get(i).getFontSize());
-                        hookupComponentBasicsVo.setSvgText(hookupComponentBasicsList.get(i).getSvgText());
-                        hookupComponentBasicsVo.setAngle(hookupComponentBasicsList.get(i).getAngle());
-                        hookupComponentBasicsVo.setTableRowCount(hookupComponentBasicsList.get(i).getTableRowCount());
-                        hookupComponentBasicsVo.setTableColCount(hookupComponentBasicsList.get(i).getTableColCount());
-                        hookupComponentBasicsVo.setTableData(hookupComponentBasicsList.get(i).getTableData());
-                        if (hookupComponentBasicsList.get(i).getElementBool().equals("")) {
-                            hookupComponentBasicsVo.setElementBool("");
-                        } else {
-                            hookupComponentBasicsVo.setElementBool(hookupComponentBasicsList.get(i).getElementBool().split(","));
-                        }
-
-                        hookupOneVo.setArray(hookupComponentBasicsVo);
-                    }
-
-
+                HookupOneVo hookupOne = new HookupOneVo();
+                hookupOne.setType(hookupList.get(i).getOuterType());
+                hookupOne.setTitle(hookupList.get(i).getTitle());
+                hookupOne.setTemplate(hookupList.get(i).getTemplate());
+                if ("".equals(hookupList.get(i).getProps())||hookupList.get(i).getProps()==null) {
+                    hookupOne.setProps("");
+                } else {
+                    hookupOne.setProps(hookupList.get(i).getProps().split(","));
+                }
+                hookupOne.setDefaultColor(hookupList.get(i).getDefaultColor());
+                hookupOne.setDataType(hookupList.get(i).getDataType());
+                hookupOne.setCreateType(hookupList.get(i).getCreateType());
+                hookupOne.setPriviewImg(hookupList.get(i).getPriviewImg());
+                hookupOne.setEchartsOption(hookupList.get(i).getEchartsOption());
+                if ("".equals(hookupList.get(i).getEchartsOption())||hookupList.get(i).getEchartsOption()==null) {
+                    hookupOne.setEchartsOption("");
+                } else {
+                    hookupOne.setEchartsOption(hookupList.get(i).getEchartsOption().split(","));
                 }
-                hookupOneVoList.add(hookupOneVo);
+
+                hookupOne.setElementBool(hookupList.get(i).getElementBool());
+                hookupOne.setSvgLineSelectval(hookupList.get(i).getSvgLineSelectval());
+                hookupListlist.add(hookupOne);
             }
         }
-        return hookupOneVoList;
+
+
+//        hookupList.get(26).setEchartsOption(JSONObject.toJSONString(hookupList.get(26).getEchartsOption()));
+
+
+
+//        LambdaQueryWrapper<HookupComponentBasics> queryWrapperOne = Wrappers.lambdaQuery();
+//        if (siteId != 0) {
+//            queryWrapperOne.eq(HookupComponentBasics::getSiteId, siteId);
+//        }
+//        List<HookupComponentBasics> hookupComponentBasicsList = hookupComponentBasicsService.list(queryWrapperOne);
+//        List<HookupOneVo> hookupOneVoList = new ArrayList<HookupOneVo>();
+////        List<HookupComponentBasicsVo> hookupComponentBasicsVoList = new ArrayList<HookupComponentBasicsVo>();
+//        if (hookupList.size() > 0) {
+//            for (int i = 0; i < hookupList.size(); i++) {
+//                HookupOneVo hookupOneVo = new HookupOneVo();
+//                hookupOneVo.setType(hookupList.get(i).getOuterType());
+//                hookupOneVo.setTemplate(hookupList.get(i).getTemplate());
+//                hookupOneVo.setProps(hookupList.get(i).getProps().split(","));
+//                hookupOneVo.setDefaultColor(hookupList.get(i).getDefaultColor());
+//                hookupOneVo.setPriviewImg(hookupList.get(i).getPriviewImg());
+//                for (int j = 0; j < hookupComponentBasicsList.size(); j++) {
+//                    if (hookupList.get(i).getId() == hookupComponentBasicsList.get(j).getHookupId()) {
+//                        HookupComponentBasicsVo hookupComponentBasicsVo = new HookupComponentBasicsVo();
+//                        hookupComponentBasicsVo.setSort(hookupComponentBasicsList.get(i).getSort());
+//                        hookupComponentBasicsVo.setTitle(hookupComponentBasicsList.get(i).getTitle());
+//                        hookupComponentBasicsVo.setType(hookupComponentBasicsList.get(i).getInnerType());
+//                        hookupComponentBasicsVo.setTypeName(hookupComponentBasicsList.get(i).getTypeName());
+//                        hookupComponentBasicsVo.setSvgColor(hookupComponentBasicsList.get(i).getSvgColor());
+//                        hookupComponentBasicsVo.setSvgPositionX(hookupComponentBasicsList.get(i).getSvgPositionX());
+//                        hookupComponentBasicsVo.setSvgPositionY(hookupComponentBasicsList.get(i).getSvgPositionY());
+//                        hookupComponentBasicsVo.setSize(hookupComponentBasicsList.get(i).getSize());
+//                        hookupComponentBasicsVo.setHeight(hookupComponentBasicsList.get(i).getHeight());
+//                        hookupComponentBasicsVo.setWidth(hookupComponentBasicsList.get(i).getWidth());
+//                        hookupComponentBasicsVo.setFontSize(hookupComponentBasicsList.get(i).getFontSize());
+//                        hookupComponentBasicsVo.setSvgText(hookupComponentBasicsList.get(i).getSvgText());
+//                        hookupComponentBasicsVo.setAngle(hookupComponentBasicsList.get(i).getAngle());
+//                        hookupComponentBasicsVo.setTableRowCount(hookupComponentBasicsList.get(i).getTableRowCount());
+//                        hookupComponentBasicsVo.setTableColCount(hookupComponentBasicsList.get(i).getTableColCount());
+//                        hookupComponentBasicsVo.setTableData(hookupComponentBasicsList.get(i).getTableData());
+//                        if (hookupComponentBasicsList.get(i).getElementBool().equals("")) {
+//                            hookupComponentBasicsVo.setElementBool("");
+//                        } else {
+//                            hookupComponentBasicsVo.setElementBool(hookupComponentBasicsList.get(i).getElementBool().split(","));
+//                        }
+//
+//                        hookupOneVo.setArray(hookupComponentBasicsVo);
+//                    }
+//
+//
+//                }
+//                hookupOneVoList.add(hookupOneVo);
+//            }
+//        }
+        return hookupListlist;
     }
 
     @Override
     public List<HookupComponentCompleteVo> getHookupComponentComplete(Integer siteId) {
-        LambdaQueryWrapper<HookupComponentComplete> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(HookupComponentComplete::getSiteId, siteId);
-        List<HookupComponentComplete> hookupComponentComplete = hookupComponentCompleteService.list(queryWrapper);
+        List<DeviceTypeVo> deviceTypeVo = baseMapper.getDevidetype(siteId);
+        List<RtAnalogDataOneVo> variable_vaue = null;
+        if (deviceTypeVo.get(0).getDeviceType() == 3) {
+            variable_vaue = baseMapper.getVariable171(siteId);
+        } else if (deviceTypeVo.get(0).getDeviceType() == 4) {
+            variable_vaue = baseMapper.getVariable173(siteId);
+        } else {
+            variable_vaue = baseMapper.getVariable(siteId);
+        }
+        List<HookupComponentCompleteTowVo> hookupComponentComplete = baseMapper.getHookupComponentComplete(siteId);
         List<HookupComponentCompleteVo> hookupComponentCompleteVoLsit = new ArrayList<HookupComponentCompleteVo>();
         if (hookupComponentComplete.size() > 0) {
             for (int i = 0; i < hookupComponentComplete.size(); i++) {
                 HookupComponentCompleteVo hookupComponentCompleteVo = new HookupComponentCompleteVo();
                 hookupComponentCompleteVo.setId(hookupComponentComplete.get(i).getId());
-                hookupComponentCompleteVo.setSort(hookupComponentComplete.get(i).getSort());
                 hookupComponentCompleteVo.setTitle(hookupComponentComplete.get(i).getTitle());
                 hookupComponentCompleteVo.setType(hookupComponentComplete.get(i).getInnerType());
                 hookupComponentCompleteVo.setTypeName(hookupComponentComplete.get(i).getTypeName());
                 hookupComponentCompleteVo.setSvgColor(hookupComponentComplete.get(i).getSvgColor());
+                hookupComponentCompleteVo.setCreateType(hookupComponentComplete.get(i).getCreateType());
                 hookupComponentCompleteVo.setSvgPositionX(hookupComponentComplete.get(i).getSvgPositionX());
                 hookupComponentCompleteVo.setSvgPositionY(hookupComponentComplete.get(i).getSvgPositionY());
+                if ("".equals(hookupComponentComplete.get(i).getMPoint())||hookupComponentComplete.get(i).getMPoint()==null){
+                    hookupComponentCompleteVo.setMPoint("");
+                }else {
+                    hookupComponentCompleteVo.setMPoint(JSONArray.parseObject(hookupComponentComplete.get(i).getMPoint()));
+                }
+                if ("".equals(hookupComponentComplete.get(i).getEchartsOption())||hookupComponentComplete.get(i).getEchartsOption()==null){
+                    hookupComponentCompleteVo.setEchartsOption("");
+                }else {
+                    hookupComponentCompleteVo.setEchartsOption(JSONArray.parseObject(hookupComponentComplete.get(i).getEchartsOption()));
+                }
+
                 hookupComponentCompleteVo.setSize(hookupComponentComplete.get(i).getSize());
-                hookupComponentCompleteVo.setHeight(hookupComponentComplete.get(i).getHeight());
-                hookupComponentCompleteVo.setWidth(hookupComponentComplete.get(i).getWidth());
-                hookupComponentCompleteVo.setFontSize(hookupComponentComplete.get(i).getFontSize());
-                hookupComponentCompleteVo.setSvgText(hookupComponentComplete.get(i).getSvgText());
                 hookupComponentCompleteVo.setAngle(hookupComponentComplete.get(i).getAngle());
-                hookupComponentCompleteVo.setTableRowCount(hookupComponentComplete.get(i).getTableRowCount());
-                hookupComponentCompleteVo.setTableColCount(hookupComponentComplete.get(i).getTableColCount());
-                hookupComponentCompleteVo.setTableData(hookupComponentComplete.get(i).getTableData());
-                if (hookupComponentComplete.get(i).getElementBool().equals("")) {
+                if ("".equals(hookupComponentComplete.get(i).getElementBool())||hookupComponentComplete.get(i).getElementBool()==null) {
                     hookupComponentCompleteVo.setElementBool("");
                 } else {
                     hookupComponentCompleteVo.setElementBool(hookupComponentComplete.get(i).getElementBool().split(","));
                 }
+                hookupComponentCompleteVo.setSvgLineSelectval(hookupComponentComplete.get(i).getSvgLineSelectval());
                 hookupComponentCompleteVo.setDeviceId(hookupComponentComplete.get(i).getDeviceId());
                 hookupComponentCompleteVo.setSiteId(hookupComponentComplete.get(i).getSiteId());
                 hookupComponentCompleteVo.setVariableId(hookupComponentComplete.get(i).getVariableId());
+                if (variable_vaue.size() > 0) {
+                    for (int j = 0; j < variable_vaue.size(); j++) {
+                        if (hookupComponentComplete.get(i).getVariableCoding().equals(variable_vaue.get(j).getVariableCoding())) {
+                            String variableValue = FieldEscapeUtils.getVariableValue(variable_vaue.get(j));
+                            hookupComponentCompleteVo.setVariableValue(variableValue);
+                        }
+                    }
+                } else {
+                    hookupComponentCompleteVo.setVariableValue("");
+                }
                 hookupComponentCompleteVoLsit.add(hookupComponentCompleteVo);
             }
         }
         return hookupComponentCompleteVoLsit;
     }
 
+
     @Override
     @Transactional
     public void setHookupComponentComplete(List<HookupComponentCompleteOneVo> hookupComponentCompleteOneVoList) {
@@ -211,6 +270,10 @@ public class HookupServiceImpl extends AbstractCrudService<HookupMapper, Hookup>
                 hookupComponentComplete.setVariableId(hookupComponentCompleteOneVoList.get(i).getVariableId());
                 hookupComponentComplete.setCreator(user.getUserName());
                 hookupComponentComplete.setCreateTime(LocalDateTime.now());
+                hookupComponentComplete.setCreateType(hookupComponentCompleteOneVoList.get(i).getCreateType());
+                hookupComponentComplete.setMPoint(hookupComponentCompleteOneVoList.get(i).getMPoint());
+                hookupComponentComplete.setEchartsOption(hookupComponentCompleteOneVoList.get(i).getEchartsOption());
+                hookupComponentComplete.setSvgLineSelectval(hookupComponentCompleteOneVoList.get(i).getSvgLineSelectval());
                 hookupComponentCompleteService.save(hookupComponentComplete);
             }
 

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

@@ -0,0 +1,20 @@
+package com.bizmatics.service.impl;
+
+import com.bizmatics.model.RtAnalog171Data;
+import com.bizmatics.persistence.mapper.RtAnalog171DataMapper;
+import com.bizmatics.service.RtAnalog171DataService;
+import com.bizmatics.common.mvc.base.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-03-10
+ */
+@Service
+public class RtAnalog171DataServiceImpl extends AbstractCrudService<RtAnalog171DataMapper, RtAnalog171Data> implements RtAnalog171DataService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.bizmatics.service.impl;
+
+import com.bizmatics.model.RtAnalog173Data;
+import com.bizmatics.persistence.mapper.RtAnalog173DataMapper;
+import com.bizmatics.service.RtAnalog173DataService;
+import com.bizmatics.common.mvc.base.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-03-10
+ */
+@Service
+public class RtAnalog173DataServiceImpl extends AbstractCrudService<RtAnalog173DataMapper, RtAnalog173Data> implements RtAnalog173DataService {
+
+}

fiveep-service/src/main/java/com/bizmatics/service/util/FieldEscapeUtils.java

@@ -1,10 +1,12 @@
 package com.bizmatics.service.util;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.bizmatics.common.core.util.HttpUtils;
 import com.bizmatics.common.core.util.StringUtils;
 import com.bizmatics.common.mvc.utils.IpUtils;
 import com.bizmatics.common.spring.util.JsonUtils;
 import com.bizmatics.model.vo.HtAnalogDataVo;
+import com.bizmatics.model.vo.RtAnalogDataOneVo;
 import com.bizmatics.service.config.WjConfig;
 import com.fasterxml.jackson.core.type.TypeReference;
 import org.slf4j.Logger;
@@ -430,7 +432,7 @@ public class FieldEscapeUtils
        }
    }
 
-    public static String getStringAbel(List<?> o, Class<?> c, String field) {
+    public  String getStringAbel(List<?> o, Class<?> c, String field) {
         StringBuffer result = new StringBuffer();
         if (StringUtils.isNoneBlank(field)) {
             Field[] fields = c.getDeclaredFields();
@@ -451,4 +453,188 @@ public class FieldEscapeUtils
         }
         return result.deleteCharAt(result.length() - 1).toString();
     }
+
+
+
+    public static String getVariableValue(RtAnalogDataOneVo rtAnalogDataOneVo){
+        String[] arr = rtAnalogDataOneVo.getVariableCoding().split("_");
+        int arrlength = arr.length;
+        String variableValue = null;
+        if (arr[arrlength-1].equals("Busot")){
+            variableValue=""+rtAnalogDataOneVo.getBusot();
+        }else if (arr[arrlength-1].equals("COS")){
+            variableValue=""+rtAnalogDataOneVo.getCos();
+        }else if (arr[arrlength-1].equals("COSa")){
+            variableValue=""+rtAnalogDataOneVo.getCOSa();
+        }else if (arr[arrlength-1].equals("COSb")){
+            variableValue=""+rtAnalogDataOneVo.getCOSb();
+        }else if (arr[arrlength-1].equals("COSc")){
+            variableValue=""+rtAnalogDataOneVo.getCOSc();
+        }else if (arr[arrlength-1].equals("Demand")){
+            variableValue=""+rtAnalogDataOneVo.getDemand();
+        }else if (arr[arrlength-1].equals("DevResetTimes")){
+            variableValue=""+rtAnalogDataOneVo.getDevResetTimes();
+        }else if (arr[arrlength-1].equals("DeviceTemp")){
+            variableValue=""+rtAnalogDataOneVo.getDeviceTemp();
+        }else if (arr[arrlength-1].equals("Epn")){
+            variableValue=""+rtAnalogDataOneVo.getEpn();
+        }else if (arr[arrlength-1].equals("Epn1")){
+            variableValue=""+rtAnalogDataOneVo.getEpn1();
+        }else if (arr[arrlength-1].equals("Epn2")){
+            variableValue=""+rtAnalogDataOneVo.getEpn2();
+        }else if (arr[arrlength-1].equals("Epn3")){
+            variableValue=""+rtAnalogDataOneVo.getEpn3();
+        }else if (arr[arrlength-1].equals("Epn4")){
+            variableValue=""+rtAnalogDataOneVo.getEpn4();
+        }else if (arr[arrlength-1].equals("Epp")){
+            variableValue=""+rtAnalogDataOneVo.getEpp();
+        }else if (arr[arrlength-1].equals("Epp1")){
+            variableValue=""+rtAnalogDataOneVo.getEpp1();
+        }else if (arr[arrlength-1].equals("Epp2")){
+            variableValue=""+rtAnalogDataOneVo.getEpp2();
+        }else if (arr[arrlength-1].equals("Epp3")){
+            variableValue=""+rtAnalogDataOneVo.getEpp3();
+        }else if (arr[arrlength-1].equals("Epp4")){
+            variableValue=""+rtAnalogDataOneVo.getEpp4();
+        }else if (arr[arrlength-1].equals("Eqn")){
+            variableValue=""+rtAnalogDataOneVo.getEqn();
+        }else if (arr[arrlength-1].equals("Eqp")){
+            variableValue=""+rtAnalogDataOneVo.getEqp();
+        }else if (arr[arrlength-1].equals("F")){
+            variableValue=""+rtAnalogDataOneVo.getF();
+        }else if (arr[arrlength-1].equals("I0")){
+            variableValue=""+rtAnalogDataOneVo.getI0();
+        }else if (arr[arrlength-1].equals("I2")){
+            variableValue=""+rtAnalogDataOneVo.getI2();
+        }else if (arr[arrlength-1].equals("IHa")){
+            variableValue=""+rtAnalogDataOneVo.getIHa();
+        }else if (arr[arrlength-1].equals("IHb")){
+            variableValue=""+rtAnalogDataOneVo.getIHb();
+        }else if (arr[arrlength-1].equals("IHc")){
+            variableValue=""+rtAnalogDataOneVo.getIHc();
+        }else if (arr[arrlength-1].equals("Ia")){
+            variableValue=""+rtAnalogDataOneVo.getIa();
+        }else if (arr[arrlength-1].equals("Ib")){
+            variableValue=""+rtAnalogDataOneVo.getIb();
+        }else if (arr[arrlength-1].equals("Ic")){
+            variableValue=""+rtAnalogDataOneVo.getIc();
+        }else if (arr[arrlength-1].equals("Ir")){
+            variableValue=""+rtAnalogDataOneVo.getIr();
+        }else if (arr[arrlength-1].equals("LastDayMD")){
+            variableValue=""+rtAnalogDataOneVo.getLastDayMD();
+        }else if (arr[arrlength-1].equals("LastDayMDt")){
+            variableValue=""+rtAnalogDataOneVo.getLastDayMDt();
+        }else if (arr[arrlength-1].equals("P")){
+            variableValue=""+rtAnalogDataOneVo.getP();
+        }else if (arr[arrlength-1].equals("Pa")){
+            variableValue=""+rtAnalogDataOneVo.getPa();
+        }else if (arr[arrlength-1].equals("Pb")){
+            variableValue=""+rtAnalogDataOneVo.getPb();
+        }else if (arr[arrlength-1].equals("Pc")){
+            variableValue=""+rtAnalogDataOneVo.getPc();
+        }else if (arr[arrlength-1].equals("Q")){
+            variableValue=""+rtAnalogDataOneVo.getQ();
+        }else if (arr[arrlength-1].equals("Qa")){
+            variableValue=""+rtAnalogDataOneVo.getQa();
+        }else if (arr[arrlength-1].equals("Qb")){
+            variableValue=""+rtAnalogDataOneVo.getQb();
+        }else if (arr[arrlength-1].equals("Qc")){
+            variableValue=""+rtAnalogDataOneVo.getQc();
+        }else if (arr[arrlength-1].equals("SignalIntensity")){
+            variableValue = "" + rtAnalogDataOneVo.getSignalIntensity();
+        }else if (arr[arrlength-1].equals("T1")){
+            variableValue=""+rtAnalogDataOneVo.getT1();
+        }else if (arr[arrlength-1].equals("T2")){
+            variableValue=""+rtAnalogDataOneVo.getT2();
+        }else if (arr[arrlength-1].equals("T3")){
+            variableValue=""+rtAnalogDataOneVo.getT3();
+        }else if (arr[arrlength-1].equals("T4")){
+            variableValue=""+rtAnalogDataOneVo.getT4();
+        }else if (arr[arrlength-1].equals("THDUa")){
+            variableValue=""+rtAnalogDataOneVo.getTHDUa();
+        }else if (arr[arrlength-1].equals("THDUb")){
+            variableValue=""+rtAnalogDataOneVo.getTHDUb();
+        }else if (arr[arrlength-1].equals("THDUc")){
+            variableValue=""+rtAnalogDataOneVo.getTHDUc();
+        }else if (arr[arrlength-1].equals("Ua")){
+            variableValue=""+rtAnalogDataOneVo.getUa();
+        }else if (arr[arrlength-1].equals("Uab")){
+            variableValue=""+rtAnalogDataOneVo.getUab();
+        }else if (arr[arrlength-1].equals("Ub")){
+            variableValue=""+rtAnalogDataOneVo.getUb();
+        }else if (arr[arrlength-1].equals("Ubc")){
+            variableValue=""+rtAnalogDataOneVo.getUbc();
+        }else if (arr[arrlength-1].equals("UblU0")){
+            variableValue=""+rtAnalogDataOneVo.getUblU0();
+        }else if (arr[arrlength-1].equals("UblU2")){
+            variableValue=""+rtAnalogDataOneVo.getUblU2();
+        }else if (arr[arrlength-1].equals("Uc")){
+            variableValue=""+rtAnalogDataOneVo.getUc();
+        }else if (arr[arrlength-1].equals("Uca")){
+            variableValue=""+rtAnalogDataOneVo.getUca();
+        }else if (arr[arrlength-1].equals("Udt")){
+            variableValue=""+rtAnalogDataOneVo.getUdt();
+        }else if (arr[arrlength-1].equals("Ul")){
+            variableValue=""+rtAnalogDataOneVo.getUl();
+        }else if (arr[arrlength-1].equals("Upt")){
+            variableValue=""+rtAnalogDataOneVo.getUpt();
+        }else if (arr[arrlength-1].equals("Ust")){
+            variableValue=""+rtAnalogDataOneVo.getUst();
+        }else if (arr[arrlength-1].equals("voltageA")){
+            variableValue=""+rtAnalogDataOneVo.getVoltageA();
+        }else if (arr[arrlength-1].equals("voltageB")){
+            variableValue=""+rtAnalogDataOneVo.getVoltageB();
+        }else if (arr[arrlength-1].equals("voltageC")){
+            variableValue=""+rtAnalogDataOneVo.getVoltageC();
+        }else if (arr[arrlength-1].equals("voltageAB")){
+            variableValue=""+rtAnalogDataOneVo.getVoltageAB();
+        }else if (arr[arrlength-1].equals("voltageBC")){
+            variableValue=""+rtAnalogDataOneVo.getVoltageBC();
+        }else if (arr[arrlength-1].equals("voltageCA")){
+            variableValue=""+rtAnalogDataOneVo.getVoltageCA();
+        }else if (arr[arrlength-1].equals("frequency")){
+            variableValue=""+rtAnalogDataOneVo.getFrequency();
+        }else if (arr[arrlength-1].equals("analog1")){
+            variableValue=""+rtAnalogDataOneVo.getAnalog1();
+        }else if (arr[arrlength-1].equals("analog2")){
+            variableValue=""+rtAnalogDataOneVo.getAnalog2();
+        }else if (arr[arrlength-1].equals("analog3")){
+            variableValue=""+rtAnalogDataOneVo.getAnalog3();
+        }else if (arr[arrlength-1].equals("analog4")){
+            variableValue=""+rtAnalogDataOneVo.getAnalog4();
+        }else if (arr[arrlength-1].equals("analog5")){
+            variableValue=""+rtAnalogDataOneVo.getAnalog5();
+        }else if (arr[arrlength-1].equals("voltageATHD")){
+            variableValue=""+rtAnalogDataOneVo.getVoltageATHD();
+        }else if (arr[arrlength-1].equals("voltageBTHD")){
+            variableValue=""+rtAnalogDataOneVo.getVoltageBTHD();
+        }else if (arr[arrlength-1].equals("voltageCTHD")){
+            variableValue=""+rtAnalogDataOneVo.getVoltageCTHD();
+        }else if (arr[arrlength-1].equals("voltageSagTimes")){
+            variableValue=""+rtAnalogDataOneVo.getVoltageSagTimes();
+        }else if (arr[arrlength-1].equals("voltageSwellTimes")){
+            variableValue=""+rtAnalogDataOneVo.getVoltageSwellTimes();
+        }else if (arr[arrlength-1].equals("voltageInterruptionTimes")){
+            variableValue=""+rtAnalogDataOneVo.getVoltageInterruptionTimes();
+        }else if (arr[arrlength-1].equals("voltageUnbalanceFactor")){
+            variableValue=""+rtAnalogDataOneVo.getVoltageUnbalanceFactor();
+        }else if (arr[arrlength-1].equals("analogReserved")){
+            variableValue=""+rtAnalogDataOneVo.getAnalogReserved();
+        }else if (arr[arrlength-1].equals("unbalanceCurrent")){
+            variableValue=""+rtAnalogDataOneVo.getUnbalanceCurrent();
+        }else if (arr[arrlength-1].equals("unbalanceVoltage")){
+            variableValue=""+rtAnalogDataOneVo.getUnbalanceVoltage();
+        }else if (arr[arrlength-1].equals("analogReserved1")){
+            variableValue=""+rtAnalogDataOneVo.getAnalogReserved1();
+        }else if (arr[arrlength-1].equals("analogReserved2")){
+            variableValue=""+rtAnalogDataOneVo.getAnalogReserved2();
+        }else if (arr[arrlength-1].equals("analogReserved3")){
+            variableValue=""+rtAnalogDataOneVo.getAnalogReserved3();
+        }else if (arr[arrlength-1].equals("analogReserved4")){
+            variableValue=""+rtAnalogDataOneVo.getAnalogReserved4();
+        }else {
+            variableValue = null;
+        }
+        return variableValue;
+    }
 }