配电图查询调试1

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

@@ -70,7 +70,7 @@ public class MybatisGeneratorUtils {
         // strategy.setTablePrefix("t_"); // 表名前缀
         strategy.setEntityLombokModel(true); //使用lombok
         //修改自己想要生成的表
-        strategy.setInclude(new String[]{"rt_analog_173_data"});  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude(new String[]{"rt_switch_173_data"});  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

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

@@ -0,0 +1,142 @@
+package com.bizmatics.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+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-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class RtSwitch171Data 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;
+
+
+}

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

@@ -0,0 +1,154 @@
+package com.bizmatics.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+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-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class RtSwitch173Data implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 伍继电力hz173消费组开关量实时数据表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("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;
+
+    /**
+     * 上报时间
+     */
+    @TableField("dataTime")
+    private LocalDateTime dataTime;
+
+
+}

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

@@ -23,5 +23,7 @@ public class DeviceTypeVo {
 
     private Integer deviceType;
 
+    private Integer dataArea;
+
 
 }

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

@@ -566,4 +566,313 @@ public class RtAnalogDataOneVo implements Serializable {
      */
     @TableField("analogReserved4")
     private Double analogReserved4;
+
+
+    /**
+     * 通讯状态(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;
+
+
+    /**
+     * 回路带电(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;
+
 }

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

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

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

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

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

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

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

@@ -25,7 +25,8 @@
         SELECT
         b.variable_coding,
         c.device_code,
-        c.device_type
+        c.device_type,
+        b.data_area
         FROM
         hookup_component_complete AS a
         JOIN device_analog_variable_list AS b ON a.variable_id = b.id
@@ -45,7 +46,7 @@
         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
+        JOIN ${table} AS d ON c.device_code = d.deviceName
         <where>
             <if test="siteId != null and siteId != 0">
                 a.site_id = #{siteId}
@@ -63,7 +64,7 @@
         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
+        JOIN ${table} AS d ON c.device_code = d.deviceName
         <where>
             <if test="siteId != null and siteId != 0">
                 a.site_id = #{siteId}
@@ -81,7 +82,7 @@
         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
+        JOIN ${table} AS d ON c.device_code = d.deviceName
         <where>
             <if test="siteId != null and siteId != 0">
                 a.site_id = #{siteId}

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

@@ -0,0 +1,28 @@
+<?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.RtSwitch171DataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.bizmatics.model.RtSwitch171Data">
+        <id column="id" property="id" />
+        <result column="deviceName" property="deviceName" />
+        <result column="commState" property="commState" />
+        <result column="busLive" property="busLive" />
+        <result column="highVoltageAlarm" property="highVoltageAlarm" />
+        <result column="lowVoltageAlarm" property="lowVoltageAlarm" />
+        <result column="busLackPhase" property="busLackPhase" />
+        <result column="analog1Alarm" property="analog1Alarm" />
+        <result column="analog2Alarm" property="analog2Alarm" />
+        <result column="analog3Alarm" property="analog3Alarm" />
+        <result column="analog4Alarm" property="analog4Alarm" />
+        <result column="analog5Alarm" property="analog5Alarm" />
+        <result column="digitalReserved1" property="digitalReserved1" />
+        <result column="digitalReserved2" property="digitalReserved2" />
+        <result column="digitalReserved3" property="digitalReserved3" />
+        <result column="digitalReserved4" property="digitalReserved4" />
+        <result column="digitalReserved5" property="digitalReserved5" />
+        <result column="digitalReserved6" property="digitalReserved6" />
+        <result column="dataTime" property="dataTime" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,30 @@
+<?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.RtSwitch173DataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.bizmatics.model.RtSwitch173Data">
+        <id column="id" property="id" />
+        <result column="deviceName" property="deviceName" />
+        <result column="commState" property="commState" />
+        <result column="LoadLive" property="LoadLive" />
+        <result column="Trip" property="Trip" />
+        <result column="OverI" property="OverI" />
+        <result column="PhaseLoss" property="PhaseLoss" />
+        <result column="UnderV" property="UnderV" />
+        <result column="OverDemandP" property="OverDemandP" />
+        <result column="OverIr" property="OverIr" />
+        <result column="OverT1" property="OverT1" />
+        <result column="OverT2" property="OverT2" />
+        <result column="OverT3" property="OverT3" />
+        <result column="DI1" property="di1" />
+        <result column="DI2" property="di2" />
+        <result column="DO1" property="do1" />
+        <result column="DO2" property="do2" />
+        <result column="ResDI1" property="ResDI1" />
+        <result column="ResDI2" property="ResDI2" />
+        <result column="ResDI3" property="ResDI3" />
+        <result column="dataTime" property="dataTime" />
+    </resultMap>
+
+</mapper>

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

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

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

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

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

@@ -90,11 +90,6 @@ public class HookupServiceImpl extends AbstractCrudService<HookupMapper, Hookup>
                 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(JSONArray.parseObject(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) {
@@ -106,60 +101,6 @@ public class HookupServiceImpl extends AbstractCrudService<HookupMapper, Hookup>
                 hookupListlist.add(hookupOne);
             }
         }
-
-
-//        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;
     }
 
@@ -169,11 +110,23 @@ public class HookupServiceImpl extends AbstractCrudService<HookupMapper, Hookup>
         List<RtAnalogDataOneVo> variable_vaue = null;
         if (deviceTypeVo.size()>0){
             if (deviceTypeVo.get(0).getDeviceType() == 3) {
-                variable_vaue = baseMapper.getVariable171(siteId);
+                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) {
-                variable_vaue = baseMapper.getVariable173(siteId);
+                String table = "rt_analog_173_data";
+                if (deviceTypeVo.get(0).getDataArea()==2){
+                    table = "rt_switch_173_data";
+                }
+                variable_vaue = baseMapper.getVariable173(siteId,table);
             } else {
-                variable_vaue = baseMapper.getVariable(siteId);
+                String table = "rt_analog_data";
+                if (deviceTypeVo.get(0).getDataArea()==2){
+                    table = "rt_switch_data";
+                }
+                variable_vaue = baseMapper.getVariable(siteId,table);
             }
         }
 

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

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

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

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

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

@@ -632,9 +632,165 @@ public class FieldEscapeUtils
             variableValue=""+rtAnalogDataOneVo.getAnalogReserved3();
         }else if (arr[arrlength-1].equals("analogReserved4")){
             variableValue=""+rtAnalogDataOneVo.getAnalogReserved4();
+        }else if (arr[arrlength-1].equals("commState")){
+            variableValue=""+rtAnalogDataOneVo.getCommState();
+        }else if (arr[arrlength-1].equals("busLive")){
+            variableValue=""+rtAnalogDataOneVo.getBusLive();
+        }else if (arr[arrlength-1].equals("highVoltageAlarm")){
+            variableValue=""+rtAnalogDataOneVo.getHighVoltageAlarm();
+        }else if (arr[arrlength-1].equals("lowVoltageAlarm")){
+            variableValue=""+rtAnalogDataOneVo.getLowVoltageAlarm();
+        }else if (arr[arrlength-1].equals("busLackPhase")){
+            variableValue=""+rtAnalogDataOneVo.getBusLackPhase();
+        }else if (arr[arrlength-1].equals("analog1Alarm")){
+            variableValue=""+rtAnalogDataOneVo.getAnalog1Alarm();
+        }else if (arr[arrlength-1].equals("analog2Alarm")){
+            variableValue=""+rtAnalogDataOneVo.getAnalog2Alarm();
+        }else if (arr[arrlength-1].equals("analog3Alarm")){
+            variableValue=""+rtAnalogDataOneVo.getAnalog3Alarm();
+        }else if (arr[arrlength-1].equals("analog4Alarm")){
+            variableValue=""+rtAnalogDataOneVo.getAnalog4Alarm();
+        }else if (arr[arrlength-1].equals("analog5Alarm")){
+            variableValue=""+rtAnalogDataOneVo.getAnalog5Alarm();
+        }else if (arr[arrlength-1].equals("digitalReserved1")){
+            variableValue=""+rtAnalogDataOneVo.getDigitalReserved1();
+        }else if (arr[arrlength-1].equals("digitalReserved2")){
+            variableValue=""+rtAnalogDataOneVo.getDigitalReserved2();
+        }else if (arr[arrlength-1].equals("digitalReserved3")){
+            variableValue=""+rtAnalogDataOneVo.getDigitalReserved3();
+        }else if (arr[arrlength-1].equals("digitalReserved4")){
+            variableValue=""+rtAnalogDataOneVo.getDigitalReserved4();
+        }else if (arr[arrlength-1].equals("digitalReserved5")){
+            variableValue=""+rtAnalogDataOneVo.getDigitalReserved5();
+        }else if (arr[arrlength-1].equals("digitalReserved6")){
+            variableValue=""+rtAnalogDataOneVo.getDigitalReserved6();
+        }else if (arr[arrlength-1].equals("LoadLive")){
+            variableValue=""+rtAnalogDataOneVo.getLoadLive();
+        }else if (arr[arrlength-1].equals("Trip")){
+            variableValue=""+rtAnalogDataOneVo.getTrip();
+        }else if (arr[arrlength-1].equals("OverI")){
+            variableValue=""+rtAnalogDataOneVo.getOverI();
+        }else if (arr[arrlength-1].equals("PhaseLoss")){
+            variableValue=""+rtAnalogDataOneVo.getPhaseLoss();
+        }else if (arr[arrlength-1].equals("UnderV")){
+            variableValue=""+rtAnalogDataOneVo.getUnderV();
+        }else if (arr[arrlength-1].equals("OverDemandP")){
+            variableValue=""+rtAnalogDataOneVo.getOverDemandP();
+        }else if (arr[arrlength-1].equals("OverIr")){
+            variableValue=""+rtAnalogDataOneVo.getOverIr();
+        }else if (arr[arrlength-1].equals("OverT1")){
+            variableValue=""+rtAnalogDataOneVo.getOverT1();
+        }else if (arr[arrlength-1].equals("OverT2")){
+            variableValue=""+rtAnalogDataOneVo.getOverT2();
+        }else if (arr[arrlength-1].equals("OverT3")){
+            variableValue=""+rtAnalogDataOneVo.getOverT3();
+        }else if (arr[arrlength-1].equals("DI1")){
+            variableValue=""+rtAnalogDataOneVo.getDi1();
+        }else if (arr[arrlength-1].equals("DI2")){
+            variableValue=""+rtAnalogDataOneVo.getDi2();
+        }else if (arr[arrlength-1].equals("DO1")){
+            variableValue=""+rtAnalogDataOneVo.getDo1();
+        }else if (arr[arrlength-1].equals("DO2")){
+            variableValue=""+rtAnalogDataOneVo.getDo2();
+        }else if (arr[arrlength-1].equals("ResDI1")){
+            variableValue=""+rtAnalogDataOneVo.getResDI1();
+        }else if (arr[arrlength-1].equals("ResDI2")){
+            variableValue=""+rtAnalogDataOneVo.getResDI2();
+        }else if (arr[arrlength-1].equals("ResDI3")){
+            variableValue=""+rtAnalogDataOneVo.getResDI3();
+        }else if (arr[arrlength-1].equals("ArcA")){
+            variableValue=""+rtAnalogDataOneVo.getArcA();
+        }else if (arr[arrlength-1].equals("ArcB")){
+            variableValue=""+rtAnalogDataOneVo.getArcB();
+        }else if (arr[arrlength-1].equals("ArcC")){
+            variableValue=""+rtAnalogDataOneVo.getArcC();
+        }else if (arr[arrlength-1].equals("BusOutage")){
+            variableValue=""+rtAnalogDataOneVo.getBusOutage();
+        }else if (arr[arrlength-1].equals("DI3")){
+            variableValue=""+rtAnalogDataOneVo.getDi3();
+        }else if (arr[arrlength-1].equals("DevAbnormal")){
+            variableValue=""+rtAnalogDataOneVo.getDevAbnormal();
+        }else if (arr[arrlength-1].equals("EleAlarm")){
+            variableValue=""+rtAnalogDataOneVo.getEleAlarm();
+        }else if (arr[arrlength-1].equals("FireAlarm")){
+            variableValue=""+rtAnalogDataOneVo.getFireAlarm();
+        }else if (arr[arrlength-1].equals("LoadBrkState")){
+            variableValue=""+rtAnalogDataOneVo.getLoadBrkState();
+        }else if (arr[arrlength-1].equals("MeasFailure")){
+            variableValue=""+rtAnalogDataOneVo.getMeasFailure();
+        }else if (arr[arrlength-1].equals("Mute")){
+            variableValue=""+rtAnalogDataOneVo.getMute();
+        }else if (arr[arrlength-1].equals("OverDemandS")){
+            variableValue=""+rtAnalogDataOneVo.getOverDemandS();
+        }else if (arr[arrlength-1].equals("OverEvT")){
+            variableValue=""+rtAnalogDataOneVo.getOverEvT();
+        }else if (arr[arrlength-1].equals("OverIH")){
+            variableValue=""+rtAnalogDataOneVo.getOverIH();
+        }else if (arr[arrlength-1].equals("OverT4")){
+            variableValue=""+rtAnalogDataOneVo.getOverT4();
+        }else if (arr[arrlength-1].equals("OverUH")){
+            variableValue=""+rtAnalogDataOneVo.getOverUH();
+        }else if (arr[arrlength-1].equals("OverV")){
+            variableValue=""+rtAnalogDataOneVo.getOverV();
+        }else if (arr[arrlength-1].equals("ResDI4")){
+            variableValue=""+rtAnalogDataOneVo.getResDI4();
         }else {
             variableValue = null;
         }
         return variableValue;
     }
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+