Skip to content

G
gassafety
Commit c4ee8561 authored by yaqizhang's avatar yaqizhang
Browse files
Options

Merge branch 'master' of http://111.61.77.35:9999/gengdidi/gassafety into master

parents 1a3961a6 afd434b8
Hide whitespace changes
Inline Side-by-side
Showing with 553 additions and 265 deletions
gassafety-admin/src/main/java/com/zehong/web/controller/dataMonitoring/TDeviceAlarmController.java
View file @ c4ee8561
......@@ -63,7 +63,7 @@ public class TDeviceAlarmController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('dataMonitoring:deviceAlarm:query')")
@GetMapping(value = "/{alarmId}")
public AjaxResult getInfo(@PathVariable("alarmId") Long alarmId)
public AjaxResult getInfo(@PathVariable("alarmId") int alarmId)
{
return AjaxResult.success(tDeviceAlarmService.selectTDeviceAlarmById(alarmId));
}
......@@ -96,7 +96,7 @@ public class TDeviceAlarmController extends BaseController
@PreAuthorize("@ss.hasPermi('dataMonitoring:deviceAlarm:remove')")
@Log(title = "报警信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{alarmIds}")
public AjaxResult remove(@PathVariable Long[] alarmIds)
public AjaxResult remove(@PathVariable int[] alarmIds)
{
return toAjax(tDeviceAlarmService.deleteTDeviceAlarmByIds(alarmIds));
}
......
gassafety-admin/src/main/java/com/zehong/web/controller/device/TDeviceInfoController.java
View file @ c4ee8561
......@@ -68,7 +68,7 @@ public class TDeviceInfoController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('device:deviceInfo:query')")
@GetMapping(value = "/{deviceId}")
public AjaxResult getInfo(@PathVariable("deviceId") Long deviceId)
public AjaxResult getInfo(@PathVariable("deviceId") int deviceId)
{
return AjaxResult.success(tDeviceInfoService.selectTDeviceInfoById(deviceId));
}
......@@ -105,7 +105,7 @@ public class TDeviceInfoController extends BaseController
@PreAuthorize("@ss.hasPermi('device:deviceInfo:remove')")
@Log(title = "设备信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{deviceIds}")
public AjaxResult remove(@PathVariable Long[] deviceIds)
public AjaxResult remove(@PathVariable int[] deviceIds)
{
return toAjax(tDeviceInfoService.deleteTDeviceInfoByIds(deviceIds));
}
......
gassafety-admin/src/main/java/com/zehong/web/controller/device/TPipeController.java
View file @ c4ee8561
......@@ -57,7 +57,7 @@ public class TPipeController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('device:pipe:query')")
@GetMapping(value = "/{pipeId}")
public AjaxResult getInfo(@PathVariable("pipeId") Long pipeId)
public AjaxResult getInfo(@PathVariable("pipeId") int pipeId)
{
return AjaxResult.success(tPipeService.selectTPipeById(pipeId));
}
......@@ -90,7 +90,7 @@ public class TPipeController extends BaseController
@PreAuthorize("@ss.hasPermi('device:pipe:remove')")
@Log(title = "管道信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{pipeIds}")
public AjaxResult remove(@PathVariable Long[] pipeIds)
public AjaxResult remove(@PathVariable int[] pipeIds)
{
return toAjax(tPipeService.deleteTPipeByIds(pipeIds));
}
......
gassafety-admin/src/main/java/com/zehong/web/controller/deviceInspection/TInspectionDataController.java
View file @ c4ee8561
......@@ -63,7 +63,7 @@ public class TInspectionDataController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('deviceInspection:inspectionData:query')")
@GetMapping(value = "/{dataId}")
public AjaxResult getInfo(@PathVariable("dataId") Long dataId)
public AjaxResult getInfo(@PathVariable("dataId") int dataId)
{
return AjaxResult.success(tInspectionDataService.selectTInspectionDataById(dataId));
}
......@@ -96,7 +96,7 @@ public class TInspectionDataController extends BaseController
@PreAuthorize("@ss.hasPermi('deviceInspection:inspectionData:remove')")
@Log(title = "巡检记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{dataIds}")
public AjaxResult remove(@PathVariable Long[] dataIds)
public AjaxResult remove(@PathVariable int[] dataIds)
{
return toAjax(tInspectionDataService.deleteTInspectionDataByIds(dataIds));
}
......
gassafety-admin/src/main/java/com/zehong/web/controller/deviceInspection/TInspectionPlanController.java
View file @ c4ee8561
......@@ -63,7 +63,7 @@ public class TInspectionPlanController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('deviceInspection:inspectionPlan:query')")
@GetMapping(value = "/{planId}")
public AjaxResult getInfo(@PathVariable("planId") Long planId)
public AjaxResult getInfo(@PathVariable("planId") int planId)
{
return AjaxResult.success(tInspectionPlanService.selectTInspectionPlanById(planId));
}
......@@ -96,7 +96,7 @@ public class TInspectionPlanController extends BaseController
@PreAuthorize("@ss.hasPermi('deviceInspection:inspectionPlan:remove')")
@Log(title = "巡检计划", businessType = BusinessType.DELETE)
@DeleteMapping("/{planIds}")
public AjaxResult remove(@PathVariable Long[] planIds)
public AjaxResult remove(@PathVariable int[] planIds)
{
return toAjax(tInspectionPlanService.deleteTInspectionPlanByIds(planIds));
}
......
gassafety-admin/src/main/java/com/zehong/web/controller/enterprise/TEnterpriseInfoController.java
View file @ c4ee8561
......@@ -63,7 +63,7 @@ public class TEnterpriseInfoController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('enterprise:info:query')")
@GetMapping(value = "/{infoId}")
public AjaxResult getInfo(@PathVariable("infoId") Long infoId)
public AjaxResult getInfo(@PathVariable("infoId") int infoId)
{
return AjaxResult.success(tEnterpriseInfoService.selectTEnterpriseInfoById(infoId));
}
......@@ -96,7 +96,7 @@ public class TEnterpriseInfoController extends BaseController
@PreAuthorize("@ss.hasPermi('enterprise:info:remove')")
@Log(title = "企业基本信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{infoIds}")
public AjaxResult remove(@PathVariable Long[] infoIds)
public AjaxResult remove(@PathVariable int[] infoIds)
{
return toAjax(tEnterpriseInfoService.deleteTEnterpriseInfoByIds(infoIds));
}
......
gassafety-admin/src/main/java/com/zehong/web/controller/riskManagement/THiddenTroubleController.java
View file @ c4ee8561
......@@ -63,7 +63,7 @@ public class THiddenTroubleController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('riskManagement:hiddenTrouble:query')")
@GetMapping(value = "/{troubleId}")
public AjaxResult getInfo(@PathVariable("troubleId") Long troubleId)
public AjaxResult getInfo(@PathVariable("troubleId") int troubleId)
{
return AjaxResult.success(tHiddenTroubleService.selectTHiddenTroubleById(troubleId));
}
......@@ -96,7 +96,7 @@ public class THiddenTroubleController extends BaseController
@PreAuthorize("@ss.hasPermi('riskManagement:hiddenTrouble:remove')")
@Log(title = "隐患信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{troubleIds}")
public AjaxResult remove(@PathVariable Long[] troubleIds)
public AjaxResult remove(@PathVariable int[] troubleIds)
{
return toAjax(tHiddenTroubleService.deleteTHiddenTroubleByIds(troubleIds));
}
......
gassafety-admin/src/main/java/com/zehong/web/controller/workOrder/TOrderFeedbackController.java
View file @ c4ee8561
......@@ -63,7 +63,7 @@ public class TOrderFeedbackController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('workOrder:feedback:query')")
@GetMapping(value = "/{feedbackId}")
public AjaxResult getInfo(@PathVariable("feedbackId") Long feedbackId)
public AjaxResult getInfo(@PathVariable("feedbackId") int feedbackId)
{
return AjaxResult.success(tOrderFeedbackService.selectTOrderFeedbackById(feedbackId));
}
......@@ -96,7 +96,7 @@ public class TOrderFeedbackController extends BaseController
@PreAuthorize("@ss.hasPermi('workOrder:feedback:remove')")
@Log(title = "工单反馈信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{feedbackIds}")
public AjaxResult remove(@PathVariable Long[] feedbackIds)
public AjaxResult remove(@PathVariable int[] feedbackIds)
{
return toAjax(tOrderFeedbackService.deleteTOrderFeedbackByIds(feedbackIds));
}
......
gassafety-system/src/main/java/com/zehong/system/domain/TDeviceAlarm.java
View file @ c4ee8561
......@@ -18,11 +18,14 @@ public class TDeviceAlarm extends BaseEntity
private static final long serialVersionUID = 1L;
/** $column.columnComment */
private Long alarmId;
private int alarmId;
/** 设备id */
@Excel(name = "设备id")
private Long deviceId;
private String deviceCode;
/** 是否是管道信息（0是，1否） */
private String isPipe;
/** 工单id */
@Excel(name = "工单id")
......@@ -37,17 +40,16 @@ public class TDeviceAlarm extends BaseEntity
private String alarmValue;
/** 报警开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "报警开始时间", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "报警开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
/** 报警结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "报警结束时间", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "报警结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
/**
处理状态（1不需处理，2已处理完成，3未处理完成） */
/** 处理状态（1不需处理，2已处理完成，3未处理完成） */
@Excel(name = "处理状态", readConverterExp = "1不需处理，2已处理完成，3未处理完成")
private String dealStatus;
......@@ -55,25 +57,34 @@ public class TDeviceAlarm extends BaseEntity
@Excel(name = "备注")
private String remarks;
public void setAlarmId(Long alarmId)
public void setAlarmId(int alarmId)
{
this.alarmId = alarmId;
}
public Long getAlarmId()
public int getAlarmId()
{
return alarmId;
}
public void setDeviceId(Long deviceId)
public void setDeviceCode(String deviceCode)
{
this.deviceId = deviceId;
this.deviceCode = deviceCode;
}
public Long getDeviceId()
public String getDeviceCode()
{
return deviceId;
return deviceCode;
}
public String getIsPipe() {
return isPipe;
}
public void setOrderId(String orderId)
public void setIsPipe(String isPipe) {
this.isPipe = isPipe;
}
public void setOrderId(String orderId)
{
this.orderId = orderId;
}
......@@ -141,7 +152,8 @@ public class TDeviceAlarm extends BaseEntity
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("alarmId", getAlarmId())
.append("deviceId", getDeviceId())
.append("deviceCode", getDeviceCode())
.append("isPipe", getIsPipe())
.append("orderId", getOrderId())
.append("alarmType", getAlarmType())
.append("alarmValue", getAlarmValue())
......
gassafety-system/src/main/java/com/zehong/system/domain/TDeviceInfo.java
View file @ c4ee8561
......@@ -19,20 +19,24 @@ public class TDeviceInfo extends BaseEntity
private static final long serialVersionUID = 1L;
/** 设备id */
private Long deviceId;
private int deviceId;
/** 企业id */
@Excel(name = "企业id")
private Long enterpriseId;
private int enterpriseId;
/** 所属管道id */
@Excel(name = "所属管道id")
private Long pipeId;
/** 所属管道编号 */
@Excel(name = "所属管道编号")
private String pipeCode;
/** 设备名称 */
@Excel(name = "设备名称")
private String deviceName;
/** 设备编号 */
@Excel(name = "设备编号")
private String deviceCode;
/** 所在地址 */
@Excel(name = "所在地址")
private String deviceAddr;
......@@ -41,7 +45,7 @@ public class TDeviceInfo extends BaseEntity
@Excel(name = "设备型号")
private String deviceModel;
/** 设备类型 */
/** 设备类型（1调压阀，2阀门井，3流量计，4压力表） */
@Excel(name = "设备类型")
private String deviceType;
......@@ -83,32 +87,32 @@ public class TDeviceInfo extends BaseEntity
@Excel(name = "备注")
private String remarks;
public void setDeviceId(Long deviceId)
public void setDeviceId(int deviceId)
{
this.deviceId = deviceId;
}
public Long getDeviceId()
public int getDeviceId()
{
return deviceId;
}
public void setEnterpriseId(Long enterpriseId)
public void setEnterpriseId(int enterpriseId)
{
this.enterpriseId = enterpriseId;
}
public Long getEnterpriseId()
public int getEnterpriseId()
{
return enterpriseId;
}
public void setPipeId(Long pipeId)
public void setPipeCode(String pipeCode)
{
this.pipeId = pipeId;
this.pipeCode = pipeCode;
}
public Long getPipeId()
public String getPipeCode()
{
return pipeId;
return pipeCode;
}
public void setDeviceName(String deviceName)
{
......@@ -119,7 +123,16 @@ public class TDeviceInfo extends BaseEntity
{
return deviceName;
}
public void setDeviceAddr(String deviceAddr)
public String getDeviceCode() {
return deviceCode;
}
public void setDeviceCode(String deviceCode) {
this.deviceCode = deviceCode;
}
public void setDeviceAddr(String deviceAddr)
{
this.deviceAddr = deviceAddr;
}
......@@ -233,8 +246,9 @@ public class TDeviceInfo extends BaseEntity
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("deviceId", getDeviceId())
.append("enterpriseId", getEnterpriseId())
.append("pipeId", getPipeId())
.append("pipeCode", getPipeCode())
.append("deviceName", getDeviceName())
.append("deviceCode", getDeviceCode())
.append("deviceAddr", getDeviceAddr())
.append("deviceModel", getDeviceModel())
.append("deviceType", getDeviceType())
......
gassafety-system/src/main/java/com/zehong/system/domain/TEnterpriseInfo.java
View file @ c4ee8561
......@@ -17,7 +17,7 @@ public class TEnterpriseInfo extends BaseEntity
private static final long serialVersionUID = 1L;
/** $column.columnComment */
private Long infoId;
private int infoId;
/** 单位名称 */
@Excel(name = "企业名称")
......@@ -75,12 +75,12 @@ public class TEnterpriseInfo extends BaseEntity
@Excel(name = "备注")
private String remarks;
public void setInfoId(Long infoId)
public void setInfoId(int infoId)
{
this.infoId = infoId;
}
public Long getInfoId()
public int getInfoId()
{
return infoId;
}
......
gassafety-system/src/main/java/com/zehong/system/domain/THiddenTrouble.java
View file @ c4ee8561
......@@ -17,11 +17,14 @@ public class THiddenTrouble extends BaseEntity
private static final long serialVersionUID = 1L;
/** 隐患信息id */
private Long troubleId;
private int troubleId;
/** 设备id */
@Excel(name = "设备id")
private Long deviceId;
/** 设备编号 */
@Excel(name = "设备编号")
private String deviceCode;
/** 设备类型（0管道，1调压阀，2阀门井，3流量计，4压力表） */
private String deviceType;
/** 工单id */
@Excel(name = "工单id")
......@@ -35,6 +38,10 @@ public class THiddenTrouble extends BaseEntity
@Excel(name = "纬度")
private BigDecimal latitude;
/** 坐标 */
@Excel(name = "坐标")
private String coordinates;
/** 处理状态（1不需处理，2已处理完成，3未处理完成） */
@Excel(name = "处理状态", readConverterExp = "1=不需处理，2已处理完成，3未处理完成")
private String dealStatus;
......@@ -43,25 +50,34 @@ public class THiddenTrouble extends BaseEntity
@Excel(name = "备注")
private String remarks;
public void setTroubleId(Long troubleId)
public void setTroubleId(int troubleId)
{
this.troubleId = troubleId;
}
public Long getTroubleId()
public int getTroubleId()
{
return troubleId;
}
public void setDeviceId(Long deviceId)
public void setDeviceCode(String deviceCode)
{
this.deviceId = deviceId;
this.deviceCode = deviceCode;
}
public Long getDeviceId()
public String getDeviceCode()
{
return deviceId;
return deviceCode;
}
public String getDeviceType() {
return deviceType;
}
public void setDeviceType(String deviceType) {
this.deviceType = deviceType;
}
public void setOrderId(String orderId)
public void setOrderId(String orderId)
{
this.orderId = orderId;
}
......@@ -88,7 +104,16 @@ public class THiddenTrouble extends BaseEntity
{
return latitude;
}
public void setDealStatus(String dealStatus)
public String getCoordinates() {
return coordinates;
}
public void setCoordinates(String coordinates) {
this.coordinates = coordinates;
}
public void setDealStatus(String dealStatus)
{
this.dealStatus = dealStatus;
}
......@@ -111,10 +136,12 @@ public class THiddenTrouble extends BaseEntity
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("troubleId", getTroubleId())
.append("deviceId", getDeviceId())
.append("deviceCode", getDeviceCode())
.append("deviceType", getDeviceType())
.append("orderId", getOrderId())
.append("longitude", getLongitude())
.append("latitude", getLatitude())
.append("coordinates", getCoordinates())
.append("dealStatus", getDealStatus())
.append("updateTime", getUpdateTime())
.append("createTime", getCreateTime())
......
gassafety-system/src/main/java/com/zehong/system/domain/TInspectionData.java
View file @ c4ee8561
......@@ -16,15 +16,15 @@ public class TInspectionData extends BaseEntity
private static final long serialVersionUID = 1L;
/** 巡检记录id */
private Long dataId;
private int dataId;
/** 巡检计划id */
@Excel(name = "巡检计划id")
private Long planId;
private int planId;
/** 设备id */
@Excel(name = "设备id")
private Long deviceId;
/** 设备编号 */
@Excel(name = "设备编号")
private String deviceCode;
/** 处理状态（1不需处理，2已处理完成，3未处理完成） */
@Excel(name = "处理状态", readConverterExp = "1=不需处理，2已处理完成，3未处理完成")
......@@ -34,32 +34,32 @@ public class TInspectionData extends BaseEntity
@Excel(name = "备注")
private String remarks;
public void setDataId(Long dataId)
public void setDataId(int dataId)
{
this.dataId = dataId;
}
public Long getDataId()
public int getDataId()
{
return dataId;
}
public void setPlanId(Long planId)
public void setPlanId(int planId)
{
this.planId = planId;
}
public Long getPlanId()
public int getPlanId()
{
return planId;
}
public void setDeviceId(Long deviceId)
public void setDeviceCode(String deviceCode)
{
this.deviceId = deviceId;
this.deviceCode = deviceCode;
}
public Long getDeviceId()
public String getDeviceCode()
{
return deviceId;
return deviceCode;
}
public void setDealStatus(String dealStatus)
{
......@@ -85,7 +85,7 @@ public class TInspectionData extends BaseEntity
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("dataId", getDataId())
.append("planId", getPlanId())
.append("deviceId", getDeviceId())
.append("deviceCode", getDeviceCode())
.append("dealStatus", getDealStatus())
.append("updateTime", getUpdateTime())
.append("createTime", getCreateTime())
......
gassafety-system/src/main/java/com/zehong/system/domain/TInspectionPlan.java
View file @ c4ee8561
......@@ -18,7 +18,7 @@ public class TInspectionPlan extends BaseEntity
private static final long serialVersionUID = 1L;
/** 巡检计划id */
private Long planId;
private int planId;
/** 巡检计划名称 */
@Excel(name = "巡检计划名称")
......@@ -28,14 +28,18 @@ public class TInspectionPlan extends BaseEntity
@Excel(name = "工单id")
private String orderId;
/** 设备编号（多个编号用逗号分隔） */
@Excel(name = "设备号")
private String deviceCodes;
/** 开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
/** 结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
/** 状态 */
......@@ -46,12 +50,12 @@ public class TInspectionPlan extends BaseEntity
@Excel(name = "计划描述")
private String remarks;
public void setPlanId(Long planId)
public void setPlanId(int planId)
{
this.planId = planId;
}
public Long getPlanId()
public int getPlanId()
{
return planId;
}
......@@ -64,7 +68,16 @@ public class TInspectionPlan extends BaseEntity
{
return planName;
}
public void setOrderId(String orderId)
public String getDeviceCodes() {
return deviceCodes;
}
public void setDeviceCodes(String deviceCodes) {
this.deviceCodes = deviceCodes;
}
public void setOrderId(String orderId)
{
this.orderId = orderId;
}
......@@ -115,6 +128,7 @@ 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 @ c4ee8561
......@@ -18,15 +18,15 @@ public class TOrderFeedback extends BaseEntity
private static final long serialVersionUID = 1L;
/** 工单反馈id */
private Long feedbackId;
private int feedbackId;
/** 工单id */
@Excel(name = "工单id")
private String orderId;
/** 设备id */
@Excel(name = "设备id")
private Long deviceId;
/** 设备编号 */
@Excel(name = "设备编号")
private String deviceCode;
/** 反馈内容 */
@Excel(name = "反馈内容")
......@@ -61,12 +61,12 @@ public class TOrderFeedback extends BaseEntity
@Excel(name = "备注")
private String remarks;
public void setFeedbackId(Long feedbackId)
public void setFeedbackId(int feedbackId)
{
this.feedbackId = feedbackId;
}
public Long getFeedbackId()
public int getFeedbackId()
{
return feedbackId;
}
......@@ -79,14 +79,14 @@ public class TOrderFeedback extends BaseEntity
{
return orderId;
}
public void setDeviceId(Long deviceId)
public void setDeviceCode(String deviceCode)
{
this.deviceId = deviceId;
this.deviceCode = deviceCode;
}
public Long getDeviceId()
public String getDeviceCode()
{
return deviceId;
return deviceCode;
}
public void setContents(String contents)
{
......@@ -166,7 +166,7 @@ public class TOrderFeedback extends BaseEntity
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("feedbackId", getFeedbackId())
.append("orderId", getOrderId())
.append("deviceId", getDeviceId())
.append("deviceId", getDeviceCode())
.append("contents", getContents())
.append("feedbackTime", getFeedbackTime())
.append("isHiddenDanger", getIsHiddenDanger())
......
gassafety-system/src/main/java/com/zehong/system/domain/TPipe.java
View file @ c4ee8561
......@@ -18,16 +18,20 @@ public class TPipe extends BaseEntity
private static final long serialVersionUID = 1L;
/** 管道id */
private Long pipeId;
private int pipeId;
/** 企业id */
@Excel(name = "企业id")
private Long enterpriseId;
private int enterpriseId;
/** 管道名称 */
@Excel(name = "管道名称")
private String pipeName;
/** 管道编号 */
@Excel(name = "管道编号")
private String pipeCode;
/** 管道所在地址 */
@Excel(name = "管道所在地址")
private String pipeAddr;
......@@ -66,21 +70,21 @@ public class TPipe extends BaseEntity
@Excel(name = "备注")
private String remarks;
public void setPipeId(Long pipeId)
public void setPipeId(int pipeId)
{
this.pipeId = pipeId;
}
public Long getPipeId()
public int getPipeId()
{
return pipeId;
}
public void setEnterpriseId(Long enterpriseId)
public void setEnterpriseId(int enterpriseId)
{
this.enterpriseId = enterpriseId;
}
public Long getEnterpriseId()
public int getEnterpriseId()
{
return enterpriseId;
}
......@@ -93,7 +97,16 @@ public class TPipe extends BaseEntity
{
return pipeName;
}
public void setPipeAddr(String pipeAddr)
public String getPipeCode() {
return pipeCode;
}
public void setPipeCode(String pipeCode) {
this.pipeCode = pipeCode;
}
public void setPipeAddr(String pipeAddr)
{
this.pipeAddr = pipeAddr;
}
......@@ -181,6 +194,7 @@ public class TPipe extends BaseEntity
.append("pipeId", getPipeId())
.append("enterpriseId", getEnterpriseId())
.append("pipeName", getPipeName())
.append("pipeCode", getPipeCode())
.append("pipeAddr", getPipeAddr())
.append("coordinates", getCoordinates())
.append("pipeLength", getPipeLength())
......
gassafety-system/src/main/java/com/zehong/system/domain/TWorkOrder.java
View file @ c4ee8561
......@@ -21,19 +21,19 @@ public class TWorkOrder extends BaseEntity
private String orderId;
/** 工单类型（1巡检信息，2隐患信息，3报警信息） */
@Excel(name = "工单类型", readConverterExp = "1=巡检信息，2隐患信息，3报警信息")
@Excel(name = "工单类型", readConverterExp = "1巡检信息，2隐患信息，3报警信息")
private String orderType;
/** 源id */
@Excel(name = "源id")
private Long resourceId;
private int resourceId;
/** 工单名称 */
@Excel(name = "工单名称")
private String orderName;
/** 工单状态（0未下发，1已下发，2已接受，3进行中，4已反馈，5已归档） */
@Excel(name = "工单状态", readConverterExp = "0=未下发，1已下发，2已接受，3进行中，4已反馈，5已归档")
/** 工单状态（0未接收，1已接收，2进行中，3已反馈，4已归档） */
@Excel(name = "工单状态", readConverterExp = "0未接收，1已接收，2进行中，3已反馈，4已归档")
private String orderStatus;
/** 指定执行人员（巡检员id） */
......@@ -77,11 +77,11 @@ public class TWorkOrder extends BaseEntity
return orderType;
}
public Long getResourceId() {
public int getResourceId() {
return resourceId;
}
public void setResourceId(Long resourceId) {
public void setResourceId(int resourceId) {
this.resourceId = resourceId;
}
......@@ -103,12 +103,12 @@ public class TWorkOrder extends BaseEntity
{
return orderStatus;
}
public void setAppointInspector(Long appointInspector)
public void setAppointInspector(Long appointInspector)
{
this.appointInspector = appointInspector;
}
public Long getAppointInspector()
public Long getAppointInspector()
{
return appointInspector;
}
......@@ -121,12 +121,12 @@ public class TWorkOrder extends BaseEntity
{
return allotTime;
}
public void setActualInspector(Long actualInspector)
public void setActualInspector(Long actualInspector)
{
this.actualInspector = actualInspector;
}
public Long getActualInspector()
public Long getActualInspector()
{
return actualInspector;
}
......
gassafety-system/src/main/java/com/zehong/system/domain/vo/WorkOrderVo.java
View file @ c4ee8561
......@@ -6,6 +6,7 @@ import com.zehong.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.math.BigDecimal;
import java.util.Date;
/**
......@@ -22,47 +23,59 @@ public class WorkOrderVo extends BaseEntity
private String orderId;
/** 工单类型（1巡检信息，2隐患信息，3报警信息） */
@Excel(name = "工单类型", readConverterExp = "1=巡检信息，2隐患信息，3报警信息")
private String orderType;
/** 源id */
@Excel(name = "源id")
private Long resourceId;
private int resourceId;
/** 工单名称 */
@Excel(name = "工单名称")
private String orderName;
/** 工单状态（0未下发，1已下发，2已接受，3进行中，4已反馈，5已归档） */
@Excel(name = "工单状态", readConverterExp = "0未下发，1已下发，2已接受，3进行中，4已反馈，5已归档")
/** 设备编号 */
private String deviceIds;
/** 设备数量 */
private int deviceNum;
/** 完成数量 */
private int finishNum;
/** 设备类型 */
private String deviceType;
/** 经度 */
private BigDecimal longitude;
/** 纬度 */
private BigDecimal latitude;
/** 坐标 */
private String coordinates;
/** 工单状态（0未接收，1已接收，2进行中，3已反馈，4已归档） */
private String orderStatus;
/** 指定执行人员（巡检员id） */
private Long appointInspector;
/** 指定执行人员姓名 */
@Excel(name = "指定执行人员")
private String appointInspectorName;
/** 下发时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "下发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date allotTime;
/** 实际接收人员（巡检员id） */
private Long actualInspector;
/** 实际接收人员姓名 */
@Excel(name = "实际接收人员")
private String actualInspectorName;
/** 实际接收时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "实际接收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date actualTime;
/** 备注 */
@Excel(name = "备注")
private String remarks;
public void setOrderId(String orderId)
......@@ -84,11 +97,11 @@ public class WorkOrderVo extends BaseEntity
return orderType;
}
public Long getResourceId() {
public int getResourceId() {
return resourceId;
}
public void setResourceId(Long resourceId) {
public void setResourceId(int resourceId) {
this.resourceId = resourceId;
}
......@@ -101,7 +114,64 @@ public class WorkOrderVo extends BaseEntity
{
return orderName;
}
public void setOrderStatus(String orderStatus)
public String getDeviceIds() {
return deviceIds;
}
public void setDeviceIds(String deviceIds) {
this.deviceIds = deviceIds;
}
public int getDeviceNum() {
return deviceNum;
}
public void setDeviceNum(int deviceNum) {
this.deviceNum = deviceNum;
}
public int getFinishNum() {
return finishNum;
}
public void setFinishNum(int finishNum) {
this.finishNum = finishNum;
}
public String getDeviceType() {
return deviceType;
}
public void setDeviceType(String deviceType) {
this.deviceType = deviceType;
}
public BigDecimal getLongitude() {
return longitude;
}
public void setLongitude(BigDecimal longitude) {
this.longitude = longitude;
}
public BigDecimal getLatitude() {
return latitude;
}
public void setLatitude(BigDecimal latitude) {
this.latitude = latitude;
}
public String getCoordinates() {
return coordinates;
}
public void setCoordinates(String coordinates) {
this.coordinates = coordinates;
}
public void setOrderStatus(String orderStatus)
{
this.orderStatus = orderStatus;
}
......@@ -110,12 +180,12 @@ public class WorkOrderVo extends BaseEntity
{
return orderStatus;
}
public void setAppointInspector(Long appointInspector)
public void setAppointInspector(Long appointInspector)
{
this.appointInspector = appointInspector;
}
public Long getAppointInspector()
public Long getAppointInspector()
{
return appointInspector;
}
......@@ -128,12 +198,12 @@ public class WorkOrderVo extends BaseEntity
{
return allotTime;
}
public void setActualInspector(Long actualInspector)
public void setActualInspector(Long actualInspector)
{
this.actualInspector = actualInspector;
}
public Long getActualInspector()
public Long getActualInspector()
{
return actualInspector;
}
......@@ -177,7 +247,15 @@ public class WorkOrderVo extends BaseEntity
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("orderId", getOrderId())
.append("orderType", getOrderType())
.append("resourceId", getResourceId())
.append("orderName", getOrderName())
.append("deviceIds", getDeviceIds())
.append("deviceNum", getDeviceNum())
.append("finishNum", getFinishNum())
.append("deviceType", getDeviceType())
.append("longitude", getLongitude())
.append("latitude", getLatitude())
.append("coordinates", getCoordinates())
.append("orderStatus", getOrderStatus())
.append("createTime", getCreateTime())
.append("appointInspector", getAppointInspector())
......
gassafety-system/src/main/java/com/zehong/system/mapper/TDeviceAlarmMapper.java
View file @ c4ee8561
......@@ -17,7 +17,7 @@ public interface TDeviceAlarmMapper
* @param alarmId 报警信息ID
* @return 报警信息
*/
public TDeviceAlarm selectTDeviceAlarmById(Long alarmId);
public TDeviceAlarm selectTDeviceAlarmById(int alarmId);
/**
* 查询报警信息列表
......@@ -49,7 +49,7 @@ public interface TDeviceAlarmMapper
* @param alarmId 报警信息ID
* @return 结果
*/
public int deleteTDeviceAlarmById(Long alarmId);
public int deleteTDeviceAlarmById(int alarmId);
/**
* 批量删除报警信息
......@@ -57,5 +57,5 @@ public interface TDeviceAlarmMapper
* @param alarmIds 需要删除的数据ID
* @return 结果
*/
public int deleteTDeviceAlarmByIds(Long[] alarmIds);
public int deleteTDeviceAlarmByIds(int[] alarmIds);
}
gassafety-system/src/main/java/com/zehong/system/mapper/TDeviceInfoMapper.java
View file @ c4ee8561
......@@ -19,7 +19,15 @@ public interface TDeviceInfoMapper
* @param deviceId 设备信息ID
* @return 设备信息
*/
public TDeviceInfo selectTDeviceInfoById(Long deviceId);
public TDeviceInfo selectTDeviceInfoById(int deviceId);
/**
* 查询设备信息
*
* @param deviceCode 设备信息ID
* @return 设备信息
*/
public TDeviceInfo selectTDeviceInfoByCode(String deviceCode);
/**
* 查询设备信息列表
......@@ -57,7 +65,7 @@ public interface TDeviceInfoMapper
* @param deviceId 设备信息ID
* @return 结果
*/
public int deleteTDeviceInfoById(Long deviceId);
public int deleteTDeviceInfoById(int deviceId);
/**
* 批量删除设备信息
......@@ -65,5 +73,5 @@ public interface TDeviceInfoMapper
* @param deviceIds 需要删除的数据ID
* @return 结果
*/
public int deleteTDeviceInfoByIds(Long[] deviceIds);
public int deleteTDeviceInfoByIds(int[] deviceIds);
}
gassafety-system/src/main/java/com/zehong/system/mapper/TEnterpriseInfoMapper.java
View file @ c4ee8561
......@@ -17,7 +17,7 @@ public interface TEnterpriseInfoMapper
* @param infoId 企业基本信息ID
* @return 企业基本信息
*/
public TEnterpriseInfo selectTEnterpriseInfoById(Long infoId);
public TEnterpriseInfo selectTEnterpriseInfoById(int infoId);
/**
* 查询企业基本信息列表
......@@ -49,7 +49,7 @@ public interface TEnterpriseInfoMapper
* @param infoId 企业基本信息ID
* @return 结果
*/
public int deleteTEnterpriseInfoById(Long infoId);
public int deleteTEnterpriseInfoById(int infoId);
/**
* 批量删除企业基本信息
......@@ -57,5 +57,5 @@ public interface TEnterpriseInfoMapper
* @param infoIds 需要删除的数据ID
* @return 结果
*/
public int deleteTEnterpriseInfoByIds(Long[] infoIds);
public int deleteTEnterpriseInfoByIds(int[] infoIds);
}
gassafety-system/src/main/java/com/zehong/system/mapper/THiddenTroubleMapper.java
View file @ c4ee8561
......@@ -17,7 +17,7 @@ public interface THiddenTroubleMapper
* @param troubleId 隐患信息ID
* @return 隐患信息
*/
public THiddenTrouble selectTHiddenTroubleById(Long troubleId);
public THiddenTrouble selectTHiddenTroubleById(int troubleId);
/**
* 查询隐患信息列表
......@@ -49,7 +49,7 @@ public interface THiddenTroubleMapper
* @param troubleId 隐患信息ID
* @return 结果
*/
public int deleteTHiddenTroubleById(Long troubleId);
public int deleteTHiddenTroubleById(int troubleId);
/**
* 批量删除隐患信息
......@@ -57,5 +57,5 @@ public interface THiddenTroubleMapper
* @param troubleIds 需要删除的数据ID
* @return 结果
*/
public int deleteTHiddenTroubleByIds(Long[] troubleIds);
public int deleteTHiddenTroubleByIds(int[] troubleIds);
}
gassafety-system/src/main/java/com/zehong/system/mapper/TInspectionDataMapper.java
View file @ c4ee8561
......@@ -17,7 +17,15 @@ public interface TInspectionDataMapper
* @param dataId 巡检记录ID
* @return 巡检记录
*/
public TInspectionData selectTInspectionDataById(Long dataId);
public TInspectionData selectTInspectionDataById(int dataId);
/**
* 查询巡检记录
*
* @param planId 巡检计划ID
* @return 完成的巡检记录数量
*/
public int selectFinishTInspectionData(int planId);
/**
* 查询巡检记录列表
......@@ -49,7 +57,7 @@ public interface TInspectionDataMapper
* @param dataId 巡检记录ID
* @return 结果
*/
public int deleteTInspectionDataById(Long dataId);
public int deleteTInspectionDataById(int dataId);
/**
* 批量删除巡检记录
......@@ -57,5 +65,5 @@ public interface TInspectionDataMapper
* @param dataIds 需要删除的数据ID
* @return 结果
*/
public int deleteTInspectionDataByIds(Long[] dataIds);
public int deleteTInspectionDataByIds(int[] dataIds);
}
gassafety-system/src/main/java/com/zehong/system/mapper/TInspectionPlanMapper.java
View file @ c4ee8561
......@@ -17,7 +17,7 @@ public interface TInspectionPlanMapper
* @param planId 巡检计划ID
* @return 巡检计划
*/
public TInspectionPlan selectTInspectionPlanById(Long planId);
public TInspectionPlan selectTInspectionPlanById(int planId);
/**
* 查询巡检计划列表
......@@ -49,7 +49,7 @@ public interface TInspectionPlanMapper
* @param planId 巡检计划ID
* @return 结果
*/
public int deleteTInspectionPlanById(Long planId);
public int deleteTInspectionPlanById(int planId);
/**
* 批量删除巡检计划
......@@ -57,5 +57,5 @@ public interface TInspectionPlanMapper
* @param planIds 需要删除的数据ID
* @return 结果
*/
public int deleteTInspectionPlanByIds(Long[] planIds);
public int deleteTInspectionPlanByIds(int[] planIds);
}
gassafety-system/src/main/java/com/zehong/system/mapper/TOrderFeedbackMapper.java
View file @ c4ee8561
......@@ -17,7 +17,7 @@ public interface TOrderFeedbackMapper
* @param feedbackId 工单反馈信息ID
* @return 工单反馈信息
*/
public TOrderFeedback selectTOrderFeedbackById(Long feedbackId);
public TOrderFeedback selectTOrderFeedbackById(int feedbackId);
/**
* 查询工单反馈信息列表
......@@ -49,7 +49,7 @@ public interface TOrderFeedbackMapper
* @param feedbackId 工单反馈信息ID
* @return 结果
*/
public int deleteTOrderFeedbackById(Long feedbackId);
public int deleteTOrderFeedbackById(int feedbackId);
/**
* 批量删除工单反馈信息
......@@ -57,5 +57,5 @@ public interface TOrderFeedbackMapper
* @param feedbackIds 需要删除的数据ID
* @return 结果
*/
public int deleteTOrderFeedbackByIds(Long[] feedbackIds);
public int deleteTOrderFeedbackByIds(int[] feedbackIds);
}
gassafety-system/src/main/java/com/zehong/system/mapper/TPipeMapper.java
View file @ c4ee8561
......@@ -17,7 +17,15 @@ public interface TPipeMapper
* @param pipeId 管道信息ID
* @return 管道信息
*/
public TPipe selectTPipeById(Long pipeId);
public TPipe selectTPipeById(int pipeId);
/**
* 查询管道信息
*
* @param pipeCode 管道编号
* @return 管道信息
*/
public TPipe selectTPipeByCode(String pipeCode);
/**
* 查询管道信息列表
......@@ -55,7 +63,7 @@ public interface TPipeMapper
* @param pipeId 管道信息ID
* @return 结果
*/
public int deleteTPipeById(Long pipeId);
public int deleteTPipeById(int pipeId);
/**
* 批量删除管道信息
......@@ -63,5 +71,5 @@ public interface TPipeMapper
* @param pipeIds 需要删除的数据ID
* @return 结果
*/
public int deleteTPipeByIds(Long[] pipeIds);
public int deleteTPipeByIds(int[] pipeIds);
}
gassafety-system/src/main/java/com/zehong/system/service/ITDeviceAlarmService.java
View file @ c4ee8561
......@@ -17,7 +17,7 @@ public interface ITDeviceAlarmService
* @param alarmId 报警信息ID
* @return 报警信息
*/
public TDeviceAlarm selectTDeviceAlarmById(Long alarmId);
public TDeviceAlarm selectTDeviceAlarmById(int alarmId);
/**
* 查询报警信息列表
......@@ -49,7 +49,7 @@ public interface ITDeviceAlarmService
* @param alarmIds 需要删除的报警信息ID
* @return 结果
*/
public int deleteTDeviceAlarmByIds(Long[] alarmIds);
public int deleteTDeviceAlarmByIds(int[] alarmIds);
/**
* 删除报警信息信息
......@@ -57,5 +57,5 @@ public interface ITDeviceAlarmService
* @param alarmId 报警信息ID
* @return 结果
*/
public int deleteTDeviceAlarmById(Long alarmId);
public int deleteTDeviceAlarmById(int alarmId);
}
gassafety-system/src/main/java/com/zehong/system/service/ITDeviceInfoService.java
View file @ c4ee8561
......@@ -19,7 +19,7 @@ public interface ITDeviceInfoService
* @param deviceId 设备信息ID
* @return 设备信息
*/
public TDeviceInfo selectTDeviceInfoById(Long deviceId);
public TDeviceInfo selectTDeviceInfoById(int deviceId);
/**
* 查询设备信息列表
......@@ -57,7 +57,7 @@ public interface ITDeviceInfoService
* @param deviceIds 需要删除的设备信息ID
* @return 结果
*/
public int deleteTDeviceInfoByIds(Long[] deviceIds);
public int deleteTDeviceInfoByIds(int[] deviceIds);
/**
* 删除设备信息信息
......@@ -65,5 +65,5 @@ public interface ITDeviceInfoService
* @param deviceId 设备信息ID
* @return 结果
*/
public int deleteTDeviceInfoById(Long deviceId);
public int deleteTDeviceInfoById(int deviceId);
}
gassafety-system/src/main/java/com/zehong/system/service/ITEnterpriseInfoService.java
View file @ c4ee8561
......@@ -17,7 +17,7 @@ public interface ITEnterpriseInfoService
* @param infoId 企业基本信息ID
* @return 企业基本信息
*/
public TEnterpriseInfo selectTEnterpriseInfoById(Long infoId);
public TEnterpriseInfo selectTEnterpriseInfoById(int infoId);
/**
* 查询企业基本信息列表
......@@ -49,7 +49,7 @@ public interface ITEnterpriseInfoService
* @param infoIds 需要删除的企业基本信息ID
* @return 结果
*/
public int deleteTEnterpriseInfoByIds(Long[] infoIds);
public int deleteTEnterpriseInfoByIds(int[] infoIds);
/**
* 删除企业基本信息信息
......@@ -57,5 +57,5 @@ public interface ITEnterpriseInfoService
* @param infoId 企业基本信息ID
* @return 结果
*/
public int deleteTEnterpriseInfoById(Long infoId);
public int deleteTEnterpriseInfoById(int infoId);
}
gassafety-system/src/main/java/com/zehong/system/service/ITHiddenTroubleService.java
View file @ c4ee8561
......@@ -17,7 +17,7 @@ public interface ITHiddenTroubleService
* @param troubleId 隐患信息ID
* @return 隐患信息
*/
public THiddenTrouble selectTHiddenTroubleById(Long troubleId);
public THiddenTrouble selectTHiddenTroubleById(int troubleId);
/**
* 查询隐患信息列表
......@@ -49,7 +49,7 @@ public interface ITHiddenTroubleService
* @param troubleIds 需要删除的隐患信息ID
* @return 结果
*/
public int deleteTHiddenTroubleByIds(Long[] troubleIds);
public int deleteTHiddenTroubleByIds(int[] troubleIds);
/**
* 删除隐患信息信息
......@@ -57,5 +57,5 @@ public interface ITHiddenTroubleService
* @param troubleId 隐患信息ID
* @return 结果
*/
public int deleteTHiddenTroubleById(Long troubleId);
public int deleteTHiddenTroubleById(int troubleId);
}
gassafety-system/src/main/java/com/zehong/system/service/ITInspectionDataService.java
View file @ c4ee8561
......@@ -17,7 +17,7 @@ public interface ITInspectionDataService
* @param dataId 巡检记录ID
* @return 巡检记录
*/
public TInspectionData selectTInspectionDataById(Long dataId);
public TInspectionData selectTInspectionDataById(int dataId);
/**
* 查询巡检记录列表
......@@ -49,7 +49,7 @@ public interface ITInspectionDataService
* @param dataIds 需要删除的巡检记录ID
* @return 结果
*/
public int deleteTInspectionDataByIds(Long[] dataIds);
public int deleteTInspectionDataByIds(int[] dataIds);
/**
* 删除巡检记录信息
......@@ -57,5 +57,5 @@ public interface ITInspectionDataService
* @param dataId 巡检记录ID
* @return 结果
*/
public int deleteTInspectionDataById(Long dataId);
public int deleteTInspectionDataById(int dataId);
}
gassafety-system/src/main/java/com/zehong/system/service/ITInspectionPlanService.java
View file @ c4ee8561
......@@ -17,7 +17,7 @@ public interface ITInspectionPlanService
* @param planId 巡检计划ID
* @return 巡检计划
*/
public TInspectionPlan selectTInspectionPlanById(Long planId);
public TInspectionPlan selectTInspectionPlanById(int planId);
/**
* 查询巡检计划列表
......@@ -49,7 +49,7 @@ public interface ITInspectionPlanService
* @param planIds 需要删除的巡检计划ID
* @return 结果
*/
public int deleteTInspectionPlanByIds(Long[] planIds);
public int deleteTInspectionPlanByIds(int[] planIds);
/**
* 删除巡检计划信息
......@@ -57,5 +57,5 @@ public interface ITInspectionPlanService
* @param planId 巡检计划ID
* @return 结果
*/
public int deleteTInspectionPlanById(Long planId);
public int deleteTInspectionPlanById(int planId);
}
gassafety-system/src/main/java/com/zehong/system/service/ITOrderFeedbackService.java
View file @ c4ee8561
......@@ -17,7 +17,7 @@ public interface ITOrderFeedbackService
* @param feedbackId 工单反馈信息ID
* @return 工单反馈信息
*/
public TOrderFeedback selectTOrderFeedbackById(Long feedbackId);
public TOrderFeedback selectTOrderFeedbackById(int feedbackId);
/**
* 查询工单反馈信息列表
......@@ -49,7 +49,7 @@ public interface ITOrderFeedbackService
* @param feedbackIds 需要删除的工单反馈信息ID
* @return 结果
*/
public int deleteTOrderFeedbackByIds(Long[] feedbackIds);
public int deleteTOrderFeedbackByIds(int[] feedbackIds);
/**
* 删除工单反馈信息信息
......@@ -57,5 +57,5 @@ public interface ITOrderFeedbackService
* @param feedbackId 工单反馈信息ID
* @return 结果
*/
public int deleteTOrderFeedbackById(Long feedbackId);
public int deleteTOrderFeedbackById(int feedbackId);
}
gassafety-system/src/main/java/com/zehong/system/service/ITPipeService.java
View file @ c4ee8561
......@@ -17,7 +17,7 @@ public interface ITPipeService
* @param pipeId 管道信息ID
* @return 管道信息
*/
public TPipe selectTPipeById(Long pipeId);
public TPipe selectTPipeById(int pipeId);
/**
* 查询管道信息列表
......@@ -56,7 +56,7 @@ public interface ITPipeService
* @param pipeIds 需要删除的管道信息ID
* @return 结果
*/
public int deleteTPipeByIds(Long[] pipeIds);
public int deleteTPipeByIds(int[] pipeIds);
/**
* 删除管道信息信息
......@@ -64,5 +64,5 @@ public interface ITPipeService
* @param pipeId 管道信息ID
* @return 结果
*/
public int deleteTPipeById(Long pipeId);
public int deleteTPipeById(int pipeId);
}
gassafety-system/src/main/java/com/zehong/system/service/ITWorkOrderService.java
View file @ c4ee8561
......@@ -12,12 +12,6 @@ import com.zehong.system.domain.vo.WorkOrderVo;
*/
public interface ITWorkOrderService
{
/**
* 获取工单基础信息id
*
* @return 工单基础信息id
*/
public String getWorkOrderId();
/**
* 查询工单基础信息
......
gassafety-system/src/main/java/com/zehong/system/service/impl/TDeviceAlarmServiceImpl.java
View file @ c4ee8561
......@@ -27,7 +27,7 @@ public class TDeviceAlarmServiceImpl implements ITDeviceAlarmService
* @return 报警信息
*/
@Override
public TDeviceAlarm selectTDeviceAlarmById(Long alarmId)
public TDeviceAlarm selectTDeviceAlarmById(int alarmId)
{
return tDeviceAlarmMapper.selectTDeviceAlarmById(alarmId);
}
......@@ -77,7 +77,7 @@ public class TDeviceAlarmServiceImpl implements ITDeviceAlarmService
* @return 结果
*/
@Override
public int deleteTDeviceAlarmByIds(Long[] alarmIds)
public int deleteTDeviceAlarmByIds(int[] alarmIds)
{
return tDeviceAlarmMapper.deleteTDeviceAlarmByIds(alarmIds);
}
......@@ -89,7 +89,7 @@ public class TDeviceAlarmServiceImpl implements ITDeviceAlarmService
* @return 结果
*/
@Override
public int deleteTDeviceAlarmById(Long alarmId)
public int deleteTDeviceAlarmById(int alarmId)
{
return tDeviceAlarmMapper.deleteTDeviceAlarmById(alarmId);
}
......
gassafety-system/src/main/java/com/zehong/system/service/impl/TDeviceInfoServiceImpl.java
View file @ c4ee8561
......@@ -28,7 +28,7 @@ public class TDeviceInfoServiceImpl implements ITDeviceInfoService
* @return 设备信息
*/
@Override
public TDeviceInfo selectTDeviceInfoById(Long deviceId)
public TDeviceInfo selectTDeviceInfoById(int deviceId)
{
return tDeviceInfoMapper.selectTDeviceInfoById(deviceId);
}
......@@ -84,7 +84,7 @@ public class TDeviceInfoServiceImpl implements ITDeviceInfoService
* @return 结果
*/
@Override
public int deleteTDeviceInfoByIds(Long[] deviceIds)
public int deleteTDeviceInfoByIds(int[] deviceIds)
{
return tDeviceInfoMapper.deleteTDeviceInfoByIds(deviceIds);
}
......@@ -96,7 +96,7 @@ public class TDeviceInfoServiceImpl implements ITDeviceInfoService
* @return 结果
*/
@Override
public int deleteTDeviceInfoById(Long deviceId)
public int deleteTDeviceInfoById(int deviceId)
{
return tDeviceInfoMapper.deleteTDeviceInfoById(deviceId);
}
......
gassafety-system/src/main/java/com/zehong/system/service/impl/TEnterpriseInfoServiceImpl.java
View file @ c4ee8561
......@@ -27,7 +27,7 @@ public class TEnterpriseInfoServiceImpl implements ITEnterpriseInfoService
* @return 企业基本信息
*/
@Override
public TEnterpriseInfo selectTEnterpriseInfoById(Long infoId)
public TEnterpriseInfo selectTEnterpriseInfoById(int infoId)
{
return tEnterpriseInfoMapper.selectTEnterpriseInfoById(infoId);
}
......@@ -77,7 +77,7 @@ public class TEnterpriseInfoServiceImpl implements ITEnterpriseInfoService
* @return 结果
*/
@Override
public int deleteTEnterpriseInfoByIds(Long[] infoIds)
public int deleteTEnterpriseInfoByIds(int[] infoIds)
{
return tEnterpriseInfoMapper.deleteTEnterpriseInfoByIds(infoIds);
}
......@@ -89,7 +89,7 @@ public class TEnterpriseInfoServiceImpl implements ITEnterpriseInfoService
* @return 结果
*/
@Override
public int deleteTEnterpriseInfoById(Long infoId)
public int deleteTEnterpriseInfoById(int infoId)
{
return tEnterpriseInfoMapper.deleteTEnterpriseInfoById(infoId);
}
......
gassafety-system/src/main/java/com/zehong/system/service/impl/THiddenTroubleServiceImpl.java
View file @ c4ee8561
......@@ -27,7 +27,7 @@ public class THiddenTroubleServiceImpl implements ITHiddenTroubleService
* @return 隐患信息
*/
@Override
public THiddenTrouble selectTHiddenTroubleById(Long troubleId)
public THiddenTrouble selectTHiddenTroubleById(int troubleId)
{
return tHiddenTroubleMapper.selectTHiddenTroubleById(troubleId);
}
......@@ -77,7 +77,7 @@ public class THiddenTroubleServiceImpl implements ITHiddenTroubleService
* @return 结果
*/
@Override
public int deleteTHiddenTroubleByIds(Long[] troubleIds)
public int deleteTHiddenTroubleByIds(int[] troubleIds)
{
return tHiddenTroubleMapper.deleteTHiddenTroubleByIds(troubleIds);
}
......@@ -89,7 +89,7 @@ public class THiddenTroubleServiceImpl implements ITHiddenTroubleService
* @return 结果
*/
@Override
public int deleteTHiddenTroubleById(Long troubleId)
public int deleteTHiddenTroubleById(int troubleId)
{
return tHiddenTroubleMapper.deleteTHiddenTroubleById(troubleId);
}
......
gassafety-system/src/main/java/com/zehong/system/service/impl/TInspectionDataServiceImpl.java
View file @ c4ee8561
......@@ -27,7 +27,7 @@ public class TInspectionDataServiceImpl implements ITInspectionDataService
* @return 巡检记录
*/
@Override
public TInspectionData selectTInspectionDataById(Long dataId)
public TInspectionData selectTInspectionDataById(int dataId)
{
return tInspectionDataMapper.selectTInspectionDataById(dataId);
}
......@@ -77,7 +77,7 @@ public class TInspectionDataServiceImpl implements ITInspectionDataService
* @return 结果
*/
@Override
public int deleteTInspectionDataByIds(Long[] dataIds)
public int deleteTInspectionDataByIds(int[] dataIds)
{
return tInspectionDataMapper.deleteTInspectionDataByIds(dataIds);
}
......@@ -89,7 +89,7 @@ public class TInspectionDataServiceImpl implements ITInspectionDataService
* @return 结果
*/
@Override
public int deleteTInspectionDataById(Long dataId)
public int deleteTInspectionDataById(int dataId)
{
return tInspectionDataMapper.deleteTInspectionDataById(dataId);
}
......
gassafety-system/src/main/java/com/zehong/system/service/impl/TInspectionPlanServiceImpl.java
View file @ c4ee8561
......@@ -27,7 +27,7 @@ public class TInspectionPlanServiceImpl implements ITInspectionPlanService
* @return 巡检计划
*/
@Override
public TInspectionPlan selectTInspectionPlanById(Long planId)
public TInspectionPlan selectTInspectionPlanById(int planId)
{
return tInspectionPlanMapper.selectTInspectionPlanById(planId);
}
......@@ -53,6 +53,7 @@ public class TInspectionPlanServiceImpl implements ITInspectionPlanService
@Override
public int insertTInspectionPlan(TInspectionPlan tInspectionPlan)
{
tInspectionPlan.setPlanStatus("0");
tInspectionPlan.setCreateTime(DateUtils.getNowDate());
return tInspectionPlanMapper.insertTInspectionPlan(tInspectionPlan);
}
......@@ -77,7 +78,7 @@ public class TInspectionPlanServiceImpl implements ITInspectionPlanService
* @return 结果
*/
@Override
public int deleteTInspectionPlanByIds(Long[] planIds)
public int deleteTInspectionPlanByIds(int[] planIds)
{
return tInspectionPlanMapper.deleteTInspectionPlanByIds(planIds);
}
......@@ -89,7 +90,7 @@ public class TInspectionPlanServiceImpl implements ITInspectionPlanService
* @return 结果
*/
@Override
public int deleteTInspectionPlanById(Long planId)
public int deleteTInspectionPlanById(int planId)
{
return tInspectionPlanMapper.deleteTInspectionPlanById(planId);
}
......
gassafety-system/src/main/java/com/zehong/system/service/impl/TOrderFeedbackServiceImpl.java
View file @ c4ee8561
......@@ -26,7 +26,7 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
* @return 工单反馈信息
*/
@Override
public TOrderFeedback selectTOrderFeedbackById(Long feedbackId)
public TOrderFeedback selectTOrderFeedbackById(int feedbackId)
{
return tOrderFeedbackMapper.selectTOrderFeedbackById(feedbackId);
}
......@@ -52,9 +52,9 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
@Override
public int insertTOrderFeedback(TOrderFeedback tOrderFeedback)
{
Long deviceId = tOrderFeedback.getDeviceId();
String deviceCode = tOrderFeedback.getDeviceCode();
// 更改巡检记录状态
if(deviceId != 0L){
if(deviceCode != null){
String dealStatus = tOrderFeedback.getDealStatus();
}
......@@ -81,7 +81,7 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
* @return 结果
*/
@Override
public int deleteTOrderFeedbackByIds(Long[] feedbackIds)
public int deleteTOrderFeedbackByIds(int[] feedbackIds)
{
return tOrderFeedbackMapper.deleteTOrderFeedbackByIds(feedbackIds);
}
......@@ -93,7 +93,7 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
* @return 结果
*/
@Override
public int deleteTOrderFeedbackById(Long feedbackId)
public int deleteTOrderFeedbackById(int feedbackId)
{
return tOrderFeedbackMapper.deleteTOrderFeedbackById(feedbackId);
}
......
gassafety-system/src/main/java/com/zehong/system/service/impl/TPipeServiceImpl.java
View file @ c4ee8561
......@@ -26,7 +26,7 @@ public class TPipeServiceImpl implements ITPipeService
* @return 管道信息
*/
@Override
public TPipe selectTPipeById(Long pipeId)
public TPipe selectTPipeById(int pipeId)
{
return tPipeMapper.selectTPipeById(pipeId);
}
......@@ -83,7 +83,7 @@ public class TPipeServiceImpl implements ITPipeService
* @return 结果
*/
@Override
public int deleteTPipeByIds(Long[] pipeIds)
public int deleteTPipeByIds(int[] pipeIds)
{
return tPipeMapper.deleteTPipeByIds(pipeIds);
}
......@@ -95,7 +95,7 @@ public class TPipeServiceImpl implements ITPipeService
* @return 结果
*/
@Override
public int deleteTPipeById(Long pipeId)
public int deleteTPipeById(int pipeId)
{
return tPipeMapper.deleteTPipeById(pipeId);
}
......
gassafety-system/src/main/java/com/zehong/system/service/impl/TWorkOrderServiceImpl.java
View file @ c4ee8561
......@@ -5,15 +5,13 @@ import java.util.List;
import com.zehong.common.core.domain.entity.SysUser;
import com.zehong.common.utils.DateUtils;
import com.zehong.common.utils.ExceptionUtil;
import com.zehong.common.utils.StringUtils;
import com.zehong.system.domain.*;
import com.zehong.system.domain.vo.WorkOrderVo;
import com.zehong.system.mapper.SysUserMapper;
import com.zehong.system.mapper.*;
import com.zehong.system.service.ITInspectionPlanService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zehong.system.mapper.TWorkOrderMapper;
import com.zehong.system.domain.TWorkOrder;
import com.zehong.system.service.ITWorkOrderService;
/**
......@@ -29,17 +27,21 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
private TWorkOrderMapper tWorkOrderMapper;
@Autowired
private SysUserMapper sysUserMapper;
@Autowired
private TInspectionDataMapper tInspectionDataMapper;
@Autowired
private TInspectionPlanMapper tInspectionPlanMapper;
@Autowired
private THiddenTroubleMapper tHiddenTroubleMapper;
@Autowired
private TDeviceAlarmMapper tDeviceAlarmMapper;
@Autowired
private TPipeMapper tPipeMapper;
@Autowired
private TDeviceInfoMapper tDeviceInfoMapper;
/**
* 获取工单基础信息id
*
* @return 工单基础信息id
*/
@Override
public String getWorkOrderId()
{
return tWorkOrderMapper.getWorkOrderId();
}
@Autowired
private ITInspectionPlanService tInspectionPlanService;
/**
* 查询工单基础信息
......@@ -68,14 +70,48 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
// 获取源数据(1巡检信息，2隐患信息，3报警信息)
String orderType = tWorkOrder.getOrderType();
int resourceId = tWorkOrder.getResourceId();
if("1".equals(orderType)){
} else if("2".equals(orderType)) {
TInspectionPlan plan = tInspectionPlanMapper.selectTInspectionPlanById(resourceId);
workOrderVo.setDeviceIds(plan.getDeviceCodes());
TInspectionData data = new TInspectionData();
data.setPlanId(resourceId);
List<TInspectionData> totalList = tInspectionDataMapper.selectTInspectionDataList(data);
workOrderVo.setDeviceNum(totalList.size());
int finish = tInspectionDataMapper.selectFinishTInspectionData(resourceId);
workOrderVo.setFinishNum(finish);
} else if("2".equals(orderType)){
THiddenTrouble trouble = tHiddenTroubleMapper.selectTHiddenTroubleById(resourceId);
workOrderVo.setDeviceIds((trouble.getDeviceCode() != null ? trouble.getDeviceCode() : null).toString());
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());
} else {
}
TDeviceAlarm alarm = tDeviceAlarmMapper.selectTDeviceAlarmById(resourceId);
String deviceCode = alarm.getDeviceCode();
workOrderVo.setDeviceIds(String.valueOf(deviceCode));
String isPipe = alarm.getIsPipe();
if("0".equals(isPipe)){
TPipe pipe = tPipeMapper.selectTPipeByCode(deviceCode);
workOrderVo.setCoordinates(pipe.getCoordinates());
workOrderVo.setDeviceType("0");
} else {
TDeviceInfo device = tDeviceInfoMapper.selectTDeviceInfoByCode(deviceCode);
workOrderVo.setLongitude(device.getLongitude());
workOrderVo.setLatitude(device.getLatitude());
workOrderVo.setDeviceType(device.getDeviceType());
}
}
return workOrderVo;
}
......@@ -124,9 +160,17 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
public int insertTWorkOrder(TWorkOrder tWorkOrder)
{
String orderId = tWorkOrderMapper.getWorkOrderId();
tWorkOrder.setOrderId(orderId);
tWorkOrder.setOrderStatus("0");
tWorkOrder.setCreateTime(DateUtils.getNowDate());
int planId = tWorkOrder.getResourceId();
// 修改巡检计划状态为已下发
TInspectionPlan plan = new TInspectionPlan();
plan.setPlanId(planId);
plan.setPlanStatus("1");
tInspectionPlanService.updateTInspectionPlan(plan);
return tWorkOrderMapper.insertTWorkOrder(tWorkOrder);
}
......@@ -139,6 +183,27 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
@Override
public int updateTWorkOrder(TWorkOrder tWorkOrder)
{
if("1".equals(tWorkOrder.getOrderStatus())){
TWorkOrder order = tWorkOrderMapper.selectTWorkOrderById(tWorkOrder.getOrderId());
int planId = order.getResourceId();
// 修改巡检计划状态为进行中
TInspectionPlan plan = new TInspectionPlan();
plan.setPlanId(planId);
plan.setPlanStatus("2");
tInspectionPlanService.updateTInspectionPlan(plan);
} else if ("4".equals(tWorkOrder.getOrderStatus())){
TWorkOrder order = tWorkOrderMapper.selectTWorkOrderById(tWorkOrder.getOrderId());
int planId = order.getResourceId();
// 修改巡检计划状态为已完成
TInspectionPlan plan = new TInspectionPlan();
plan.setPlanId(planId);
plan.setPlanStatus("3");
tInspectionPlanService.updateTInspectionPlan(plan);
}
return tWorkOrderMapper.updateTWorkOrder(tWorkOrder);
}
......
gassafety-system/src/main/resources/mapper/system/TDeviceAlarmMapper.xml
View file @ c4ee8561
......@@ -6,7 +6,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="TDeviceAlarm" id="TDeviceAlarmResult">
<result property="alarmId" column="alarm_id" />
<result property="deviceId" column="device_id" />
<result property="deviceCode" column="device_code" />
<result property="isPipe" column="is_pipe" />
<result property="orderId" column="order_id" />
<result property="alarmType" column="alarm_type" />
<result property="alarmValue" column="alarm_value" />
......@@ -19,13 +20,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTDeviceAlarmVo">
select alarm_id, device_id, 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_code, is_pipe, 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="deviceId != null "> and device_id = #{deviceId}</if>
<if test="deviceCode != null "> and device_code = #{deviceCode}</if>
<if test="isPipe != null "> and is_pipe = #{isPipe}</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>
......@@ -44,7 +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="deviceId != null">device_id,</if>
<if test="deviceCode != null">device_code,</if>
<if test="isPipe != null">is_pipe,</if>
<if test="orderId != null">order_id,</if>
<if test="alarmType != null">alarm_type,</if>
<if test="alarmValue != null">alarm_value,</if>
......@@ -56,7 +59,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="remarks != null">remarks,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="deviceId != null">#{deviceId},</if>
<if test="deviceCode != null">#{deviceCode},</if>
<if test="isPipe != null">#{isPipe},</if>
<if test="orderId != null">#{orderId},</if>
<if test="alarmType != null">#{alarmType},</if>
<if test="alarmValue != null">#{alarmValue},</if>
......@@ -72,7 +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="deviceId != null">device_id = #{deviceId},</if>
<if test="deviceCode != null">device_code = #{deviceCode},</if>
<if test="isPipe != null">is_pipe = #{isPipe},</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/TDeviceInfoMapper.xml
View file @ c4ee8561
......@@ -7,8 +7,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="TDeviceInfo" id="TDeviceInfoResult">
<result property="deviceId" column="device_id" />
<result property="enterpriseId" column="enterprise_id" />
<result property="pipeId" column="pipe_id" />
<result property="pipeCode" column="pipe_code" />
<result property="deviceName" column="device_name" />
<result property="deviceCode" column="device_code" />
<result property="deviceAddr" column="device_addr" />
<result property="deviceModel" column="device_model" />
<result property="deviceType" column="device_type" />
......@@ -24,15 +25,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTDeviceInfoVo">
select device_id, enterprise_id, pipe_id, device_name, device_addr, device_model, device_type, longitude, latitude, iot_no, icon_url, linkman, phone, installation_time, inspection_time, remarks from t_device_info
select device_id, enterprise_id, pipe_code, device_name, device_code, device_addr, device_model, device_type, longitude, latitude, iot_no, icon_url, linkman, phone, installation_time, inspection_time, remarks from t_device_info
</sql>
<select id="selectTDeviceInfoList" parameterType="TDeviceInfo" resultMap="TDeviceInfoResult">
<include refid="selectTDeviceInfoVo"/>
<where>
<if test="enterpriseId != null "> and enterprise_id = #{enterpriseId}</if>
<if test="pipeId != null "> and pipe_id = #{pipeId}</if>
<if test="enterpriseId != null and enterpriseId != 0 "> and enterprise_id = #{enterpriseId}</if>
<if test="pipeCode != null "> and pipe_code = #{pipeCode}</if>
<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="deviceAddr != null and deviceAddr != ''"> and device_addr = #{deviceAddr}</if>
<if test="deviceModel != null and deviceModel != ''"> and device_model = #{deviceModel}</if>
<if test="deviceType != null and deviceType != ''"> and device_type = #{deviceType}</if>
......@@ -53,6 +55,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where device_id = #{deviceId}
</select>
<select id="selectTDeviceInfoByCode" parameterType="String" resultMap="TDeviceInfoResult">
<include refid="selectTDeviceInfoVo"/>
where device_code = #{deviceCode}
</select>
<select id="countDeviceByType" resultType="map">
select count(device_id) number, device_type type from t_device_info
group by device_type
......@@ -62,8 +69,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into t_device_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="enterpriseId != null">enterprise_id,</if>
<if test="pipeId != null">pipe_id,</if>
<if test="pipeCode != null">pipe_code,</if>
<if test="deviceName != null">device_name,</if>
<if test="deviceCode != null">device_code,</if>
<if test="deviceAddr != null">device_addr,</if>
<if test="deviceModel != null">device_model,</if>
<if test="deviceType != null">device_type,</if>
......@@ -79,8 +87,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="enterpriseId != null">#{enterpriseId},</if>
<if test="pipeId != null">#{pipeId},</if>
<if test="pipeCode != null">#{pipeCode},</if>
<if test="deviceName != null">#{deviceName},</if>
<if test="deviceCode != null">#{deviceCode},</if>
<if test="deviceAddr != null">#{deviceAddr},</if>
<if test="deviceModel != null">#{deviceModel},</if>
<if test="deviceType != null">#{deviceType},</if>
......@@ -100,8 +109,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update t_device_info
<trim prefix="SET" suffixOverrides=",">
<if test="enterpriseId != null">enterprise_id = #{enterpriseId},</if>
<if test="pipeId != null">pipe_id = #{pipeId},</if>
<if test="pipeCode != null">pipe_code = #{pipeCode},</if>
<if test="deviceName != null">device_name = #{deviceName},</if>
<if test="deviceCode != null">device_code = #{deviceCode},</if>
<if test="deviceAddr != null">device_addr = #{deviceAddr},</if>
<if test="deviceModel != null">device_model = #{deviceModel},</if>
<if test="deviceType != null">device_type = #{deviceType},</if>
......
gassafety-system/src/main/resources/mapper/system/THiddenTroubleMapper.xml
View file @ c4ee8561
......@@ -6,10 +6,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="THiddenTrouble" id="THiddenTroubleResult">
<result property="troubleId" column="trouble_id" />
<result property="deviceId" column="device_id" />
<result property="deviceCode" column="device_code" />
<result property="deviceType" column="device_type" />
<result property="orderId" column="order_id" />
<result property="longitude" column="longitude" />
<result property="latitude" column="latitude" />
<result property="coordinates" column="coordinates" />
<result property="dealStatus" column="deal_status" />
<result property="updateTime" column="update_time" />
<result property="createTime" column="create_time" />
......@@ -17,16 +19,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTHiddenTroubleVo">
select trouble_id, device_id, order_id, longitude, latitude, deal_status, update_time, create_time, remarks from t_hidden_trouble
select trouble_id, device_code, device_type, order_id, 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="deviceId != null "> and device_id = #{deviceId}</if>
<if test="deviceCode != null "> and device_code = #{deviceCode}</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>
<if test="latitude != null "> and latitude = #{latitude}</if>
<if test="coordinates != null "> and coordinates = #{coordinates}</if>
<if test="dealStatus != null and dealStatus != ''"> and deal_status = #{dealStatus}</if>
<if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if>
</where>
......@@ -40,20 +44,24 @@ 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="deviceId != null">device_id,</if>
<if test="deviceCode != null">device_code,</if>
<if test="deviceType != null">device_type,</if>
<if test="orderId != null">order_id,</if>
<if test="longitude != null">longitude,</if>
<if test="latitude != null">latitude,</if>
<if test="coordinates != null">coordinates,</if>
<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>
<if test="deviceCode != null">#{deviceCode},</if>
<if test="deviceType != null">#{deviceType},</if>
<if test="orderId != null">#{orderId},</if>
<if test="longitude != null">#{longitude},</if>
<if test="latitude != null">#{latitude},</if>
<if test="coordinates != null">#{coordinates},</if>
<if test="dealStatus != null">#{dealStatus},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="createTime != null">#{createTime},</if>
......@@ -64,10 +72,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updateTHiddenTrouble" parameterType="THiddenTrouble">
update t_hidden_trouble
<trim prefix="SET" suffixOverrides=",">
<if test="deviceId != null">device_id = #{deviceId},</if>
<if test="deviceCode != null">device_code = #{deviceCode},</if>
<if test="deviceType != null">device_code = #{deviceType},</if>
<if test="orderId != null">order_id = #{orderId},</if>
<if test="longitude != null">longitude = #{longitude},</if>
<if test="latitude != null">latitude = #{latitude},</if>
<if test="coordinates != null">coordinates = #{coordinates},</if>
<if test="dealStatus != null">deal_status = #{dealStatus},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="createTime != null">create_time = #{createTime},</if>
......
gassafety-system/src/main/resources/mapper/system/TInspectionDataMapper.xml
View file @ c4ee8561
......@@ -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="deviceId" column="device_id" />
<result property="deviceCode" column="device_code" />
<result property="dealStatus" column="deal_status" />
<result property="updateTime" column="update_time" />
<result property="createTime" column="create_time" />
......@@ -15,20 +15,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTInspectionDataVo">
select data_id, plan_id, device_id, deal_status, update_time, create_time, remarks from t_inspection_data
select data_id, plan_id, device_code, 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="deviceId != null "> and device_id = #{deviceId}</if>
<if test="deviceCode != null "> and device_code = #{deviceCode}</if>
<if test="dealStatus != null and dealStatus != ''"> and deal_status = #{dealStatus}</if>
<if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if>
</where>
</select>
<select id="selectTInspectionDataById" parameterType="Long" resultMap="TInspectionDataResult">
<select id="selectFinishTInspectionData" parameterType="int">
select count(*) from t_inspection_data
where plan_id = #{planId}
and deal_status != null
</select>
<select id="selectTInspectionDataById" parameterType="int" resultMap="TInspectionDataResult">
<include refid="selectTInspectionDataVo"/>
where data_id = #{dataId}
</select>
......@@ -38,7 +44,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="deviceId != null">device_id,</if>
<if test="deviceCode != null">device_code,</if>
<if test="dealStatus != null">deal_status,</if>
<if test="updateTime != null">update_time,</if>
<if test="createTime != null">create_time,</if>
......@@ -47,7 +53,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="deviceId != null">#{deviceId},</if>
<if test="deviceCode != null">#{deviceCode},</if>
<if test="dealStatus != null">#{dealStatus},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="createTime != null">#{createTime},</if>
......@@ -59,7 +65,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="deviceId != null">device_id = #{deviceId},</if>
<if test="deviceCode != null">device_code = #{deviceCode},</if>
<if test="dealStatus != null">deal_status = #{dealStatus},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="createTime != null">create_time = #{createTime},</if>
......@@ -68,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where data_id = #{dataId}
</update>
<delete id="deleteTInspectionDataById" parameterType="Long">
<delete id="deleteTInspectionDataById" parameterType="int">
delete from t_inspection_data where data_id = #{dataId}
</delete>
......
gassafety-system/src/main/resources/mapper/system/TInspectionPlanMapper.xml
View file @ c4ee8561
......@@ -7,6 +7,7 @@ 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" />
......@@ -17,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTInspectionPlanVo">
select plan_id, plan_name, order_id, start_time, end_time, plan_status, update_time, create_time, remarks from t_inspection_plan
select plan_id, plan_name, device_codes, order_id, start_time, end_time, plan_status, update_time, create_time, remarks from t_inspection_plan
</sql>
<select id="selectTInspectionPlanList" parameterType="TInspectionPlan" resultMap="TInspectionPlanResult">
......@@ -41,6 +42,7 @@ 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>
......@@ -51,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</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>
......@@ -65,6 +68,7 @@ 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>
......
gassafety-system/src/main/resources/mapper/system/TOrderFeedbackMapper.xml
View file @ c4ee8561
......@@ -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="deviceId" column="device_id" />
<result property="deviceCode" column="device_code" />
<result property="contents" column="contents" />
<result property="feedbackTime" column="feedback_time" />
<result property="isHiddenDanger" column="is_hidden_danger" />
......@@ -19,14 +19,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTOrderFeedbackVo">
select feedback_id, order_id, device_id, contents, feedback_time, is_hidden_danger, deal_status, picture_url_1, picture_url_2, picture_url_3, remarks from t_order_feedback
select feedback_id, order_id, device_code, contents, feedback_time, is_hidden_danger, deal_status, picture_url_1, picture_url_2, picture_url_3, remarks 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="deviceId != null "> and device_id = #{deviceId}</if>
<if test="deviceCode != null "> and device_code = #{deviceCode}</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>
......@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="feedbackId != null">feedback_id,</if>
<if test="orderId != null">order_id,</if>
<if test="deviceId != null">device_id,</if>
<if test="deviceCode != null">device_code,</if>
<if test="contents != null">contents,</if>
<if test="feedbackTime != null">feedback_time,</if>
<if test="isHiddenDanger != null">is_hidden_danger,</if>
......@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="feedbackId != null">#{feedbackId},</if>
<if test="orderId != null">#{orderId},</if>
<if test="deviceId != null">#{deviceId},</if>
<if test="deviceCode != null">#{deviceCode},</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="deviceId != null">device_id = #{deviceId},</if>
<if test="deviceCode != null">device_code = #{deviceCode},</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-system/src/main/resources/mapper/system/TPipeMapper.xml
View file @ c4ee8561
......@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="pipeId" column="pipe_id" />
<result property="enterpriseId" column="enterprise_id" />
<result property="pipeName" column="pipe_name" />
<result property="pipeCode" column="pipe_code" />
<result property="pipeAddr" column="pipe_addr" />
<result property="coordinates" column="coordinates" />
<result property="pipeLength" column="pipe_length" />
......@@ -20,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTPipeVo">
select pipe_id, enterprise_id, pipe_name, pipe_addr, coordinates, pipe_length, pipe_type, pipe_pressure, icon_url, installation_time, inspection_time, remarks from t_pipe
select pipe_id, enterprise_id, pipe_name, pipe_code, pipe_addr, coordinates, pipe_length, pipe_type, pipe_pressure, icon_url, installation_time, inspection_time, remarks from t_pipe
</sql>
<select id="selectTPipeList" parameterType="TPipe" resultMap="TPipeResult">
......@@ -28,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="enterpriseId != null "> and enterprise_id = #{enterpriseId}</if>
<if test="pipeName != null and pipeName != ''"> and pipe_name like concat('%', #{pipeName}, '%')</if>
<if test="pipeCode != null and pipeCode != ''"> and pipe_code like concat('%', #{pipeCode}, '%')</if>
<if test="pipeAddr != null and pipeAddr != ''"> and pipe_addr = #{pipeAddr}</if>
<if test="coordinates != null and coordinates != ''"> and coordinates = #{coordinates}</if>
<if test="pipeType != null and pipeType != ''"> and pipe_type = #{pipeType}</if>
......@@ -44,6 +46,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where pipe_id = #{pipeId}
</select>
<select id="selectTPipeByCode" parameterType="String" resultMap="TPipeResult">
<include refid="selectTPipeVo"/>
where pipe_code = #{pipeCode}
</select>
<select id="countPipeLength" resultType="double">
select sum(pipe_length) from t_pipe
</select>
......@@ -53,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="enterpriseId != null">enterprise_id,</if>
<if test="pipeName != null">pipe_name,</if>
<if test="pipeCode != null">pipe_code,</if>
<if test="pipeAddr != null">pipe_addr,</if>
<if test="coordinates != null">coordinates,</if>
<if test="pipeLength != null">pipe_length,</if>
......@@ -66,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="enterpriseId != null">#{enterpriseId},</if>
<if test="pipeName != null">#{pipeName},</if>
<if test="pipeCode != null">#{pipeCode},</if>
<if test="pipeAddr != null">#{pipeAddr},</if>
<if test="coordinates != null">#{coordinates},</if>
<if test="pipeLength != null">#{pipeLength},</if>
......@@ -83,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=",">
<if test="enterpriseId != null">enterprise_id = #{enterpriseId},</if>
<if test="pipeName != null">pipe_name = #{pipeName},</if>
<if test="pipeCode != null">pipe_code = #{pipeCode},</if>
<if test="pipeAddr != null">pipe_addr = #{pipeAddr},</if>
<if test="coordinates != null">coordinates = #{coordinates},</if>
<if test="pipeLength != null">pipe_length = #{pipeLength},</if>
......
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