配电图bug修复

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

@@ -587,4 +587,7 @@ public class ContextualDataVo implements Serializable {
     @TableField("analogReserved4")
     private Double analogReserved4;
 
+    private Integer idd;
+
+    private String variableCoding;
 }

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

@@ -0,0 +1,53 @@
+package com.bizmatics.model.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author ya
+ * @since 2021-07-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DeviceData implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 变量列表id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 1：183用电设备，2：视频监控设备，3：171用电设备，4：173用电设备，5：158智能网关，6：其他
+     */
+    private String deviceType;
+
+    /**
+     * 变量编码
+     */
+    private String variableCoding;
+
+    /**
+     * 1.模拟量 2.状态量 3.参数量
+     */
+    private Integer dataArea;
+
+
+}

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

@@ -17,6 +17,8 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 public class DeviceTypeVo {
 
+    private Integer id;
+
     private String variableCoding;
 
     private String deviceCode;

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

@@ -0,0 +1,355 @@
+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-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class RtSwitchDataVo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 伍继电力hz171消费组开关量实时数据表ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 阿里云平台设备名称
+     */
+    @TableField("deviceName")
+    private String deviceName;
+
+    /**
+     * 通讯状态(0 通讯中断  1 正常通讯)
+     */
+    @TableField("commState")
+    private Integer commState;
+
+    /**
+     * 母线带电(0 正常  1 告警)
+     */
+    @TableField("busLive")
+    private Integer busLive;
+
+    /**
+     * 电压越上限(0 正常  1 告警)
+     */
+    @TableField("highVoltageAlarm")
+    private Integer highVoltageAlarm;
+
+    /**
+     * 电压越下限(0 正常  1 告警)
+     */
+    @TableField("lowVoltageAlarm")
+    private Integer lowVoltageAlarm;
+
+    /**
+     * 缺相(0 正常  1 告警)
+     */
+    @TableField("busLackPhase")
+    private Integer busLackPhase;
+
+    /**
+     * 直流量告警1(0 正常  1 告警)
+     */
+    @TableField("analog1Alarm")
+    private Integer analog1Alarm;
+
+    /**
+     * 直流量告警2(0 正常  1 告警)
+     */
+    @TableField("analog2Alarm")
+    private Integer analog2Alarm;
+
+    /**
+     * 直流量告警3(0 正常  1 告警)
+     */
+    @TableField("analog3Alarm")
+    private Integer analog3Alarm;
+
+    /**
+     * 直流量告警4(0 正常  1 告警)
+     */
+    @TableField("analog4Alarm")
+    private Integer analog4Alarm;
+
+    /**
+     * 直流量告警5(0 正常  1 告警)
+     */
+    @TableField("analog5Alarm")
+    private Integer analog5Alarm;
+
+    /**
+     * 预留1(0 正常  1 告警)
+     */
+    @TableField("digitalReserved1")
+    private Integer digitalReserved1;
+
+    /**
+     * 预留2(0 正常  1 告警)
+     */
+    @TableField("digitalReserved2")
+    private Integer digitalReserved2;
+
+    /**
+     * 预留3(0 正常  1 告警)
+     */
+    @TableField("digitalReserved3")
+    private Integer digitalReserved3;
+
+    /**
+     * 预留4(0 正常  1 告警)
+     */
+    @TableField("digitalReserved4")
+    private Integer digitalReserved4;
+
+    /**
+     * 预留5(0 正常  1 告警)
+     */
+    @TableField("digitalReserved5")
+    private Integer digitalReserved5;
+
+    /**
+     * 预留6(0 正常  1 告警)
+     */
+    @TableField("digitalReserved6")
+    private Integer digitalReserved6;
+
+    /**
+     * 上报时间
+     */
+    @TableField("dataTime")
+    private LocalDateTime dataTime;
+
+    /**
+     * 回路带电(0 正常  1 告警)
+     */
+    @TableField("LoadLive")
+    private Integer LoadLive;
+
+    /**
+     * 回路跳闸(0 正常  1 告警)
+     */
+    @TableField("Trip")
+    private Integer Trip;
+
+    /**
+     * 电流越限(0 正常  1 告警)
+     */
+    @TableField("OverI")
+    private Integer OverI;
+
+    /**
+     * 电压缺相(0 正常  1 告警)
+     */
+    @TableField("PhaseLoss")
+    private Integer PhaseLoss;
+
+    /**
+     * 低压(0 正常  1 告警)
+     */
+    @TableField("UnderV")
+    private Integer UnderV;
+
+    /**
+     * 需量超限(0 正常  1 告警)
+     */
+    @TableField("OverDemandP")
+    private Integer OverDemandP;
+
+    /**
+     * 剩余电流超限(0 正常  1 告警)
+     */
+    @TableField("OverIr")
+    private Integer OverIr;
+
+    /**
+     * T1超温(0 正常  1 告警)
+     */
+    @TableField("OverT1")
+    private Integer OverT1;
+
+    /**
+     * T2超温(0 正常  1 告警)
+     */
+    @TableField("OverT2")
+    private Integer OverT2;
+
+    /**
+     * T3超温(0 正常  1 告警)
+     */
+    @TableField("OverT3")
+    private Integer OverT3;
+
+    /**
+     * 通用遥信1(0 正常  1 告警)
+     */
+    @TableField("DI1")
+    private Integer di1;
+
+    /**
+     * 通用遥信2(0 正常  1 告警)
+     */
+    @TableField("DI2")
+    private Integer di2;
+
+    /**
+     * 继电器1状态(0 正常  1 告警)
+     */
+    @TableField("DO1")
+    private Integer do1;
+
+    /**
+     * 继电器2状态(0 正常  1 告警)
+     */
+    @TableField("DO2")
+    private Integer do2;
+
+    /**
+     * 备用遥信1(0 正常  1 告警)
+     */
+    @TableField("ResDI1")
+    private Integer ResDI1;
+
+    /**
+     * 备用遥信2(0 正常  1 告警)
+     */
+    @TableField("ResDI2")
+    private Integer ResDI2;
+
+    /**
+     * 备用遥信3(0 正常  1 告警)
+     */
+    @TableField("ResDI3")
+    private Integer ResDI3;
+
+    /**
+     * A相燃弧(0 正常  1 告警)
+     */
+    @TableField("ArcA")
+    private Integer ArcA;
+
+    /**
+     * B相燃弧(0 正常  1 告警)
+     */
+    @TableField("ArcB")
+    private Integer ArcB;
+
+    /**
+     * C相燃弧(0 正常  1 告警)
+     */
+    @TableField("ArcC")
+    private Integer ArcC;
+
+    /**
+     * 母线停电(0 正常  1 告警)
+     */
+    @TableField("BusOutage")
+    private Integer BusOutage;
+
+    /**
+     * 开入3(0 正常  1 告警)
+     */
+    @TableField("DI3")
+    private Integer di3;
+
+    /**
+     * 设备异常(0 正常  1 告警)
+     */
+    @TableField("DevAbnormal")
+    private Integer DevAbnormal;
+
+    /**
+     * 线路电气故障总(0 正常  1 告警)
+     */
+    @TableField("EleAlarm")
+    private Integer EleAlarm;
+
+    /**
+     * 火灾预警总(0 正常  1 告警)
+     */
+    @TableField("FireAlarm")
+    private Integer FireAlarm;
+
+    /**
+     * 线路开关状态(0 正常  1 告警)
+     */
+    @TableField("LoadBrkState")
+    private Integer LoadBrkState;
+
+    /**
+     * 测量通道故障(0 正常  1 告警)
+     */
+    @TableField("MeasFailure")
+    private Integer MeasFailure;
+
+    /**
+     * 消音(0 正常  1 告警)
+     */
+    @TableField("Mute")
+    private Integer Mute;
+
+    /**
+     * 视在需量超限(0 正常  1 告警)
+     */
+    @TableField("OverDemandS")
+    private Integer OverDemandS;
+
+    /**
+     * 环境温度越限(0 正常  1 告警)
+     */
+    @TableField("OverEvT")
+    private Integer OverEvT;
+
+    /**
+     * 电流谐波越限(0 正常  1 告警)
+     */
+    @TableField("OverIH")
+    private Integer OverIH;
+
+    /**
+     * 测温点4超温(0 正常  1 告警)
+     */
+    @TableField("OverT4")
+    private Integer OverT4;
+
+    /**
+     * 电压谐波越限(0 正常  1 告警)
+     */
+    @TableField("OverUH")
+    private Integer OverUH;
+
+    /**
+     * 过压(0 正常  1 告警)
+     */
+    @TableField("OverV")
+    private Integer OverV;
+
+    /**
+     * 备用遥信4(0 正常  1 告警)
+     */
+    @TableField("ResDI4")
+    private Integer ResDI4;
+
+    private Integer idd;
+
+    private String variableCoding;
+}

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

