Skip to content

Z
zhxf_java
Commit 2ff41292 authored by co_dengxiongwen's avatar co_dengxiongwen
Browse files
Options

接口调整

parent e9e67c03
Show whitespace changes
Inline Side-by-side
Showing with 63 additions and 26 deletions
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/FsyInfo.java
View file @ 2ff41292
package com.devplatform.admin.modules.eq.bean; package com.devplatform.admin.modules.eq.bean;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@Data @Data
@ApiModel(value="风速仪信息对象",description="风速仪信息对象") @ApiModel(value="风速仪信息对象",description="风速仪信息对象")
@TableName("fsy_info") @TableName("fsy_info")
...@@ -22,6 +21,9 @@ public class FsyInfo implements Serializable { ...@@ -22,6 +21,9 @@ public class FsyInfo implements Serializable {
/** 资源点id */ /** 资源点id */
@ApiModelProperty(value="资源点id",name="resourceId") @ApiModelProperty(value="资源点id",name="resourceId")
private java.lang.String resourceId; private java.lang.String resourceId;
/** 资源点类型 */
@ApiModelProperty(value="资源点类型",name="resourceType")
private java.lang.String resourceType;
/** 风速 */ /** 风速 */
@ApiModelProperty(value="风速",name="windSpeed") @ApiModelProperty(value="风速",name="windSpeed")
private java.lang.String windSpeed; private java.lang.String windSpeed;
......
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/FyyInfo.java
View file @ 2ff41292
package com.devplatform.admin.modules.eq.bean; package com.devplatform.admin.modules.eq.bean;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@Data @Data
@ApiModel(value="风压仪信息对象",description="风压仪信息对象") @ApiModel(value="风压仪信息对象",description="风压仪信息对象")
@TableName("fyy_info") @TableName("fyy_info")
...@@ -22,6 +21,9 @@ public class FyyInfo implements Serializable { ...@@ -22,6 +21,9 @@ public class FyyInfo implements Serializable {
/** 资源点id */ /** 资源点id */
@ApiModelProperty(value="资源点id",name="resourceId") @ApiModelProperty(value="资源点id",name="resourceId")
private java.lang.String resourceId; private java.lang.String resourceId;
/** 资源点类型 */
@ApiModelProperty(value="资源点类型",name="resourceType")
private java.lang.String resourceType;
/** 风压 */ /** 风压 */
@ApiModelProperty(value="风压",name="windPressure") @ApiModelProperty(value="风压",name="windPressure")
private java.lang.String windPressure; private java.lang.String windPressure;
......
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/HjtcqInfo.java
View file @ 2ff41292
...@@ -21,6 +21,9 @@ public class HjtcqInfo implements Serializable { ...@@ -21,6 +21,9 @@ public class HjtcqInfo implements Serializable {
/** 资源点id */ /** 资源点id */
@ApiModelProperty(value="资源点id",name="resourceId") @ApiModelProperty(value="资源点id",name="resourceId")
private java.lang.String resourceId; private java.lang.String resourceId;
/** 资源点类型 */
@ApiModelProperty(value="资源点类型",name="resourceType")
private java.lang.String resourceType;
/** 温度 */ /** 温度 */
@ApiModelProperty(value="温度",name="temperature") @ApiModelProperty(value="温度",name="temperature")
private java.lang.String temperature; private java.lang.String temperature;
......
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/LljInfo.java
View file @ 2ff41292
package com.devplatform.admin.modules.eq.bean; package com.devplatform.admin.modules.eq.bean;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@Data @Data
@ApiModel(value="流量计信息对象",description="流量计信息对象") @ApiModel(value="流量计信息对象",description="流量计信息对象")
@TableName("llj_info") @TableName("llj_info")
...@@ -22,6 +21,9 @@ public class LljInfo implements Serializable { ...@@ -22,6 +21,9 @@ public class LljInfo implements Serializable {
/** 资源点id */ /** 资源点id */
@ApiModelProperty(value="资源点id",name="resourceId") @ApiModelProperty(value="资源点id",name="resourceId")
private java.lang.String resourceId; private java.lang.String resourceId;
/** 资源点类型 */
@ApiModelProperty(value="资源点类型",name="resourceType")
private java.lang.String resourceType;
/** 水流流量 */ /** 水流流量 */
@ApiModelProperty(value="水流流量",name="flowRate") @ApiModelProperty(value="水流流量",name="flowRate")
private java.lang.String flowRate; private java.lang.String flowRate;
......
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/WxyljInfo.java
View file @ 2ff41292
package com.devplatform.admin.modules.eq.bean; package com.devplatform.admin.modules.eq.bean;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@Data @Data
@ApiModel(value="无线压力计信息对象",description="无线压力计信息对象") @ApiModel(value="无线压力计信息对象",description="无线压力计信息对象")
@TableName("wxylj_info") @TableName("wxylj_info")
...@@ -22,6 +21,9 @@ public class WxyljInfo implements Serializable { ...@@ -22,6 +21,9 @@ public class WxyljInfo implements Serializable {
/** 资源点id */ /** 资源点id */
@ApiModelProperty(value="资源点id",name="resourceId") @ApiModelProperty(value="资源点id",name="resourceId")
private java.lang.String resourceId; private java.lang.String resourceId;
/** 资源点类型 */
@ApiModelProperty(value="资源点类型",name="resourceType")
private java.lang.String resourceType;
/** 水流压力 */ /** 水流压力 */
@ApiModelProperty(value="水流压力",name="waterPressure") @ApiModelProperty(value="水流压力",name="waterPressure")
private java.lang.String waterPressure; private java.lang.String waterPressure;
......
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/bean/WxywyInfo.java
View file @ 2ff41292
package com.devplatform.admin.modules.eq.bean; package com.devplatform.admin.modules.eq.bean;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@Data @Data
@ApiModel(value="无线液位仪信息对象",description="无线液位仪信息对象") @ApiModel(value="无线液位仪信息对象",description="无线液位仪信息对象")
@TableName("wxywy_info") @TableName("wxywy_info")
...@@ -22,6 +21,9 @@ public class WxywyInfo implements Serializable { ...@@ -22,6 +21,9 @@ public class WxywyInfo implements Serializable {
/** 资源点id */ /** 资源点id */
@ApiModelProperty(value="资源点id",name="resourceId") @ApiModelProperty(value="资源点id",name="resourceId")
private java.lang.String resourceId; private java.lang.String resourceId;
/** 资源点类型 */
@ApiModelProperty(value="资源点类型",name="resourceType")
private java.lang.String resourceType;
/** 水位高度 */ /** 水位高度 */
@ApiModelProperty(value="水位高度",name="gaugeHeight") @ApiModelProperty(value="水位高度",name="gaugeHeight")
private java.lang.String gaugeHeight; private java.lang.String gaugeHeight;
......
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/FsyInfoModel.java
View file @ 2ff41292
...@@ -15,6 +15,8 @@ public class FsyInfoModel extends BaseModel { ...@@ -15,6 +15,8 @@ public class FsyInfoModel extends BaseModel {
private java.lang.String id; private java.lang.String id;
/** 资源点id */ /** 资源点id */
private java.lang.String resourceId; private java.lang.String resourceId;
/** 资源点类型 */
private java.lang.String resourceType;
/** 风速 */ /** 风速 */
private java.lang.String windSpeed; private java.lang.String windSpeed;
/** 是否报警(1否，2是) */ /** 是否报警(1否，2是) */
......
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/FyyInfoModel.java
View file @ 2ff41292
...@@ -15,6 +15,8 @@ public class FyyInfoModel extends BaseModel { ...@@ -15,6 +15,8 @@ public class FyyInfoModel extends BaseModel {
private java.lang.String id; private java.lang.String id;
/** 资源点id */ /** 资源点id */
private java.lang.String resourceId; private java.lang.String resourceId;
/** 资源点类型 */
private java.lang.String resourceType;
/** 风压 */ /** 风压 */
private java.lang.String windPressure; private java.lang.String windPressure;
/** 是否报警(1否，2是) */ /** 是否报警(1否，2是) */
......
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/HjtcqInfoModel.java
View file @ 2ff41292
...@@ -15,6 +15,8 @@ public class HjtcqInfoModel extends BaseModel { ...@@ -15,6 +15,8 @@ public class HjtcqInfoModel extends BaseModel {
private java.lang.String id; private java.lang.String id;
/** 资源点id */ /** 资源点id */
private java.lang.String resourceId; private java.lang.String resourceId;
/** 资源点类型 */
private java.lang.String resourceType;
/** 温度 */ /** 温度 */
private java.lang.String temperature; private java.lang.String temperature;
/** 温度是否报警(1否，2是) */ /** 温度是否报警(1否，2是) */
......
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/LljInfoModel.java
View file @ 2ff41292
...@@ -15,6 +15,8 @@ public class LljInfoModel extends BaseModel { ...@@ -15,6 +15,8 @@ public class LljInfoModel extends BaseModel {
private java.lang.String id; private java.lang.String id;
/** 资源点id */ /** 资源点id */
private java.lang.String resourceId; private java.lang.String resourceId;
/** 资源点类型 */
private java.lang.String resourceType;
/** 水流流量 */ /** 水流流量 */
private java.lang.String flowRate; private java.lang.String flowRate;
/** 是否报警(1否，2是) */ /** 是否报警(1否，2是) */
......
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/WxyljInfoModel.java
View file @ 2ff41292
...@@ -15,6 +15,8 @@ public class WxyljInfoModel extends BaseModel { ...@@ -15,6 +15,8 @@ public class WxyljInfoModel extends BaseModel {
private java.lang.String id; private java.lang.String id;
/** 资源点id */ /** 资源点id */
private java.lang.String resourceId; private java.lang.String resourceId;
/** 资源点类型 */
private java.lang.String resourceType;
/** 水流压力 */ /** 水流压力 */
private java.lang.String waterPressure; private java.lang.String waterPressure;
/** 是否报警(1否，2是) */ /** 是否报警(1否，2是) */
......
microservice-admin/src/main/java/com/devplatform/admin/modules/eq/model/WxywyInfoModel.java
View file @ 2ff41292
...@@ -15,6 +15,8 @@ public class WxywyInfoModel extends BaseModel { ...@@ -15,6 +15,8 @@ public class WxywyInfoModel extends BaseModel {
private java.lang.String id; private java.lang.String id;
/** 资源点id */ /** 资源点id */
private java.lang.String resourceId; private java.lang.String resourceId;
/** 资源点类型 */
private java.lang.String resourceType;
/** 水位高度 */ /** 水位高度 */
private java.lang.String gaugeHeight; private java.lang.String gaugeHeight;
/** 是否报警(1否，2是) */ /** 是否报警(1否，2是) */
......
microservice-admin/src/main/resources/mapper/eq/FsyInfoMapper.xml
View file @ 2ff41292
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<resultMap id="BaseResultMap" type="com.devplatform.admin.modules.eq.bean.FsyInfo"> <resultMap id="BaseResultMap" type="com.devplatform.admin.modules.eq.bean.FsyInfo">
<result column="id" property="id"/> <result column="id" property="id"/>
<result column="resource_id" property="resourceId"/> <result column="resource_id" property="resourceId"/>
<result column="resource_type" property="resourceType"/>
<result column="wind_speed" property="windSpeed"/> <result column="wind_speed" property="windSpeed"/>
<result column="ws_is_alarm" property="wsIsAlarm"/> <result column="ws_is_alarm" property="wsIsAlarm"/>
<result column="station_id" property="stationId"/> <result column="station_id" property="stationId"/>
...@@ -17,7 +18,7 @@ ...@@ -17,7 +18,7 @@
<!-- fsy_info table all fields --> <!-- fsy_info table all fields -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id,resource_id,wind_speed,ws_is_alarm,station_id,create_user_id,create_time,byx1,byx2,byx3 id,resource_id,resource_type,wind_speed,ws_is_alarm,station_id,create_user_id,create_time,byx1,byx2,byx3
</sql> </sql>
<!-- 公共查询条件 --> <!-- 公共查询条件 -->
...@@ -25,6 +26,7 @@ ...@@ -25,6 +26,7 @@
where t.deleted=0 where t.deleted=0
<if test="id!=null and id!=''">and t.id = #{id}</if> <if test="id!=null and id!=''">and t.id = #{id}</if>
<if test="resourceId!=null and resourceId!=''">and t.resource_id = #{resourceId}</if> <if test="resourceId!=null and resourceId!=''">and t.resource_id = #{resourceId}</if>
<if test="resourceType!=null and resourceType!=''">and t.resource_type = #{resourceType}</if>
<if test="windSpeed!=null and windSpeed!=''">and t.wind_speed = #{windSpeed}</if> <if test="windSpeed!=null and windSpeed!=''">and t.wind_speed = #{windSpeed}</if>
<if test="wsIsAlarm!=null ">and t.ws_is_alarm = #{wsIsAlarm}</if> <if test="wsIsAlarm!=null ">and t.ws_is_alarm = #{wsIsAlarm}</if>
<if test="stationId!=null and stationId!=''">and t.station_id = #{stationId}</if> <if test="stationId!=null and stationId!=''">and t.station_id = #{stationId}</if>
......
microservice-admin/src/main/resources/mapper/eq/FyyInfoMapper.xml
View file @ 2ff41292
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<resultMap id="BaseResultMap" type="com.devplatform.admin.modules.eq.bean.FyyInfo"> <resultMap id="BaseResultMap" type="com.devplatform.admin.modules.eq.bean.FyyInfo">
<result column="id" property="id"/> <result column="id" property="id"/>
<result column="resource_id" property="resourceId"/> <result column="resource_id" property="resourceId"/>
<result column="resource_type" property="resourceType"/>
<result column="wind_pressure" property="windPressure"/> <result column="wind_pressure" property="windPressure"/>
<result column="wp_is_alarm" property="wpIsAlarm"/> <result column="wp_is_alarm" property="wpIsAlarm"/>
<result column="station_id" property="stationId"/> <result column="station_id" property="stationId"/>
...@@ -17,7 +18,7 @@ ...@@ -17,7 +18,7 @@
<!-- fyy_info table all fields --> <!-- fyy_info table all fields -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id,resource_id,wind_pressure,wp_is_alarm,station_id,create_user_id,create_time,byx1,byx2,byx3 id,resource_id,resource_type,wind_pressure,wp_is_alarm,station_id,create_user_id,create_time,byx1,byx2,byx3
</sql> </sql>
<!-- 公共查询条件 --> <!-- 公共查询条件 -->
...@@ -25,6 +26,7 @@ ...@@ -25,6 +26,7 @@
where t.deleted=0 where t.deleted=0
<if test="id!=null and id!=''">and t.id = #{id}</if> <if test="id!=null and id!=''">and t.id = #{id}</if>
<if test="resourceId!=null and resourceId!=''">and t.resource_id = #{resourceId}</if> <if test="resourceId!=null and resourceId!=''">and t.resource_id = #{resourceId}</if>
<if test="resourceType!=null and resourceType!=''">and t.resource_type = #{resourceType}</if>
<if test="windPressure!=null and windPressure!=''">and t.wind_pressure = #{windPressure}</if> <if test="windPressure!=null and windPressure!=''">and t.wind_pressure = #{windPressure}</if>
<if test="wpIsAlarm!=null ">and t.wp_is_alarm = #{wpIsAlarm}</if> <if test="wpIsAlarm!=null ">and t.wp_is_alarm = #{wpIsAlarm}</if>
<if test="stationId!=null and stationId!=''">and t.station_id = #{stationId}</if> <if test="stationId!=null and stationId!=''">and t.station_id = #{stationId}</if>
......
microservice-admin/src/main/resources/mapper/eq/HjtcqInfoMapper.xml
View file @ 2ff41292
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<resultMap id="BaseResultMap" type="com.devplatform.admin.modules.eq.bean.HjtcqInfo"> <resultMap id="BaseResultMap" type="com.devplatform.admin.modules.eq.bean.HjtcqInfo">
<result column="id" property="id"/> <result column="id" property="id"/>
<result column="resource_id" property="resourceId"/> <result column="resource_id" property="resourceId"/>
<result column="resource_type" property="resourceType"/>
<result column="temperature" property="temperature"/> <result column="temperature" property="temperature"/>
<result column="tp_is_alarm" property="tpIsAlarm"/> <result column="tp_is_alarm" property="tpIsAlarm"/>
<result column="humidity" property="humidity"/> <result column="humidity" property="humidity"/>
...@@ -23,7 +24,7 @@ ...@@ -23,7 +24,7 @@
<!-- hjtcq_info table all fields --> <!-- hjtcq_info table all fields -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id,resource_id,temperature,tp_is_alarm,humidity,hm_is_alarm,carbon_monoxide,cm_is_alarm,carbon_dioxide,cd_is_alarm,station_id,create_user_id,create_time,byx1,byx2,byx3 id,resource_id,resource_type,temperature,tp_is_alarm,humidity,hm_is_alarm,carbon_monoxide,cm_is_alarm,carbon_dioxide,cd_is_alarm,station_id,create_user_id,create_time,byx1,byx2,byx3
</sql> </sql>
<!-- 公共查询条件 --> <!-- 公共查询条件 -->
...@@ -31,6 +32,7 @@ ...@@ -31,6 +32,7 @@
where t.deleted=0 where t.deleted=0
<if test="id!=null and id!=''">and t.id = #{id}</if> <if test="id!=null and id!=''">and t.id = #{id}</if>
<if test="resourceId!=null and resourceId!=''">and t.resource_id = #{resourceId}</if> <if test="resourceId!=null and resourceId!=''">and t.resource_id = #{resourceId}</if>
<if test="resourceType!=null and resourceType!=''">and t.resource_type = #{resourceType}</if>
<if test="temperature!=null and temperature!=''">and t.temperature = #{temperature}</if> <if test="temperature!=null and temperature!=''">and t.temperature = #{temperature}</if>
<if test="tpIsAlarm!=null ">and t.tp_is_alarm = #{tpIsAlarm}</if> <if test="tpIsAlarm!=null ">and t.tp_is_alarm = #{tpIsAlarm}</if>
<if test="humidity!=null and humidity!=''">and t.humidity = #{humidity}</if> <if test="humidity!=null and humidity!=''">and t.humidity = #{humidity}</if>
......
microservice-admin/src/main/resources/mapper/eq/LljInfoMapper.xml
View file @ 2ff41292
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<resultMap id="BaseResultMap" type="com.devplatform.admin.modules.eq.bean.LljInfo"> <resultMap id="BaseResultMap" type="com.devplatform.admin.modules.eq.bean.LljInfo">
<result column="id" property="id"/> <result column="id" property="id"/>
<result column="resource_id" property="resourceId"/> <result column="resource_id" property="resourceId"/>
<result column="resource_type" property="resourceType"/>
<result column="flow_rate" property="flowRate"/> <result column="flow_rate" property="flowRate"/>
<result column="fr_is_alarm" property="frIsAlarm"/> <result column="fr_is_alarm" property="frIsAlarm"/>
<result column="station_id" property="stationId"/> <result column="station_id" property="stationId"/>
...@@ -17,7 +18,7 @@ ...@@ -17,7 +18,7 @@
<!-- llj_info table all fields --> <!-- llj_info table all fields -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id,resource_id,flow_rate,fr_is_alarm,station_id,create_user_id,create_time,byx1,byx2,byx3 id,resource_id,resource_type,flow_rate,fr_is_alarm,station_id,create_user_id,create_time,byx1,byx2,byx3
</sql> </sql>
<!-- 公共查询条件 --> <!-- 公共查询条件 -->
...@@ -25,6 +26,7 @@ ...@@ -25,6 +26,7 @@
where t.deleted=0 where t.deleted=0
<if test="id!=null and id!=''">and t.id = #{id}</if> <if test="id!=null and id!=''">and t.id = #{id}</if>
<if test="resourceId!=null and resourceId!=''">and t.resource_id = #{resourceId}</if> <if test="resourceId!=null and resourceId!=''">and t.resource_id = #{resourceId}</if>
<if test="resourceType!=null and resourceType!=''">and t.resource_type = #{resourceType}</if>
<if test="flowRate!=null and flowRate!=''">and t.flow_rate = #{flowRate}</if> <if test="flowRate!=null and flowRate!=''">and t.flow_rate = #{flowRate}</if>
<if test="frIsAlarm!=null ">and t.fr_is_alarm = #{frIsAlarm}</if> <if test="frIsAlarm!=null ">and t.fr_is_alarm = #{frIsAlarm}</if>
<if test="stationId!=null and stationId!=''">and t.station_id = #{stationId}</if> <if test="stationId!=null and stationId!=''">and t.station_id = #{stationId}</if>
......
microservice-admin/src/main/resources/mapper/eq/WxyljInfoMapper.xml
View file @ 2ff41292
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<resultMap id="BaseResultMap" type="com.devplatform.admin.modules.eq.bean.WxyljInfo"> <resultMap id="BaseResultMap" type="com.devplatform.admin.modules.eq.bean.WxyljInfo">
<result column="id" property="id"/> <result column="id" property="id"/>
<result column="resource_id" property="resourceId"/> <result column="resource_id" property="resourceId"/>
<result column="resource_type" property="resourceType"/>
<result column="water_pressure" property="waterPressure"/> <result column="water_pressure" property="waterPressure"/>
<result column="is_alarm" property="isAlarm"/> <result column="is_alarm" property="isAlarm"/>
<result column="station_id" property="stationId"/> <result column="station_id" property="stationId"/>
...@@ -17,7 +18,7 @@ ...@@ -17,7 +18,7 @@
<!-- wxylj_info table all fields --> <!-- wxylj_info table all fields -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id,resource_id,water_pressure,is_alarm,station_id,create_user_id,create_time,byx1,byx2,byx3 id,resource_id,resource_type,water_pressure,is_alarm,station_id,create_user_id,create_time,byx1,byx2,byx3
</sql> </sql>
<!-- 公共查询条件 --> <!-- 公共查询条件 -->
...@@ -25,6 +26,7 @@ ...@@ -25,6 +26,7 @@
where t.deleted=0 where t.deleted=0
<if test="id!=null and id!=''">and t.id = #{id}</if> <if test="id!=null and id!=''">and t.id = #{id}</if>
<if test="resourceId!=null and resourceId!=''">and t.resource_id = #{resourceId}</if> <if test="resourceId!=null and resourceId!=''">and t.resource_id = #{resourceId}</if>
<if test="resourceType!=null and resourceType!=''">and t.resource_type = #{resourceType}</if>
<if test="waterPressure!=null and waterPressure!=''">and t.water_pressure = #{waterPressure}</if> <if test="waterPressure!=null and waterPressure!=''">and t.water_pressure = #{waterPressure}</if>
<if test="isAlarm!=null ">and t.is_alarm = #{isAlarm}</if> <if test="isAlarm!=null ">and t.is_alarm = #{isAlarm}</if>
<if test="stationId!=null and stationId!=''">and t.station_id = #{stationId}</if> <if test="stationId!=null and stationId!=''">and t.station_id = #{stationId}</if>
......
microservice-admin/src/main/resources/mapper/eq/WxywyInfoMapper.xml
View file @ 2ff41292
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<resultMap id="BaseResultMap" type="com.devplatform.admin.modules.eq.bean.WxywyInfo"> <resultMap id="BaseResultMap" type="com.devplatform.admin.modules.eq.bean.WxywyInfo">
<result column="id" property="id"/> <result column="id" property="id"/>
<result column="resource_id" property="resourceId"/> <result column="resource_id" property="resourceId"/>
<result column="resource_type" property="resourceType"/>
<result column="gauge_height" property="gaugeHeight"/> <result column="gauge_height" property="gaugeHeight"/>
<result column="gh_is_alarm" property="ghIsAlarm"/> <result column="gh_is_alarm" property="ghIsAlarm"/>
<result column="station_id" property="stationId"/> <result column="station_id" property="stationId"/>
...@@ -17,7 +18,7 @@ ...@@ -17,7 +18,7 @@
<!-- wxywy_info table all fields --> <!-- wxywy_info table all fields -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id,resource_id,gauge_height,gh_is_alarm,station_id,create_user_id,create_time,byx1,byx2,byx3 id,resource_id,resource_type,gauge_height,gh_is_alarm,station_id,create_user_id,create_time,byx1,byx2,byx3
</sql> </sql>
<!-- 公共查询条件 --> <!-- 公共查询条件 -->
...@@ -25,6 +26,7 @@ ...@@ -25,6 +26,7 @@
where t.deleted=0 where t.deleted=0
<if test="id!=null and id!=''">and t.id = #{id}</if> <if test="id!=null and id!=''">and t.id = #{id}</if>
<if test="resourceId!=null and resourceId!=''">and t.resource_id = #{resourceId}</if> <if test="resourceId!=null and resourceId!=''">and t.resource_id = #{resourceId}</if>
<if test="resourceType!=null and resourceType!=''">and t.resource_type = #{resourceType}</if>
<if test="gaugeHeight!=null and gaugeHeight!=''">and t.gauge_height = #{gaugeHeight}</if> <if test="gaugeHeight!=null and gaugeHeight!=''">and t.gauge_height = #{gaugeHeight}</if>
<if test="ghIsAlarm!=null ">and t.gh_is_alarm = #{ghIsAlarm}</if> <if test="ghIsAlarm!=null ">and t.gh_is_alarm = #{ghIsAlarm}</if>
<if test="stationId!=null and stationId!=''">and t.station_id = #{stationId}</if> <if test="stationId!=null and stationId!=''">and t.station_id = #{stationId}</if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment