字段调整

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/DlsnjInfo.java

@@ -42,19 +42,7 @@ public class DlsnjInfo implements Serializable {
 	/** 站点表id */
 	@ApiModelProperty(value="站点表id",name="stationId")
 	private java.lang.String stationId;
-	/** 创建人 */
-	@ApiModelProperty(value="创建人",name="createUserId")
-	private java.lang.String createUserId;
 	/** 创建时间 */
 	@ApiModelProperty(value="创建时间",name="createTime")
 	private java.util.Date createTime;
-	/** 备用项1 */
-	@ApiModelProperty(value="备用项1",name="byx1")
-	private java.lang.String byx1;
-	/** 备用项2 */
-	@ApiModelProperty(value="备用项2",name="byx2")
-	private java.lang.String byx2;
-	/** 备用项3 */
-	@ApiModelProperty(value="备用项3",name="byx3")
-	private java.lang.String byx3;
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/FlrbInfo.java

@@ -111,19 +111,7 @@ public class FlrbInfo implements Serializable {
 	/** 站点表id */
 	@ApiModelProperty(value="站点表id",name="stationId")
 	private java.lang.String stationId;
-	/** 创建人 */
-	@ApiModelProperty(value="创建人",name="createUserId")
-	private java.lang.String createUserId;
 	/** 创建时间 */
 	@ApiModelProperty(value="创建时间",name="createTime")
 	private java.util.Date createTime;
-	/** 备用项1 */
-	@ApiModelProperty(value="备用项1",name="byx1")
-	private java.lang.String byx1;
-	/** 备用项2 */
-	@ApiModelProperty(value="备用项2",name="byx2")
-	private java.lang.String byx2;
-	/** 备用项3 */
-	@ApiModelProperty(value="备用项3",name="byx3")
-	private java.lang.String byx3;
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/JfktgInfo.java

@@ -72,19 +72,7 @@ public class JfktgInfo implements Serializable {
 	/** 站点表id */
 	@ApiModelProperty(value="站点表id",name="stationId")
 	private java.lang.String stationId;
-	/** 创建人 */
-	@ApiModelProperty(value="创建人",name="createUserId")
-	private java.lang.String createUserId;
 	/** 创建时间 */
 	@ApiModelProperty(value="创建时间",name="createTime")
 	private java.util.Date createTime;
-	/** 备用项1 */
-	@ApiModelProperty(value="备用项1",name="byx1")
-	private java.lang.String byx1;
-	/** 备用项2 */
-	@ApiModelProperty(value="备用项2",name="byx2")
-	private java.lang.String byx2;
-	/** 备用项3 */
-	@ApiModelProperty(value="备用项3",name="byx3")
-	private java.lang.String byx3;
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/JfktpInfo.java

@@ -48,19 +48,7 @@ public class JfktpInfo implements Serializable {
 	/** 站点表id */
 	@ApiModelProperty(value="站点表id",name="stationId")
 	private java.lang.String stationId;
-	/** 创建人 */
-	@ApiModelProperty(value="创建人",name="createUserId")
-	private java.lang.String createUserId;
 	/** 创建时间 */
 	@ApiModelProperty(value="创建时间",name="createTime")
 	private java.util.Date createTime;
-	/** 备用项1 */
-	@ApiModelProperty(value="备用项1",name="byx1")
-	private java.lang.String byx1;
-	/** 备用项2 */
-	@ApiModelProperty(value="备用项2",name="byx2")
-	private java.lang.String byx2;
-	/** 备用项3 */
-	@ApiModelProperty(value="备用项3",name="byx3")
-	private java.lang.String byx3;
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/PfjInfo.java

@@ -78,19 +78,7 @@ public class PfjInfo implements Serializable {
 	/** 站点表id */
 	@ApiModelProperty(value="站点表id",name="stationId")
 	private java.lang.String stationId;
-	/** 创建人 */
-	@ApiModelProperty(value="创建人",name="createUserId")
-	private java.lang.String createUserId;
 	/** 创建时间 */
 	@ApiModelProperty(value="创建时间",name="createTime")
 	private java.util.Date createTime;
-	/** 备用项1 */
-	@ApiModelProperty(value="备用项1",name="byx1")
-	private java.lang.String byx1;
-	/** 备用项2 */
-	@ApiModelProperty(value="备用项2",name="byx2")
-	private java.lang.String byx2;
-	/** 备用项3 */
-	@ApiModelProperty(value="备用项3",name="byx3")
-	private java.lang.String byx3;
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/SbInfo.java

@@ -36,19 +36,7 @@ public class SbInfo implements Serializable {
 	/** 站点表id */
 	@ApiModelProperty(value="站点表id",name="stationId")
 	private java.lang.String stationId;
-	/** 创建人 */
-	@ApiModelProperty(value="创建人",name="createUserId")
-	private java.lang.String createUserId;
 	/** 创建时间 */
 	@ApiModelProperty(value="创建时间",name="createTime")
 	private java.util.Date createTime;
-	/** 备用项1 */
-	@ApiModelProperty(value="备用项1",name="byx1")
-	private java.lang.String byx1;
-	/** 备用项2 */
-	@ApiModelProperty(value="备用项2",name="byx2")
-	private java.lang.String byx2;
-	/** 备用项3 */
-	@ApiModelProperty(value="备用项3",name="byx3")
-	private java.lang.String byx3;
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/SljfgInfo.java

@@ -78,19 +78,7 @@ public class SljfgInfo implements Serializable {
 	/** 站点表id */
 	@ApiModelProperty(value="站点表id",name="stationId")
 	private java.lang.String stationId;
-	/** 创建人 */
-	@ApiModelProperty(value="创建人",name="createUserId")
-	private java.lang.String createUserId;
 	/** 创建时间 */
 	@ApiModelProperty(value="创建时间",name="createTime")
 	private java.util.Date createTime;
-	/** 备用项1 */
-	@ApiModelProperty(value="备用项1",name="byx1")
-	private java.lang.String byx1;
-	/** 备用项2 */
-	@ApiModelProperty(value="备用项2",name="byx2")
-	private java.lang.String byx2;
-	/** 备用项3 */
-	@ApiModelProperty(value="备用项3",name="byx3")
-	private java.lang.String byx3;
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/SnqxzInfo.java

@@ -42,19 +42,7 @@ public class SnqxzInfo implements Serializable {
 	/** 站点表id */
 	@ApiModelProperty(value="站点表id",name="stationId")
 	private java.lang.String stationId;
-	/** 创建人 */
-	@ApiModelProperty(value="创建人",name="createUserId")
-	private java.lang.String createUserId;
 	/** 创建时间 */
 	@ApiModelProperty(value="创建时间",name="createTime")
 	private java.util.Date createTime;
-	/** 备用项1 */
-	@ApiModelProperty(value="备用项1",name="byx1")
-	private java.lang.String byx1;
-	/** 备用项2 */
-	@ApiModelProperty(value="备用项2",name="byx2")
-	private java.lang.String byx2;
-	/** 备用项3 */
-	@ApiModelProperty(value="备用项3",name="byx3")
-	private java.lang.String byx3;
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/SwqxzInfo.java

@@ -57,19 +57,7 @@ public class SwqxzInfo implements Serializable {
 	/** 站点表id */
 	@ApiModelProperty(value="站点表id",name="stationId")
 	private java.lang.String stationId;
-	/** 创建人 */
-	@ApiModelProperty(value="创建人",name="createUserId")
-	private java.lang.String createUserId;
 	/** 创建时间 */
 	@ApiModelProperty(value="创建时间",name="createTime")
 	private java.util.Date createTime;
-	/** 备用项1 */
-	@ApiModelProperty(value="备用项1",name="byx1")
-	private java.lang.String byx1;
-	/** 备用项2 */
-	@ApiModelProperty(value="备用项2",name="byx2")
-	private java.lang.String byx2;
-	/** 备用项3 */
-	@ApiModelProperty(value="备用项3",name="byx3")
-	private java.lang.String byx3;
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/DlsnjInfoModel.java

@@ -27,14 +27,6 @@ public class DlsnjInfoModel extends BaseModel {
 	private Integer type;
 	/** 站点表id */
 	private java.lang.String stationId;
-	/** 创建人 */
-	private java.lang.String createUserId;
 	/** 创建时间 */
 	private java.util.Date createTime;
-	/** 备用项1 */
-	private java.lang.String byx1;
-	/** 备用项2 */
-	private java.lang.String byx2;
-	/** 备用项3 */
-	private java.lang.String byx3;
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/FlrbInfoModel.java

@@ -73,14 +73,6 @@ public class FlrbInfoModel extends BaseModel {
 	private Integer type;
 	/** 站点表id */
 	private java.lang.String stationId;
-	/** 创建人 */
-	private java.lang.String createUserId;
 	/** 创建时间 */
 	private java.util.Date createTime;
-	/** 备用项1 */
-	private java.lang.String byx1;
-	/** 备用项2 */
-	private java.lang.String byx2;
-	/** 备用项3 */
-	private java.lang.String byx3;
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/JfktgInfoModel.java

@@ -47,14 +47,6 @@ public class JfktgInfoModel extends BaseModel {
 	private Integer type;
 	/** 站点表id */
 	private java.lang.String stationId;
-	/** 创建人 */
-	private java.lang.String createUserId;
 	/** 创建时间 */
 	private java.util.Date createTime;
-	/** 备用项1 */
-	private java.lang.String byx1;
-	/** 备用项2 */
-	private java.lang.String byx2;
-	/** 备用项3 */
-	private java.lang.String byx3;
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/JfktpInfoModel.java

@@ -31,14 +31,6 @@ public class JfktpInfoModel extends BaseModel {
 	private Integer type;
 	/** 站点表id */
 	private java.lang.String stationId;
-	/** 创建人 */
-	private java.lang.String createUserId;
 	/** 创建时间 */
 	private java.util.Date createTime;
-	/** 备用项1 */
-	private java.lang.String byx1;
-	/** 备用项2 */
-	private java.lang.String byx2;
-	/** 备用项3 */
-	private java.lang.String byx3;
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/PfjInfoModel.java

@@ -51,14 +51,6 @@ public class PfjInfoModel extends BaseModel {
 	private Integer type;
 	/** 站点表id */
 	private java.lang.String stationId;
-	/** 创建人 */
-	private java.lang.String createUserId;
 	/** 创建时间 */
 	private java.util.Date createTime;
-	/** 备用项1 */
-	private java.lang.String byx1;
-	/** 备用项2 */
-	private java.lang.String byx2;
-	/** 备用项3 */
-	private java.lang.String byx3;
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/SbInfoModel.java

@@ -23,14 +23,6 @@ public class SbInfoModel extends BaseModel {
 	private Integer type;
 	/** 站点表id */
 	private java.lang.String stationId;
-	/** 创建人 */
-	private java.lang.String createUserId;
 	/** 创建时间 */
 	private java.util.Date createTime;
-	/** 备用项1 */
-	private java.lang.String byx1;
-	/** 备用项2 */
-	private java.lang.String byx2;
-	/** 备用项3 */
-	private java.lang.String byx3;
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/SljfgInfoModel.java

@@ -51,14 +51,6 @@ public class SljfgInfoModel extends BaseModel {
 	private Integer type;
 	/** 站点表id */
 	private java.lang.String stationId;
-	/** 创建人 */
-	private java.lang.String createUserId;
 	/** 创建时间 */
 	private java.util.Date createTime;
-	/** 备用项1 */
-	private java.lang.String byx1;
-	/** 备用项2 */
-	private java.lang.String byx2;
-	/** 备用项3 */
-	private java.lang.String byx3;
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/SnqxzInfoModel.java

@@ -27,14 +27,6 @@ public class SnqxzInfoModel extends BaseModel {
 	private Integer type;
 	/** 站点表id */
 	private java.lang.String stationId;
-	/** 创建人 */
-	private java.lang.String createUserId;
 	/** 创建时间 */
 	private java.util.Date createTime;
-	/** 备用项1 */
-	private java.lang.String byx1;
-	/** 备用项2 */
-	private java.lang.String byx2;
-	/** 备用项3 */
-	private java.lang.String byx3;
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/SwqxzInfoModel.java

@@ -37,14 +37,6 @@ public class SwqxzInfoModel extends BaseModel {
 	private Integer type;
 	/** 站点表id */
 	private java.lang.String stationId;
-	/** 创建人 */
-	private java.lang.String createUserId;
 	/** 创建时间 */
 	private java.util.Date createTime;
-	/** 备用项1 */
-	private java.lang.String byx1;
-	/** 备用项2 */
-	private java.lang.String byx2;
-	/** 备用项3 */
-	private java.lang.String byx3;
 }

microservice-admin/src/main/resources/mapper/eq/DlsnjInfoMapper.xml

@@ -11,16 +11,12 @@
 	    <result column="fault_alarm" property="faultAlarm"/>
 	    <result column="type" property="type"/>
 	    <result column="station_id" property="stationId"/>
-	    <result column="create_user_id" property="createUserId"/>
 	    <result column="create_time" property="createTime"/>
-	    <result column="byx1" property="byx1"/>
-	    <result column="byx2" property="byx2"/>
-	    <result column="byx3" property="byx3"/>
 	</resultMap>
 
 	<!-- dlsnj_info table all fields -->
 	<sql id="Base_Column_List">
-		id,resource_id,setting_temperature,setting_mode,setting_wind_speed,fault_alarm,type,station_id,create_user_id,create_time,byx1,byx2,byx3
+		id,resource_id,setting_temperature,setting_mode,setting_wind_speed,fault_alarm,type,station_id,create_time
 	</sql>
 
 	<!-- 公共查询条件 -->
@@ -34,11 +30,7 @@
 		<if test="faultAlarm!=null and faultAlarm!=''">and t.fault_alarm = #{faultAlarm}</if>
 		<if test="type!=null ">and t.type = #{type}</if>
 		<if test="stationId!=null and stationId!=''">and t.station_id = #{stationId}</if>
-		<if test="createUserId!=null and createUserId!=''">and t.create_user_id = #{createUserId}</if>
 		<if test="createTime!=null ">and t.create_time = #{createTime}</if>
-		<if test="byx1!=null and byx1!=''">and t.byx1 = #{byx1}</if>
-		<if test="byx2!=null and byx2!=''">and t.byx2 = #{byx2}</if>
-		<if test="byx3!=null and byx3!=''">and t.byx3 = #{byx3}</if>
 	</sql>
 
 	<select id="queryPageByCount" parameterType="Object" resultType="java.lang.Integer">

microservice-admin/src/main/resources/mapper/eq/FlrbInfoMapper.xml

@@ -34,16 +34,12 @@
 	    <result column="communication_failure" property="communicationFailure"/>
 	    <result column="type" property="type"/>
 	    <result column="station_id" property="stationId"/>
-	    <result column="create_user_id" property="createUserId"/>
 	    <result column="create_time" property="createTime"/>
-	    <result column="byx1" property="byx1"/>
-	    <result column="byx2" property="byx2"/>
-	    <result column="byx3" property="byx3"/>
 	</resultMap>
 
 	<!-- flrb_info table all fields -->
 	<sql id="Base_Column_List">
-		id,resource_id,phase_a_voltage,phase_b_voltage,phase_c_voltage,phase_a_current,phase_b_current,phase_c_current,phase_a_power_factor,phase_b_power_factor,phase_c_power_factor,phase_a_power,phase_b_power,phase_c_power,electric_energy,power_protection_alarm,water_flow_alarm,feng_shui_mode,hot_water_mode,water_supply_temperature,return_water_temperature,heating_start_temperature,heating_stop_temperature,indoor_ambient_temperature,outlet_temperature,return_air_temperature,hot_air_start_temperature,hot_air_stop_temperature,communication_failure,type,station_id,create_user_id,create_time,byx1,byx2,byx3
+		id,resource_id,phase_a_voltage,phase_b_voltage,phase_c_voltage,phase_a_current,phase_b_current,phase_c_current,phase_a_power_factor,phase_b_power_factor,phase_c_power_factor,phase_a_power,phase_b_power,phase_c_power,electric_energy,power_protection_alarm,water_flow_alarm,feng_shui_mode,hot_water_mode,water_supply_temperature,return_water_temperature,heating_start_temperature,heating_stop_temperature,indoor_ambient_temperature,outlet_temperature,return_air_temperature,hot_air_start_temperature,hot_air_stop_temperature,communication_failure,type,station_id,create_time
 	</sql>
 
 	<!-- 公共查询条件 -->
@@ -80,11 +76,7 @@
 		<if test="communicationFailure!=null and communicationFailure!=''">and t.communication_failure = #{communicationFailure}</if>
 		<if test="type!=null ">and t.type = #{type}</if>
 		<if test="stationId!=null and stationId!=''">and t.station_id = #{stationId}</if>
-		<if test="createUserId!=null and createUserId!=''">and t.create_user_id = #{createUserId}</if>
 		<if test="createTime!=null ">and t.create_time = #{createTime}</if>
-		<if test="byx1!=null and byx1!=''">and t.byx1 = #{byx1}</if>
-		<if test="byx2!=null and byx2!=''">and t.byx2 = #{byx2}</if>
-		<if test="byx3!=null and byx3!=''">and t.byx3 = #{byx3}</if>
 	</sql>
 
 	<select id="queryPageByCount" parameterType="Object" resultType="java.lang.Integer">

microservice-admin/src/main/resources/mapper/eq/JfktgInfoMapper.xml

@@ -21,16 +21,12 @@
 	    <result column="communication_failure" property="communicationFailure"/>
 	    <result column="type" property="type"/>
 	    <result column="station_id" property="stationId"/>
-	    <result column="create_user_id" property="createUserId"/>
 	    <result column="create_time" property="createTime"/>
-	    <result column="byx1" property="byx1"/>
-	    <result column="byx2" property="byx2"/>
-	    <result column="byx3" property="byx3"/>
 	</resultMap>
 
 	<!-- jfktg_info table all fields -->
 	<sql id="Base_Column_List">
-		id,resource_id,phase_a_voltage,phase_b_voltage,phase_c_voltage,phase_a_current,phase_b_current,phase_c_current,phase_a_power_factor,phase_b_power_factor,phase_c_power_factor,phase_a_power,phase_b_power,phase_c_power,electric_energy,communication_failure,type,station_id,create_user_id,create_time,byx1,byx2,byx3
+		id,resource_id,phase_a_voltage,phase_b_voltage,phase_c_voltage,phase_a_current,phase_b_current,phase_c_current,phase_a_power_factor,phase_b_power_factor,phase_c_power_factor,phase_a_power,phase_b_power,phase_c_power,electric_energy,communication_failure,type,station_id,create_time
 	</sql>
 
 	<!-- 公共查询条件 -->
@@ -54,11 +50,7 @@
 		<if test="communicationFailure!=null and communicationFailure!=''">and t.communication_failure = #{communicationFailure}</if>
 		<if test="type!=null ">and t.type = #{type}</if>
 		<if test="stationId!=null and stationId!=''">and t.station_id = #{stationId}</if>
-		<if test="createUserId!=null and createUserId!=''">and t.create_user_id = #{createUserId}</if>
 		<if test="createTime!=null ">and t.create_time = #{createTime}</if>
-		<if test="byx1!=null and byx1!=''">and t.byx1 = #{byx1}</if>
-		<if test="byx2!=null and byx2!=''">and t.byx2 = #{byx2}</if>
-		<if test="byx3!=null and byx3!=''">and t.byx3 = #{byx3}</if>
 	</sql>
 
 	<select id="queryPageByCount" parameterType="Object" resultType="java.lang.Integer">

microservice-admin/src/main/resources/mapper/eq/JfktpInfoMapper.xml

@@ -13,16 +13,12 @@
 	    <result column="communication_failure" property="communicationFailure"/>
 	    <result column="type" property="type"/>
 	    <result column="station_id" property="stationId"/>
-	    <result column="create_user_id" property="createUserId"/>
 	    <result column="create_time" property="createTime"/>
-	    <result column="byx1" property="byx1"/>
-	    <result column="byx2" property="byx2"/>
-	    <result column="byx3" property="byx3"/>
 	</resultMap>
 
 	<!-- jfktp_info table all fields -->
 	<sql id="Base_Column_List">
-		id,resource_id,voltage,current,power_factor,power,electric_energy,communication_failure,type,station_id,create_user_id,create_time,byx1,byx2,byx3
+		id,resource_id,voltage,current,power_factor,power,electric_energy,communication_failure,type,station_id,create_time
 	</sql>
 
 	<!-- 公共查询条件 -->
@@ -38,11 +34,7 @@
 		<if test="communicationFailure!=null and communicationFailure!=''">and t.communication_failure = #{communicationFailure}</if>
 		<if test="type!=null ">and t.type = #{type}</if>
 		<if test="stationId!=null and stationId!=''">and t.station_id = #{stationId}</if>
-		<if test="createUserId!=null and createUserId!=''">and t.create_user_id = #{createUserId}</if>
 		<if test="createTime!=null ">and t.create_time = #{createTime}</if>
-		<if test="byx1!=null and byx1!=''">and t.byx1 = #{byx1}</if>
-		<if test="byx2!=null and byx2!=''">and t.byx2 = #{byx2}</if>
-		<if test="byx3!=null and byx3!=''">and t.byx3 = #{byx3}</if>
 	</sql>
 
 	<select id="queryPageByCount" parameterType="Object" resultType="java.lang.Integer">

microservice-admin/src/main/resources/mapper/eq/PfjInfoMapper.xml

@@ -23,16 +23,12 @@
 	    <result column="signal_feedback" property="signalFeedback"/>
 	    <result column="type" property="type"/>
 	    <result column="station_id" property="stationId"/>
-	    <result column="create_user_id" property="createUserId"/>
 	    <result column="create_time" property="createTime"/>
-	    <result column="byx1" property="byx1"/>
-	    <result column="byx2" property="byx2"/>
-	    <result column="byx3" property="byx3"/>
 	</resultMap>
 
 	<!-- pfj_info table all fields -->
 	<sql id="Base_Column_List">
-		id,resource_id,phase_a_voltage,phase_b_voltage,phase_c_voltage,phase_a_current,phase_b_current,phase_c_current,phase_a_power_factor,phase_b_power_factor,phase_c_power_factor,phase_a_power,phase_b_power,phase_c_power,electric_energy,communication_failure,io_fault_alarm,signal_feedback,type,station_id,create_user_id,create_time,byx1,byx2,byx3
+		id,resource_id,phase_a_voltage,phase_b_voltage,phase_c_voltage,phase_a_current,phase_b_current,phase_c_current,phase_a_power_factor,phase_b_power_factor,phase_c_power_factor,phase_a_power,phase_b_power,phase_c_power,electric_energy,communication_failure,io_fault_alarm,signal_feedback,type,station_id,create_time
 	</sql>
 
 	<!-- 公共查询条件 -->
@@ -58,11 +54,7 @@
 		<if test="signalFeedback!=null and signalFeedback!=''">and t.signal_feedback = #{signalFeedback}</if>
 		<if test="type!=null ">and t.type = #{type}</if>
 		<if test="stationId!=null and stationId!=''">and t.station_id = #{stationId}</if>
-		<if test="createUserId!=null and createUserId!=''">and t.create_user_id = #{createUserId}</if>
 		<if test="createTime!=null ">and t.create_time = #{createTime}</if>
-		<if test="byx1!=null and byx1!=''">and t.byx1 = #{byx1}</if>
-		<if test="byx2!=null and byx2!=''">and t.byx2 = #{byx2}</if>
-		<if test="byx3!=null and byx3!=''">and t.byx3 = #{byx3}</if>
 	</sql>
 
 	<select id="queryPageByCount" parameterType="Object" resultType="java.lang.Integer">

microservice-admin/src/main/resources/mapper/eq/SbInfoMapper.xml

@@ -9,16 +9,12 @@
 	    <result column="fault_alarm" property="faultAlarm"/>
 	    <result column="type" property="type"/>
 	    <result column="station_id" property="stationId"/>
-	    <result column="create_user_id" property="createUserId"/>
 	    <result column="create_time" property="createTime"/>
-	    <result column="byx1" property="byx1"/>
-	    <result column="byx2" property="byx2"/>
-	    <result column="byx3" property="byx3"/>
 	</resultMap>
 
 	<!-- sb_info table all fields -->
 	<sql id="Base_Column_List">
-		id,resource_id,current_frequency,fault_alarm,type,station_id,create_user_id,create_time,byx1,byx2,byx3
+		id,resource_id,current_frequency,fault_alarm,type,station_id,create_time
 	</sql>
 
 	<!-- 公共查询条件 -->
@@ -30,11 +26,7 @@
 		<if test="faultAlarm!=null and faultAlarm!=''">and t.fault_alarm = #{faultAlarm}</if>
 		<if test="type!=null ">and t.type = #{type}</if>
 		<if test="stationId!=null and stationId!=''">and t.station_id = #{stationId}</if>
-		<if test="createUserId!=null and createUserId!=''">and t.create_user_id = #{createUserId}</if>
 		<if test="createTime!=null ">and t.create_time = #{createTime}</if>
-		<if test="byx1!=null and byx1!=''">and t.byx1 = #{byx1}</if>
-		<if test="byx2!=null and byx2!=''">and t.byx2 = #{byx2}</if>
-		<if test="byx3!=null and byx3!=''">and t.byx3 = #{byx3}</if>
 	</sql>
 
 	<select id="queryPageByCount" parameterType="Object" resultType="java.lang.Integer">

microservice-admin/src/main/resources/mapper/eq/SljfgInfoMapper.xml

@@ -23,16 +23,12 @@
 	    <result column="communication_failure" property="communicationFailure"/>
 	    <result column="type" property="type"/>
 	    <result column="station_id" property="stationId"/>
-	    <result column="create_user_id" property="createUserId"/>
 	    <result column="create_time" property="createTime"/>
-	    <result column="byx1" property="byx1"/>
-	    <result column="byx2" property="byx2"/>
-	    <result column="byx3" property="byx3"/>
 	</resultMap>
 
 	<!-- sljfg_info table all fields -->
 	<sql id="Base_Column_List">
-		id,resource_id,phase_a_voltage,phase_b_voltage,phase_c_voltage,phase_a_current,phase_b_current,phase_c_current,phase_a_power_factor,phase_b_power_factor,phase_c_power_factor,phase_a_power,phase_b_power,phase_c_power,electric_energy,current_frequency,fault_alarm,communication_failure,type,station_id,create_user_id,create_time,byx1,byx2,byx3
+		id,resource_id,phase_a_voltage,phase_b_voltage,phase_c_voltage,phase_a_current,phase_b_current,phase_c_current,phase_a_power_factor,phase_b_power_factor,phase_c_power_factor,phase_a_power,phase_b_power,phase_c_power,electric_energy,current_frequency,fault_alarm,communication_failure,type,station_id,create_time
 	</sql>
 
 	<!-- 公共查询条件 -->
@@ -58,11 +54,7 @@
 		<if test="communicationFailure!=null and communicationFailure!=''">and t.communication_failure = #{communicationFailure}</if>
 		<if test="type!=null ">and t.type = #{type}</if>
 		<if test="stationId!=null and stationId!=''">and t.station_id = #{stationId}</if>
-		<if test="createUserId!=null and createUserId!=''">and t.create_user_id = #{createUserId}</if>
 		<if test="createTime!=null ">and t.create_time = #{createTime}</if>
-		<if test="byx1!=null and byx1!=''">and t.byx1 = #{byx1}</if>
-		<if test="byx2!=null and byx2!=''">and t.byx2 = #{byx2}</if>
-		<if test="byx3!=null and byx3!=''">and t.byx3 = #{byx3}</if>
 	</sql>
 
 	<select id="queryPageByCount" parameterType="Object" resultType="java.lang.Integer">

microservice-admin/src/main/resources/mapper/eq/SnqxzInfoMapper.xml

@@ -11,16 +11,12 @@
 	    <result column="communication_failure" property="communicationFailure"/>
 	    <result column="type" property="type"/>
 	    <result column="station_id" property="stationId"/>
-	    <result column="create_user_id" property="createUserId"/>
 	    <result column="create_time" property="createTime"/>
-	    <result column="byx1" property="byx1"/>
-	    <result column="byx2" property="byx2"/>
-	    <result column="byx3" property="byx3"/>
 	</resultMap>
 
 	<!-- snqxz_info table all fields -->
 	<sql id="Base_Column_List">
-		id,resource_id,temperature,humidity,carbon_dioxide,communication_failure,type,station_id,create_user_id,create_time,byx1,byx2,byx3
+		id,resource_id,temperature,humidity,carbon_dioxide,communication_failure,type,station_id,create_time
 	</sql>
 
 	<!-- 公共查询条件 -->
@@ -34,11 +30,7 @@
 		<if test="communicationFailure!=null and communicationFailure!=''">and t.communication_failure = #{communicationFailure}</if>
 		<if test="type!=null ">and t.type = #{type}</if>
 		<if test="stationId!=null and stationId!=''">and t.station_id = #{stationId}</if>
-		<if test="createUserId!=null and createUserId!=''">and t.create_user_id = #{createUserId}</if>
 		<if test="createTime!=null ">and t.create_time = #{createTime}</if>
-		<if test="byx1!=null and byx1!=''">and t.byx1 = #{byx1}</if>
-		<if test="byx2!=null and byx2!=''">and t.byx2 = #{byx2}</if>
-		<if test="byx3!=null and byx3!=''">and t.byx3 = #{byx3}</if>
 	</sql>
 
 	<select id="queryPageByCount" parameterType="Object" resultType="java.lang.Integer">

microservice-admin/src/main/resources/mapper/eq/SwqxzInfoMapper.xml

@@ -16,16 +16,12 @@
 	    <result column="communication_failure" property="communicationFailure"/>
 	    <result column="type" property="type"/>
 	    <result column="station_id" property="stationId"/>
-	    <result column="create_user_id" property="createUserId"/>
 	    <result column="create_time" property="createTime"/>
-	    <result column="byx1" property="byx1"/>
-	    <result column="byx2" property="byx2"/>
-	    <result column="byx3" property="byx3"/>
 	</resultMap>
 
 	<!-- swqxz_info table all fields -->
 	<sql id="Base_Column_List">
-		id,resource_id,temperature,humidity,wind_speed,wind_direction,illuminance,carbon_dioxide,fine_particles,radiation,communication_failure,type,station_id,create_user_id,create_time,byx1,byx2,byx3
+		id,resource_id,temperature,humidity,wind_speed,wind_direction,illuminance,carbon_dioxide,fine_particles,radiation,communication_failure,type,station_id,create_time
 	</sql>
 
 	<!-- 公共查询条件 -->
@@ -44,11 +40,7 @@
 		<if test="communicationFailure!=null and communicationFailure!=''">and t.communication_failure = #{communicationFailure}</if>
 		<if test="type!=null ">and t.type = #{type}</if>
 		<if test="stationId!=null and stationId!=''">and t.station_id = #{stationId}</if>
-		<if test="createUserId!=null and createUserId!=''">and t.create_user_id = #{createUserId}</if>
 		<if test="createTime!=null ">and t.create_time = #{createTime}</if>
-		<if test="byx1!=null and byx1!=''">and t.byx1 = #{byx1}</if>
-		<if test="byx2!=null and byx2!=''">and t.byx2 = #{byx2}</if>
-		<if test="byx3!=null and byx3!=''">and t.byx3 = #{byx3}</if>
 	</sql>
 
 	<select id="queryPageByCount" parameterType="Object" resultType="java.lang.Integer">