Commit aebb74eb authored by 王晓倩's avatar 王晓倩

设备报警信息删除remarks字段

parent 3c2710a6
......@@ -53,10 +53,6 @@ public class TDeviceAlarm extends BaseEntity
@Excel(name = "处理状态", readConverterExp = "1不需处理,2已处理完成,3未处理完成")
private String dealStatus;
/** 备注 */
@Excel(name = "备注")
private String remarks;
public void setAlarmId(Integer alarmId)
{
this.alarmId = alarmId;
......@@ -138,15 +134,6 @@ public class TDeviceAlarm extends BaseEntity
{
return dealStatus;
}
public void setRemarks(String remarks)
{
this.remarks = remarks;
}
public String getRemarks()
{
return remarks;
}
@Override
public String toString() {
......@@ -162,7 +149,6 @@ public class TDeviceAlarm extends BaseEntity
.append("dealStatus", getDealStatus())
.append("updateTime", getUpdateTime())
.append("createTime", getCreateTime())
.append("remarks", getRemarks())
.toString();
}
}
package com.zehong.system.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zehong.common.core.domain.BaseEntity;
import com.zehong.system.domain.TDeviceInfo;
import java.util.Date;
/**
* 报警信息对象 t_device_alarm
*
* @author zehong
* @date 2021-07-21
*/
public class DeviceAlarmVo extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
private Integer alarmId;
/** 设备id */
private Integer deviceId;
/** 设备类型(0管道,1调压阀,2阀门井,3流量计,4压力表) */
private String deviceType;
/** 设备 */
private TDeviceInfo deviceInfo;
/** 工单id */
private String orderId;
/** 报警类型 */
private String alarmType;
/** 报警值(报警信息) */
private String alarmValue;
/** 报警开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
/** 报警结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
/** 处理状态(1不需处理,2已处理完成,3未处理完成) */
private String dealStatus;
public void setAlarmId(Integer alarmId)
{
this.alarmId = alarmId;
}
public Integer getAlarmId()
{
return alarmId;
}
public void setDeviceId(Integer deviceId)
{
this.deviceId = deviceId;
}
public Integer getDeviceId()
{
return deviceId;
}
public String getDeviceType() {
return deviceType;
}
public void setDeviceType(String deviceType) {
this.deviceType = deviceType;
}
public TDeviceInfo getDeviceInfo() {
return deviceInfo;
}
public void setDeviceInfo(TDeviceInfo deviceInfo) {
this.deviceInfo = deviceInfo;
}
public void setOrderId(String orderId)
{
this.orderId = orderId;
}
public String getOrderId()
{
return orderId;
}
public void setAlarmType(String alarmType)
{
this.alarmType = alarmType;
}
public String getAlarmType()
{
return alarmType;
}
public void setAlarmValue(String alarmValue)
{
this.alarmValue = alarmValue;
}
public String getAlarmValue()
{
return alarmValue;
}
public void setStartTime(Date startTime)
{
this.startTime = startTime;
}
public Date getStartTime()
{
return startTime;
}
public void setEndTime(Date endTime)
{
this.endTime = endTime;
}
public Date getEndTime()
{
return endTime;
}
public void setDealStatus(String dealStatus)
{
this.dealStatus = dealStatus;
}
public String getDealStatus()
{
return dealStatus;
}
}
......@@ -3,11 +3,11 @@ package com.zehong.system.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zehong.common.core.domain.BaseEntity;
import com.zehong.system.domain.TDeviceInfo;
import com.zehong.system.domain.TInspectionData;
import com.zehong.system.domain.TPipe;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* 巡检计划对象 t_inspection_plan
......@@ -28,8 +28,14 @@ public class InspectionPlanVo extends BaseEntity
/** 设备id */
private String deviceIds;
/** 设备树列表 */
private Map<Object, List> deviceList;
/** 设备列表 */
private List<TInspectionData> inspectionDataList;
/** 设备列表 */
private List<TDeviceInfo> deviceList;
/** 管道列表 */
private List<TPipe> pipeList;
/** 工单id */
private String orderId;
......@@ -82,14 +88,30 @@ public class InspectionPlanVo extends BaseEntity
this.deviceIds = deviceIds;
}
public Map<Object, List> getDeviceList() {
public List<TInspectionData> getInspectionDataList() {
return inspectionDataList;
}
public void setInspectionDataList(List<TInspectionData> inspectionDataList) {
this.inspectionDataList = inspectionDataList;
}
public List<TDeviceInfo> getDeviceList() {
return deviceList;
}
public void setDeviceList(Map<Object, List> deviceList) {
public void setDeviceList( List<TDeviceInfo> deviceList) {
this.deviceList = deviceList;
}
public List<TPipe> getPipeList() {
return pipeList;
}
public void setPipeList(List<TPipe> pipeList) {
this.pipeList = pipeList;
}
public void setOrderId(String orderId)
{
this.orderId = orderId;
......
......@@ -16,11 +16,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="dealStatus" column="deal_status" />
<result property="updateTime" column="update_time" />
<result property="createTime" column="create_time" />
<result property="remarks" column="remarks" />
</resultMap>
<sql id="selectTDeviceAlarmVo">
select alarm_id, device_id, device_type, order_id, alarm_type, alarm_value, start_time, end_time, deal_status, update_time, create_time, remarks from t_device_alarm
select alarm_id, device_id, device_type, order_id, alarm_type, alarm_value, start_time, end_time, deal_status, update_time, create_time from t_device_alarm
</sql>
<select id="selectTDeviceAlarmList" parameterType="TDeviceAlarm" resultMap="TDeviceAlarmResult">
......@@ -34,7 +33,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="startTime != null "> and start_time = #{startTime}</if>
<if test="endTime != null "> and end_time = #{endTime}</if>
<if test="dealStatus != null and dealStatus != ''"> and deal_status = #{dealStatus}</if>
<if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if>
</where>
</select>
......@@ -56,7 +54,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dealStatus != null">deal_status,</if>
<if test="updateTime != null">update_time,</if>
<if test="createTime != null">create_time,</if>
<if test="remarks != null">remarks,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="deviceId != null">#{deviceId},</if>
......@@ -69,7 +66,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dealStatus != null">#{dealStatus},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="createTime != null">#{createTime},</if>
<if test="remarks != null">#{remarks},</if>
</trim>
</insert>
......@@ -86,7 +82,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dealStatus != null">deal_status = #{dealStatus},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="remarks != null">remarks = #{remarks},</if>
</trim>
where alarm_id = #{alarmId}
</update>
......
......@@ -104,7 +104,7 @@
@click="handleIssue(scope.row)"
v-hasPermi="['workOrder:basicsInfo:add']"
v-if="scope.row.planStatus == 0"
>下发
>下发工单
</el-button>
<el-button
size="normal"
......@@ -251,9 +251,6 @@
typeOptions: [],
// 设备级联
options: [],
planId: null,
planName: null,
remarks: null,
props: {
multiple: true,
value: "id",
......@@ -280,11 +277,7 @@
remarks: null
},
// 表单参数
form: {
planId: null,
planName: null,
remarks: null
},
form: { },
// 表单校验
rules: {
planName: [
......@@ -447,7 +440,7 @@
this.form.resourceId = this.form.planId;
this.form.orderType = "1";
addBasicsInfo(this.form).then(response => {
this.form = response.data;
this.msgSuccess("下发成功");
this.open = false;
this.getList();
});
......
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