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

设备控制完善日志

master
lld 2026-02-01 01:48:01 +08:00
parent f6bf679a77
commit 2756492d89
2 changed files with 52 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
agri-system/src/main/java/com/agri/system/domain/SysDevOperLog.java
View File

@ -41,11 +41,11 @@ public class SysDevOperLog extends BaseEntity
/** 操作类型 */
@Excel(name = "操作类型")
private int opType;
private Integer opType;
/** 操作来源 */
@Excel(name = "操作来源")
private int opSource;
private Integer opSource;
/** 指令 */
@Excel(name = "指令")
@ -53,7 +53,7 @@ public class SysDevOperLog extends BaseEntity
/** 是否成功获取锁 */
@Excel(name = "是否成功获取锁")
private int lockAcquired;
private Integer lockAcquired;
/** 锁持有者 */
@Excel(name = "锁持有者")
@ -65,22 +65,22 @@ public class SysDevOperLog extends BaseEntity
/** 是否收到设备回执 */
@Excel(name = "是否收到设备回执")
private int ackReceived;
private Integer ackReceived;
/** 设备控制是否成功 */
@Excel(name = "设备控制是否成功")
private int ackSuc;
private Integer ackSuc;
/** 设备控制锁是否释放成功 */
@Excel(name = "设备控制锁是否释放成功")
private int isLockSuc;
private Integer isLockSuc;
/** 是否触发定时任务 */
@Excel(name = "是否触发定时任务")
private int isTask;
private Integer isTask;
@Excel(name = "大棚运行时间限位")
private int runTime;
private Integer runTime;
/** 未触发原因 */
@Excel(name = "未触发原因")
@ -92,7 +92,7 @@ public class SysDevOperLog extends BaseEntity
/** 自动关任务最终执行结果 */
@Excel(name = "自动关任务最终执行结果")
private int execResult;
private Integer execResult;
/** 未执行原因（如：锁占用、无最新状态、JSON异常） */
@Excel(name = "未执行原因", readConverterExp = "如=：锁占用、无最新状态、JSON异常")
@ -138,19 +138,19 @@ public class SysDevOperLog extends BaseEntity
this.funcCode = funcCode;
}
public int getOpType() {
public Integer getOpType() {
return opType;
}
public void setOpType(int opType) {
public void setOpType(Integer opType) {
this.opType = opType;
}
public int getOpSource() {
public Integer getOpSource() {
return opSource;
}
public void setOpSource(int opSource) {
public void setOpSource(Integer opSource) {
this.opSource = opSource;
}
@ -162,11 +162,11 @@ public class SysDevOperLog extends BaseEntity
this.payload = payload;
}
public int getLockAcquired() {
public Integer getLockAcquired() {
return lockAcquired;
}
public void setLockAcquired(int lockAcquired) {
public void setLockAcquired(Integer lockAcquired) {
this.lockAcquired = lockAcquired;
}
@ -186,35 +186,35 @@ public class SysDevOperLog extends BaseEntity
this.taskStatus = taskStatus;
}
public int getAckReceived() {
public Integer getAckReceived() {
return ackReceived;
}
public void setAckReceived(int ackReceived) {
public void setAckReceived(Integer ackReceived) {
this.ackReceived = ackReceived;
}
public int getAckSuc() {
public Integer getAckSuc() {
return ackSuc;
}
public void setAckSuc(int ackSuc) {
public void setAckSuc(Integer ackSuc) {
this.ackSuc = ackSuc;
}
public int getIsLockSuc() {
public Integer getIsLockSuc() {
return isLockSuc;
}
public void setIsLockSuc(int isLockSuc) {
public void setIsLockSuc(Integer isLockSuc) {
this.isLockSuc = isLockSuc;
}
public int getIsTask() {
public Integer getIsTask() {
return isTask;
}
public void setIsTask(int isTask) {
public void setIsTask(Integer isTask) {
this.isTask = isTask;
}
@ -234,11 +234,11 @@ public class SysDevOperLog extends BaseEntity
this.ack = ack;
}
public int getExecResult() {
public Integer getExecResult() {
return execResult;
}
public void setExecResult(int execResult) {
public void setExecResult(Integer execResult) {
this.execResult = execResult;
}
@ -267,11 +267,11 @@ public class SysDevOperLog extends BaseEntity
this.version = version;
}
public int getRunTime() {
public Integer getRunTime() {
return runTime;
}
public void setRunTime(int runTime) {
public void setRunTime(Integer runTime) {
this.runTime = runTime;
}

32
agri-system/src/main/resources/mapper/system/SysDevOperLogMapper.xml
View File

@ -40,9 +40,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectSysDevOperLogList" parameterType="SysDevOperLog" resultMap="SysDevOperLogResult">
<include refid="selectSysDevOperLogVo"/>
<where>
<if test="agriName != null and agriName != ''"> and agri_name like concat('%', #{agriName}, '%')</if>
<if test="imei != null and imei != ''"> and imei like concat('%', #{imei}, '%')</if>
<if test="funcCode != null and funcCode != ''"> and func_code = #{funcCode}</if>
<if test="opType != null "> and op_type = #{opType}</if>
<if test="opSource != null "> and op_source = #{opSource}</if>
<if test="lockAcquired != null "> and lock_acquired = #{lockAcquired}</if>
<if test="ackReceived != null "> and ack_received = #{ackReceived}</if>
<if test="ackSuc != null "> and ack_suc = #{ackSuc}</if>
<if test="isLockSuc != null "> and is_lock_suc = #{isLockSuc}</if>
<if test="isTask != null "> and is_task = #{isTask}</if>
<if test="execResult != null "> and exec_result = #{execResult}</if>
</where>
</select>
<select id="selectSysDevOperLogById" parameterType="Long" resultMap="SysDevOperLogResult">
<include refid="selectSysDevOperLogVo"/>
where id = #{id}
@ -72,11 +84,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="latestState != null">latest_state,</if>
<if test="remark != null">remark,</if>
<if test="version != null">version,</if>
create_by,
create_time,
update_by,
update_time,
</trim>
create_by,
create_time,
update_by,
update_time,
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="agriName != null">#{agriName},</if>
<if test="imei != null">#{imei},</if>
@ -99,11 +111,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="latestState != null">#{latestState},</if>
<if test="remark != null">#{remark},</if>
<if test="version != null">#{version},</if>
#{createBy},
#{createTime},
#{updateBy},
#{updateTime},
</trim>
#{createBy},
#{createTime},
#{updateBy},
#{updateTime},
</trim>
</insert>
<update id="updateSysDevOperLog" parameterType="SysDevOperLog">