root
/
agri
2
0
Fork 0
Code Issues Pull Requests Packages Projects 1 Releases Wiki Activity

设备控制完善日志

master
lld 2026-02-01 02:03:11 +08:00
parent 2756492d89
commit b3c036bf80
2 changed files with 2 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
agri-system/src/main/java/com/agri/system/domain/SysAgriInfo.java
View File

@ -41,22 +41,6 @@ public class SysAgriInfo extends BaseEntity
@Excel(name = "关联用户ID")
private Long userId;
/** 温度上限(℃) */
@Excel(name = "温度上限(℃)")
private BigDecimal tempUpper;
/** 温度下限(℃) */
@Excel(name = "温度下限(℃)")
private BigDecimal tempLower;
/** 湿度上限(%RH) */
@Excel(name = "湿度上限(%RH)")
private BigDecimal humiUpper;
/** 湿度下限(%RH) */
@Excel(name = "湿度下限(%RH)")
private BigDecimal humiLower;
/** 告警开关(0-关闭，1-开启) */
@Excel(name = "告警开关(0-关闭，1-开启)")
private Integer alarmStatus;
@ -118,46 +102,6 @@ public class SysAgriInfo extends BaseEntity
return userId;
}
public void setTempUpper(BigDecimal tempUpper)
{
this.tempUpper = tempUpper;
}
public BigDecimal getTempUpper()
{
return tempUpper;
}
public void setTempLower(BigDecimal tempLower)
{
this.tempLower = tempLower;
}
public BigDecimal getTempLower()
{
return tempLower;
}
public void setHumiUpper(BigDecimal humiUpper)
{
this.humiUpper = humiUpper;
}
public BigDecimal getHumiUpper()
{
return humiUpper;
}
public void setHumiLower(BigDecimal humiLower)
{
this.humiLower = humiLower;
}
public BigDecimal getHumiLower()
{
return humiLower;
}
public void setAlarmStatus(Integer alarmStatus)
{
this.alarmStatus = alarmStatus;
@ -215,10 +159,6 @@ public class SysAgriInfo extends BaseEntity
.append("imei", getImei())
.append("agriName", getAgriName())
.append("userId", getUserId())
.append("tempUpper", getTempUpper())
.append("tempLower", getTempLower())
.append("humiUpper", getHumiUpper())
.append("humiLower", getHumiLower())
.append("alarmStatus", getAlarmStatus())
.append("deviceStatus", getDeviceStatus())
.append("installTime", getInstallTime())

31
agri-system/src/main/resources/mapper/system/SysAgriInfoMapper.xml
View File

@ -9,10 +9,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="imei" column="imei" />
<result property="agriName" column="agri_name" />
<result property="userId" column="user_id" />
<result property="tempUpper" column="temp_upper" />
<result property="tempLower" column="temp_lower" />
<result property="humiUpper" column="humi_upper" />
<result property="humiLower" column="humi_lower" />
<result property="alarmStatus" column="alarm_status" />
<result property="deviceStatus" column="device_status" />
<result property="installTime" column="install_time" />
@ -26,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectSysAgriInfoVo">
select id, imei, agri_name, user_id, temp_upper, temp_lower, humi_upper, humi_lower, alarm_status, device_status, install_time, location, remark, create_time, create_by, update_time, update_by, is_deleted from sys_agri_info
select id, imei, agri_name, user_id, alarm_status, device_status, install_time, location, remark, create_time, create_by, update_time, update_by, is_deleted from sys_agri_info
</sql>
<sql id="agriUserVo">
@ -34,10 +30,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
agri.id,
agri.imei,
agri.agri_name,
agri.temp_upper,
agri.temp_lower,
agri.humi_upper,
agri.humi_lower,
agri.alarm_status,
agri.device_status,
agri.install_time,
@ -61,10 +53,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="imei != null and imei != ''"> and imei = #{imei}</if>
<if test="agriName != null and agriName != ''"> and agri_name like concat('%', #{agriName}, '%')</if>
<if test="userId != null "> and user_id = #{userId}</if>
<if test="tempUpper != null "> and temp_upper = #{tempUpper}</if>
<if test="tempLower != null "> and temp_lower = #{tempLower}</if>
<if test="humiUpper != null "> and humi_upper = #{humiUpper}</if>
<if test="humiLower != null "> and humi_lower = #{humiLower}</if>
<if test="alarmStatus != null "> and alarm_status = #{alarmStatus}</if>
<if test="deviceStatus != null "> and device_status = #{deviceStatus}</if>
<if test="installTime != null "> and install_time = #{installTime}</if>
@ -84,10 +72,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="imei != null and imei != ''">imei,</if>
<if test="agriName != null and agriName != ''">agri_name,</if>
<if test="userId != null">user_id,</if>
<if test="tempUpper != null">temp_upper,</if>
<if test="tempLower != null">temp_lower,</if>
<if test="humiUpper != null">humi_upper,</if>
<if test="humiLower != null">humi_lower,</if>
<if test="alarmStatus != null">alarm_status,</if>
<if test="deviceStatus != null">device_status,</if>
<if test="installTime != null">install_time,</if>
@ -103,10 +87,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="imei != null and imei != ''">#{imei},</if>
<if test="agriName != null and agriName != ''">#{agriName},</if>
<if test="userId != null">#{userId},</if>
<if test="tempUpper != null">#{tempUpper},</if>
<if test="tempLower != null">#{tempLower},</if>
<if test="humiUpper != null">#{humiUpper},</if>
<if test="humiLower != null">#{humiLower},</if>
<if test="alarmStatus != null">#{alarmStatus},</if>
<if test="deviceStatus != null">#{deviceStatus},</if>
<if test="installTime != null">#{installTime},</if>
@ -126,10 +106,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="imei != null and imei != ''">imei = #{imei},</if>
<if test="agriName != null and agriName != ''">agri_name = #{agriName},</if>
<if test="userId != null">user_id = #{userId},</if>
<if test="tempUpper != null">temp_upper = #{tempUpper},</if>
<if test="tempLower != null">temp_lower = #{tempLower},</if>
<if test="humiUpper != null">humi_upper = #{humiUpper},</if>
<if test="humiLower != null">humi_lower = #{humiLower},</if>
<if test="alarmStatus != null">alarm_status = #{alarmStatus},</if>
<if test="deviceStatus != null">device_status = #{deviceStatus},</if>
<if test="installTime != null">install_time = #{installTime},</if>
@ -159,12 +135,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="findAgriByUser" parameterType="SysAgriInfo" resultMap="SysAgriInfoResult">
<include refid="agriUserVo"/>
<where>
is_deleted = 0
<if test="imei != null and imei != ''"> and agri.imei = #{imei}</if>
<if test="agriName != null and agriName != ''"> and agri.agri_name like concat('%', #{agriName}, '%')</if>
<if test="tempUpper != null "> and agri.temp_upper = #{tempUpper}</if>
<if test="tempLower != null "> and agri.temp_lower = #{tempLower}</if>
<if test="humiUpper != null "> and agri.humi_upper = #{humiUpper}</if>
<if test="humiLower != null "> and agri.humi_lower = #{humiLower}</if>
<if test="alarmStatus != null "> and agri.alarm_status = #{alarmStatus}</if>
<if test="deviceStatus != null "> and agri.device_status = #{deviceStatus}</if>
<if test="installTime != null "> and agri.install_time = #{installTime}</if>