@@ -0,0 +1,29 @@
+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-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class VariableVo implements Serializable {
+
+    private String variableCoding;
+
+    private Object variableValue;
+}

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

@@ -18,12 +18,18 @@ import java.util.List;
 public interface HookupMapper extends CrudMapper<Hookup> {
     List<DeviceTypeVo> getDevidetype(@Param("siteId") Integer siteId);
 
-    List<RtAnalogDataOneVo> getVariable(@Param("siteId") Integer siteId,@Param("table") String table);
+    List<RtAnalogDataOneVo> getVariable(@Param("siteId") Integer siteId, @Param("table") String table);
 
-    List<RtAnalogDataOneVo> getVariable171(@Param("siteId") Integer siteId,@Param("table") String table);
+    List<RtAnalogDataOneVo> getVariable171(@Param("siteId") Integer siteId, @Param("table") String table);
 
-    List<RtAnalogDataOneVo> getVariable173(@Param("siteId") Integer siteId,@Param("table") String table);
+    List<RtAnalogDataOneVo> getVariable173(@Param("siteId") Integer siteId, @Param("table") String table);
 
     List<HookupComponentCompleteTowVo> getHookupComponentComplete(@Param("siteId") Integer siteId);
 
+    List<ContextualDataVo> getRtAnalogData(@Param("idList") List idList,
+                                           @Param("table") String table);
+
+    List<RtSwitchDataVo> getRtSwitchData(@Param("idList") List idList,
+                                         @Param("table") String table);
+
 }

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

