diff --git a/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/DmsConstants.java b/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/DmsConstants.java index 1c099a63..e1ffe50d 100644 --- a/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/DmsConstants.java +++ b/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/DmsConstants.java @@ -12,12 +12,50 @@ public class DmsConstants { /**故障报修工单状态*/ public static final String DMS_BILLS_FAULT_INSTANCE_STATUS_TO_REPAIR = "0";//待维修 + public static final String DMS_BILLS_FAULT_INSTANCE_STATUS_REPAIRING = "1";//维修中 + public static final String DMS_BILLS_FAULT_INSTANCE_STATUS_FINISH = "2";//维修完成 /**故障报修工单实例状态*/ - public static final String DMS_BILLS_FAULT_INSTANCE_ACTIVITY_STATUS_TO_PICK = "2";//待接取 + public static final String DMS_BILLS_FAULT_INSTANCE_ACTIVITY_HANDLE_STATUS_FINISH = "0";//已结束 + public static final String DMS_BILLS_FAULT_INSTANCE_ACTIVITY_HANDLE_STATUS_EXECUTING = "1";//执行中 + public static final String DMS_BILLS_FAULT_INSTANCE_ACTIVITY_HANDLE_STATUS_TO_PICK = "2";//待接取 /**故障报修工单类型*/ public static final String DMS_BILLS_FAULT_INSTANCE_TYPE_MAUAL = "1";//手工创建 + + /**点巡检工单巡检状态*/ + public static final String DMS_BILLS_INSPECT_INSTANCE_INSPECT_STATUS_TO_INSPECT="1";//待巡检 + public static final String DMS_BILLS_INSPECT_INSTANCE_INSPECT_STATUS_INSPECTING="2";//巡检中 + public static final String DMS_BILLS_INSPECT_INSTANCE_INSPECT_STATUS_FINISH="3";//巡检完成 + + /**点巡检项目属性*/ + public static final String DMS_INSPECT_INSTANCE_PROJECT_PROPERTY_QUALITATIVE = "1";//定性 + + + + /**点巡检工单明细状态*/ + public static final String DMS_INSPECT_INSTANCE_DETAIL_STATUS_TO_INSPECT = "1";//待巡检 + public static final String DMS_INSPECT_INSTANCE_DETAIL_STATUS_INSPECTING = "2";//巡检中 + public static final String DMS_INSPECT_INSTANCE_DETAIL_STATUS_FINISH = "3";//巡检完成 + + /**点巡检工单明细检验状态*/ + public static final String DMS_INSPECT_INSTANCE_DETAIL_INSPECT_STATUS_PASS = "1";//正常 + public static final String DMS_INSPECT_INSTANCE_DETAIL_INSPECT_STATUS_FAIL = "0";//异常 + + + /**点巡检工单明细项目信息检验状态*/ + public static final String DMS_INSPECT_INSTANCE_DETAIL_PROJECT_STATUS_PASS = "1";//正常 + public static final String DMS_INSPECT_INSTANCE_DETAIL_PROJECT_STATUS_FAIL = "0";//异常 + + + /**外协信息状态*/ + public static final Long DMS_BASE_OUTSRC_INFO_STATUS_NROMAL = 1L;//启用 + + + /**工单文件关联类型*/ + public static final String DMS_INSTANCE_FILE_TARGET_TYPE_FAULT_INSTANCE_ACTIVITY = "1";//故障报修工单实例节点 + + } diff --git a/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/WfConstants.java b/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/WfConstants.java index 1ad9d626..11a92d38 100644 --- a/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/WfConstants.java +++ b/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/WfConstants.java @@ -12,7 +12,7 @@ public class WfConstants { public static final Long WF_BILLS_FAULT_INSTANCE_PROCESS_ID = 102L;//故障报修工单流程ID public static final Long WF_BILLS_FAULT_INSTANCE_PROCESS_ACTIVITY_FIRST_ID = 1021L;//故障报修工单流程节点第一步ID - + public static final Long WF_BILLS_FAULT_INSTANCE_PROCESS_ACTIVITY_SECOND_ID = 1022L;//故障报修工单流程节点第二步ID public static final Long WF_QUALITY_ABNORMAL_PROCESS_ID = 301L;//不合格处置工单流程ID diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsMobileController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsMobileController.java index 0fb89e41..64a7329e 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsMobileController.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsMobileController.java @@ -1,19 +1,24 @@ package com.hw.dms.controller; +import com.hw.common.core.constant.DmsConstants; import com.hw.common.core.domain.R; import com.hw.common.core.web.controller.BaseController; import com.hw.common.core.web.domain.AjaxResult; +import com.hw.common.core.web.page.TableDataInfo; import com.hw.common.log.annotation.Log; import com.hw.common.log.enums.BusinessType; -import com.hw.dms.domain.DmsBillsFaultInstance; +import com.hw.dms.domain.*; +import com.hw.dms.domain.vo.DmsBillsFaultInstanceScanVo; +import com.hw.dms.domain.vo.DmsBillsInspectInstanceScanVo; +import com.hw.dms.service.IDmsBaseDeviceLedgerService; +import com.hw.dms.service.IDmsBaseOutsrcInfoService; import com.hw.dms.service.IDmsBillsFaultInstanceService; +import com.hw.dms.service.IDmsBillsInspectInstanceService; import com.hw.system.api.RemoteFileService; import com.hw.system.api.domain.SysFile; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; @@ -33,13 +38,48 @@ public class DmsMobileController extends BaseController { @Autowired private IDmsBillsFaultInstanceService dmsBillsFaultInstanceService; + @Autowired + private IDmsBillsInspectInstanceService dmsBillsInspectInstanceService; + + @Autowired + private IDmsBaseDeviceLedgerService baseDeviceLedgerService; + + @Autowired + private IDmsBaseOutsrcInfoService dmsBaseOutsrcInfoService; + @Resource private RemoteFileService remoteFileService; + /** + * 根据设备编号获取设备信息 + * + * @return + */ + // @RequiresPermissions("qms:checkrule:list") + @GetMapping("/getDeviceByDeviceCode/{deviceCode}") + public AjaxResult getDeviceByDeviceCode(@PathVariable("deviceCode") String deviceCode) { + DmsBaseDeviceLedger dmsBaseDeviceLedger = baseDeviceLedgerService.selectDmsBaseDeviceLedgerByDeviceCode(deviceCode); + return success(dmsBaseDeviceLedger); + } /** - * PDA-报修 + * 获取外协单位列表 * + * @return + */ + // @RequiresPermissions("qms:checkrule:list") + @GetMapping("/getOutsrcInfos") + public AjaxResult getOutsrcInfos() { + DmsBaseOutsrcInfo queryBaseOutsrcInfo = new DmsBaseOutsrcInfo(); + queryBaseOutsrcInfo.setOutsrcStatus(DmsConstants.DMS_BASE_OUTSRC_INFO_STATUS_NROMAL); + List baseOutsrcInfos = dmsBaseOutsrcInfoService.selectDmsBaseOutsrcInfoList(queryBaseOutsrcInfo); + return success(baseOutsrcInfos); + } + + + /** + * PDA-报修 + *

* 需传入 * 设备id deviceId * 故障类别 faultType @@ -48,12 +88,12 @@ public class DmsMobileController extends BaseController { * 维修类型 repairType * 外协id outsrcId(可不传入) * 图片 files - * */ + */ // @RequiresPermissions("qms:checkresultdetail:add") @Log(title = "故障报修工单", businessType = BusinessType.INSERT) @PostMapping("/insertFaultInstsanceActivity") public AjaxResult insertFaultInstsanceActivity(DmsBillsFaultInstance dmsBillsFaultInstance, - @RequestParam(value = "files") List files) { + @RequestParam(value = "files") List files) { List fileUrls = new ArrayList<>(); for (MultipartFile file : files) { R sysFileR = remoteFileService.upload(file); @@ -64,4 +104,129 @@ public class DmsMobileController extends BaseController { return success(dmsBillsFaultInstanceService.insertDmsBillsFaultInstance(dmsBillsFaultInstance)); } + + /** + * 获取故障报修工单列表 + * + * @return + */ + // @RequiresPermissions("qms:checkrule:list") + @GetMapping("/getBillsFaultInstances") + public TableDataInfo getBillsFaultInstances() { + startPage(); + DmsBillsFaultInstance queryBillsFaultInstance = new DmsBillsFaultInstance(); + List billsFaultInstances = dmsBillsFaultInstanceService.selectDmsBillsFaultInstanceJoinList(queryBillsFaultInstance); + return getDataTable(billsFaultInstances); + } + + /** + * 获取故障报修工单详细信息,修改工单使用 + * + * @return + */ + // @RequiresPermissions("qms:checkrule:list") + @GetMapping("/getBillsFaultInstanceByRepairInstanceId/{repairInstanceId}") + public AjaxResult getBillsFaultInstanceByRepairInstanceId(@PathVariable("repairInstanceId") Long repairInstanceId) { + DmsBillsFaultInstance billsFaultInstance = dmsBillsFaultInstanceService.selectDmsBillsFaultInstanceByRepairInstanceId(repairInstanceId); + return success(billsFaultInstance); + } + + /** + * 修改工单提交 + */ +// @RequiresPermissions("qms:checkresultdetail:add") + @Log(title = "故障报修工单", businessType = BusinessType.UPDATE) + @PostMapping("/updateFaultInstanceActivity") + public AjaxResult updateFaultInstanceActivity(DmsFaultInstanceActivity dmsFaultInstanceActivity, + @RequestParam(value = "files") List files) { + List fileUrls = new ArrayList<>(); + for (MultipartFile file : files) { + R sysFileR = remoteFileService.upload(file); + SysFile sysFile = sysFileR.getData(); + fileUrls.add(sysFile.getUrl()); + } + dmsFaultInstanceActivity.setFileUrls(fileUrls); + return success(dmsBillsFaultInstanceService.updateDmsFaultInstanceActivity(dmsFaultInstanceActivity)); + } + + /** + * 获取故障报修工单详细信息,维修使用 + * + * @return + */ + // @RequiresPermissions("qms:checkrule:list") + @GetMapping("/getBillsFaultInstance4Repair/{repairInstanceId}") + public AjaxResult getBillsFaultInstance4Repair(@PathVariable("repairInstanceId") Long repairInstanceId) { + DmsBillsFaultInstance billsFaultInstance = dmsBillsFaultInstanceService.getDmsBillsFaultInstance4Repair(repairInstanceId); + return success(billsFaultInstance); + } + + + /** + * 故障报修扫描设备验证 + * + * @return + */ + // @RequiresPermissions("qms:checkrule:list") + @GetMapping("/scanDevice4Repair") + public AjaxResult scanDevice4Repair(@Validated DmsBillsFaultInstanceScanVo dmsBillsFaultInstanceScanVo) { + dmsBillsFaultInstanceService.scanDevice4Repair(dmsBillsFaultInstanceScanVo); + return success(); + } + + + /** + * 开始维修 + */ +// @RequiresPermissions("qms:checkresultdetail:add") + @Log(title = "故障报修工单", businessType = BusinessType.START) + @PostMapping("/startRepair") + public AjaxResult startRepair(@RequestBody DmsFaultInstanceActivity dmsFaultInstanceActivity) { + return success(dmsBillsFaultInstanceService.startRepair(dmsFaultInstanceActivity)); + } + + /** + * 完成维修 + */ +// @RequiresPermissions("qms:checkresultdetail:add") + @Log(title = "故障报修工单", businessType = BusinessType.COMPLETE) + @PostMapping("/completeRepair") + public AjaxResult completeRepair(@RequestBody DmsFaultInstanceActivity dmsFaultInstanceActivity) { + return success(dmsBillsFaultInstanceService.completeRepair(dmsFaultInstanceActivity)); + } + + + /** + * 获取最新一条待巡检的巡检或点检工单(检查类型inspectType(1巡检,2点检)) + * + * @return + */ + // @RequiresPermissions("qms:checkrule:list") + @GetMapping("/getNewestInspectInstance") + public AjaxResult getNewestInspectInstance(DmsBillsInspectInstance dmsBillsInspectInstance) { + DmsBillsInspectInstance newestInspectInstance = dmsBillsInspectInstanceService.getNewestBillsInspectInstance(dmsBillsInspectInstance); + return success(newestInspectInstance); + } + + + /** + * 扫描设备编号或者输入设备编号进行巡检验证 + * */ + // @RequiresPermissions("qms:checkrule:list") + @GetMapping("/scanInspectInstanceDetail") + public AjaxResult scanInspectInstanceDetail(@Validated DmsBillsInspectInstanceScanVo dmsBillsInspectInstanceScanVo) { + return success(dmsBillsInspectInstanceService.scanInspectInstanceDetail(dmsBillsInspectInstanceScanVo)); + } + + /** + * 新增质检结果详情 + */ +// @RequiresPermissions("qms:checkresultdetail:add") + @Log(title = "点巡检工单明细", businessType = BusinessType.INSERT) + @PostMapping("/saveInspectInstanceDetail") + public AjaxResult saveInspectInstanceDetail(@RequestBody DmsInspectInstanceDetail dmsInspectInstanceDetail) { + return success(dmsBillsInspectInstanceService.updateDmsInspectInstanceDetail(dmsInspectInstanceDetail)); + + } + } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBaseInspectProject.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBaseInspectProject.java index 85514e7b..a9085f0a 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBaseInspectProject.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBaseInspectProject.java @@ -8,7 +8,7 @@ import com.hw.common.core.web.domain.BaseEntity; /** * 巡检项目信息对象 dms_base_inspect_project - * + * * @author Open Platform * @date 2024-01-17 */ @@ -31,6 +31,9 @@ public class DmsBaseInspectProject extends BaseEntity @Excel(name = "检查类型(1巡检,2点检)") private String inspectType; + /**巡检项目属性(1定性,2定量) */ + private String inspectProjectProperty; + /** 记录方式 */ @Excel(name = "记录方式") private String recordMethod; @@ -51,84 +54,93 @@ public class DmsBaseInspectProject extends BaseEntity @Excel(name = "是否标识：1-是；0-否") private String isFlag; - public void setInspectProjectId(Long inspectProjectId) + public void setInspectProjectId(Long inspectProjectId) { this.inspectProjectId = inspectProjectId; } - public Long getInspectProjectId() + public Long getInspectProjectId() { return inspectProjectId; } - public void setInspectProjectCode(String inspectProjectCode) + public void setInspectProjectCode(String inspectProjectCode) { this.inspectProjectCode = inspectProjectCode; } - public String getInspectProjectCode() + public String getInspectProjectCode() { return inspectProjectCode; } - public void setInspectProject(String inspectProject) + public void setInspectProject(String inspectProject) { this.inspectProject = inspectProject; } - public String getInspectProject() + public String getInspectProject() { return inspectProject; } - public void setInspectType(String inspectType) + public void setInspectType(String inspectType) { this.inspectType = inspectType; } - public String getInspectType() + public String getInspectType() { return inspectType; } - public void setRecordMethod(String recordMethod) + + public String getInspectProjectProperty() { + return inspectProjectProperty; + } + + public void setInspectProjectProperty(String inspectProjectProperty) { + this.inspectProjectProperty = inspectProjectProperty; + } + + public void setRecordMethod(String recordMethod) { this.recordMethod = recordMethod; } - public String getRecordMethod() + public String getRecordMethod() { return recordMethod; } - public void setUpLimit(BigDecimal upLimit) + public void setUpLimit(BigDecimal upLimit) { this.upLimit = upLimit; } - public BigDecimal getUpLimit() + public BigDecimal getUpLimit() { return upLimit; } - public void setLowLimit(BigDecimal lowLimit) + public void setLowLimit(BigDecimal lowLimit) { this.lowLimit = lowLimit; } - public BigDecimal getLowLimit() + public BigDecimal getLowLimit() { return lowLimit; } - public void setDefValue(BigDecimal defValue) + public void setDefValue(BigDecimal defValue) { this.defValue = defValue; } - public BigDecimal getDefValue() + public BigDecimal getDefValue() { return defValue; } - public void setIsFlag(String isFlag) + public void setIsFlag(String isFlag) { this.isFlag = isFlag; } - public String getIsFlag() + public String getIsFlag() { return isFlag; } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsFaultInstance.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsFaultInstance.java index c7962464..70b0234f 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsFaultInstance.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsFaultInstance.java @@ -71,18 +71,22 @@ public class DmsBillsFaultInstance extends BaseEntity @Excel(name = "工单类型", readConverterExp = "1=手工创建,2自动创建") private String instanceType; - /** 是否标识：1-是；0-否 */ - @Excel(name = "是否标识：1-是；0-否") - + private String deviceCode; - private List sysFiles; + private String deviceName; + private String deviceLocation; + private String deviceSpec; private String imgUrl; + /** 是否标识：1-是；0-否 */ + @Excel(name = "是否标识：1-是；0-否") private String isFlag; + private Long instanceActivityId; + private String faultType; private String faultDescription; @@ -95,8 +99,25 @@ public class DmsBillsFaultInstance extends BaseEntity private Long outsrcId; + private String processHandleResolution; + private List fileUrls; + private List sysFiles; + + private List dmsInstanceFiles; + + public Long getInstanceActivityId() { + return instanceActivityId; + } + + public void setInstanceActivityId(Long instanceActivityId) { + this.instanceActivityId = instanceActivityId; + } + + private List dmsFaultInstanceActivityList; + + public List getSysFiles() { return sysFiles; } @@ -161,6 +182,14 @@ public class DmsBillsFaultInstance extends BaseEntity this.outsrcId = outsrcId; } + public String getProcessHandleResolution() { + return processHandleResolution; + } + + public void setProcessHandleResolution(String processHandleResolution) { + this.processHandleResolution = processHandleResolution; + } + public void setRepairInstanceId(Long repairInstanceId) { this.repairInstanceId = repairInstanceId; @@ -269,6 +298,39 @@ public class DmsBillsFaultInstance extends BaseEntity { return instanceType; } + + public String getDeviceCode() { + return deviceCode; + } + + public void setDeviceCode(String deviceCode) { + this.deviceCode = deviceCode; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getDeviceLocation() { + return deviceLocation; + } + + public void setDeviceLocation(String deviceLocation) { + this.deviceLocation = deviceLocation; + } + + public String getDeviceSpec() { + return deviceSpec; + } + + public void setDeviceSpec(String deviceSpec) { + this.deviceSpec = deviceSpec; + } + public void setIsFlag(String isFlag) { this.isFlag = isFlag; @@ -287,6 +349,22 @@ public class DmsBillsFaultInstance extends BaseEntity this.fileUrls = fileUrls; } + public List getDmsFaultInstanceActivityList() { + return dmsFaultInstanceActivityList; + } + + public void setDmsFaultInstanceActivityList(List dmsFaultInstanceActivityList) { + this.dmsFaultInstanceActivityList = dmsFaultInstanceActivityList; + } + + public List getDmsInstanceFiles() { + return dmsInstanceFiles; + } + + public void setDmsInstanceFiles(List dmsInstanceFiles) { + this.dmsInstanceFiles = dmsInstanceFiles; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsInspectInstance.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsInspectInstance.java index 9c328e82..3c2b0bd5 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsInspectInstance.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsInspectInstance.java @@ -1,6 +1,8 @@ package com.hw.dms.domain; import java.util.Date; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -74,9 +76,12 @@ public class DmsBillsInspectInstance extends BaseEntity @Excel(name = "是否标识：1-是；0-否") private String isFlag; + private String routeName; + /**多个状态时使用，以,隔开*/ + private String inspectStatusStr; - + private List dmsInspectInstanceDetailList; public void setInspectInstanceId(Long inspectInstanceId) { @@ -204,6 +209,30 @@ public class DmsBillsInspectInstance extends BaseEntity return isFlag; } + public String getRouteName() { + return routeName; + } + + public void setRouteName(String routeName) { + this.routeName = routeName; + } + + public String getInspectStatusStr() { + return inspectStatusStr; + } + + public void setInspectStatusStr(String inspectStatusStr) { + this.inspectStatusStr = inspectStatusStr; + } + + public List getDmsInspectInstanceDetailList() { + return dmsInspectInstanceDetailList; + } + + public void setDmsInspectInstanceDetailList(List dmsInspectInstanceDetailList) { + this.dmsInspectInstanceDetailList = dmsInspectInstanceDetailList; + } + @Override public String toString() { return "DmsBillsInspectInstance{" + diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsFaultInstanceActivity.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsFaultInstanceActivity.java index 21adf1f7..d9c4e746 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsFaultInstanceActivity.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsFaultInstanceActivity.java @@ -1,6 +1,8 @@ package com.hw.dms.domain; import java.util.Date; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -96,6 +98,8 @@ public class DmsFaultInstanceActivity extends BaseEntity private String attr1; private Long wfLength; + private List fileUrls; + public Long getWfLength() { return wfLength; } @@ -276,6 +280,14 @@ public class DmsFaultInstanceActivity extends BaseEntity return attr1; } + public List getFileUrls() { + return fileUrls; + } + + public void setFileUrls(List fileUrls) { + this.fileUrls = fileUrls; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsInspectInstanceDetail.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsInspectInstanceDetail.java new file mode 100644 index 00000000..ae0146ab --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsInspectInstanceDetail.java @@ -0,0 +1,200 @@ +package com.hw.dms.domain; + +import java.math.BigDecimal; +import java.util.List; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.hw.common.core.annotation.Excel; +import com.hw.common.core.web.domain.BaseEntity; + +/** + * 点巡检工单明细对象 dms_inspect_instance_detail + * + * @author xins + * @date 2024-03-19 + */ +public class DmsInspectInstanceDetail extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键标识 */ + private Long instanceDetailId; + + /** 点巡检工单ID */ + @Excel(name = "点巡检工单ID") + private Long inspectInstanceId; + + /** 巡检步骤 */ + @Excel(name = "巡检步骤") + private Long lineStep; + + /** 实际巡检步骤 */ + @Excel(name = "实际巡检步骤") + private Long realLineStep; + + /** 巡检设备ID，关联dms_base_device_ledger的device_id */ + @Excel(name = "巡检设备ID，关联dms_base_device_ledger的device_id") + private Long deviceId; + + /** 点巡检状态：1-待巡检；2-巡检中；3-已完成 */ + @Excel(name = "点巡检状态：1-待巡检；2-巡检中；3-已完成") + private String instanceDetailStatus; + + /** 巡检标准 */ + @Excel(name = "巡检标准") + private String inspectStandard; + + /** 操作描述 */ + @Excel(name = "操作描述") + private String inspectDesc; + + /** 巡检值，对于定量的需要输入 */ + @Excel(name = "巡检值，对于定量的需要输入") + private BigDecimal inspectValue; + + /** 巡检状态（1正常 0异常），对于定性的需要输入 */ + @Excel(name = "巡检状态", readConverterExp = "1=正常,0=异常") + private String inspectStatus; + + private String deviceCode; + + private String deviceName; + + private List dmsInspectInstanceDetailProjectList; + + public void setInstanceDetailId(Long instanceDetailId) + { + this.instanceDetailId = instanceDetailId; + } + + public Long getInstanceDetailId() + { + return instanceDetailId; + } + public void setInspectInstanceId(Long inspectInstanceId) + { + this.inspectInstanceId = inspectInstanceId; + } + + public Long getInspectInstanceId() + { + return inspectInstanceId; + } + public void setLineStep(Long lineStep) + { + this.lineStep = lineStep; + } + + public Long getLineStep() + { + return lineStep; + } + public void setRealLineStep(Long realLineStep) + { + this.realLineStep = realLineStep; + } + + public Long getRealLineStep() + { + return realLineStep; + } + public void setDeviceId(Long deviceId) + { + this.deviceId = deviceId; + } + + public Long getDeviceId() + { + return deviceId; + } + public void setInstanceDetailStatus(String instanceDetailStatus) + { + this.instanceDetailStatus = instanceDetailStatus; + } + + public String getInstanceDetailStatus() + { + return instanceDetailStatus; + } + public void setInspectStandard(String inspectStandard) + { + this.inspectStandard = inspectStandard; + } + + public String getInspectStandard() + { + return inspectStandard; + } + public void setInspectDesc(String inspectDesc) + { + this.inspectDesc = inspectDesc; + } + + public String getInspectDesc() + { + return inspectDesc; + } + public void setInspectValue(BigDecimal inspectValue) + { + this.inspectValue = inspectValue; + } + + public BigDecimal getInspectValue() + { + return inspectValue; + } + public void setInspectStatus(String inspectStatus) + { + this.inspectStatus = inspectStatus; + } + + public String getInspectStatus() + { + return inspectStatus; + } + + public String getDeviceCode() { + return deviceCode; + } + + public void setDeviceCode(String deviceCode) { + this.deviceCode = deviceCode; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public List getDmsInspectInstanceDetailProjectList() { + return dmsInspectInstanceDetailProjectList; + } + + public void setDmsInspectInstanceDetailProjectList(List dmsInspectInstanceDetailProjectList) { + this.dmsInspectInstanceDetailProjectList = dmsInspectInstanceDetailProjectList; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("instanceDetailId", getInstanceDetailId()) + .append("inspectInstanceId", getInspectInstanceId()) + .append("lineStep", getLineStep()) + .append("realLineStep", getRealLineStep()) + .append("deviceId", getDeviceId()) + .append("instanceDetailStatus", getInstanceDetailStatus()) + .append("inspectStandard", getInspectStandard()) + .append("inspectDesc", getInspectDesc()) + .append("inspectValue", getInspectValue()) + .append("inspectStatus", getInspectStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsInspectInstanceDetailProject.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsInspectInstanceDetailProject.java new file mode 100644 index 00000000..2a993ced --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsInspectInstanceDetailProject.java @@ -0,0 +1,203 @@ +package com.hw.dms.domain; + +import java.math.BigDecimal; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.hw.common.core.annotation.Excel; +import com.hw.common.core.web.domain.BaseEntity; + +/** + * 点巡检工单明细项目信息;质检检查每个项目的质检结果详情对象 dms_inspect_instance_detail_project + * + * @author xins + * @date 2024-03-19 + */ +public class DmsInspectInstanceDetailProject extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 点巡检工单明细项目信息ID */ + private Long instanceDetailProjectId; + + /** 点巡检工单明细ID，关联dms_inspect_instance_detail主键 */ + @Excel(name = "点巡检工单明细ID，关联dms_inspect_instance_detail主键") + private Long instanceDetailId; + + /** 巡检项目ID，关联dms_base_inspect_project主键 */ + @Excel(name = "巡检项目ID，关联dms_base_inspect_project主键") + private Long inspectProjectId; + + /** 巡检结果(1正常,0异常);定性需选择，定量的话根据检验结果的具体值自动选择 */ + @Excel(name = "巡检结果(1正常,0异常);定性需选择，定量的话根据检验结果的具体值自动选择") + private String inspectProjectStatus; + + /** 巡检结果,具体值 */ + @Excel(name = "巡检结果,具体值") + private BigDecimal inspectProjectResult; + + /** 巡检顺序 */ + @Excel(name = "巡检顺序") + private Long projectStepOrder; + + /** 标准值 */ + @Excel(name = "标准值") + private BigDecimal defValue; + + /** 巡检项目名称（冗余字段） */ + @Excel(name = "巡检项目名称", readConverterExp = "冗=余字段") + private String inspectProjectName; + + /** 巡检项目属性(1定性,2定量),冗余字段 */ + @Excel(name = "巡检项目属性(1定性,2定量),冗余字段") + private String inspectProjectProperty; + + /** 上差值，检验时从检验项目复制过来的值 */ + @Excel(name = "上差值，检验时从检验项目复制过来的值") + private BigDecimal upLimit; + + /** 下差值，检验时从检验项目复制过来的值 */ + @Excel(name = "下差值，检验时从检验项目复制过来的值") + private BigDecimal lowLimit; + + @Excel(name = "巡检描述") + private String inspectProjectDesc; + + private Long deviceId; + + public void setInstanceDetailProjectId(Long instanceDetailProjectId) + { + this.instanceDetailProjectId = instanceDetailProjectId; + } + + public Long getInstanceDetailProjectId() + { + return instanceDetailProjectId; + } + public void setInstanceDetailId(Long instanceDetailId) + { + this.instanceDetailId = instanceDetailId; + } + + public Long getInstanceDetailId() + { + return instanceDetailId; + } + public void setInspectProjectId(Long inspectProjectId) + { + this.inspectProjectId = inspectProjectId; + } + + public Long getInspectProjectId() + { + return inspectProjectId; + } + public void setInspectProjectStatus(String inspectProjectStatus) + { + this.inspectProjectStatus = inspectProjectStatus; + } + + public String getInspectProjectStatus() + { + return inspectProjectStatus; + } + public void setInspectProjectResult(BigDecimal inspectProjectResult) + { + this.inspectProjectResult = inspectProjectResult; + } + + public BigDecimal getInspectProjectResult() + { + return inspectProjectResult; + } + public void setProjectStepOrder(Long projectStepOrder) + { + this.projectStepOrder = projectStepOrder; + } + + public Long getProjectStepOrder() + { + return projectStepOrder; + } + public void setDefValue(BigDecimal defValue) + { + this.defValue = defValue; + } + + public BigDecimal getDefValue() + { + return defValue; + } + public void setInspectProjectName(String inspectProjectName) + { + this.inspectProjectName = inspectProjectName; + } + + public String getInspectProjectName() + { + return inspectProjectName; + } + public void setInspectProjectProperty(String inspectProjectProperty) + { + this.inspectProjectProperty = inspectProjectProperty; + } + + public String getInspectProjectProperty() + { + return inspectProjectProperty; + } + public void setUpLimit(BigDecimal upLimit) + { + this.upLimit = upLimit; + } + + public BigDecimal getUpLimit() + { + return upLimit; + } + public void setLowLimit(BigDecimal lowLimit) + { + this.lowLimit = lowLimit; + } + + public BigDecimal getLowLimit() + { + return lowLimit; + } + + public String getInspectProjectDesc() { + return inspectProjectDesc; + } + + public void setInspectProjectDesc(String inspectProjectDesc) { + this.inspectProjectDesc = inspectProjectDesc; + } + + public Long getDeviceId() { + return deviceId; + } + + public void setDeviceId(Long deviceId) { + this.deviceId = deviceId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("instanceDetailProjectId", getInstanceDetailProjectId()) + .append("instanceDetailId", getInstanceDetailId()) + .append("inspectProjectId", getInspectProjectId()) + .append("inspectProjectStatus", getInspectProjectStatus()) + .append("inspectProjectResult", getInspectProjectResult()) + .append("projectStepOrder", getProjectStepOrder()) + .append("defValue", getDefValue()) + .append("inspectProjectName", getInspectProjectName()) + .append("inspectProjectProperty", getInspectProjectProperty()) + .append("upLimit", getUpLimit()) + .append("lowLimit", getLowLimit()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/vo/DmsBillsFaultInstanceScanVo.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/vo/DmsBillsFaultInstanceScanVo.java new file mode 100644 index 00000000..49f93520 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/vo/DmsBillsFaultInstanceScanVo.java @@ -0,0 +1,24 @@ +package com.hw.dms.domain.vo; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * @Description: 故障报修扫描设备验证VO对象 + * @ClassName: DmsBillsFaultInstanceScanVo + * @Author : xins + * @Date :2024-03-20 10:44 + * @Version :1.0 + */ +@Data +public class DmsBillsFaultInstanceScanVo { + + @NotNull(message="故障报修工单ID必须输入") + private Long repairInstanceId; + + /** 设备编号 */ + @NotBlank(message="设备编号必须输入") + private String deviceCode; +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/vo/DmsBillsInspectInstanceScanVo.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/vo/DmsBillsInspectInstanceScanVo.java new file mode 100644 index 00000000..b8342861 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/vo/DmsBillsInspectInstanceScanVo.java @@ -0,0 +1,24 @@ +package com.hw.dms.domain.vo; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * @Description:点巡检任务扫描设备验证VO对象 + * @ProjectName:HwMes + * @Author:xins + * @Date:2024-03-19 14:43 + * @Version:1.0 + */ +@Data +public class DmsBillsInspectInstanceScanVo { + + @NotNull(message="点巡检工单ID必须输入") + private Long inspectInstanceId; + + /** 设备编号 */ + @NotBlank(message="设备编号必须输入") + private String deviceCode; +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBaseDeviceLedgerMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBaseDeviceLedgerMapper.java index 78395a43..5440987d 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBaseDeviceLedgerMapper.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBaseDeviceLedgerMapper.java @@ -5,15 +5,15 @@ import com.hw.dms.domain.DmsBaseDeviceLedger; /** * 设备台账信息Mapper接口 - * + * * @author xins * @date 2023-12-28 */ -public interface DmsBaseDeviceLedgerMapper +public interface DmsBaseDeviceLedgerMapper { /** * 查询设备台账信息 - * + * * @param deviceId 设备台账信息主键 * @return 设备台账信息 */ @@ -21,7 +21,7 @@ public interface DmsBaseDeviceLedgerMapper /** * 查询设备台账信息列表 - * + * * @param dmsBaseDeviceLedger 设备台账信息 * @return 设备台账信息集合 */ @@ -29,7 +29,7 @@ public interface DmsBaseDeviceLedgerMapper /** * 新增设备台账信息 - * + * * @param dmsBaseDeviceLedger 设备台账信息 * @return 结果 */ @@ -37,7 +37,7 @@ public interface DmsBaseDeviceLedgerMapper /** * 修改设备台账信息 - * + * * @param dmsBaseDeviceLedger 设备台账信息 * @return 结果 */ @@ -45,7 +45,7 @@ public interface DmsBaseDeviceLedgerMapper /** * 删除设备台账信息 - * + * * @param deviceId 设备台账信息主键 * @return 结果 */ @@ -53,9 +53,20 @@ public interface DmsBaseDeviceLedgerMapper /** * 批量删除设备台账信息 - * + * * @param deviceIds 需要删除的数据主键集合 * @return 结果 */ public int deleteDmsBaseDeviceLedgerByDeviceIds(Long[] deviceIds); + + + + /** + * 查询设备台账信息 + * + * @param deviceCode 设备CODE + * @return 设备台账信息 + */ + public DmsBaseDeviceLedger selectDmsBaseDeviceLedgerByDeviceCode(String deviceCode); + } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsFaultInstanceMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsFaultInstanceMapper.java index 883ad94b..71dd4bb7 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsFaultInstanceMapper.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsFaultInstanceMapper.java @@ -2,6 +2,7 @@ package com.hw.dms.mapper; import java.util.List; import com.hw.dms.domain.DmsBillsFaultInstance; +import org.apache.ibatis.annotations.Param; /** * 检修工单Mapper接口 @@ -60,6 +61,44 @@ public interface DmsBillsFaultInstanceMapper public int deleteDmsBillsFaultInstanceByRepairInstanceIds(Long[] repairInstanceIds); public Long selectProcessActivityId(Long wfProcessId); + + + /** + * 查询检修工单列表 + * + * @param dmsBillsFaultInstance 检修工单 + * @return 检修工单集合 + */ + public List selectDmsBillsFaultInstanceJoinList(DmsBillsFaultInstance dmsBillsFaultInstance); + + /** + * 查询检修工单,Join device,Join 第一步骤dms_fault_instance_activiy + * + * @param repairInstanceId 检修工单主键 + * @return 检修工单 + */ + public DmsBillsFaultInstance selectFaultInstanceJoinFirstAndDeviceById(Long repairInstanceId); + + /** + * 查询检修工单,Join device,Join 所有步骤的dms_fault_instance_activiy + * + * @param repairInstanceId 检修工单主键 + * @return 检修工单 + */ + public DmsBillsFaultInstance selectFaultInstanceJoinActivityByRepairInstanceId(Long repairInstanceId); + + + public Long selectCountByRepairInstanceIdAndDeviceCode(@Param("repairInstanceId") Long repairInstanceId, + @Param("deviceCode") String deviceCode); + + + /** + * 查询检修工单,Join 第一步骤dms_fault_instance_activiy + * + * @param repairInstanceId 检修工单主键 + * @return 检修工单 + */ + public DmsBillsFaultInstance selectFaultInstanceJoinFirstById(Long repairInstanceId); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsInspectInstanceMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsInspectInstanceMapper.java index 65e1ecd1..8a0a6a76 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsInspectInstanceMapper.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsInspectInstanceMapper.java @@ -63,4 +63,13 @@ public interface DmsBillsInspectInstanceMapper int insertDmsBillsInspectInstancePDA(DmsBillsInspectInstance dmsBillsInspectInstance); + /** + * 查询最新一条巡检工单列表 + * + * @param dmsBillsInspectInstance 巡检工单 + * @return 巡检工单 + */ + public DmsBillsInspectInstance selectNewestDmsBillsInspectInstance(DmsBillsInspectInstance dmsBillsInspectInstance); + + } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsInspectInstanceDetailMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsInspectInstanceDetailMapper.java new file mode 100644 index 00000000..7f4a77fc --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsInspectInstanceDetailMapper.java @@ -0,0 +1,83 @@ +package com.hw.dms.mapper; + +import java.util.List; +import com.hw.dms.domain.DmsInspectInstanceDetail; +import org.apache.ibatis.annotations.Param; + +/** + * 点巡检工单明细Mapper接口 + * + * @author xins + * @date 2024-03-19 + */ +public interface DmsInspectInstanceDetailMapper +{ + /** + * 查询点巡检工单明细 + * + * @param instanceDetailId 点巡检工单明细主键 + * @return 点巡检工单明细 + */ + public DmsInspectInstanceDetail selectDmsInspectInstanceDetailByInstanceDetailId(Long instanceDetailId); + + /** + * 查询点巡检工单明细列表 + * + * @param dmsInspectInstanceDetail 点巡检工单明细 + * @return 点巡检工单明细集合 + */ + public List selectDmsInspectInstanceDetailList(DmsInspectInstanceDetail dmsInspectInstanceDetail); + + /** + * 新增点巡检工单明细 + * + * @param dmsInspectInstanceDetail 点巡检工单明细 + * @return 结果 + */ + public int insertDmsInspectInstanceDetail(DmsInspectInstanceDetail dmsInspectInstanceDetail); + + /** + * 修改点巡检工单明细 + * + * @param dmsInspectInstanceDetail 点巡检工单明细 + * @return 结果 + */ + public int updateDmsInspectInstanceDetail(DmsInspectInstanceDetail dmsInspectInstanceDetail); + + /** + * 删除点巡检工单明细 + * + * @param instanceDetailId 点巡检工单明细主键 + * @return 结果 + */ + public int deleteDmsInspectInstanceDetailByInstanceDetailId(Long instanceDetailId); + + /** + * 批量删除点巡检工单明细 + * + * @param instanceDetailIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDmsInspectInstanceDetailByInstanceDetailIds(Long[] instanceDetailIds); + + + + + /** + * 查询点巡检工单明细列表,Join设备 + * + * @param dmsInspectInstanceDetail 点巡检工单明细 + * @return 点巡检工单明细集合 + */ + public List selectDmsInspectInstanceDetailJoinList(DmsInspectInstanceDetail dmsInspectInstanceDetail); + + /** + * 根据唯一索引（inspectInstanceId和deviceCode）查询点巡检工单明细 + * @param inspectInstanceId + * @param deviceCode + * @return + */ + public DmsInspectInstanceDetail selectDmsInspectInstanceDetailByUI(@Param("inspectInstanceId") Long inspectInstanceId, + @Param("deviceCode") String deviceCode); + +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsInspectInstanceDetailProjectMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsInspectInstanceDetailProjectMapper.java new file mode 100644 index 00000000..ab4f15d0 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsInspectInstanceDetailProjectMapper.java @@ -0,0 +1,76 @@ +package com.hw.dms.mapper; + +import java.util.List; +import com.hw.dms.domain.DmsInspectInstanceDetailProject; + +/** + * 点巡检工单明细项目信息;质检检查每个项目的质检结果详情Mapper接口 + * + * @author xins + * @date 2024-03-19 + */ +public interface DmsInspectInstanceDetailProjectMapper +{ + /** + * 查询点巡检工单明细项目信息;质检检查每个项目的质检结果详情 + * + * @param instanceDetailProjectId 点巡检工单明细项目信息;质检检查每个项目的质检结果详情主键 + * @return 点巡检工单明细项目信息;质检检查每个项目的质检结果详情 + */ + public DmsInspectInstanceDetailProject selectDmsInspectInstanceDetailProjectByInstanceDetailProjectId(Long instanceDetailProjectId); + + /** + * 查询点巡检工单明细项目信息;质检检查每个项目的质检结果详情列表 + * + * @param dmsInspectInstanceDetailProject 点巡检工单明细项目信息;质检检查每个项目的质检结果详情 + * @return 点巡检工单明细项目信息;质检检查每个项目的质检结果详情集合 + */ + public List selectDmsInspectInstanceDetailProjectList(DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject); + + /** + * 新增点巡检工单明细项目信息;质检检查每个项目的质检结果详情 + * + * @param dmsInspectInstanceDetailProject 点巡检工单明细项目信息;质检检查每个项目的质检结果详情 + * @return 结果 + */ + public int insertDmsInspectInstanceDetailProject(DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject); + + /** + * 修改点巡检工单明细项目信息;质检检查每个项目的质检结果详情 + * + * @param dmsInspectInstanceDetailProject 点巡检工单明细项目信息;质检检查每个项目的质检结果详情 + * @return 结果 + */ + public int updateDmsInspectInstanceDetailProject(DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject); + + /** + * 删除点巡检工单明细项目信息;质检检查每个项目的质检结果详情 + * + * @param instanceDetailProjectId 点巡检工单明细项目信息;质检检查每个项目的质检结果详情主键 + * @return 结果 + */ + public int deleteDmsInspectInstanceDetailProjectByInstanceDetailProjectId(Long instanceDetailProjectId); + + /** + * 批量删除点巡检工单明细项目信息;质检检查每个项目的质检结果详情 + * + * @param instanceDetailProjectIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDmsInspectInstanceDetailProjectByInstanceDetailProjectIds(Long[] instanceDetailProjectIds); + + + + + + + /** + * 查询点巡检工单明细项目信息;Join + * + * @param dmsInspectInstanceDetailProject 点巡检工单明细项目信息;质检检查每个项目的质检结果详情 + * @return 点巡检工单明细项目信息;质检检查每个项目的质检结果详情集合 + */ + public List selectDmsInspectInstanceDetailProjectJoinList(DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject); + + +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBaseDeviceLedgerService.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBaseDeviceLedgerService.java index 99580692..09fd2a8b 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBaseDeviceLedgerService.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBaseDeviceLedgerService.java @@ -5,15 +5,15 @@ import com.hw.dms.domain.DmsBaseDeviceLedger; /** * 设备台账信息Service接口 - * + * * @author xins * @date 2023-12-28 */ -public interface IDmsBaseDeviceLedgerService +public interface IDmsBaseDeviceLedgerService { /** * 查询设备台账信息 - * + * * @param deviceId 设备台账信息主键 * @return 设备台账信息 */ @@ -21,7 +21,7 @@ public interface IDmsBaseDeviceLedgerService /** * 查询设备台账信息列表 - * + * * @param dmsBaseDeviceLedger 设备台账信息 * @return 设备台账信息集合 */ @@ -29,7 +29,7 @@ public interface IDmsBaseDeviceLedgerService /** * 新增设备台账信息 - * + * * @param dmsBaseDeviceLedger 设备台账信息 * @return 结果 */ @@ -37,7 +37,7 @@ public interface IDmsBaseDeviceLedgerService /** * 修改设备台账信息 - * + * * @param dmsBaseDeviceLedger 设备台账信息 * @return 结果 */ @@ -45,7 +45,7 @@ public interface IDmsBaseDeviceLedgerService /** * 批量删除设备台账信息 - * + * * @param deviceIds 需要删除的设备台账信息主键集合 * @return 结果 */ @@ -53,9 +53,20 @@ public interface IDmsBaseDeviceLedgerService /** * 删除设备台账信息信息 - * + * * @param deviceId 设备台账信息主键 * @return 结果 */ public int deleteDmsBaseDeviceLedgerByDeviceId(Long deviceId); + + + + + /** + * 查询设备台账信息 + * + * @param deviceCode 设备Code + * @return 设备台账信息 + */ + public DmsBaseDeviceLedger selectDmsBaseDeviceLedgerByDeviceCode(String deviceCode); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsFaultInstanceService.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsFaultInstanceService.java index aba7a396..8562e95e 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsFaultInstanceService.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsFaultInstanceService.java @@ -2,6 +2,9 @@ package com.hw.dms.service; import java.util.List; import com.hw.dms.domain.DmsBillsFaultInstance; +import com.hw.dms.domain.DmsFaultInstanceActivity; +import com.hw.dms.domain.vo.DmsBillsFaultInstanceScanVo; +import org.springframework.transaction.annotation.Transactional; /** * 检修工单Service接口 @@ -60,4 +63,50 @@ public interface IDmsBillsFaultInstanceService public int deleteDmsBillsFaultInstanceByRepairInstanceId(Long repairInstanceId); int insertDmsBillsFaultInstancePDA(DmsBillsFaultInstance dmsBillsFaultInstance); + + + /** + * 查询报修工单列表，Join 设备 + * + * @param dmsBillsFaultInstance 报修工单 + * @return 报修工单 + */ + public List selectDmsBillsFaultInstanceJoinList(DmsBillsFaultInstance dmsBillsFaultInstance); + + /** + * 获取故障报修工单明细，提供给维修使用 + * @param repairInstanceId + * @return + */ + public DmsBillsFaultInstance getDmsBillsFaultInstance4Repair(Long repairInstanceId); + + /** + * 修改报修工单实例节点 + * + * @param dmsFaultInstanceActivity 报修工单实例节点 + * @return 结果 + */ + public int updateDmsFaultInstanceActivity(DmsFaultInstanceActivity dmsFaultInstanceActivity); + + /** + * 扫描设备编码验证，验证通过后进行维修 + * @param dmsBillsFaultInstanceScanVo + */ + public void scanDevice4Repair(DmsBillsFaultInstanceScanVo dmsBillsFaultInstanceScanVo); + + /** + * 开始维修 + * + * @param dmsFaultInstanceActivity 报修工单实例节点 + * @return 结果 + */ + public int startRepair(DmsFaultInstanceActivity dmsFaultInstanceActivity); + + /** + * 完成维修 + * + * @param dmsFaultInstanceActivity 报修工单实例节点 + * @return 结果 + */ + public int completeRepair(DmsFaultInstanceActivity dmsFaultInstanceActivity); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsInspectInstanceService.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsInspectInstanceService.java index 22504e7d..22f36b98 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsInspectInstanceService.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsInspectInstanceService.java @@ -2,6 +2,9 @@ package com.hw.dms.service; import java.util.List; import com.hw.dms.domain.DmsBillsInspectInstance; +import com.hw.dms.domain.DmsInspectInstanceDetail; +import com.hw.dms.domain.vo.DmsBillsInspectInstanceScanVo; +import org.springframework.transaction.annotation.Transactional; /** * 巡检工单Service接口 @@ -64,4 +67,27 @@ public interface IDmsBillsInspectInstanceService public int deleteDmsBillsInspectInstanceByInspectInstanceId(Long inspectInstanceId); int insertDmsBillsInspectInstancePDA(DmsBillsInspectInstance dmsBillsInspectInstance); + + /** + * 获取最新一条未完成的巡检工单 + * + * @param dmsBillsInspectInstance + * @return + */ + public DmsBillsInspectInstance getNewestBillsInspectInstance(DmsBillsInspectInstance dmsBillsInspectInstance); + + /** + * 扫描设备验证并获取巡检项目信息 + * @param dmsBillsInspectInstanceScanVo + * @return + */ + public DmsInspectInstanceDetail scanInspectInstanceDetail(DmsBillsInspectInstanceScanVo dmsBillsInspectInstanceScanVo); + + /** + * 更新点巡检工单明细 + * + * @param dmsInspectInstanceDetail 点巡检工单明细 + * @return 结果 + */ + public int updateDmsInspectInstanceDetail(DmsInspectInstanceDetail dmsInspectInstanceDetail); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseDeviceLedgerServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseDeviceLedgerServiceImpl.java index a4cfc67d..cb0a941c 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseDeviceLedgerServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseDeviceLedgerServiceImpl.java @@ -1,6 +1,8 @@ package com.hw.dms.service.impl; import java.util.List; + +import com.hw.common.core.exception.ServiceException; import com.hw.common.core.utils.DateUtils; import com.hw.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; @@ -16,8 +18,7 @@ import com.hw.dms.service.IDmsBaseDeviceLedgerService; * @date 2023-12-28 */ @Service -public class DmsBaseDeviceLedgerServiceImpl implements IDmsBaseDeviceLedgerService -{ +public class DmsBaseDeviceLedgerServiceImpl implements IDmsBaseDeviceLedgerService { @Autowired private DmsBaseDeviceLedgerMapper dmsBaseDeviceLedgerMapper; @@ -28,8 +29,7 @@ public class DmsBaseDeviceLedgerServiceImpl implements IDmsBaseDeviceLedgerServi * @return 设备台账信息 */ @Override - public DmsBaseDeviceLedger selectDmsBaseDeviceLedgerByDeviceId(Long deviceId) - { + public DmsBaseDeviceLedger selectDmsBaseDeviceLedgerByDeviceId(Long deviceId) { return dmsBaseDeviceLedgerMapper.selectDmsBaseDeviceLedgerByDeviceId(deviceId); } @@ -40,8 +40,7 @@ public class DmsBaseDeviceLedgerServiceImpl implements IDmsBaseDeviceLedgerServi * @return 设备台账信息 */ @Override - public List selectDmsBaseDeviceLedgerList(DmsBaseDeviceLedger dmsBaseDeviceLedger) - { + public List selectDmsBaseDeviceLedgerList(DmsBaseDeviceLedger dmsBaseDeviceLedger) { return dmsBaseDeviceLedgerMapper.selectDmsBaseDeviceLedgerList(dmsBaseDeviceLedger); } @@ -52,8 +51,7 @@ public class DmsBaseDeviceLedgerServiceImpl implements IDmsBaseDeviceLedgerServi * @return 结果 */ @Override - public int insertDmsBaseDeviceLedger(DmsBaseDeviceLedger dmsBaseDeviceLedger) - { + public int insertDmsBaseDeviceLedger(DmsBaseDeviceLedger dmsBaseDeviceLedger) { dmsBaseDeviceLedger.setIsFlag(1l); LoginUser loginUser = new LoginUser(); dmsBaseDeviceLedger.setCreateBy(loginUser.getUsername()); @@ -68,8 +66,7 @@ public class DmsBaseDeviceLedgerServiceImpl implements IDmsBaseDeviceLedgerServi * @return 结果 */ @Override - public int updateDmsBaseDeviceLedger(DmsBaseDeviceLedger dmsBaseDeviceLedger) - { + public int updateDmsBaseDeviceLedger(DmsBaseDeviceLedger dmsBaseDeviceLedger) { LoginUser loginUser = new LoginUser(); dmsBaseDeviceLedger.setUpdateBy(loginUser.getUsername()); dmsBaseDeviceLedger.setUpdateTime(DateUtils.getNowDate()); @@ -83,8 +80,7 @@ public class DmsBaseDeviceLedgerServiceImpl implements IDmsBaseDeviceLedgerServi * @return 结果 */ @Override - public int deleteDmsBaseDeviceLedgerByDeviceIds(Long[] deviceIds) - { + public int deleteDmsBaseDeviceLedgerByDeviceIds(Long[] deviceIds) { return dmsBaseDeviceLedgerMapper.deleteDmsBaseDeviceLedgerByDeviceIds(deviceIds); } @@ -95,8 +91,24 @@ public class DmsBaseDeviceLedgerServiceImpl implements IDmsBaseDeviceLedgerServi * @return 结果 */ @Override - public int deleteDmsBaseDeviceLedgerByDeviceId(Long deviceId) - { + public int deleteDmsBaseDeviceLedgerByDeviceId(Long deviceId) { return dmsBaseDeviceLedgerMapper.deleteDmsBaseDeviceLedgerByDeviceId(deviceId); } + + + /** + * 查询设备台账信息 + * + * @param deviceCode 设备Code + * @return 设备台账信息 + */ + @Override + public DmsBaseDeviceLedger selectDmsBaseDeviceLedgerByDeviceCode(String deviceCode) { + DmsBaseDeviceLedger dmsBaseDeviceLedger = dmsBaseDeviceLedgerMapper.selectDmsBaseDeviceLedgerByDeviceCode(deviceCode); + if (dmsBaseDeviceLedger == null) { + throw new ServiceException("无此设备"); + } + return dmsBaseDeviceLedger; + } + } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java index 1905fdc3..a94b6d43 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java @@ -6,11 +6,13 @@ import java.util.List; import com.hw.common.core.constant.DmsConstants; import com.hw.common.core.constant.WfConstants; +import com.hw.common.core.exception.ServiceException; import com.hw.common.core.utils.DateUtils; import com.hw.common.core.utils.uuid.Seq; import com.hw.common.security.utils.SecurityUtils; import com.hw.dms.domain.DmsFaultInstanceActivity; import com.hw.dms.domain.DmsInstanceFile; +import com.hw.dms.domain.vo.DmsBillsFaultInstanceScanVo; import com.hw.dms.mapper.DmsFaultInstanceActivityMapper; import com.hw.dms.mapper.DmsInstanceFileMapper; import com.hw.system.api.domain.SysFile; @@ -45,26 +47,20 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS */ @Override public DmsBillsFaultInstance selectDmsBillsFaultInstanceByRepairInstanceId(Long repairInstanceId) { - DmsFaultInstanceActivity dmsFaultInstanceActivity = dmsFaultInstanceActivityMapper.selectDmsFaultInstanceActivityByRepairIdMin(repairInstanceId); - DmsBillsFaultInstance dmsBillsFaultInstance = dmsBillsFaultInstanceMapper.selectDmsBillsFaultInstanceByRepairInstanceId(repairInstanceId); -// List dmsFaultInstanceFiles = dmsFaultInstanceFileMapper.selectDmsFaultInstanceFileByFaultId(repairInstanceId); - List sysFiles = new ArrayList(); - SysFile sysFile = new SysFile(); - dmsBillsFaultInstance.setFaultType(dmsFaultInstanceActivity.getFaultType()); - dmsBillsFaultInstance.setFaultDescription(dmsFaultInstanceActivity.getFaultDescription()); - dmsBillsFaultInstance.setDesignOperations(dmsFaultInstanceActivity.getDesignOperations()); - dmsBillsFaultInstance.setDesignOperations(dmsFaultInstanceActivity.getDesignOperations()); - dmsBillsFaultInstance.setDeviceId(dmsFaultInstanceActivity.getDeviceId()); - dmsBillsFaultInstance.setRepairType(dmsFaultInstanceActivity.getRepairType()); - if (dmsFaultInstanceActivity.getOutsrcId() != null) { - dmsBillsFaultInstance.setOutsrcId(dmsFaultInstanceActivity.getOutsrcId()); - } -// for (DmsFaultInstanceFile dmsFaultFor : dmsFaultInstanceFiles) { -// sysFile.setUrl(dmsFaultFor.getFaultFile()); -// sysFiles.add(sysFile); -// } -// dmsBillsFaultInstance.setDmsFaultInstanceFiles(dmsFaultInstanceFiles); - dmsBillsFaultInstance.setSysFiles(sysFiles); +// DmsFaultInstanceActivity dmsFaultInstanceActivity = dmsFaultInstanceActivityMapper.selectDmsFaultInstanceActivityByRepairIdMin(repairInstanceId); +// DmsBillsFaultInstance dmsBillsFaultInstance = dmsBillsFaultInstanceMapper.selectDmsBillsFaultInstanceByRepairInstanceId(repairInstanceId); + DmsBillsFaultInstance dmsBillsFaultInstance = dmsBillsFaultInstanceMapper.selectFaultInstanceJoinFirstAndDeviceById(repairInstanceId); + DmsInstanceFile queryInstanceFile = new DmsInstanceFile(); + queryInstanceFile.setTargetType(DmsConstants.DMS_INSTANCE_FILE_TARGET_TYPE_FAULT_INSTANCE_ACTIVITY); + queryInstanceFile.setTargetId(dmsBillsFaultInstance.getInstanceActivityId()); + List dmsInstanceFiles = dmsInstanceFileMapper.selectDmsInstanceFileList(queryInstanceFile); + dmsBillsFaultInstance.setDmsInstanceFiles(dmsInstanceFiles); +// dmsBillsFaultInstance.setFaultType(dmsFaultInstanceActivity.getFaultType()); +// dmsBillsFaultInstance.setFaultDescription(dmsFaultInstanceActivity.getFaultDescription()); +// dmsBillsFaultInstance.setDesignOperations(dmsFaultInstanceActivity.getDesignOperations()); +// dmsBillsFaultInstance.setDeviceId(dmsFaultInstanceActivity.getDeviceId()); +// dmsBillsFaultInstance.setRepairType(dmsFaultInstanceActivity.getRepairType()); + return dmsBillsFaultInstance; } @@ -113,23 +109,13 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS if (dmsBillsFaultInstance.getOutsrcId() != null) { dmsFaultInstanceActivity.setOutsrcId(dmsBillsFaultInstance.getOutsrcId()); } - dmsFaultInstanceActivity.setProcessHandleStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_ACTIVITY_STATUS_TO_PICK); + dmsFaultInstanceActivity.setProcessHandleStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_ACTIVITY_HANDLE_STATUS_TO_PICK); dmsFaultInstanceActivity.setProcessStepOrder(1l); dmsFaultInstanceActivityMapper.insertDmsFaultInstanceActivity(dmsFaultInstanceActivity); //存储图片 List fileUrls = dmsBillsFaultInstance.getFileUrls(); - if (fileUrls != null && !fileUrls.isEmpty()) { - List dmsInstanceFiles = new ArrayList<>(); - for (String fileUrl : fileUrls) { - DmsInstanceFile dmsInstanceFile = new DmsInstanceFile(); - dmsInstanceFile.setTargetId(dmsFaultInstanceActivity.getInstanceActivityId()); - dmsInstanceFile.setTargetType("1"); - dmsInstanceFile.setFilePath(fileUrl); - dmsInstanceFiles.add(dmsInstanceFile); - } - dmsInstanceFileMapper.batchDmsInstanceFile(dmsInstanceFiles); - } + batchInsertInstanceFiles(fileUrls, dmsFaultInstanceActivity.getInstanceActivityId()); return rows; } @@ -191,4 +177,196 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS return i; } + + /** + * 查询报修工单列表，Join 设备 + * + * @param dmsBillsFaultInstance 报修工单 + * @return 报修工单 + */ + @Override + public List selectDmsBillsFaultInstanceJoinList(DmsBillsFaultInstance dmsBillsFaultInstance) { + + return dmsBillsFaultInstanceMapper.selectDmsBillsFaultInstanceJoinList(dmsBillsFaultInstance); + } + + + /** + * 获取故障报修工单明细，提供给维修使用 + * + * @param repairInstanceId + * @return + */ + @Override + public DmsBillsFaultInstance getDmsBillsFaultInstance4Repair(Long repairInstanceId) { + DmsBillsFaultInstance dmsBillsFaultInstance = dmsBillsFaultInstanceMapper.selectFaultInstanceJoinActivityByRepairInstanceId(repairInstanceId); + List dmsBillsFaultInstanceActivityList = dmsBillsFaultInstance.getDmsFaultInstanceActivityList(); + DmsFaultInstanceActivity firstStepActivity = dmsBillsFaultInstanceActivityList.get(0); + DmsFaultInstanceActivity dmsFaultInstanceActivity; + if (dmsBillsFaultInstanceActivityList.size() == 1) { + dmsFaultInstanceActivity = firstStepActivity; + } else { + dmsFaultInstanceActivity = dmsBillsFaultInstanceActivityList.get(1); + dmsBillsFaultInstance.setInstanceActivityId(dmsFaultInstanceActivity.getInstanceActivityId()); + } + dmsBillsFaultInstance.setFaultType(dmsFaultInstanceActivity.getFaultType()); + dmsBillsFaultInstance.setFaultDescription(firstStepActivity.getFaultDescription()); + dmsBillsFaultInstance.setDesignOperations(dmsFaultInstanceActivity.getDesignOperations()); + dmsBillsFaultInstance.setDeviceId(dmsFaultInstanceActivity.getDeviceId()); + dmsBillsFaultInstance.setRepairType(dmsFaultInstanceActivity.getRepairType()); + dmsBillsFaultInstance.setOutsrcId(dmsFaultInstanceActivity.getOutsrcId()); + dmsBillsFaultInstance.setProcessHandleResolution(dmsFaultInstanceActivity.getProcessHandleResolution()); + + dmsBillsFaultInstance.setDmsFaultInstanceActivityList(null); + + DmsInstanceFile queryInstanceFile = new DmsInstanceFile(); + queryInstanceFile.setTargetType(DmsConstants.DMS_INSTANCE_FILE_TARGET_TYPE_FAULT_INSTANCE_ACTIVITY); + queryInstanceFile.setTargetId(firstStepActivity.getInstanceActivityId()); + List dmsInstanceFiles = dmsInstanceFileMapper.selectDmsInstanceFileList(queryInstanceFile); + dmsBillsFaultInstance.setDmsInstanceFiles(dmsInstanceFiles); + + return dmsBillsFaultInstance; + } + + + /** + * 修改报修工单实例节点 + * + * @param dmsFaultInstanceActivity 报修工单实例节点 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int updateDmsFaultInstanceActivity(DmsFaultInstanceActivity dmsFaultInstanceActivity) { + //存储图片 + List fileUrls = dmsFaultInstanceActivity.getFileUrls(); + batchInsertInstanceFiles(fileUrls, dmsFaultInstanceActivity.getInstanceActivityId()); + return dmsFaultInstanceActivityMapper.updateDmsFaultInstanceActivity(dmsFaultInstanceActivity); + } + + /** + * 扫描设备编码验证，验证通过后进行维修 + * + * @param dmsBillsFaultInstanceScanVo + */ + @Override + public void scanDevice4Repair(DmsBillsFaultInstanceScanVo dmsBillsFaultInstanceScanVo) { + Long count = dmsBillsFaultInstanceMapper.selectCountByRepairInstanceIdAndDeviceCode( + dmsBillsFaultInstanceScanVo.getRepairInstanceId(), dmsBillsFaultInstanceScanVo.getDeviceCode()); + if (count <= 0) { + throw new ServiceException("扫描验证失败"); + } + } + + + /** + * 开始维修 + * + * @param dmsFaultInstanceActivity 报修工单实例节点 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int startRepair(DmsFaultInstanceActivity dmsFaultInstanceActivity) { + DmsBillsFaultInstance dmsBillsFaultInstance = dmsBillsFaultInstanceMapper + .selectFaultInstanceJoinFirstById(dmsFaultInstanceActivity.getRepairInstanceId());//join 第一步activity + String dmsBillsStatus = dmsBillsFaultInstance.getBillsStatus(); + if (dmsBillsStatus.equals(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_FINISH)) {//维修完成 + throw new ServiceException("已经维修完成"); + } + + Date currentDate = new Date(); + String userName = SecurityUtils.getUsername(); + + if (dmsBillsStatus.equals(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_TO_REPAIR)) {//待维修 + dmsBillsFaultInstance.setBillsStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_REPAIRING); + dmsBillsFaultInstance.setRealBeginTime(currentDate); + dmsBillsFaultInstance.setUpdateTime(currentDate); + dmsBillsFaultInstance.setUpdateBy(userName); + dmsBillsFaultInstanceMapper.updateDmsBillsFaultInstance(dmsBillsFaultInstance); + + dmsFaultInstanceActivity.setRepairInstanceId(dmsBillsFaultInstance.getRepairInstanceId()); + dmsFaultInstanceActivity.setProcessActivityId(WfConstants.WF_BILLS_FAULT_INSTANCE_PROCESS_ACTIVITY_SECOND_ID); + dmsFaultInstanceActivity.setDeviceId(dmsBillsFaultInstance.getDeviceId()); + dmsFaultInstanceActivity.setProcessHandleStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_ACTIVITY_HANDLE_STATUS_EXECUTING); + dmsFaultInstanceActivity.setProcessStepOrder(2L); + dmsFaultInstanceActivity.setStartTime(currentDate); + dmsFaultInstanceActivity.setHandleUserId(SecurityUtils.getUserId()); + dmsFaultInstanceActivity.setHandleBy(userName); + dmsFaultInstanceActivity.setHandleTime(currentDate); + dmsFaultInstanceActivity.setCreateBy(userName); + dmsFaultInstanceActivity.setCreateTime(currentDate); + + dmsFaultInstanceActivityMapper.insertDmsFaultInstanceActivity(dmsFaultInstanceActivity); + + DmsFaultInstanceActivity firstInstanceActivity = new DmsFaultInstanceActivity(); + firstInstanceActivity.setInstanceActivityId(dmsBillsFaultInstance.getInstanceActivityId()); + firstInstanceActivity.setProcessHandleStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_ACTIVITY_HANDLE_STATUS_FINISH); + firstInstanceActivity.setEndTime(currentDate); + + dmsFaultInstanceActivityMapper.updateDmsFaultInstanceActivity(firstInstanceActivity); + + } else {//维修中 + + dmsFaultInstanceActivityMapper.updateDmsFaultInstanceActivity(dmsFaultInstanceActivity); + } + + return 1; + } + + + /** + * 完成维修 + * + * @param dmsFaultInstanceActivity 报修工单实例节点 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int completeRepair(DmsFaultInstanceActivity dmsFaultInstanceActivity) { + DmsBillsFaultInstance dmsBillsFaultInstance = dmsBillsFaultInstanceMapper. + selectDmsBillsFaultInstanceByRepairInstanceId(dmsFaultInstanceActivity.getRepairInstanceId()); + String dmsBillsStatus = dmsBillsFaultInstance.getBillsStatus(); + if (dmsBillsStatus.equals(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_FINISH)) {//维修完成 + throw new ServiceException("已经维修完成"); + } + if (dmsBillsStatus.equals(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_TO_REPAIR)) {//待维修 + throw new ServiceException("请先开始维修"); + + } + + Date currentDate = new Date(); + String userName = SecurityUtils.getUsername(); + + dmsBillsFaultInstance.setBillsStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_STATUS_FINISH); + dmsBillsFaultInstance.setRealEndTime(currentDate); + dmsBillsFaultInstance.setUpdateBy(userName); + dmsBillsFaultInstance.setUpdateTime(currentDate); + + dmsBillsFaultInstanceMapper.updateDmsBillsFaultInstance(dmsBillsFaultInstance); + + dmsFaultInstanceActivity.setProcessHandleStatus(DmsConstants.DMS_BILLS_FAULT_INSTANCE_ACTIVITY_HANDLE_STATUS_FINISH); + dmsFaultInstanceActivity.setEndTime(currentDate); + + dmsFaultInstanceActivityMapper.updateDmsFaultInstanceActivity(dmsFaultInstanceActivity); + + return 1; + } + + + public void batchInsertInstanceFiles(List fileUrls, Long instanceActivityId) { + if (fileUrls != null && !fileUrls.isEmpty()) { + List dmsInstanceFiles = new ArrayList<>(); + for (String fileUrl : fileUrls) { + DmsInstanceFile dmsInstanceFile = new DmsInstanceFile(); + dmsInstanceFile.setTargetId(instanceActivityId); + dmsInstanceFile.setTargetType(DmsConstants.DMS_INSTANCE_FILE_TARGET_TYPE_FAULT_INSTANCE_ACTIVITY); + dmsInstanceFile.setFilePath(fileUrl); + dmsInstanceFiles.add(dmsInstanceFile); + } + dmsInstanceFileMapper.batchDmsInstanceFile(dmsInstanceFiles); + } + } + + } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java index c3743bd9..3bd82b79 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsInspectInstanceServiceImpl.java @@ -1,20 +1,30 @@ package com.hw.dms.service.impl; -import java.text.SimpleDateFormat; -import java.util.List; - +import com.hw.common.core.constant.DmsConstants; +import com.hw.common.core.constant.QmsConstants; import com.hw.common.core.constant.SecurityConstants; +import com.hw.common.core.exception.ServiceException; import com.hw.common.core.utils.DateUtils; +import com.hw.common.core.utils.StringUtils; +import com.hw.common.security.utils.SecurityUtils; +import com.hw.dms.domain.DmsBillsInspectInstance; import com.hw.dms.domain.DmsBillsInspectInstanceActivity; -import com.hw.dms.mapper.DmsBillsInspectInstanceActivityMapper; -import com.hw.dms.mapper.DmsRepairInstanceMapper; +import com.hw.dms.domain.DmsInspectInstanceDetail; +import com.hw.dms.domain.DmsInspectInstanceDetailProject; +import com.hw.dms.domain.vo.DmsBillsInspectInstanceScanVo; +import com.hw.dms.mapper.*; +import com.hw.dms.service.IDmsBillsInspectInstanceService; import com.hw.system.api.RemoteSysCommonService; import com.hw.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.hw.dms.mapper.DmsBillsInspectInstanceMapper; -import com.hw.dms.domain.DmsBillsInspectInstance; -import com.hw.dms.service.IDmsBillsInspectInstanceService; +import org.springframework.transaction.annotation.Transactional; + +import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; /** * 巡检工单Service业务层处理 @@ -23,8 +33,7 @@ import com.hw.dms.service.IDmsBillsInspectInstanceService; * @date 2024-01-23 */ @Service -public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInstanceService -{ +public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInstanceService { @Autowired private DmsBillsInspectInstanceMapper dmsBillsInspectInstanceMapper; @Autowired @@ -32,6 +41,12 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta @Autowired private DmsRepairInstanceMapper dmsRepairInstanceMapper; @Autowired + private DmsInspectInstanceDetailMapper dmsInspectInstanceDetailMapper; + @Autowired + private DmsInspectInstanceDetailProjectMapper dmsInspectInstanceDetailProjectMapper; + @Autowired + private DmsInspectInstanceDetailProjectMapper dmsInspectInstanceDetailPrjectMapper; + @Autowired private RemoteSysCommonService remoteSysCommonService; /** @@ -41,8 +56,7 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta * @return 巡检工单 */ @Override - public DmsBillsInspectInstance selectDmsBillsInspectInstanceByInspectInstanceId(Long inspectInstanceId) - { + public DmsBillsInspectInstance selectDmsBillsInspectInstanceByInspectInstanceId(Long inspectInstanceId) { return dmsBillsInspectInstanceMapper.selectDmsBillsInspectInstanceByInspectInstanceId(inspectInstanceId); } @@ -53,8 +67,7 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta * @return 巡检工单 */ @Override - public List selectDmsBillsInspectInstanceList(DmsBillsInspectInstance dmsBillsInspectInstance) - { + public List selectDmsBillsInspectInstanceList(DmsBillsInspectInstance dmsBillsInspectInstance) { return dmsBillsInspectInstanceMapper.selectDmsBillsInspectInstanceList(dmsBillsInspectInstance); } @@ -75,14 +88,13 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta * @return 结果 */ @Override - public int insertDmsBillsInspectInstance(DmsBillsInspectInstance dmsBillsInspectInstance) - { + public int insertDmsBillsInspectInstance(DmsBillsInspectInstance dmsBillsInspectInstance) { LoginUser user = new LoginUser(); //写死105，也可根据传入对象的wfprocessid作为传参。 Long aLong = dmsRepairInstanceMapper.selectWfProcessActivityId(105l); - if (dmsBillsInspectInstance.getInspectType().equals("1")){ + if (dmsBillsInspectInstance.getInspectType().equals("1")) { dmsBillsInspectInstance.setWfProcessId(105l); - }else if (dmsBillsInspectInstance.getInspectType().equals("2")){ + } else if (dmsBillsInspectInstance.getInspectType().equals("2")) { dmsBillsInspectInstance.setWfProcessId(104l); } dmsBillsInspectInstance.setCreateTime(DateUtils.getNowDate()); @@ -109,8 +121,7 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta * @return 结果 */ @Override - public int updateDmsBillsInspectInstance(DmsBillsInspectInstance dmsBillsInspectInstance) - { + public int updateDmsBillsInspectInstance(DmsBillsInspectInstance dmsBillsInspectInstance) { dmsBillsInspectInstance.setUpdateTime(DateUtils.getNowDate()); return dmsBillsInspectInstanceMapper.updateDmsBillsInspectInstance(dmsBillsInspectInstance); } @@ -122,8 +133,7 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta * @return 结果 */ @Override - public int deleteDmsBillsInspectInstanceByInspectInstanceIds(Long[] inspectInstanceIds) - { + public int deleteDmsBillsInspectInstanceByInspectInstanceIds(Long[] inspectInstanceIds) { return dmsBillsInspectInstanceMapper.deleteDmsBillsInspectInstanceByInspectInstanceIds(inspectInstanceIds); } @@ -134,8 +144,7 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta * @return 结果 */ @Override - public int deleteDmsBillsInspectInstanceByInspectInstanceId(Long inspectInstanceId) - { + public int deleteDmsBillsInspectInstanceByInspectInstanceId(Long inspectInstanceId) { return dmsBillsInspectInstanceMapper.deleteDmsBillsInspectInstanceByInspectInstanceId(inspectInstanceId); } @@ -143,13 +152,12 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta public int insertDmsBillsInspectInstancePDA(DmsBillsInspectInstance dmsBillsInspectInstance) { Long along = null; SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHH"); - if (dmsBillsInspectInstance.getInspectType().equals("1")){ + if (dmsBillsInspectInstance.getInspectType().equals("1")) { dmsBillsInspectInstance.setWfProcessId(105l); - along = remoteSysCommonService.selectProcessActivityIdByWfProcessId(SecurityConstants.INNER,105l); - } - else if (dmsBillsInspectInstance.getInspectType().equals("2")){ + along = remoteSysCommonService.selectProcessActivityIdByWfProcessId(SecurityConstants.INNER, 105l); + } else if (dmsBillsInspectInstance.getInspectType().equals("2")) { dmsBillsInspectInstance.setWfProcessId(104l); - along = remoteSysCommonService.selectProcessActivityIdByWfProcessId(SecurityConstants.INNER,104l); + along = remoteSysCommonService.selectProcessActivityIdByWfProcessId(SecurityConstants.INNER, 104l); } dmsBillsInspectInstance.setBillsInspectCode(sdf.format(DateUtils.getNowDate())); @@ -171,4 +179,153 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta } + /** + * 获取最新一条未完成的巡检工单 + * + * @param dmsBillsInspectInstance + * @return + */ + @Override + public DmsBillsInspectInstance getNewestBillsInspectInstance(DmsBillsInspectInstance dmsBillsInspectInstance) { + dmsBillsInspectInstance.setInspectStatusStr(DmsConstants.DMS_BILLS_INSPECT_INSTANCE_INSPECT_STATUS_TO_INSPECT + "," + DmsConstants.DMS_BILLS_INSPECT_INSTANCE_INSPECT_STATUS_INSPECTING); + DmsBillsInspectInstance newestBillsInspectInstance = dmsBillsInspectInstanceMapper.selectNewestDmsBillsInspectInstance(dmsBillsInspectInstance); + if (newestBillsInspectInstance != null) { + DmsInspectInstanceDetail queryInspectInstanceDetail = new DmsInspectInstanceDetail(); + queryInspectInstanceDetail.setInspectInstanceId(newestBillsInspectInstance.getInspectInstanceId()); + List inspectInstanceDetails = dmsInspectInstanceDetailMapper.selectDmsInspectInstanceDetailJoinList(queryInspectInstanceDetail); + newestBillsInspectInstance.setDmsInspectInstanceDetailList(inspectInstanceDetails); + } + + return newestBillsInspectInstance; + } + + + /** + * 扫描设备验证并获取巡检项目信息 + * + * @param dmsBillsInspectInstanceScanVo + * @return + */ + @Override + public DmsInspectInstanceDetail scanInspectInstanceDetail(DmsBillsInspectInstanceScanVo dmsBillsInspectInstanceScanVo) { + DmsInspectInstanceDetail dmsInspectInstanceDetail = dmsInspectInstanceDetailMapper.selectDmsInspectInstanceDetailByUI(dmsBillsInspectInstanceScanVo.getInspectInstanceId(), + dmsBillsInspectInstanceScanVo.getDeviceCode()); + if (dmsInspectInstanceDetail == null) { + throw new ServiceException("无此设备的检查工单"); + } + + Long deviceId = dmsInspectInstanceDetail.getDeviceId(); + DmsInspectInstanceDetailProject queryInspectInstanceDetailProject = new DmsInspectInstanceDetailProject(); + queryInspectInstanceDetailProject.setDeviceId(deviceId); + List dmsInspectInstanceDetailProjects = dmsInspectInstanceDetailPrjectMapper.selectDmsInspectInstanceDetailProjectJoinList(queryInspectInstanceDetailProject); + + dmsInspectInstanceDetail.setDmsInspectInstanceDetailProjectList(dmsInspectInstanceDetailProjects); + + return dmsInspectInstanceDetail; + + } + + + /** + * 更新点巡检工单明细 + * + * @param dmsInspectInstanceDetail 点巡检工单明细 + * @return 结果 + */ + @Transactional + @Override + public int updateDmsInspectInstanceDetail(DmsInspectInstanceDetail dmsInspectInstanceDetail) { + String userName = SecurityUtils.getUsername(); + Date currentDate = new Date(); + dmsInspectInstanceDetail.setUpdateTime(currentDate); + dmsInspectInstanceDetail.setUpdateBy(userName); + + DmsInspectInstanceDetail returnInspectInstanceDetail = handleDmsInspectInstanceDetailProject(dmsInspectInstanceDetail); + if (returnInspectInstanceDetail != null) { + dmsInspectInstanceDetail.setInspectStatus(returnInspectInstanceDetail.getInspectStatus()); + dmsInspectInstanceDetail.setInstanceDetailStatus(returnInspectInstanceDetail.getInstanceDetailStatus()); + dmsInspectInstanceDetail.setDmsInspectInstanceDetailProjectList(returnInspectInstanceDetail.getDmsInspectInstanceDetailProjectList()); + batchUpdateDmsInspectInstanceDetailProject(dmsInspectInstanceDetail); + } + + return dmsInspectInstanceDetailMapper.updateDmsInspectInstanceDetail(dmsInspectInstanceDetail); + } + + /** + * 更新点巡检工单明细项目信息 + * + * @param dmsInspectInstanceDetail 点巡检工单明细 + */ + public DmsInspectInstanceDetail handleDmsInspectInstanceDetailProject(DmsInspectInstanceDetail dmsInspectInstanceDetail) { + String instanceDetailStatus = DmsConstants.DMS_INSPECT_INSTANCE_DETAIL_STATUS_FINISH; + String inspectStatus = DmsConstants.DMS_INSPECT_INSTANCE_DETAIL_INSPECT_STATUS_PASS;//质检结果检验状态 + List inspectInstanceDetailProjectList = dmsInspectInstanceDetail.getDmsInspectInstanceDetailProjectList(); + if (StringUtils.isNotNull(inspectInstanceDetailProjectList)) { + DmsInspectInstanceDetail returnInspectInstanceDetail = new DmsInspectInstanceDetail(); + List toUpdatedList = new ArrayList<>(); + for (DmsInspectInstanceDetailProject inspectInstanceDetailProject : inspectInstanceDetailProjectList) { + String inspectProjectProperty = inspectInstanceDetailProject.getInspectProjectProperty(); + if (inspectProjectProperty.equals(DmsConstants.DMS_INSPECT_INSTANCE_PROJECT_PROPERTY_QUALITATIVE)) {//如果是定性 + String inspectProjectStatus = inspectInstanceDetailProject.getInspectProjectStatus(); + if (inspectProjectStatus != null) { + if (inspectProjectStatus.equals(DmsConstants.DMS_INSPECT_INSTANCE_DETAIL_PROJECT_STATUS_FAIL)) { + inspectStatus = DmsConstants.DMS_INSPECT_INSTANCE_DETAIL_INSPECT_STATUS_FAIL; + } + } else { + instanceDetailStatus = DmsConstants.DMS_INSPECT_INSTANCE_DETAIL_STATUS_INSPECTING; + } + } else {//如果是定量 + BigDecimal inspectProjectResult = inspectInstanceDetailProject.getInspectProjectResult(); + if (inspectProjectResult != null) { + BigDecimal standardValue = inspectInstanceDetailProject.getDefValue(); + BigDecimal upperDiff = inspectInstanceDetailProject.getUpLimit(); + BigDecimal downDiff = inspectInstanceDetailProject.getLowLimit(); + + if (upperDiff == null) {//如果没设置上差值，则标准值为上差值 + upperDiff = standardValue; + } else if (downDiff == null) {//如果没设置下差值，则标准值为下差值 + downDiff = standardValue; + } + if (inspectProjectResult.compareTo(downDiff) >= 0 && inspectProjectResult.compareTo(upperDiff) <= 0) { + inspectInstanceDetailProject.setInspectProjectStatus(DmsConstants.DMS_INSPECT_INSTANCE_DETAIL_PROJECT_STATUS_PASS); + } else { + inspectInstanceDetailProject.setInspectProjectStatus(DmsConstants.DMS_INSPECT_INSTANCE_DETAIL_PROJECT_STATUS_FAIL); + inspectStatus = DmsConstants.DMS_INSPECT_INSTANCE_DETAIL_INSPECT_STATUS_FAIL; + } + + } else { + instanceDetailStatus = DmsConstants.DMS_INSPECT_INSTANCE_DETAIL_STATUS_INSPECTING; + } + } + + toUpdatedList.add(inspectInstanceDetailProject); + } + + returnInspectInstanceDetail.setInspectStatus(inspectStatus); + returnInspectInstanceDetail.setInstanceDetailStatus(instanceDetailStatus); + returnInspectInstanceDetail.setDmsInspectInstanceDetailProjectList(toUpdatedList); + + return returnInspectInstanceDetail; + } + + + return null; + } + + /** + * 批量更新点巡检工单明细项目信息(事务，需要用public，不能用private) + */ + public void batchUpdateDmsInspectInstanceDetailProject(DmsInspectInstanceDetail dmsInspectInstanceDetail) { + List inspectInstanceDetailProjects = dmsInspectInstanceDetail.getDmsInspectInstanceDetailProjectList(); + for (DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject : inspectInstanceDetailProjects) { + if (dmsInspectInstanceDetailProject.getInstanceDetailProjectId() == null) { + dmsInspectInstanceDetailProject.setInstanceDetailId(dmsInspectInstanceDetail.getInstanceDetailId()); + dmsInspectInstanceDetailProjectMapper.insertDmsInspectInstanceDetailProject(dmsInspectInstanceDetailProject); + } else { + dmsInspectInstanceDetailProjectMapper.updateDmsInspectInstanceDetailProject(dmsInspectInstanceDetailProject); + } + } + + } + } diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseDeviceLedgerMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseDeviceLedgerMapper.xml index 06369c91..0477bd08 100644 --- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseDeviceLedgerMapper.xml +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseDeviceLedgerMapper.xml @@ -121,4 +121,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{deviceId} + + + + + + diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml index 3db4c549..a564841b 100644 --- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml @@ -24,6 +24,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -139,4 +182,76 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select min(process_activity_id) from wf_process_activity where wf_process_id = #{wfProcessId} + + + + + + + + select dbfi.repair_instance_id, dbfi.fault_source_type, dbfi.fault_source_id, dbfi.wf_process_id, dbfi.bills_fault_code, dbfi.bills_status, + dbfi.apply_user, dbfi.apply_time, dbfi.real_begin_time, dbfi.real_end_time, dbfi.require_end_time, dbfi.device_id, + dbdl.device_code,dbdl.device_name,dbdl.device_location,dbdl.device_spec + from dms_bills_fault_instance dbfi left join dms_base_device_ledger dbdl on dbfi.device_id=dbdl.device_id + + + + + + + + + + + + + + + + + + + + + diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml index b22c7db5..cd285203 100644 --- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml @@ -21,6 +21,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -127,4 +129,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{inspectInstanceId} + + + + + + + + + + + + + diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsInspectInstanceDetailMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsInspectInstanceDetailMapper.xml new file mode 100644 index 00000000..20ab5a94 --- /dev/null +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsInspectInstanceDetailMapper.xml @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + + + + + + select instance_detail_id, inspect_instance_id, line_step, real_line_step, device_id, instance_detail_status, inspect_standard, inspect_desc, inspect_value, inspect_status, create_by, create_time, update_by, update_time from dms_inspect_instance_detail + + + + + + + + insert into dms_inspect_instance_detail + + inspect_instance_id, + line_step, + real_line_step, + device_id, + instance_detail_status, + inspect_standard, + inspect_desc, + inspect_status, + create_by, + create_time, + update_by, + update_time, + + + #{inspectInstanceId}, + #{lineStep}, + #{realLineStep}, + #{deviceId}, + #{instanceDetailStatus}, + #{inspectStandard}, + #{inspectDesc}, + #{inspectStatus}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update dms_inspect_instance_detail + + inspect_instance_id = #{inspectInstanceId}, + line_step = #{lineStep}, + real_line_step = #{realLineStep}, + device_id = #{deviceId}, + instance_detail_status = #{instanceDetailStatus}, + inspect_standard = #{inspectStandard}, + inspect_desc = #{inspectDesc}, + inspect_status = #{inspectStatus}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where instance_detail_id = #{instanceDetailId} + + + + delete from dms_inspect_instance_detail where instance_detail_id = #{instanceDetailId} + + + + delete from dms_inspect_instance_detail where instance_detail_id in + + #{instanceDetailId} + + + + + + + + + + + select diid.instance_detail_id, diid.inspect_instance_id, diid.line_step, diid.real_line_step, diid.device_id, diid.instance_detail_status, + diid.inspect_standard, diid.inspect_desc, diid.inspect_status,dbdl.device_code,dbdl.device_name + from dms_inspect_instance_detail diid left join dms_base_device_ledger dbdl on diid.device_id=dbdl.device_id + + + + + + diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsInspectInstanceDetailProjectMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsInspectInstanceDetailProjectMapper.xml new file mode 100644 index 00000000..cba4ce92 --- /dev/null +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsInspectInstanceDetailProjectMapper.xml @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + select instance_detail_project_id, instance_detail_id, inspect_project_id, inspect_project_status, inspect_project_result, project_step_order, def_value, inspect_project_name, inspect_project_property, up_limit, low_limit, create_by, create_time, update_by, update_time from dms_inspect_instance_detail_project + + + + + + + + insert into dms_inspect_instance_detail_project + + instance_detail_id, + inspect_project_id, + inspect_project_status, + inspect_project_result, + project_step_order, + def_value, + inspect_project_name, + inspect_project_property, + up_limit, + low_limit, + create_by, + create_time, + update_by, + update_time, + + + #{instanceDetailId}, + #{inspectProjectId}, + #{inspectProjectStatus}, + #{inspectProjectResult}, + #{projectStepOrder}, + #{defValue}, + #{inspectProjectName}, + #{inspectProjectProperty}, + #{upLimit}, + #{lowLimit}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update dms_inspect_instance_detail_project + + instance_detail_id = #{instanceDetailId}, + inspect_project_id = #{inspectProjectId}, + inspect_project_status = #{inspectProjectStatus}, + inspect_project_result = #{inspectProjectResult}, + project_step_order = #{projectStepOrder}, + def_value = #{defValue}, + inspect_project_name = #{inspectProjectName}, + inspect_project_property = #{inspectProjectProperty}, + up_limit = #{upLimit}, + low_limit = #{lowLimit}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where instance_detail_project_id = #{instanceDetailProjectId} + + + + delete from dms_inspect_instance_detail_project where instance_detail_project_id = #{instanceDetailProjectId} + + + + delete from dms_inspect_instance_detail_project where instance_detail_project_id in + + #{instanceDetailProjectId} + + + + + + + + + select diidp.instance_detail_project_id, diidp.instance_detail_id, diidp.inspect_project_id, diidp.inspect_project_status, + diidp.inspect_project_result, diidp.inspect_project_desc, + dbip.inspect_project as inspect_project_name,dbip.inspect_project_property, dbip.up_limit, dbip.low_limit,dbip.def_value + from dms_inspect_instance_detail_project diidp right join dms_base_inspect_project dbip on dbip.inspect_project_id=diidp.inspect_project_id + + + + +