Skip to content

G
gassafety
Commit 02c94e41 authored by 耿迪迪's avatar 耿迪迪
Browse files
Options

Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety

parents 6664a2ce ab3de9ba
Show whitespace changes
Inline Side-by-side
Showing with 513 additions and 340 deletions
gassafety-admin/src/main/java/com/zehong/web/controller/deviceInspection/TInspectionPlanController.java
View file @ 02c94e41
package com.zehong.web.controller.deviceInspection;
import java.util.List;
import com.zehong.system.domain.form.InspectionPlanForm;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
......@@ -38,10 +40,10 @@ public class TInspectionPlanController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('deviceInspection:inspectionPlan:list')")
@GetMapping("/list")
public TableDataInfo list(TInspectionPlan tInspectionPlan)
public TableDataInfo list(InspectionPlanForm inspectionPlanForm)
{
startPage();
List<TInspectionPlan> list = tInspectionPlanService.selectTInspectionPlanList(tInspectionPlan);
List<TInspectionPlan> list = tInspectionPlanService.selectTInspectionPlanList(inspectionPlanForm);
return getDataTable(list);
}
......@@ -51,9 +53,9 @@ public class TInspectionPlanController extends BaseController
@PreAuthorize("@ss.hasPermi('deviceInspection:inspectionPlan:export')")
@Log(title = "巡检计划", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(TInspectionPlan tInspectionPlan)
public AjaxResult export(InspectionPlanForm inspectionPlanForm)
{
List<TInspectionPlan> list = tInspectionPlanService.selectTInspectionPlanList(tInspectionPlan);
List<TInspectionPlan> list = tInspectionPlanService.selectTInspectionPlanList(inspectionPlanForm);
ExcelUtil<TInspectionPlan> util = new ExcelUtil<TInspectionPlan>(TInspectionPlan.class);
return util.exportExcel(list, "巡检计划数据");
}
......
gassafety-system/src/main/java/com/zehong/system/domain/TDeviceAlarm.java
View file @ 02c94e41
......@@ -18,14 +18,14 @@ public class TDeviceAlarm extends BaseEntity
private static final long serialVersionUID = 1L;
/** $column.columnComment */
private int alarmId;
private Integer alarmId;
/** 设备id */
@Excel(name = "设备id")
private String deviceCode;
private Integer deviceId;
/** 是否是管道信息（0是，1否） */
private String isPipe;
/** 设备类型（0管道，1调压阀，2阀门井，3流量计，4压力表） */
private String deviceType;
/** 工单id */
@Excel(name = "工单id")
......@@ -57,31 +57,31 @@ public class TDeviceAlarm extends BaseEntity
@Excel(name = "备注")
private String remarks;
public void setAlarmId(int alarmId)
public void setAlarmId(Integer alarmId)
{
this.alarmId = alarmId;
}
public int getAlarmId()
public Integer getAlarmId()
{
return alarmId;
}
public void setDeviceCode(String deviceCode)
public void setDeviceId(Integer deviceId)
{
this.deviceCode = deviceCode;
this.deviceId = deviceId;
}
public String getDeviceCode()
public Integer getDeviceId()
{
return deviceCode;
return deviceId;
}
public String getIsPipe() {
return isPipe;
public String getDeviceType() {
return deviceType;
}
public void setIsPipe(String isPipe) {
this.isPipe = isPipe;
public void setDeviceType(String deviceType) {
this.deviceType = deviceType;
}
public void setOrderId(String orderId)
......@@ -152,8 +152,8 @@ public class TDeviceAlarm extends BaseEntity
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("alarmId", getAlarmId())
.append("deviceCode", getDeviceCode())
.append("isPipe", getIsPipe())
.append("deviceId", getDeviceId())
.append("isPipe", getDeviceType())
.append("orderId", getOrderId())
.append("alarmType", getAlarmType())
.append("alarmValue", getAlarmValue())
......
gassafety-system/src/main/java/com/zehong/system/domain/TDeviceInfo.java
View file @ 02c94e41
......@@ -19,11 +19,11 @@ public class TDeviceInfo extends BaseEntity
private static final long serialVersionUID = 1L;
/** 设备id */
private int deviceId;
private Integer deviceId;
/** 企业id */
@Excel(name = "企业id")
private int enterpriseId;
private Integer enterpriseId;
/** 所属管道编号 */
@Excel(name = "所属管道编号")
......@@ -87,21 +87,21 @@ public class TDeviceInfo extends BaseEntity
@Excel(name = "备注")
private String remarks;
public void setDeviceId(int deviceId)
public void setDeviceId(Integer deviceId)
{
this.deviceId = deviceId;
}
public int getDeviceId()
public Integer getDeviceId()
{
return deviceId;
}
public void setEnterpriseId(int enterpriseId)
public void setEnterpriseId(Integer enterpriseId)
{
this.enterpriseId = enterpriseId;
}
public int getEnterpriseId()
public Integer getEnterpriseId()
{
return enterpriseId;
}
......
gassafety-system/src/main/java/com/zehong/system/domain/TEnterpriseInfo.java
View file @ 02c94e41
......@@ -17,7 +17,7 @@ public class TEnterpriseInfo extends BaseEntity
private static final long serialVersionUID = 1L;
/** $column.columnComment */
private int infoId;
private Integer infoId;
/** 单位名称 */
@Excel(name = "企业名称")
......@@ -75,12 +75,12 @@ public class TEnterpriseInfo extends BaseEntity
@Excel(name = "备注")
private String remarks;
public void setInfoId(int infoId)
public void setInfoId(Integer infoId)
{
this.infoId = infoId;
}
public int getInfoId()
public Integer getInfoId()
{
return infoId;
}
......
gassafety-system/src/main/java/com/zehong/system/domain/THiddenTrouble.java
View file @ 02c94e41
......@@ -17,11 +17,11 @@ public class THiddenTrouble extends BaseEntity
private static final long serialVersionUID = 1L;
/** 隐患信息id */
private int troubleId;
private Integer troubleId;
/** 设备编号 */
@Excel(name = "设备编号")
private String deviceCode;
/** 设备id */
@Excel(name = "设备id")
private Integer deviceId;
/** 设备类型（0管道，1调压阀，2阀门井，3流量计，4压力表） */
private String deviceType;
......@@ -47,30 +47,30 @@ public class THiddenTrouble extends BaseEntity
private String coordinates;
/** 处理状态（1不需处理，2已处理完成，3未处理完成） */
@Excel(name = "处理状态", readConverterExp = "1=不需处理，2已处理完成，3未处理完成")
@Excel(name = "处理状态", readConverterExp = "1不需处理，2已处理完成，3未处理完成")
private String dealStatus;
/** 备注 */
@Excel(name = "备注")
private String remarks;
public void setTroubleId(int troubleId)
public void setTroubleId(Integer troubleId)
{
this.troubleId = troubleId;
}
public int getTroubleId()
public Integer getTroubleId()
{
return troubleId;
}
public void setDeviceCode(String deviceCode)
public void setDeviceId(Integer deviceId)
{
this.deviceCode = deviceCode;
this.deviceId = deviceId;
}
public String getDeviceCode()
public Integer getDeviceId()
{
return deviceCode;
return deviceId;
}
public String getDeviceType() {
......@@ -149,7 +149,7 @@ public class THiddenTrouble extends BaseEntity
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("troubleId", getTroubleId())
.append("deviceCode", getDeviceCode())
.append("deviceId", getDeviceId())
.append("deviceType", getDeviceType())
.append("orderId", getOrderId())
.append("address", getAddress())
......
gassafety-system/src/main/java/com/zehong/system/domain/TInspectionData.java
View file @ 02c94e41
......@@ -16,22 +16,22 @@ public class TInspectionData extends BaseEntity
private static final long serialVersionUID = 1L;
/** 巡检记录id */
private int dataId;
private Integer dataId;
/** 巡检计划id */
@Excel(name = "巡检计划id")
private int planId;
private Integer planId;
/** 设备编号 */
@Excel(name = "设备编号")
private String deviceCode;
/** 设备id */
@Excel(name = "设备id")
private Integer deviceId;
/** 设备类型 */
@Excel(name = "设备类型")
/** 设备类型（0管道，1调压阀，2阀门井，3流量计，4压力表） */
@Excel(name = "设备类型（0管道，1调压阀，2阀门井，3流量计，4压力表）")
private String deviceType;
/** 处理状态（1不需处理，2已处理完成，3未处理完成） */
@Excel(name = "处理状态", readConverterExp = "1=不需处理，2已处理完成，3未处理完成")
@Excel(name = "处理状态", readConverterExp = "1不需处理，2已处理完成，3未处理完成")
private String dealStatus;
/** 是否存在隐患 */
......@@ -42,34 +42,34 @@ public class TInspectionData extends BaseEntity
@Excel(name = "备注")
private String remarks;
public void setDataId(int dataId)
public void setDataId(Integer dataId)
{
this.dataId = dataId;
}
public int getDataId()
public Integer getDataId()
{
return dataId;
}
public void setPlanId(int planId)
public void setPlanId(Integer planId)
{
this.planId = planId;
}
public int getPlanId()
public Integer getPlanId()
{
return planId;
}
public void setDeviceCode(String deviceCode)
public void setDeviceId(Integer deviceId)
{
this.deviceCode = deviceCode;
this.deviceId = deviceId;
}
public String getDeviceCode()
public Integer getDeviceId()
{
return deviceCode;
return deviceId;
}
public String getDeviceType() {
......@@ -113,7 +113,7 @@ public class TInspectionData extends BaseEntity
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("dataId", getDataId())
.append("planId", getPlanId())
.append("deviceCode", getDeviceCode())
.append("deviceId", getDeviceId())
.append("deviceType", getDeviceType())
.append("dealStatus", getDealStatus())
.append("isHiddenDanger", getIsHiddenDanger())
......
gassafety-system/src/main/java/com/zehong/system/domain/TInspectionPlan.java
View file @ 02c94e41
......@@ -18,7 +18,7 @@ public class TInspectionPlan extends BaseEntity
private static final long serialVersionUID = 1L;
/** 巡检计划id */
private int planId;
private Integer planId;
/** 巡检计划名称 */
@Excel(name = "巡检计划名称")
......@@ -28,10 +28,6 @@ public class TInspectionPlan extends BaseEntity
@Excel(name = "工单id")
private String orderId;
/** 设备编号（多个编号用逗号分隔） */
@Excel(name = "设备号")
private String deviceCodes;
/** 开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
......@@ -42,23 +38,32 @@ public class TInspectionPlan extends BaseEntity
@Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
/** 地址 */
@Excel(name = "地址")
private String address;
/** 计划状态（0未下发，1已下发，2进行中，3已完成） */
@Excel(name = "计划状态（0未下发，1已下发，2进行中，3已完成）")
private String planStatus;
/** 是否作废（0正常，1作废） */
@Excel(name = "是否作废（0正常，1作废）")
private String isDel;
/** 计划描述 */
@Excel(name = "计划描述")
private String remarks;
public void setPlanId(int planId)
public void setPlanId(Integer planId)
{
this.planId = planId;
}
public int getPlanId()
public Integer getPlanId()
{
return planId;
}
public void setPlanName(String planName)
{
this.planName = planName;
......@@ -69,14 +74,6 @@ public class TInspectionPlan extends BaseEntity
return planName;
}
public String getDeviceCodes() {
return deviceCodes;
}
public void setDeviceCodes(String deviceCodes) {
this.deviceCodes = deviceCodes;
}
public void setOrderId(String orderId)
{
this.orderId = orderId;
......@@ -86,6 +83,7 @@ public class TInspectionPlan extends BaseEntity
{
return orderId;
}
public void setStartTime(Date startTime)
{
this.startTime = startTime;
......@@ -95,6 +93,7 @@ public class TInspectionPlan extends BaseEntity
{
return startTime;
}
public void setEndTime(Date endTime)
{
this.endTime = endTime;
......@@ -104,6 +103,15 @@ public class TInspectionPlan extends BaseEntity
{
return endTime;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public void setPlanStatus(String planStatus)
{
this.planStatus = planStatus;
......@@ -113,6 +121,15 @@ public class TInspectionPlan extends BaseEntity
{
return planStatus;
}
public String getIsDel() {
return isDel;
}
public void setIsDel(String isDel) {
this.isDel = isDel;
}
public void setRemarks(String remarks)
{
this.remarks = remarks;
......@@ -128,7 +145,6 @@ public class TInspectionPlan extends BaseEntity
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("planId", getPlanId())
.append("planName", getPlanName())
.append("deviceCodes", getDeviceCodes())
.append("orderId", getOrderId())
.append("startTime", getStartTime())
.append("endTime", getEndTime())
......
gassafety-system/src/main/java/com/zehong/system/domain/TOrderFeedback.java
View file @ 02c94e41
......@@ -18,15 +18,15 @@ public class TOrderFeedback extends BaseEntity
private static final long serialVersionUID = 1L;
/** 工单反馈id */
private int feedbackId;
private Integer feedbackId;
/** 工单id */
@Excel(name = "工单id")
private String orderId;
/** 设备编号 */
@Excel(name = "设备编号")
private String deviceCode;
/** 设备id */
@Excel(name = "设备id")
private Integer deviceId;
/** 反馈内容 */
@Excel(name = "反馈内容")
......@@ -57,12 +57,12 @@ public class TOrderFeedback extends BaseEntity
@Excel(name = "图片地址3")
private String pictureUrl3;
public void setFeedbackId(int feedbackId)
public void setFeedbackId(Integer feedbackId)
{
this.feedbackId = feedbackId;
}
public int getFeedbackId()
public Integer getFeedbackId()
{
return feedbackId;
}
......@@ -75,14 +75,14 @@ public class TOrderFeedback extends BaseEntity
{
return orderId;
}
public void setDeviceCode(String deviceCode)
public void setDeviceId(Integer deviceId)
{
this.deviceCode = deviceCode;
this.deviceId = deviceId;
}
public String getDeviceCode()
public Integer getDeviceId()
{
return deviceCode;
return deviceId;
}
public void setContents(String contents)
{
......@@ -153,7 +153,7 @@ public class TOrderFeedback extends BaseEntity
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("feedbackId", getFeedbackId())
.append("orderId", getOrderId())
.append("deviceId", getDeviceCode())
.append("deviceId", getDeviceId())
.append("contents", getContents())
.append("feedbackTime", getFeedbackTime())
.append("isHiddenDanger", getIsHiddenDanger())
......
gassafety-system/src/main/java/com/zehong/system/domain/TPipe.java
View file @ 02c94e41
......@@ -18,11 +18,11 @@ public class TPipe extends BaseEntity
private static final long serialVersionUID = 1L;
/** 管道id */
private int pipeId;
private Integer pipeId;
/** 企业id */
@Excel(name = "企业id")
private int enterpriseId;
private Integer enterpriseId;
/** 管道名称 */
@Excel(name = "管道名称")
......@@ -70,21 +70,21 @@ public class TPipe extends BaseEntity
@Excel(name = "备注")
private String remarks;
public void setPipeId(int pipeId)
public void setPipeId(Integer pipeId)
{
this.pipeId = pipeId;
}
public int getPipeId()
public Integer getPipeId()
{
return pipeId;
}
public void setEnterpriseId(int enterpriseId)
public void setEnterpriseId(Integer enterpriseId)
{
this.enterpriseId = enterpriseId;
}
public int getEnterpriseId()
public Integer getEnterpriseId()
{
return enterpriseId;
}
......
gassafety-system/src/main/java/com/zehong/system/domain/TWorkOrder.java
View file @ 02c94e41
......@@ -26,7 +26,7 @@ public class TWorkOrder extends BaseEntity
/** 源id */
@Excel(name = "源id")
private int resourceId;
private Integer resourceId;
/** 工单名称 */
@Excel(name = "工单名称")
......@@ -77,11 +77,11 @@ public class TWorkOrder extends BaseEntity
return orderType;
}
public int getResourceId() {
public Integer getResourceId() {
return resourceId;
}
public void setResourceId(int resourceId) {
public void setResourceId(Integer resourceId) {
this.resourceId = resourceId;
}
......
gassafety-system/src/main/java/com/zehong/system/domain/form/InspectionPlanForm.java 0 → 100644
View file @ 02c94e41
package com.zehong.system.domain.form;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zehong.common.core.domain.BaseEntity;
import java.util.Date;
/**
* 巡检计划对象 t_inspection_plan
*
* @author zehong
* @date 2021-07-21
*/
public class InspectionPlanForm extends BaseEntity
{
/** 巡检计划名称 */
private String planName;
/** 工单id */
private String orderId;
/** 起始开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime1;
/** 起始结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime1;
/** 截止开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime2;
/** 截止结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime2;
/** 计划状态（0未下发，1已下发，2进行中，3已完成） */
private String planStatus;
/** 计划描述 */
private String remarks;
public void setPlanName(String planName)
{
this.planName = planName;
}
public String getPlanName()
{
return planName;
}
public void setOrderId(String orderId)
{
this.orderId = orderId;
}
public String getOrderId()
{
return orderId;
}
public void setStartTime1(Date startTime1)
{
this.startTime1 = startTime1;
}
public Date getStartTime1()
{
return startTime1;
}
public void setEndTime1(Date endTime1)
{
this.endTime1 = endTime1;
}
public Date getEndTime1()
{
return endTime1;
}
public void setPlanStatus(String planStatus)
{
this.planStatus = planStatus;
}
public String getPlanStatus()
{
return planStatus;
}
public void setRemarks(String remarks)
{
this.remarks = remarks;
}
public String getRemarks()
{
return remarks;
}
}
gassafety-system/src/main/java/com/zehong/system/domain/vo/OrderFeedbackVo.java
View file @ 02c94e41
package com.zehong.system.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
......@@ -19,13 +18,13 @@ public class OrderFeedbackVo extends BaseEntity
private static final long serialVersionUID = 1L;
/** 工单反馈id */
private int feedbackId;
private Integer feedbackId;
/** 工单id */
private String orderId;
/** 设备编号 */
private String deviceCode;
/** 设备id */
private Integer deviceId;
/** 设备名称 */
private String deviceName;
......@@ -55,12 +54,12 @@ public class OrderFeedbackVo extends BaseEntity
/** 图片地址3 */
private String pictureUrl3;
public void setFeedbackId(int feedbackId)
public void setFeedbackId(Integer feedbackId)
{
this.feedbackId = feedbackId;
}
public int getFeedbackId()
public Integer getFeedbackId()
{
return feedbackId;
}
......@@ -75,14 +74,14 @@ public class OrderFeedbackVo extends BaseEntity
return orderId;
}
public void setDeviceCode(String deviceCode)
public void setDeviceId(Integer deviceId)
{
this.deviceCode = deviceCode;
this.deviceId = deviceId;
}
public String getDeviceCode()
public Integer getDeviceId()
{
return deviceCode;
return deviceId;
}
public String getDeviceName() {
......@@ -176,7 +175,7 @@ public class OrderFeedbackVo extends BaseEntity
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("feedbackId", getFeedbackId())
.append("orderId", getOrderId())
.append("deviceId", getDeviceCode())
.append("deviceId", getDeviceId())
.append("contents", getContents())
.append("feedbackTime", getFeedbackTime())
.append("isHiddenDanger", getIsHiddenDanger())
......
gassafety-system/src/main/java/com/zehong/system/domain/vo/WorkOrderVo.java
View file @ 02c94e41
......@@ -33,8 +33,8 @@ public class WorkOrderVo extends BaseEntity
/** 工单名称 */
private String orderName;
/** 设备编号 */
private String deviceCodes;
/** 设备id */
private Integer deviceId;
/** 设备名称 */
private String deviceName;
......@@ -132,12 +132,12 @@ public class WorkOrderVo extends BaseEntity
return orderName;
}
public String getDeviceCodes() {
return deviceCodes;
public Integer getDeviceId() {
return deviceId;
}
public void setDeviceCodes(String deviceCodes) {
this.deviceCodes = deviceCodes;
public void setDeviceId(Integer deviceId) {
this.deviceId = deviceId;
}
public String getDeviceName() {
......@@ -311,7 +311,6 @@ public class WorkOrderVo extends BaseEntity
.append("orderType", getOrderType())
.append("resourceId", getResourceId())
.append("orderName", getOrderName())
.append("deviceCodes", getDeviceCodes())
.append("deviceNum", getDeviceNum())
.append("finishNum", getFinishNum())
.append("deviceType", getDeviceType())
......
gassafety-system/src/main/java/com/zehong/system/mapper/TInspectionDataMapper.java
View file @ 02c94e41
......@@ -22,10 +22,10 @@ public interface TInspectionDataMapper
/**
* 查询巡检记录
*
* @param deviceCode 设备编号
* @param deviceId 设备id
* @return 巡检记录
*/
public TInspectionData selectTInspectionDataByCode(String deviceCode);
public TInspectionData selectTInspectionDataByDeviceId(int deviceId);
/**
* 查询巡检记录
......
gassafety-system/src/main/java/com/zehong/system/mapper/TInspectionPlanMapper.java
View file @ 02c94e41
......@@ -2,6 +2,7 @@ package com.zehong.system.mapper;
import java.util.List;
import com.zehong.system.domain.TInspectionPlan;
import com.zehong.system.domain.form.InspectionPlanForm;
/**
* 巡检计划Mapper接口
......@@ -22,10 +23,10 @@ public interface TInspectionPlanMapper
/**
* 查询巡检计划列表
*
* @param tInspectionPlan 巡检计划
* @param inspectionPlanForm 巡检计划
* @return 巡检计划集合
*/
public List<TInspectionPlan> selectTInspectionPlanList(TInspectionPlan tInspectionPlan);
public List<TInspectionPlan> selectTInspectionPlanList(InspectionPlanForm inspectionPlanForm);
/**
* 新增巡检计划
......
gassafety-system/src/main/java/com/zehong/system/service/ITInspectionPlanService.java
View file @ 02c94e41
......@@ -2,6 +2,7 @@ package com.zehong.system.service;
import java.util.List;
import com.zehong.system.domain.TInspectionPlan;
import com.zehong.system.domain.form.InspectionPlanForm;
/**
* 巡检计划Service接口
......@@ -22,10 +23,10 @@ public interface ITInspectionPlanService
/**
* 查询巡检计划列表
*
* @param tInspectionPlan 巡检计划
* @param inspectionPlanForm 巡检计划
* @return 巡检计划集合
*/
public List<TInspectionPlan> selectTInspectionPlanList(TInspectionPlan tInspectionPlan);
public List<TInspectionPlan> selectTInspectionPlanList(InspectionPlanForm inspectionPlanForm);
/**
* 新增巡检计划
......
gassafety-system/src/main/java/com/zehong/system/service/impl/TInspectionPlanServiceImpl.java
View file @ 02c94e41
......@@ -2,6 +2,7 @@ package com.zehong.system.service.impl;
import java.util.List;
import com.zehong.common.utils.DateUtils;
import com.zehong.system.domain.form.InspectionPlanForm;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zehong.system.mapper.TInspectionPlanMapper;
......@@ -35,13 +36,13 @@ public class TInspectionPlanServiceImpl implements ITInspectionPlanService
/**
* 查询巡检计划列表
*
* @param tInspectionPlan 巡检计划
* @param inspectionPlanForm 巡检计划
* @return 巡检计划
*/
@Override
public List<TInspectionPlan> selectTInspectionPlanList(TInspectionPlan tInspectionPlan)
public List<TInspectionPlan> selectTInspectionPlanList(InspectionPlanForm inspectionPlanForm)
{
return tInspectionPlanMapper.selectTInspectionPlanList(tInspectionPlan);
return tInspectionPlanMapper.selectTInspectionPlanList(inspectionPlanForm);
}
/**
......
gassafety-system/src/main/java/com/zehong/system/service/impl/TOrderFeedbackServiceImpl.java
View file @ 02c94e41
......@@ -25,6 +25,8 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
@Autowired
private TInspectionDataMapper tInspectionDataMapper;
@Autowired
private TInspectionPlanMapper tInspectionPlanMapper;
@Autowired
private THiddenTroubleMapper tHiddenTroubleMapper;
@Autowired
private TDeviceAlarmMapper tDeviceAlarmMapper;
......@@ -71,7 +73,7 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
}
tOrderFeedback.setFeedbackTime(DateUtils.getNowDate());
String deviceCode = tOrderFeedback.getDeviceCode();
Integer deviceId = tOrderFeedback.getDeviceId();
String dealStatus = tOrderFeedback.getDealStatus();
String isHiddenDanger = tOrderFeedback.getIsHiddenDanger();
......@@ -80,18 +82,18 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
String orderType = order.getOrderType();
if("1".equals(orderType)){
TInspectionData data = tInspectionDataMapper.selectTInspectionDataByCode(deviceCode);
TInspectionData data = tInspectionDataMapper.selectTInspectionDataByDeviceId(deviceId);
data.setDealStatus(dealStatus);
data.setIsHiddenDanger(isHiddenDanger);
data.setUpdateTime(DateUtils.getNowDate());
tInspectionDataMapper.updateTInspectionData(data);
if("0".equals(data.getDeviceType())){
TPipe pipe = tPipeMapper.selectTPipeByCode(deviceCode);
TPipe pipe = tPipeMapper.selectTPipeById(deviceId);
pipe.setInspectionTime(DateUtils.getNowDate());
tPipeMapper.updateTPipe(pipe);
} else {
TDeviceInfo device = tDeviceInfoMapper.selectTDeviceInfoByCode(deviceCode);
TDeviceInfo device = tDeviceInfoMapper.selectTDeviceInfoById(deviceId);
device.setInspectionTime(DateUtils.getNowDate());
tDeviceInfoMapper.updateTDeviceInfo(device);
}
......
gassafety-system/src/main/java/com/zehong/system/service/impl/TWorkOrderServiceImpl.java
View file @ 02c94e41
......@@ -76,9 +76,6 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
if("1".equals(orderType)){
TInspectionPlan plan = tInspectionPlanMapper.selectTInspectionPlanById(resourceId);
workOrderVo.setDeviceCodes(plan.getDeviceCodes());
TInspectionData data = new TInspectionData();
data.setPlanId(resourceId);
......@@ -87,7 +84,7 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
TDeviceInfo deviceInfo = null;
for(TInspectionData temp : totalList){
deviceInfo = tDeviceInfoMapper.selectTDeviceInfoByCode(temp.getDeviceCode());
deviceInfo = tDeviceInfoMapper.selectTDeviceInfoById(temp.getDeviceId());
if(deviceInfo != null){
deviceInfoList.add(deviceInfo);
}
......@@ -99,15 +96,16 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
} else if("2".equals(orderType)) {
THiddenTrouble trouble = tHiddenTroubleMapper.selectTHiddenTroubleById(resourceId);
workOrderVo.setDeviceCodes((trouble.getDeviceCode() != null ? trouble.getDeviceCode() : null).toString());
Integer deviceId = trouble.getDeviceId();
workOrderVo.setDeviceId(deviceId);
workOrderVo.setLongitude(trouble.getLongitude() != null ? trouble.getLongitude() : null);
workOrderVo.setLatitude(trouble.getLatitude() != null ? trouble.getLatitude() : null);
workOrderVo.setCoordinates(trouble.getCoordinates() != null ? trouble.getCoordinates() : null);
workOrderVo.setDeviceType(trouble.getDeviceType());
workOrderVo.setAddress(trouble.getAddress());
String deviceCode = trouble.getDeviceCode();
TDeviceInfo device = tDeviceInfoMapper.selectTDeviceInfoByCode(deviceCode);
TDeviceInfo device = tDeviceInfoMapper.selectTDeviceInfoById(deviceId);
if(device != null){
workOrderVo.setDeviceName(device.getDeviceName());
deviceInfoList.add(device);
......@@ -116,17 +114,17 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
} else if("3".equals(orderType)) {
TDeviceAlarm alarm = tDeviceAlarmMapper.selectTDeviceAlarmById(resourceId);
String deviceCode = alarm.getDeviceCode();
workOrderVo.setDeviceCodes(String.valueOf(deviceCode));
Integer deviceId = alarm.getDeviceId();
workOrderVo.setDeviceId(deviceId);
String isPipe = alarm.getIsPipe();
if("0".equals(isPipe)){
TPipe pipe = tPipeMapper.selectTPipeByCode(deviceCode);
String deviceType = alarm.getDeviceType();
if("0".equals(deviceType)){
TPipe pipe = tPipeMapper.selectTPipeById(deviceId);
workOrderVo.setCoordinates(pipe.getCoordinates());
workOrderVo.setDeviceType("0");
workOrderVo.setAddress(pipe.getPipeAddr());
} else {
TDeviceInfo device = tDeviceInfoMapper.selectTDeviceInfoByCode(deviceCode);
TDeviceInfo device = tDeviceInfoMapper.selectTDeviceInfoById(deviceId);
if(device != null){
workOrderVo.setLongitude(device.getLongitude());
workOrderVo.setLatitude(device.getLatitude());
......@@ -151,7 +149,7 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
BeanUtils.copyProperties(feedback, feedbackVo);
}
device = tDeviceInfoMapper.selectTDeviceInfoByCode(feedback.getDeviceCode());
device = tDeviceInfoMapper.selectTDeviceInfoById(feedback.getDeviceId());
if (device != null) {
feedbackVo.setDeviceName(device.getDeviceName());
feedbackVo.setDeviceType(device.getDeviceType());
......
gassafety-system/src/main/resources/mapper/system/TDeviceAlarmMapper.xml
View file @ 02c94e41
......@@ -6,8 +6,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="TDeviceAlarm" id="TDeviceAlarmResult">
<result property="alarmId" column="alarm_id" />
<result property="deviceCode" column="device_code" />
<result property="isPipe" column="is_pipe" />
<result property="deviceId" column="device_id" />
<result property="deviceType" column="device_type" />
<result property="orderId" column="order_id" />
<result property="alarmType" column="alarm_type" />
<result property="alarmValue" column="alarm_value" />
......@@ -20,14 +20,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTDeviceAlarmVo">
select alarm_id, device_code, is_pipe, 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, remarks from t_device_alarm
</sql>
<select id="selectTDeviceAlarmList" parameterType="TDeviceAlarm" resultMap="TDeviceAlarmResult">
<include refid="selectTDeviceAlarmVo"/>
<where>
<if test="deviceCode != null "> and device_code = #{deviceCode}</if>
<if test="isPipe != null "> and is_pipe = #{isPipe}</if>
<if test="deviceId != null "> and device_id = #{deviceId}</if>
<if test="deviceType != null "> and device_type = #{deviceType}</if>
<if test="orderId != null and orderId != ''"> and order_id = #{orderId}</if>
<if test="alarmType != null and alarmType != ''"> and alarm_type = #{alarmType}</if>
<if test="alarmValue != null and alarmValue != ''"> and alarm_value = #{alarmValue}</if>
......@@ -46,8 +46,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertTDeviceAlarm" parameterType="TDeviceAlarm" useGeneratedKeys="true" keyProperty="alarmId">
insert into t_device_alarm
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="deviceCode != null">device_code,</if>
<if test="isPipe != null">is_pipe,</if>
<if test="deviceId != null">device_id,</if>
<if test="deviceType != null">device_type,</if>
<if test="orderId != null">order_id,</if>
<if test="alarmType != null">alarm_type,</if>
<if test="alarmValue != null">alarm_value,</if>
......@@ -59,8 +59,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="remarks != null">remarks,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="deviceCode != null">#{deviceCode},</if>
<if test="isPipe != null">#{isPipe},</if>
<if test="deviceId != null">#{deviceId},</if>
<if test="deviceType != null">#{deviceType},</if>
<if test="orderId != null">#{orderId},</if>
<if test="alarmType != null">#{alarmType},</if>
<if test="alarmValue != null">#{alarmValue},</if>
......@@ -76,8 +76,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updateTDeviceAlarm" parameterType="TDeviceAlarm">
update t_device_alarm
<trim prefix="SET" suffixOverrides=",">
<if test="deviceCode != null">device_code = #{deviceCode},</if>
<if test="isPipe != null">is_pipe = #{isPipe},</if>
<if test="deviceId != null">device_id = #{deviceId},</if>
<if test="deviceType != null">device_type = #{deviceType},</if>
<if test="orderId != null">order_id = #{orderId},</if>
<if test="alarmType != null">alarm_type = #{alarmType},</if>
<if test="alarmValue != null">alarm_value = #{alarmValue},</if>
......
gassafety-system/src/main/resources/mapper/system/THiddenTroubleMapper.xml
View file @ 02c94e41
......@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="THiddenTrouble" id="THiddenTroubleResult">
<result property="troubleId" column="trouble_id" />
<result property="deviceCode" column="device_code" />
<result property="deviceId" column="device_id" />
<result property="deviceType" column="device_type" />
<result property="orderId" column="order_id" />
<result property="address" column="address" />
......@@ -20,13 +20,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTHiddenTroubleVo">
select trouble_id, device_code, device_type, order_id, address, longitude, latitude, coordinates, deal_status, update_time, create_time, remarks from t_hidden_trouble
select trouble_id, device_id, device_type, order_id, address, longitude, latitude, coordinates, deal_status, update_time, create_time, remarks from t_hidden_trouble
</sql>
<select id="selectTHiddenTroubleList" parameterType="THiddenTrouble" resultMap="THiddenTroubleResult">
<include refid="selectTHiddenTroubleVo"/>
<where>
<if test="deviceCode != null "> and device_code = #{deviceCode}</if>
<if test="deviceId != null "> and device_id = #{deviceId}</if>
<if test="deviceType != null "> and device_type = #{deviceType}</if>
<if test="orderId != null and orderId != ''"> and order_id = #{orderId}</if>
<if test="longitude != null "> and longitude = #{longitude}</if>
......@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertTHiddenTrouble" parameterType="THiddenTrouble" useGeneratedKeys="true" keyProperty="troubleId">
insert into t_hidden_trouble
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="deviceCode != null">device_code,</if>
<if test="deviceId != null">device_id,</if>
<if test="deviceType != null">device_type,</if>
<if test="orderId != null">order_id,</if>
<if test="address != null">address,</if>
......@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="remarks != null">remarks,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="deviceCode != null">#{deviceCode},</if>
<if test="deviceId != null">#{deviceId},</if>
<if test="deviceType != null">#{deviceType},</if>
<if test="orderId != null">#{orderId},</if>
<if test="address != null">#{address},</if>
......@@ -75,8 +75,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updateTHiddenTrouble" parameterType="THiddenTrouble">
update t_hidden_trouble
<trim prefix="SET" suffixOverrides=",">
<if test="deviceCode != null">device_code = #{deviceCode},</if>
<if test="deviceType != null">device_code = #{deviceType},</if>
<if test="deviceId != null">device_id = #{deviceId},</if>
<if test="deviceType != null">device_id = #{deviceType},</if>
<if test="orderId != null">order_id = #{orderId},</if>
<if test="address != null">address = #{address},</if>
<if test="longitude != null">longitude = #{longitude},</if>
......
gassafety-system/src/main/resources/mapper/system/TInspectionDataMapper.xml
View file @ 02c94e41
......@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="TInspectionData" id="TInspectionDataResult">
<result property="dataId" column="data_id" />
<result property="planId" column="plan_id" />
<result property="deviceCode" column="device_code" />
<result property="deviceId" column="device_id" />
<result property="deviceType" column="device_type" />
<result property="isHiddenDanger" column="is_hidden_danger" />
<result property="dealStatus" column="deal_status" />
......@@ -17,14 +17,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTInspectionDataVo">
select data_id, plan_id, device_code, device_type, is_hidden_danger, deal_status, update_time, create_time, remarks from t_inspection_data
select data_id, plan_id, device_id, device_type, is_hidden_danger, deal_status, update_time, create_time, remarks from t_inspection_data
</sql>
<select id="selectTInspectionDataList" parameterType="TInspectionData" resultMap="TInspectionDataResult">
<include refid="selectTInspectionDataVo"/>
<where>
<if test="planId != null "> and plan_id = #{planId}</if>
<if test="deviceCode != null "> and device_code = #{deviceCode}</if>
<if test="deviceId != null "> and device_id = #{deviceId}</if>
<if test="deviceType != null "> and device_type = #{deviceType}</if>
<if test="dealStatus != null and dealStatus != ''"> and deal_status = #{dealStatus}</if>
<if test="isHiddenDanger != null and isHiddenDanger != ''"> and is_hidden_danger = #{isHiddenDanger}</if>
......@@ -43,9 +43,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where data_id = #{dataId}
</select>
<select id="selectTInspectionDataByCode" parameterType="String" resultMap="TInspectionDataResult">
<select id="selectTInspectionDataByDeviceId" parameterType="int" resultMap="TInspectionDataResult">
<include refid="selectTInspectionDataVo"/>
where device_code = #{deviceCode}
where device_id = #{deviceId}
</select>
<insert id="insertTInspectionData" parameterType="TInspectionData">
......@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="dataId != null">data_id,</if>
<if test="planId != null">plan_id,</if>
<if test="deviceCode != null">device_code,</if>
<if test="deviceId != null">device_id,</if>
<if test="deviceType != null">device_type,</if>
<if test="isHiddenDanger != null">is_hidden_danger,</if>
<if test="dealStatus != null">deal_status,</if>
......@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="dataId != null">#{dataId},</if>
<if test="planId != null">#{planId},</if>
<if test="deviceCode != null">#{deviceCode},</if>
<if test="deviceId != null">#{deviceId},</if>
<if test="deviceType != null">#{deviceType},</if>
<if test="isHiddenDanger != null">#{isHiddenDanger},</if>
<if test="dealStatus != null">#{dealStatus},</if>
......@@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update t_inspection_data
<trim prefix="SET" suffixOverrides=",">
<if test="planId != null">plan_id = #{planId},</if>
<if test="deviceCode != null">device_code = #{deviceCode},</if>
<if test="deviceId != null">device_id = #{deviceId},</if>
<if test="deviceType != null">device_type = #{deviceType},</if>
<if test="isHiddenDanger != null">is_hidden_danger = #{isHiddenDanger},</if>
<if test="dealStatus != null">deal_status = #{dealStatus},</if>
......
gassafety-system/src/main/resources/mapper/system/TInspectionPlanMapper.xml
View file @ 02c94e41
......@@ -7,29 +7,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="TInspectionPlan" id="TInspectionPlanResult">
<result property="planId" column="plan_id" />
<result property="planName" column="plan_name" />
<result property="deviceCodes" column="device_codes" />
<result property="orderId" column="order_id" />
<result property="startTime" column="start_time" />
<result property="endTime" column="end_time" />
<result property="address" column="address" />
<result property="planStatus" column="plan_status" />
<result property="isDel" column="is_del" />
<result property="updateTime" column="update_time" />
<result property="createTime" column="create_time" />
<result property="remarks" column="remarks" />
</resultMap>
<sql id="selectTInspectionPlanVo">
select plan_id, plan_name, device_codes, order_id, start_time, end_time, plan_status, update_time, create_time, remarks from t_inspection_plan
select plan_id, plan_name, order_id, start_time, end_time, address, plan_status, is_del, update_time, create_time, remarks from t_inspection_plan
</sql>
<select id="selectTInspectionPlanList" parameterType="TInspectionPlan" resultMap="TInspectionPlanResult">
<select id="selectTInspectionPlanList" parameterType="InspectionPlanForm" resultMap="TInspectionPlanResult">
<include refid="selectTInspectionPlanVo"/>
<where>
and is_del = '0'
<if test="planName != null and planName != ''"> and plan_name like concat('%', #{planName}, '%')</if>
<if test="orderId != null and orderId != ''"> and order_id = #{orderId}</if>
<if test="startTime != null "> and start_time = #{startTime}</if>
<if test="endTime != null "> and end_time = #{endTime}</if>
<if test="orderId != null and orderId != ''"> and order_id like concat('%', #{orderId}, '%')</if>
<if test="startTime1 != null "> and start_time &gt;= #{startTime1}</if>
<if test="endTime1 != null "> and start_time &lt;= #{endTime1}</if>
<if test="startTime2 != null "> and end_time &gt;= #{startTime2}</if>
<if test="endTime2 != null "> and end_time &lt;= #{endTime2}</if>
<if test="planStatus != null and planStatus != ''"> and plan_status = #{planStatus}</if>
<if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if>
<if test="remarks != null "> and remarks &lt;= #{remarks}</if>
</where>
</select>
......@@ -42,22 +46,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into t_inspection_plan
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="planName != null">plan_name,</if>
<if test="deviceCodes != null">device_codes,</if>
<if test="orderId != null">order_id,</if>
<if test="startTime != null">start_time,</if>
<if test="endTime != null">end_time,</if>
<if test="address != null">address,</if>
<if test="planStatus != null">plan_status,</if>
<if test="isDel != null">is_del,</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="planName != null">#{planName},</if>
<if test="deviceCodes != null">#{deviceCodes},</if>
<if test="orderId != null">#{orderId},</if>
<if test="startTime != null">#{startTime},</if>
<if test="endTime != null">#{endTime},</if>
<if test="address != null">#{address},</if>
<if test="planStatus != null">#{planStatus},</if>
<if test="isDel != null">#{isDel},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="createTime != null">#{createTime},</if>
<if test="remarks != null">#{remarks},</if>
......@@ -68,11 +74,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update t_inspection_plan
<trim prefix="SET" suffixOverrides=",">
<if test="planName != null">plan_name = #{planName},</if>
<if test="deviceCodes != null">device_codes = #{deviceCodes},</if>
<if test="orderId != null">order_id = #{orderId},</if>
<if test="startTime != null">start_time = #{startTime},</if>
<if test="endTime != null">end_time = #{endTime},</if>
<if test="address != null">address = #{address},</if>
<if test="planStatus != null">plan_status = #{planStatus},</if>
<if test="isDel != null">is_del = #{isDel},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="remarks != null">remarks = #{remarks},</if>
......
gassafety-system/src/main/resources/mapper/system/TOrderFeedbackMapper.xml
View file @ 02c94e41
......@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="TOrderFeedback" id="TOrderFeedbackResult">
<result property="feedbackId" column="feedback_id" />
<result property="orderId" column="order_id" />
<result property="deviceCode" column="device_code" />
<result property="deviceId" column="device_id" />
<result property="contents" column="contents" />
<result property="feedbackTime" column="feedback_time" />
<result property="isHiddenDanger" column="is_hidden_danger" />
......@@ -18,14 +18,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTOrderFeedbackVo">
select feedback_id, order_id, device_code, contents, feedback_time, is_hidden_danger, deal_status, picture_url_1, picture_url_2, picture_url_3 from t_order_feedback
select feedback_id, order_id, device_id, contents, feedback_time, is_hidden_danger, deal_status, picture_url_1, picture_url_2, picture_url_3 from t_order_feedback
</sql>
<select id="selectTOrderFeedbackList" parameterType="TOrderFeedback" resultMap="TOrderFeedbackResult">
<include refid="selectTOrderFeedbackVo"/>
<where>
<if test="orderId != null and orderId != ''"> and order_id = #{orderId}</if>
<if test="deviceCode != null "> and device_code = #{deviceCode}</if>
<if test="deviceId != null "> and device_id = #{deviceId}</if>
<if test="contents != null and contents != ''"> and contents = #{contents}</if>
<if test="feedbackTime != null "> and feedback_time = #{feedbackTime}</if>
<if test="isHiddenDanger != null and isHiddenDanger != ''"> and is_hidden_danger = #{isHiddenDanger}</if>
......@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into t_order_feedback
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="orderId != null">order_id,</if>
<if test="deviceCode != null">device_code,</if>
<if test="deviceId != null">device_id,</if>
<if test="contents != null">contents,</if>
<if test="feedbackTime != null">feedback_time,</if>
<if test="isHiddenDanger != null">is_hidden_danger,</if>
......@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="orderId != null">#{orderId},</if>
<if test="deviceCode != null">#{deviceCode},</if>
<if test="deviceId != null">#{deviceId},</if>
<if test="contents != null">#{contents},</if>
<if test="feedbackTime != null">#{feedbackTime},</if>
<if test="isHiddenDanger != null">#{isHiddenDanger},</if>
......@@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update t_order_feedback
<trim prefix="SET" suffixOverrides=",">
<if test="orderId != null">order_id = #{orderId},</if>
<if test="deviceCode != null">device_code = #{deviceCode},</if>
<if test="deviceId != null">device_id = #{deviceId},</if>
<if test="contents != null">contents = #{contents},</if>
<if test="feedbackTime != null">feedback_time = #{feedbackTime},</if>
<if test="isHiddenDanger != null">is_hidden_danger = #{isHiddenDanger},</if>
......
gassafety-web/src/views/deviceInspection/inspectionPlan/index.vue
View file @ 02c94e41
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="巡检计划名称" prop="planName">
<el-input
v-model="queryParams.planName"
......@@ -10,45 +10,50 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="工单id" prop="orderId">
<el-input
v-model="queryParams.orderId"
placeholder="请输入工单id"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<!--<el-form-item label="计划起始时间" prop="startTime1">
<el-date-picker clearable size="small"
v-model="queryParams.startTime"
v-model="queryParams.startTime1"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择开始时间">
</el-date-picker>
<font color="#C0C4CC"> 至</font>
</el-form-item>
<el-form-item label="结束时间" prop="endTime">
<el-form-item label="" prop="endTime1">
<el-date-picker clearable size="small"
v-model="queryParams.endTime"
v-model="queryParams.endTime1"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="计划截止时间" prop="startTime1">
<el-date-picker clearable size="small"
v-model="queryParams.startTime2"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择开始时间">
</el-date-picker>
<font color="#C0C4CC"> 至</font>
</el-form-item>
<el-form-item label="" prop="endTime1">
<el-date-picker clearable size="small"
v-model="queryParams.endTime2"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择结束时间">
</el-date-picker>
</el-form-item>-->
<el-form-item label="状态" prop="planStatus">
<el-select v-model="queryParams.planStatus" placeholder="请选择状态" clearable size="small">
<el-option label="请选择字典生成" value="" />
<el-option
v-for="dict in typeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="计划描述" prop="remarks">
<el-input
v-model="queryParams.remarks"
placeholder="请输入计划描述"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
......@@ -66,75 +71,56 @@
v-hasPermi="['deviceInspection:inspectionPlan:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['deviceInspection:inspectionPlan:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['deviceInspection:inspectionPlan:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
:loading="exportLoading"
@click="handleExport"
v-hasPermi="['deviceInspection:inspectionPlan:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="inspectionPlanList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="巡检计划id" align="center" prop="planId" />
<el-table-column label="序号" type="index" align="center" prop="planName" />
<el-table-column label="巡检计划名称" align="center" prop="planName" />
<el-table-column label="工单id" align="center" prop="orderId" />
<el-table-column label="开始时间" align="center" prop="startTime" width="180">
<el-table-column label="计划时间" align="center" prop="startTime" width="280">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.startTime, '{y}/{m}/{d}') }}</span> -
<span>{{ parseTime(scope.row.endTime, '{y}/{m}/{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="结束时间" align="center" prop="endTime" width="180">
<el-table-column label="地址" align="center" prop="address" />
<el-table-column label="计划描述" align="center" prop="remarks" />
<el-table-column label="状态" align="center" prop="planStatus" >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
<span v-if="scope.row.planStatus == 0">未下发</span>
<span v-if="scope.row.planStatus == 1">已下发</span>
<span v-if="scope.row.planStatus == 2">进行中</span>
<span v-if="scope.row.planStatus == 3">已完成</span>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="planStatus" />
<el-table-column label="计划描述" align="center" prop="remarks" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<font v-if="scope.row.planStatus != 0">-</font>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['deviceInspection:inspectionPlan:edit']"
v-if="scope.row.planStatus == 0"
>下发</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['deviceInspection:inspectionPlan:edit']"
v-if="scope.row.planStatus == 0"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['deviceInspection:inspectionPlan:remove']"
>删除</el-button>
@click="handleIsDel(scope.row)"
v-hasPermi="['deviceInspection:inspectionPlan:edit']"
v-if="scope.row.planStatus == 0"
>作废</el-button>
</template>
</el-table-column>
</el-table>
......@@ -153,9 +139,6 @@
<el-form-item label="巡检计划名称" prop="planName">
<el-input v-model="form.planName" placeholder="请输入巡检计划名称" />
</el-form-item>
<el-form-item label="工单id" prop="orderId">
<el-input v-model="form.orderId" placeholder="请输入工单id" />
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-date-picker clearable size="small"
v-model="form.startTime"
......@@ -172,13 +155,11 @@
placeholder="选择结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="状态">
<el-radio-group v-model="form.planStatus">
<el-radio label="1">请选择字典生成</el-radio>
</el-radio-group>
<el-form-item label="地址" prop="address">
<el-input v-model="form.address" placeholder="请输入地址" />
</el-form-item>
<el-form-item label="计划描述" prop="remarks">
<el-input v-model="form.remarks" placeholder="请输入计划描述" />
<el-input type="textarea" v-model="form.remarks" placeholder="请输入计划描述" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -214,6 +195,8 @@ export default {
total: 0,
// 巡检计划表格数据
inspectionPlanList: [],
// 计划状态字典
typeOptions: [],
// 弹出层标题
title: "",
// 是否显示弹出层
......@@ -238,6 +221,9 @@ export default {
},
created() {
this.getList();
this.getDicts("t_plan_status").then(response => {
this.typeOptions = response.data;
});
},
methods: {
/** 查询巡检计划列表 */
......@@ -321,10 +307,10 @@ export default {
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const planIds = row.planId || this.ids;
this.$confirm('是否确认删除巡检计划编号为"' + planIds + '"的数据项?', "警告", {
/** 作废按钮操作 */
handleIsDel(row) {
const planName = row.planName;
this.$confirm('是否确认作废巡检计划名称为"' + planName + '"的数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
......@@ -335,21 +321,6 @@ export default {
this.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有巡检计划数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.exportLoading = true;
return exportInspectionPlan(queryParams);
}).then(response => {
this.download(response.msg);
this.exportLoading = false;
}).catch(() => {});
}
}
};
</script>
gassafety-web/src/views/workOrder/basicsInfo/detail.vue
View file @ 02c94e41
......@@ -3,7 +3,7 @@
<!-- 工单信息 -->
<div style="padding-top: 10px;background: #fff;height: 100%;">
<div>
<div style="width: 5%;height: 50px;margin-left: 20px;" @click="$router.go(-1)">
<div style="width: 5%;height: 45px;margin-left: 20px;" @click="$router.go(-1)">
<el-button
size="medium"
type="text"
......@@ -20,9 +20,9 @@
</el-steps>
</div>
<div style="width: 100%;height: 280px;">
<div style="width: 100%;height: 265px;">
<el-divider></el-divider>
<div style="color: #31EAEA;width: 30%;height: 40px;">
<div style="color: #31EAEA;width: 30%;height: 30px;">
<ul><li>详细信息</li></ul>
</div>
<el-form ref="form" v-model="form" :rules="rules" label-width="100px" style="float: left;margin-left: 50px;">
......@@ -101,16 +101,16 @@
</el-form-item>
</el-form>
</div>
<el-divider></el-divider>
<!-- 反馈信息 -->
<!-- <div style="width: 100%;font-weight: 600;height: 200px;" v-if="form.dealStatus != '' && form.dealStatus != null"> -->
<!-- <div style="width: 100%;font-weight: 600;" v-if="activity.deviceType != '' && activity.deviceType != null"> -->
<div style="width: 100%;font-weight: 600;">
<el-divider></el-divider>
<div style="color: #31EAEA;width: 100%;height: 40px;">
<ul><li>反馈信息</li></ul>
</div>
<div class="block" style="width: 95%;margin-left: 2%;">
<el-timeline>
<el-timeline-item v-for="(activity, index) in form.feedbackList" :key="index" :timestamp="activity.feedbackTime">
<el-timeline ref="timeline">
<el-timeline-item v-for="(activity, index) in form.feedbackList" v-show='index>2?false:true' :key="index" :timestamp="activity.feedbackTime">
<el-card>
<div style="width: 600px;float: left;">
<div style=" width: 600px;">
......@@ -122,11 +122,16 @@
<span v-if="activity.deviceType == 3">流量计</span>
<span v-if="activity.deviceType == 4">压力表</span>
</p>
<p>设备名称：{{activity.deviceName}}</p>
<p>是否有隐患：
<span v-if="activity.isHiddenDanger == 1">是</span>
<span v-if="activity.isHiddenDanger == 2">否</span>
</p>
<p v-if="activity.isHiddenDanger == 1">处理状态：
<span v-if="activity.dealStatus == 1">不需要处理</span>
<span v-if="activity.dealStatus == 2">已处理完成</span>
<span v-if="activity.dealStatus == 3">未处理完成</span>
</p>
<div style="width: 600px;">
<p>反馈信息：
<span>{{activity.contents}}</span>
......@@ -134,14 +139,9 @@
</div>
</div>
<div style="float: left;margin-left: 50px; width: 250px;">
<p v-if="activity.dealStatus == 3">是否解决：未解决</p>
<p v-if="activity.dealStatus != 3">是否解决：已解决</p>
<p>设备名称：{{activity.deviceName}}</p>
<p>反馈时间：{{activity.feedbackTime}}</p>
<p v-if="activity.isHiddenDanger == 1">处理状态：
<span v-if="activity.dealStatus == 1">不需要处理</span>
<span v-if="activity.dealStatus == 2">已处理完成</span>
<span v-if="activity.dealStatus == 3">未处理完成</span>
</p>
</div>
</div>
</div>
......@@ -150,7 +150,7 @@
<el-image :src="activity.pictureUrl1" :preview-src-list="[activity.pictureUrl1]" v-if="activity.pictureUrl1 != null && activity.pictureUrl1 != ''" style="width: 90px;"></el-image>
</div>
<div class="feedbackTime">
<el-image :src="activity.pictureUrl2" :preview-src-list="[activity.pictureUrl2]" v-if="activity.pictureUrl2 != null && activity.pictureUrl2 != ''" style="width: 9s0px;"></el-image>
<el-image :src="activity.pictureUrl2" :preview-src-list="[activity.pictureUrl2]" v-if="activity.pictureUrl2 != null && activity.pictureUrl2 != ''" style="width: 90px;"></el-image>
</div>
<div class="feedbackTime">
<el-image :src="activity.pictureUrl3" :preview-src-list="[activity.pictureUrl3]" v-if="activity.pictureUrl3 != null && activity.pictureUrl3 != ''" style="width: 90px;"></el-image>
......@@ -160,6 +160,10 @@
</el-timeline-item>
</el-timeline>
</div>
<el-button type="danger" icon="el-icon-info" @click="changeDisplay(scope)">
<span v-if="isDisplay==false">点击展开</span>
<span v-else>点击隐藏</span>
</el-button>
</div>
<!-- 返回按钮 -->
......@@ -182,6 +186,7 @@ export default {
},
data() {
return {
isDisplay:false,
dialogImageUrl: '',
dialogVisible: false,
disabled: false,
......@@ -238,13 +243,46 @@ export default {
},
// 表单参数
form: {},
activity: {},
// 表单校验
rules: {
},
active : 0,
orderId : ""
orderId : "",
showAndHide : false
};
},
// mocData() {
// for (var i = 0; i < activity.length; i++) {
// let item = {title: lists[i], name: activity[i]}
// this.detailList.push(activity)
// }
// console.log(this.detailList)
// },
// computed: {
// feedbackList: {
// get: function () {
// if (this.brandFold) {
// if (this.detailList.length < 7) {
// return this.detailList
// }
// let newArr = []
// for (var i = 0; i < 6; i++) {
// let item = this.detailList[i]
// newArr.push(activity)
// }
// return newArr
// }
// return this.detailList
// },
// set: function (val) {
// this.form.feedbackList = val
// }
// }
// },
// changeFoldState() {
// this.brandFold = !this.brandFold
// },
created() {
// 如果是跳转来的，则接受初始化参数
// this.user_id = this.$route.query.id; //详细信息页接收参数
......@@ -264,6 +302,31 @@ export default {
this.getBasicsInfo();
},
methods: {
// 点击按钮显示隐藏
changeDisplay(e){
this.isDisplay = !this.isDisplay
let $timeline = this.$refs.timeline;
if(!this.showAndHide){
for(let i = 0; i< $timeline.$children.length; i++){
if(i>3){
$timeline.$children[i].$el.style.display = "block";
}
}
this.showAndHide = true;
}else{
for(let i = 0; i< $timeline.$children.length; i++){
if(i>3){
$timeline.$children[i].$el.style.display = "none";
}
}
this.showAndHide = false;
}
//$timeline.toggleRowExpansion(row,true)
},
handleRemove(file) {
console.log(file);
},
......@@ -421,6 +484,15 @@ export default {
}
</script>
<style>
.el-tree-node__content{
width: 150px;
}
.el-divider--horizontal {
display: block;
height: 1px;
width: 100%;
margin: 20px 0;
}
.feedbackTime-div{
float: left;margin-left: 150px;margin-top: 10px;
}
......
gassafety-web/src/views/workOrder/feedback/index.vue
View file @ 02c94e41
......@@ -136,12 +136,12 @@
<font>{{form.orderId}}</font>
</el-form-item>
<el-form-item label="设备列表" prop="deviceCode" v-if="form.orderType == '1'">
<el-select v-model="form.deviceCode" placeholder="请选择设备" clearable size="small" filterable >
<el-select v-model="form.deviceId" placeholder="请选择设备" clearable size="small" filterable >
<el-option
v-for="device in form.deviceInfoList"
:key="device.deviceCode"
:key="device.deviceId"
:label="device.deviceName"
:value="device.deviceCode"
:value="device.deviceId"
></el-option>
</el-select>
</el-form-item>
......
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