@@ -23,6 +23,7 @@
 
     <select id="getDevidetype" resultType="com.bizmatics.model.vo.DeviceTypeVo">
         SELECT
+        b.id,
         b.variable_coding,
         c.device_code,
         c.device_type,
@@ -36,6 +37,7 @@
                 a.site_id = #{siteId}
             </if>
         </where>
+        group by b.variable_coding
     </select>
 
     <select id="getVariable" resultType="com.bizmatics.model.vo.RtAnalogDataOneVo">
@@ -105,4 +107,42 @@
         </where>
     </select>
 
+    <select id="getRtAnalogData" resultType="com.bizmatics.model.vo.ContextualDataVo">
+        SELECT
+        a.id AS idd,
+        a.variable_coding,
+        c.*
+        FROM
+        device_analog_variable_list AS a
+        JOIN device AS b ON a.communication_equipment = b.id
+        LEFT JOIN ${table} AS c ON a.device_code = c.deviceName
+        <where>
+            a.id IN
+            <foreach item="item" collection="idList" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </where>
+        GROUP BY
+        a.variable_coding
+    </select>
+
+    <select id="getRtSwitchData" resultType="com.bizmatics.model.vo.RtSwitchDataVo">
+        SELECT
+        a.id AS idd,
+        a.variable_coding,
+        c.*
+        FROM
+        device_analog_variable_list AS a
+        JOIN device AS b ON a.communication_equipment = b.id
+        LEFT JOIN ${table} AS c ON a.device_code = c.deviceName
+        <where>
+            a.id IN
+            <foreach item="item" collection="idList" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </where>
+        GROUP BY
+        a.variable_coding
+    </select>
+
 </mapper>

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

