Skip to content

Z
zhengyuan-danger-chemistry-manage
Commit 2d837d7d authored by 王晓倩's avatar 王晓倩
Browse files
Options

设备台账和特种设备台账改动，新加详情

parent 8e795399
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 500 additions and 352 deletions
danger-manage-system/src/main/java/com/zehong/system/domain/TDeviceInfo.java
View file @ 2d837d7d
......@@ -2,9 +2,12 @@ package com.zehong.system.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity;
import java.util.Date;
/**
* 设备信息管理对象 t_device_info
*
......@@ -18,171 +21,176 @@ public class TDeviceInfo extends BaseEntity
/** $column.columnComment */
private Long id;
/** 设备位号 */
@Excel(name = "设备位号")
private String tagNumber;
/** 设备名称 */
@Excel(name = "设备名称")
private String deviceName;
/** 设备编码 */
@Excel(name = "设备编码")
private String deviceCode;
/** 规格 */
@Excel(name = "规格")
private String specifications;
/** 设备状态（0正常 1报警 2离线） */
private String deviceStatus;
/** 技术性能 */
@Excel(name = "技术性能")
private String function;
/** 设备类型 */
@Excel(name = "设备类型(液位探测器/气体报警器/压力报警器)", readConverterExp = "1=液位探测器,2=气体报警器,3=压力报警器")
private String deviceType;
/** 介质 */
@Excel(name = "介质")
private String medium;
/** 位号 */
@Excel(name = "位号")
private String tagNumber;
/** 制造厂家 */
@Excel(name = "制造厂家")
private String manufactor;
/** 设备等级 */
@Excel(name = "设备等级(一级危险源/二级危险源/三级危险源)", readConverterExp = "1=一级危险源,2=二级危险源,3=三级危险源")
private String deviceGrade;
/** 所属车间 */
@Excel(name = "所属车间", readConverterExp = "1=电仪车间,2=化工车间,3=热电车间,4=压缩车间,5=尿素车间,6=制气车间,7=维修车间")
private String shop;
/** 安装位置 */
@Excel(name = "安装位置")
private String installLocation;
/** 投运时间 */
@Excel(name = "投运时间(xxxx-xx-xx)", dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date commissionDate;
/** 是否特种设备（0否，1是） */
@Excel(name = "是否特种设备(是/否)", readConverterExp = "0=否,1=是")
private String isSpecial;
/** 设备状态 */
@Excel(name = "设备状态", readConverterExp = "0=运行,1=备用,2=检修")
private String deviceStatus;
/** 负责人 */
@Excel(name = "负责人")
private String responsiblePerson;
/** 设备分类 */
@Excel(name = "设备分类(动设备/静设备)", readConverterExp = "1=动设备,2=静设备")
private String classify;
/** 分级 */
@Excel(name = "分级")
private String deviceGrade;
/** 负责人电话 */
@Excel(name = "负责人电话")
private String responsiblePhone;
/** 是否特种设备（0否，1是） */
@Excel(name = "是否特种设备(否/是)", readConverterExp = "0=否,1=是")
private String isSpecial;
/** 备注信息 */
@Excel(name = "备注信息")
private String remarks;
/** 特种设备类型 */
@Excel(name = "特种设备类型(预防事故设施/控制事故设施/减少与消除事故影响设施)", readConverterExp = "1=预防事故设施,2=控制事故设施,3=减少与消除事故影响设施")
private String deviceType;
/** 是否作废(0正常，1作废) */
@Excel(name = "是否作废(0正常，1作废)")
/** 是否报废(0正常，1报废) */
@Excel(name = "是否报废(否/是)", readConverterExp = "0=否,1=是")
private String isCancel;
/** 是否删除(0正常，1删除) */
private String isDel;
public void setId(Long id)
{
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getId()
{
return id;
public String getTagNumber() {
return tagNumber;
}
public void setDeviceName(String deviceName)
{
this.deviceName = deviceName;
public void setTagNumber(String tagNumber) {
this.tagNumber = tagNumber;
}
public String getDeviceName()
{
public String getDeviceName() {
return deviceName;
}
public void setDeviceCode(String deviceCode)
{
this.deviceCode = deviceCode;
public void setDeviceName(String deviceName) {
this.deviceName = deviceName;
}
public String getDeviceCode()
{
return deviceCode;
public String getSpecifications() {
return specifications;
}
public void setDeviceStatus(String deviceStatus)
{
this.deviceStatus = deviceStatus;
public void setSpecifications(String specifications) {
this.specifications = specifications;
}
public String getDeviceStatus()
{
return deviceStatus;
public String getFunction() {
return function;
}
public void setDeviceType(String deviceType)
{
this.deviceType = deviceType;
public void setFunction(String function) {
this.function = function;
}
public String getDeviceType()
{
return deviceType;
public String getMedium() {
return medium;
}
public void setTagNumber(String tagNumber)
{
this.tagNumber = tagNumber;
public void setMedium(String medium) {
this.medium = medium;
}
public String getTagNumber()
{
return tagNumber;
public String getManufactor() {
return manufactor;
}
public void setDeviceGrade(String deviceGrade)
{
this.deviceGrade = deviceGrade;
public void setManufactor(String manufactor) {
this.manufactor = manufactor;
}
public String getDeviceGrade()
{
return deviceGrade;
public String getShop() {
return shop;
}
public void setInstallLocation(String installLocation)
{
this.installLocation = installLocation;
public void setShop(String shop) {
this.shop = shop;
}
public String getInstallLocation()
{
return installLocation;
public Date getCommissionDate() {
return commissionDate;
}
public void setIsSpecial(String isSpecial)
{
this.isSpecial = isSpecial;
public void setCommissionDate(Date commissionDate) {
this.commissionDate = commissionDate;
}
public String getIsSpecial()
{
return isSpecial;
public String getDeviceStatus() {
return deviceStatus;
}
public void setResponsiblePerson(String responsiblePerson)
{
this.responsiblePerson = responsiblePerson;
public void setDeviceStatus(String deviceStatus) {
this.deviceStatus = deviceStatus;
}
public String getResponsiblePerson()
{
return responsiblePerson;
public String getDeviceType() {
return deviceType;
}
public void setResponsiblePhone(String responsiblePhone)
{
this.responsiblePhone = responsiblePhone;
public void setDeviceType(String deviceType) {
this.deviceType = deviceType;
}
public String getResponsiblePhone()
{
return responsiblePhone;
public String getClassify() {
return classify;
}
public void setIsDel(String isDel)
{
this.isDel = isDel;
public void setClassify(String classify) {
this.classify = classify;
}
public String getIsDel()
{
return isDel;
public String getDeviceGrade() {
return deviceGrade;
}
public String getRemarks() {
return remarks;
public void setDeviceGrade(String deviceGrade) {
this.deviceGrade = deviceGrade;
}
public void setRemarks(String remarks) {
this.remarks = remarks;
public String getIsSpecial() {
return isSpecial;
}
public void setIsSpecial(String isSpecial) {
this.isSpecial = isSpecial;
}
public String getIsCancel() {
......@@ -192,4 +200,12 @@ public class TDeviceInfo extends BaseEntity
public void setIsCancel(String isCancel) {
this.isCancel = isCancel;
}
public String getIsDel() {
return isDel;
}
public void setIsDel(String isDel) {
this.isDel = isDel;
}
}
danger-manage-system/src/main/java/com/zehong/system/domain/TSpecialDeviceRecord.java
View file @ 2d837d7d
......@@ -27,9 +27,9 @@ public class TSpecialDeviceRecord extends BaseEntity
@Excel(name = "对应类型")
private String operateType;
/** 设备编号 */
@Excel(name = "设备编号")
private String deviceCode;
/** 设备位号 */
@Excel(name = "设备位号")
private String tagNumber;
/** 设备id */
private Long deviceId;
......@@ -46,14 +46,12 @@ public class TSpecialDeviceRecord extends BaseEntity
/** 是否删除 */
private String isDel;
public void setId(Long id)
{
this.id = id;
public Long getId() {
return id;
}
public Long getId()
{
return id;
public void setId(Long id) {
this.id = id;
}
public String getOperateCode() {
......@@ -64,14 +62,20 @@ public class TSpecialDeviceRecord extends BaseEntity
this.operateCode = operateCode;
}
public void setDeviceCode(String deviceCode)
{
this.deviceCode = deviceCode;
public String getOperateType() {
return operateType;
}
public void setOperateType(String operateType) {
this.operateType = operateType;
}
public String getTagNumber() {
return tagNumber;
}
public String getDeviceCode()
{
return deviceCode;
public void setTagNumber(String tagNumber) {
this.tagNumber = tagNumber;
}
public Long getDeviceId() {
......@@ -82,24 +86,14 @@ public class TSpecialDeviceRecord extends BaseEntity
this.deviceId = deviceId;
}
public String getOperateType() {
return operateType;
}
public void setOperateType(String operateType) {
this.operateType = operateType;
public Date getEffectiveDate() {
return effectiveDate;
}
public void setEffectiveDate(Date effectiveDate)
{
public void setEffectiveDate(Date effectiveDate) {
this.effectiveDate = effectiveDate;
}
public Date getEffectiveDate()
{
return effectiveDate;
}
public String getRecordStatus() {
return recordStatus;
}
......
danger-manage-system/src/main/java/com/zehong/system/service/impl/TDeviceInfoServiceImpl.java
View file @ 2d837d7d
......@@ -126,32 +126,32 @@ public class TDeviceInfoServiceImpl implements ITDeviceInfoService
{
try
{
// 验证是否存在这个用户
TDeviceInfo d = new TDeviceInfo();
d.setDeviceCode(device.getDeviceCode());
List<TDeviceInfo> list = tDeviceInfoMapper.selectTDeviceInfoList(d);
if (list.size() == 0)
{
// // 验证是否存在这个设备位号
// TDeviceInfo d = new TDeviceInfo();
// d.setTagNumber(device.getTagNumber());
// List<TDeviceInfo> list = tDeviceInfoMapper.selectTDeviceInfoList(d);
// if (list.size() == 0)
// {
this.insertTDeviceInfo(device);
successNum++;
// successMsg.append("<br/>" + successNum + "、设备 " + device.getDeviceName() + "(" + device.getDeviceCode() + ")" + " 导入成功");
}
else if (isUpdateSupport)
{
this.updateTDeviceInfo(device);
successNum++;
// successMsg.append("<br/>" + successNum + "、设备 " + device.getDeviceName() + "(" + device.getDeviceCode() + ")" + " 更新成功");
}
else
{
failureNum++;
failureMsg.append("<br/>" + failureNum + "、设备编号 " + device.getDeviceCode() + " 已存在");
}
//// successMsg.append("<br/>" + successNum + "、设备 " + device.getDeviceName() + "(" + device.getDeviceCode() + ")" + " 导入成功");
// }
// else if (isUpdateSupport)
// {
// this.updateTDeviceInfo(device);
// successNum++;
//// successMsg.append("<br/>" + successNum + "、设备 " + device.getDeviceName() + "(" + device.getDeviceCode() + ")" + " 更新成功");
// }
// else
// {
// failureNum++;
// failureMsg.append("<br/>" + failureNum + "、设备位号 " + device.getTagNumber() + " 已存在");
// }
}
catch (Exception e)
{
failureNum++;
String msg = "<br/>" + failureNum + "、设备 " + device.getDeviceName() + "(" + device.getDeviceCode() + ")" + " 导入失败：";
String msg = "<br/>" + failureNum + "、设备 " + device.getDeviceName() + "(" + device.getTagNumber() + ")" + " 导入失败：";
failureMsg.append(msg + e.getMessage());
log.error(msg, e);
}
......
danger-manage-system/src/main/java/com/zehong/system/service/impl/TMaintainPlanServiceImpl.java
View file @ 2d837d7d
......@@ -68,7 +68,7 @@ public class TMaintainPlanServiceImpl implements ITMaintainPlanService
TDeviceInfo tDeviceInfo = tDeviceInfoMapper.selectTDeviceInfoById(Long.valueOf(id));
TSpecialDeviceRecord tSpecialDeviceRecord = new TSpecialDeviceRecord();
tSpecialDeviceRecord.setDeviceCode(tDeviceInfo.getDeviceCode());
tSpecialDeviceRecord.setTagNumber(tDeviceInfo.getTagNumber());
tSpecialDeviceRecord.setDeviceId(tDeviceInfo.getId());
tSpecialDeviceRecord.setOperateCode(planCode);
tSpecialDeviceRecord.setOperateType("1");
......
danger-manage-system/src/main/java/com/zehong/system/service/impl/TRepairOrderServiceImpl.java
View file @ 2d837d7d
......@@ -66,7 +66,7 @@ public class TRepairOrderServiceImpl implements ITRepairOrderService
TDeviceInfo tDeviceInfo = tDeviceInfoMapper.selectTDeviceInfoById(tRepairOrder.getDeviceId());
TSpecialDeviceRecord tSpecialDeviceRecord = new TSpecialDeviceRecord();
tSpecialDeviceRecord.setDeviceCode(tDeviceInfo.getDeviceCode());
tSpecialDeviceRecord.setTagNumber(tDeviceInfo.getTagNumber());
tSpecialDeviceRecord.setDeviceId(tDeviceInfo.getId());
tSpecialDeviceRecord.setOperateCode(repairCode);
tSpecialDeviceRecord.setOperateType("2");
......
danger-manage-system/src/main/resources/mapper/system/TDeviceInfoMapper.xml
View file @ 2d837d7d
......@@ -7,43 +7,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="TDeviceInfo" id="TDeviceInfoResult">
<result property="id" column="id" />
<result property="deviceName" column="device_name" />
<result property="deviceCode" column="device_code" />
<result property="deviceStatus" column="device_status" />
<result property="deviceType" column="device_type" />
<result property="classify" column="classify" />
<result property="tagNumber" column="tag_number" />
<result property="specifications" column="specifications" />
<result property="function" column="function" />
<result property="medium" column="medium" />
<result property="manufactor" column="manufactor" />
<result property="shop" column="shop" />
<result property="commissionDate" column="commission_date" />
<result property="deviceStatus" column="device_status" />
<result property="deviceGrade" column="device_grade" />
<result property="installLocation" column="install_location" />
<result property="isCancel" column="is_cancel" />
<result property="isSpecial" column="is_special" />
<result property="responsiblePerson" column="responsible_person" />
<result property="responsiblePhone" column="responsible_phone" />
<result property="isDel" column="is_del" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
<result property="isDel" column="is_del" />
<result property="isCancel" column="is_cancel" />
<result property="remarks" column="remarks" />
</resultMap>
<sql id="selectTDeviceInfoVo">
select id, device_name, device_code, device_status, device_type, tag_number, device_grade, install_location, is_special, responsible_person, responsible_phone, create_time, update_time, is_cancel, is_del, remarks from t_device_info
select id, device_name, device_type, classify, tag_number, specifications, function, medium, manufactor, shop, commission_date, device_status, device_grade, is_cancel, is_special, is_del, create_time, update_time from t_device_info
</sql>
<select id="selectTDeviceInfoList" parameterType="TDeviceInfo" resultMap="TDeviceInfoResult">
<include refid="selectTDeviceInfoVo"/>
<where> is_del = '0'
<if test="deviceName != null and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
<if test="deviceCode != null and deviceCode != ''"> and device_code like concat('%', #{deviceCode}, '%')</if>
<if test="tagNumber != null and tagNumber != ''"> and tag_number like concat('%', #{tagNumber}, '%')</if>
<if test="deviceStatus != null and deviceStatus != ''"> and device_status = #{deviceStatus}</if>
<if test="deviceType != null and deviceType != ''"> and device_type = #{deviceType}</if>
<if test="tagNumber != null and tagNumber != ''"> and tag_number = #{tagNumber}</if>
<if test="shop != null and shop != ''"> and shop = #{shop}</if>
<if test="deviceGrade != null and deviceGrade != ''"> and device_grade = #{deviceGrade}</if>
<if test="isSpecial != null and isSpecial != ''"> and is_special = #{isSpecial}</if>
<if test="isCancel != null and isCancel != ''"> and is_cancel = #{isCancel}</if>
<if test="responsiblePhone != null and responsiblePhone != ''"> and responsible_phone = #{responsiblePhone}</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
AND date_format(commission_date,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
AND date_format(commission_date,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
</where>
</select>
......@@ -57,35 +58,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into t_device_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="deviceName != null">device_name,</if>
<if test="deviceCode != null">device_code,</if>
<if test="deviceStatus != null">device_status,</if>
<if test="deviceType != null">device_type,</if>
<if test="classify != null">classify,</if>
<if test="tagNumber != null">tag_number,</if>
<if test="specifications != null">specifications,</if>
<if test="function != null">function,</if>
<if test="medium != null">medium,</if>
<if test="manufactor != null">manufactor,</if>
<if test="shop != null">shop,</if>
<if test="commissionDate != null">commission_date,</if>
<if test="deviceStatus != null">device_status,</if>
<if test="deviceGrade != null">device_grade,</if>
<if test="installLocation != null">install_location,</if>
<if test="isCancel != null">is_cancel,</if>
<if test="isSpecial != null">is_special,</if>
<if test="responsiblePerson != null">responsible_person,</if>
<if test="responsiblePhone != null">responsible_phone,</if>
<if test="isDel != null">is_del,</if>
<if test="createTime != null">create_time,</if>
<if test="updateTime != null">update_time,</if>
<if test="isDel != null">is_del,</if>
<if test="remarks != null">remarks,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="deviceName != null">#{deviceName},</if>
<if test="deviceCode != null">#{deviceCode},</if>
<if test="deviceStatus != null">#{deviceStatus},</if>
<if test="deviceType != null">#{deviceType},</if>
<if test="classify != null">#{classify},</if>
<if test="tagNumber != null">#{tagNumber},</if>
<if test="specifications != null">#{specifications},</if>
<if test="function != null">#{function},</if>
<if test="medium != null">#{medium},</if>
<if test="manufactor != null">#{manufactor},</if>
<if test="shop != null">#{shop},</if>
<if test="commissionDate != null">#{commissionDate},</if>
<if test="deviceStatus != null">#{deviceStatus},</if>
<if test="deviceGrade != null">#{deviceGrade},</if>
<if test="installLocation != null">#{installLocation},</if>
<if test="isCancel != null">#{isCancel},</if>
<if test="isSpecial != null">#{isSpecial},</if>
<if test="responsiblePerson != null">#{responsiblePerson},</if>
<if test="responsiblePhone != null">#{responsiblePhone},</if>
<if test="isDel != null">#{isDel},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="isDel != null">#{isDel},</if>
<if test="remarks != null">#{remarks},</if>
</trim>
</insert>
......@@ -93,20 +100,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update t_device_info
<trim prefix="SET" suffixOverrides=",">
<if test="deviceName != null">device_name = #{deviceName},</if>
<if test="deviceCode != null">device_code = #{deviceCode},</if>
<if test="deviceStatus != null">device_status = #{deviceStatus},</if>
<if test="deviceType != null">device_type = #{deviceType},</if>
<if test="classify != null">classify = #{classify},</if>
<if test="tagNumber != null">tag_number = #{tagNumber},</if>
<if test="specifications != null">specifications = #{specifications},</if>
<if test="function != null">function = #{function},</if>
<if test="medium != null">medium = #{medium},</if>
<if test="manufactor != null">manufactor = #{manufactor},</if>
<if test="shop != null">shop = #{shop},</if>
<if test="commissionDate != null">commission_date = #{commissionDate},</if>
<if test="deviceStatus != null">device_status = #{deviceStatus},</if>
<if test="deviceGrade != null">device_grade = #{deviceGrade},</if>
<if test="installLocation != null">install_location = #{installLocation},</if>
<if test="isCancel != null">is_cancel = #{isCancel},</if>
<if test="isSpecial != null">is_special = #{isSpecial},</if>
<if test="responsiblePerson != null">responsible_person = #{responsiblePerson},</if>
<if test="responsiblePhone != null">responsible_phone = #{responsiblePhone},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="isDel != null">is_del = #{isDel},</if>
<if test="isCancel != null">is_cancel = #{isCancel},</if>
<if test="remarks != null">remarks = #{remarks},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id} and is_del = '0'
</update>
......
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