@@ -74,13 +74,13 @@ public class HookupServiceImpl extends AbstractCrudService<HookupMapper, Hookup>
         }
         List<Hookup> hookupList = this.list(queryWrapper);
         List<HookupOneVo> hookupListlist = new ArrayList<>();
-        if (hookupList.size()>0){
+        if (hookupList.size() > 0) {
             for (int i = 0; i < hookupList.size(); i++) {
                 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) {
+                if ("".equals(hookupList.get(i).getProps()) || hookupList.get(i).getProps() == null) {
                     hookupOne.setProps("");
                 } else {
                     hookupOne.setProps(hookupList.get(i).getProps().split(","));
@@ -92,9 +92,9 @@ public class HookupServiceImpl extends AbstractCrudService<HookupMapper, Hookup>
                 hookupOne.setEchartsOption(hookupList.get(i).getEchartsOption());
                 hookupOne.setEchartsOption(hookupList.get(i).getEchartsOption());
                 hookupOne.setElementBool(hookupList.get(i).getElementBool());
-                if ("".equals(hookupList.get(i).getSvgLineSelectval())||hookupList.get(i).getSvgLineSelectval()==null) {
+                if ("".equals(hookupList.get(i).getSvgLineSelectval()) || hookupList.get(i).getSvgLineSelectval() == null) {
                     hookupOne.setSvgLineSelectval("");
-                }else {
+                } else {
                     hookupOne.setSvgLineSelectval(hookupList.get(i).getSvgLineSelectval());
                 }
 
@@ -108,25 +108,104 @@ public class HookupServiceImpl extends AbstractCrudService<HookupMapper, Hookup>
     public List<HookupComponentCompleteVo> getHookupComponentComplete(Integer siteId) {
         List<DeviceTypeVo> deviceTypeVo = baseMapper.getDevidetype(siteId);
         List<RtAnalogDataOneVo> variable_vaue = null;
-        if (deviceTypeVo.size()>0){
-            if (deviceTypeVo.get(0).getDeviceType() == 3) {
-                String table = "rt_analog_171_data";
-                if (deviceTypeVo.get(0).getDataArea()==2){
-                    table = "rt_switch_171_data";
-                }
-                variable_vaue = baseMapper.getVariable171(siteId,table);
-            } else if (deviceTypeVo.get(0).getDeviceType() == 4) {
-                String table = "rt_analog_173_data";
-                if (deviceTypeVo.get(0).getDataArea()==2){
-                    table = "rt_switch_173_data";
+        List<Integer> variable_173_analog = new ArrayList<>();
+        List<Integer> variable_171_analog = new ArrayList<>();
+        List<Integer> variable_183_analog = new ArrayList<>();
+        List<Integer> variable_173_switch = new ArrayList<>();
+        List<Integer> variable_171_switch = new ArrayList<>();
+        List<Integer> variable_183_switch = new ArrayList<>();
+        for (int i = 0; i < deviceTypeVo.size(); i++) {
+            if (deviceTypeVo.get(i).getDataArea() == 2) {
+                if (deviceTypeVo.get(i).getDeviceType() == 3) {
+                    variable_171_switch.add(deviceTypeVo.get(i).getId());
+                } else if (deviceTypeVo.get(i).getDeviceType() == 4) {
+                    variable_173_switch.add(deviceTypeVo.get(i).getId());
+                } else if (deviceTypeVo.get(i).getDeviceType() ==1){
+                    variable_183_switch.add(deviceTypeVo.get(i).getId());
                 }
-                variable_vaue = baseMapper.getVariable173(siteId,table);
             } else {
-                String table = "rt_analog_data";
-                if (deviceTypeVo.get(0).getDataArea()==2){
-                    table = "rt_switch_data";
+                if (deviceTypeVo.get(i).getDeviceType() == 3) {
+                    variable_171_analog.add(deviceTypeVo.get(i).getId());
+                } else if (deviceTypeVo.get(i).getDeviceType() == 4) {
+                    variable_173_analog.add(deviceTypeVo.get(i).getId());
+                } else if (deviceTypeVo.get(i).getDeviceType() == 1){
+                    variable_183_analog.add(deviceTypeVo.get(i).getId());
                 }
-                variable_vaue = baseMapper.getVariable(siteId,table);
+            }
+        }
+
+        List<ContextualDataVo> variable_173_analog_data = new ArrayList<>();
+        List<ContextualDataVo> variable_171_analog_data = new ArrayList<>();
+        List<ContextualDataVo> variable_183_analog_data = new ArrayList<>();
+        List<RtSwitchDataVo> variable_173_switch_data = new ArrayList<>();
+        List<RtSwitchDataVo> variable_171_switch_data = new ArrayList<>();
+        List<RtSwitchDataVo> variable_183_switch_data = new ArrayList<>();
+
+        if (variable_173_analog.size() > 0) {
+            variable_173_analog_data = baseMapper.getRtAnalogData(variable_173_analog, "rt_analog_173_data");
+        }
+        if (variable_171_analog.size() > 0) {
+            variable_171_analog_data = baseMapper.getRtAnalogData(variable_171_analog, "rt_analog_171_data");
+        }
+        if (variable_183_analog.size() > 0) {
+            variable_183_analog_data = baseMapper.getRtAnalogData(variable_183_analog, "rt_analog_data");
+        }
+        if (variable_173_switch.size() > 0) {
+            variable_173_switch_data = baseMapper.getRtSwitchData(variable_173_switch, "rt_switch_173_data");
+        }
+        if (variable_171_switch.size() > 0) {
+            variable_171_switch_data = baseMapper.getRtSwitchData(variable_171_switch, "rt_switch_171_data");
+        }
+        if (variable_183_switch.size() > 0) {
+            variable_183_switch_data = baseMapper.getRtSwitchData(variable_183_switch, "rt_switch_data");
+        }
+        List<VariableVo> variableVoList = new ArrayList<>();
+        if(variable_173_analog_data.size()>0){
+            for (int i = 0; i < variable_173_analog_data.size(); i++) {
+                VariableVo vriableVo = new VariableVo();
+                vriableVo.setVariableCoding(variable_173_analog_data.get(i).getVariableCoding());
+                vriableVo.setVariableValue(FieldEscapeUtils.transformation1(variable_173_analog_data.get(i),variable_173_analog_data.get(i).getVariableCoding().split("_")[1]));
+                variableVoList.add(vriableVo);
+            }
+        }
+        if(variable_171_analog_data.size()>0){
+            for (int i = 0; i < variable_171_analog_data.size(); i++) {
+                VariableVo vriableVo = new VariableVo();
+                vriableVo.setVariableCoding(variable_171_analog_data.get(i).getVariableCoding());
+                vriableVo.setVariableValue(FieldEscapeUtils.transformation1(variable_171_analog_data.get(i),variable_171_analog_data.get(i).getVariableCoding().split("_")[1]));
+                variableVoList.add(vriableVo);
+            }
+        }
+        if(variable_183_analog_data.size()>0){
+            for (int i = 0; i < variable_183_analog_data.size(); i++) {
+                VariableVo vriableVo = new VariableVo();
+                vriableVo.setVariableCoding(variable_183_analog_data.get(i).getVariableCoding());
+                vriableVo.setVariableValue(FieldEscapeUtils.transformation1(variable_183_analog_data.get(i),variable_183_analog_data.get(i).getVariableCoding().split("_")[1]));
+                variableVoList.add(vriableVo);
+            }
+        }
+        if(variable_173_switch_data.size()>0){
+            for (int i = 0; i < variable_173_switch_data.size(); i++) {
+                VariableVo vriableVo = new VariableVo();
+                vriableVo.setVariableCoding(variable_173_switch_data.get(i).getVariableCoding());
+                vriableVo.setVariableValue(FieldEscapeUtils.transformation2(variable_173_switch_data.get(i),variable_173_switch_data.get(i).getVariableCoding().split("_")[1]));
+                variableVoList.add(vriableVo);
+            }
+        }
+        if(variable_171_switch_data.size()>0){
+            for (int i = 0; i < variable_171_switch_data.size(); i++) {
+                VariableVo vriableVo = new VariableVo();
+                vriableVo.setVariableCoding(variable_171_switch_data.get(i).getVariableCoding());
+                vriableVo.setVariableValue(FieldEscapeUtils.transformation2(variable_171_switch_data.get(i),variable_171_switch_data.get(i).getVariableCoding().split("_")[1]));
+                variableVoList.add(vriableVo);
+            }
+        }
+        if(variable_183_switch_data.size()>0){
+            for (int i = 0; i < variable_183_switch_data.size(); i++) {
+                VariableVo vriableVo = new VariableVo();
+                vriableVo.setVariableCoding(variable_183_switch_data.get(i).getVariableCoding());
+                vriableVo.setVariableValue(FieldEscapeUtils.transformation2(variable_183_switch_data.get(i),variable_183_switch_data.get(i).getVariableCoding().split("_")[1]));
+                variableVoList.add(vriableVo);
             }
         }
 
@@ -143,21 +222,21 @@ public class HookupServiceImpl extends AbstractCrudService<HookupMapper, Hookup>
                 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){
+                if ("".equals(hookupComponentComplete.get(i).getMPoint()) || hookupComponentComplete.get(i).getMPoint() == null) {
                     hookupComponentCompleteVo.setMPoint("");
-                }else {
+                } else {
                     hookupComponentCompleteVo.setMPoint(JSONArray.parseObject(hookupComponentComplete.get(i).getMPoint()));
                 }
-                if ("\"\"".equals(hookupComponentComplete.get(i).getEchartsOption())||"".equals(hookupComponentComplete.get(i).getEchartsOption())||
-                        hookupComponentComplete.get(i).getEchartsOption()==null){
+                if ("\"\"".equals(hookupComponentComplete.get(i).getEchartsOption()) || "".equals(hookupComponentComplete.get(i).getEchartsOption()) ||
+                        hookupComponentComplete.get(i).getEchartsOption() == null) {
                     hookupComponentCompleteVo.setEchartsOption("");
-                }else {
+                } else {
                     hookupComponentCompleteVo.setEchartsOption(JSONArray.parseObject(hookupComponentComplete.get(i).getEchartsOption()));
                 }
 
                 hookupComponentCompleteVo.setSize(hookupComponentComplete.get(i).getSize());
                 hookupComponentCompleteVo.setAngle(hookupComponentComplete.get(i).getAngle());
-                if ("".equals(hookupComponentComplete.get(i).getElementBool())||hookupComponentComplete.get(i).getElementBool()==null) {
+                if ("".equals(hookupComponentComplete.get(i).getElementBool()) || hookupComponentComplete.get(i).getElementBool() == null) {
                     hookupComponentCompleteVo.setElementBool("");
                 } else {
                     hookupComponentCompleteVo.setElementBool(hookupComponentComplete.get(i).getElementBool().split(","));
@@ -166,10 +245,10 @@ public class HookupServiceImpl extends AbstractCrudService<HookupMapper, Hookup>
                 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));
+                if (variableVoList.size() > 0) {
+                    for (int j = 0; j < variableVoList.size(); j++) {
+                        if (hookupComponentComplete.get(i).getVariableCoding().equals(variableVoList.get(j).getVariableCoding())) {
+                            String variableValue = ""+variableVoList.get(j).getVariableValue();
                             hookupComponentCompleteVo.setVariableValue(variableValue);
                         }
                     }
@@ -182,6 +261,82 @@ public class HookupServiceImpl extends AbstractCrudService<HookupMapper, Hookup>
         return hookupComponentCompleteVoLsit;
     }
 
+//    public List<HookupComponentCompleteVo> getHookupComponentComplete(Integer siteId) {
+//        List<DeviceTypeVo> deviceTypeVo = baseMapper.getDevidetype(siteId);
+//        List<RtAnalogDataOneVo> variable_vaue = null;
+//        if (deviceTypeVo.size()>0){
+//            if (deviceTypeVo.get(0).getDeviceType() == 3) {
+//                String table = "rt_analog_171_data";
+//                if (deviceTypeVo.get(0).getDataArea()==2){
+//                    table = "rt_switch_171_data";
+//                }
+//                variable_vaue = baseMapper.getVariable171(siteId,table);
+//            } else if (deviceTypeVo.get(0).getDeviceType() == 4) {
+//                String table = "rt_analog_173_data";
+//                if (deviceTypeVo.get(0).getDataArea()==2){
+//                    table = "rt_switch_173_data";
+//                }
+//                variable_vaue = baseMapper.getVariable173(siteId,table);
+//            } else {
+//                String table = "rt_analog_data";
+//                if (deviceTypeVo.get(0).getDataArea()==2){
+//                    table = "rt_switch_data";
+//                }
+//                variable_vaue = baseMapper.getVariable(siteId,table);
+//            }
+//        }
+//
+//        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.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())||"".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.setAngle(hookupComponentComplete.get(i).getAngle());
+//                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

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

@@ -1,6 +1,8 @@
 package com.bizmatics.service.util;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.bizmatics.common.core.util.HttpUtils;
 import com.bizmatics.common.core.util.StringUtils;
 import com.bizmatics.common.mvc.utils.IpUtils;
@@ -8,6 +10,7 @@ import com.bizmatics.common.spring.util.JsonUtils;
 import com.bizmatics.model.vo.ContextualDataVo;
 import com.bizmatics.model.vo.HtAnalogDataVo;
 import com.bizmatics.model.vo.RtAnalogDataOneVo;
+import com.bizmatics.model.vo.RtSwitchDataVo;
 import com.bizmatics.service.config.WjConfig;
 import com.fasterxml.jackson.core.type.TypeReference;
 import org.slf4j.Logger;
@@ -16,6 +19,7 @@ import org.slf4j.LoggerFactory;
 import java.lang.reflect.Field;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.*;
 
 /**
@@ -665,7 +669,7 @@ public class FieldEscapeUtils
             case "voltageATHD":
                 return contextualDataVo.getVoltageATHD();
             case "voltageBTHD":
-                return contextualDataVo.getVoltageATHD();
+                return contextualDataVo.getVoltageBTHD();
             case "voltageCTHD":
                 return contextualDataVo.getVoltageCTHD();
             case "voltageSagTimes":
@@ -1089,5 +1093,175 @@ public class FieldEscapeUtils
         }
         return fieldDisplayOne;
     }
-}
 
+    public static Object transformation2(RtSwitchDataVo rtSwitchDataVo, String fieldValue){
+        switch (fieldValue) {
+            case "id":
+                return rtSwitchDataVo.getId();
+//               break;
+            case "deviceName":
+                return rtSwitchDataVo.getDeviceName();
+//               break;
+            case "commState":
+                return rtSwitchDataVo.getCommState();
+//               break;
+            case "busLive":
+                return rtSwitchDataVo.getBusLive();
+//               break;
+            case "highVoltageAlarm":
+                return rtSwitchDataVo.getHighVoltageAlarm();
+//               break;
+            case "lowVoltageAlarm":
+                return rtSwitchDataVo.getLowVoltageAlarm();
+//               break;
+            case "busLackPhase":
+                return rtSwitchDataVo.getBusLackPhase();
+//               break;
+            case "analog1Alarm":
+                return rtSwitchDataVo.getAnalog1Alarm();
+//               break;
+            case "analog2Alarm":
+                return rtSwitchDataVo.getAnalog2Alarm();
+//               break;
+            case "analog3Alarm":
+                return rtSwitchDataVo.getAnalog3Alarm();
+//               break;
+            case "analog4Alarm":
+                return rtSwitchDataVo.getAnalog4Alarm();
+//               break;
+            case "analog5Alarm":
+                return rtSwitchDataVo.getAnalog5Alarm();
+//               break;
+            case "digitalReserved1":
+                return rtSwitchDataVo.getDigitalReserved1();
+//               break;
+            case "digitalReserved2":
+                return rtSwitchDataVo.getDigitalReserved2();
+//               break;
+            case "digitalReserved3":
+                return rtSwitchDataVo.getDigitalReserved3();
+//               break;
+            case "digitalReserved4":
+                return rtSwitchDataVo.getDigitalReserved4();
+//               break;
+            case "digitalReserved5":
+                return rtSwitchDataVo.getDigitalReserved5();
+//               break;
+            case "digitalReserved6":
+                return rtSwitchDataVo.getDigitalReserved6();
+//               break;
+            case "dataTime":
+                return rtSwitchDataVo.getDataTime();
+//               break;
+            case "LoadLive":
+                return rtSwitchDataVo.getLoadLive();
+//               break;
+            case "Trip":
+                return rtSwitchDataVo.getTrip();
+//               break;
+            case "OverI":
+                return rtSwitchDataVo.getOverI();
+//               break;
+            case "PhaseLoss":
+                return rtSwitchDataVo.getPhaseLoss();
+//               break;
+            case "UnderV":
+                return rtSwitchDataVo.getUnderV();
+//               break;
+            case "OverDemandP":
+                return rtSwitchDataVo.getOverDemandP();
+//               break;
+            case "OverIr":
+                return rtSwitchDataVo.getOverIr();
+//               break;
+            case "OverT1":
+                return rtSwitchDataVo.getOverT1();
+//               break;
+            case "OverT2":
+                return rtSwitchDataVo.getOverT2();
+//               break;
+            case "OverT3":
+                return rtSwitchDataVo.getOverT3();
+//               break;
+            case "DI1":
+                return rtSwitchDataVo.getDi1();
+//               break;
+            case "DI2":
+                return rtSwitchDataVo.getDi2();
+//               break;
+            case "DO1":
+                return rtSwitchDataVo.getDo1();
+//               break;
+            case "DO2":
+                return rtSwitchDataVo.getDo2();
+//               break;
+            case "ResDI1":
+                return rtSwitchDataVo.getResDI1();
+//               break;
+            case "ResDI2":
+                return rtSwitchDataVo.getResDI2();
+//               break;
+            case "ResDI3":
+                return rtSwitchDataVo.getResDI3();
+//               break;
+            case "ArcA":
+                return rtSwitchDataVo.getArcA();
+//               break;
+            case "ArcB":
+                return rtSwitchDataVo.getArcB();
+//               break;
+            case "ArcC":
+                return rtSwitchDataVo.getArcC();
+//               break;
+            case "BusOutage":
+                return rtSwitchDataVo.getBusOutage();
+//               break;
+            case "DevAbnormal":
+                return rtSwitchDataVo.getDevAbnormal();
+//               break;
+            case "EleAlarm":
+                return rtSwitchDataVo.getEleAlarm();
+//               break;
+            case "FireAlarm":
+                return rtSwitchDataVo.getFireAlarm();
+//               break;
+            case "MeasFailure":
+                return rtSwitchDataVo.getMeasFailure();
+//               break;
+            case "Mute":
+                return rtSwitchDataVo.getMute();
+//               break;
+            case "OverDemandS":
+                return rtSwitchDataVo.getOverDemandS();
+//               break;
+            case "OverEvT":
+                return rtSwitchDataVo.getOverEvT();
+//               break;
+            case "OverIH":
+                return rtSwitchDataVo.getOverIH();
+//               break;
+            case "OverT4":
+                return rtSwitchDataVo.getOverT4();
+//               break;
+            case "OverUH":
+                return rtSwitchDataVo.getOverUH();
+//               break;
+            case "OverV":
+                return rtSwitchDataVo.getOverV();
+//               break;
+            case "ResDI4":
+                return rtSwitchDataVo.getResDI4();
+//               break;
+            case "idd":
+                return rtSwitchDataVo.getIdd();
+//               break;
+            case "variableCoding":
+                return rtSwitchDataVo.getVariableCoding();
+//               break;
+            default:
+                return null;
+        }
+    }
+
+
+}