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 7a89bda0..0d8dec59 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 @@ -71,4 +71,10 @@ public class DmsConstants { public static final String DMS_BILLS_LUBE_INSTANCE_STATUS_LUBING="2";//润滑中 public static final String DMS_BILLS_LUBE_INSTANCE_STATUS_COMPLETE="3";//润滑完成 + + /** 附件信息附件类别*/ + public static final String MES_BASE_ATTACH_INFO_KNOWLEDGELUBE="3";//润滑知识库 + public static final String MES_BASE_ATTACH_INFO_KNOWLEDGEMAINT="4";//保养知识库 + public static final String MES_BASE_ATTACH_INFO_KNOWLEDGEREPAIR="5";//设备知识库 + } diff --git a/hw-common/hw-common-core/src/main/java/com/hw/common/core/web/controller/BaseController.java b/hw-common/hw-common-core/src/main/java/com/hw/common/core/web/controller/BaseController.java index f6106c70..2d03d1aa 100644 --- a/hw-common/hw-common-core/src/main/java/com/hw/common/core/web/controller/BaseController.java +++ b/hw-common/hw-common-core/src/main/java/com/hw/common/core/web/controller/BaseController.java @@ -151,4 +151,6 @@ public class BaseController return rspData; } + + } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBillsInspectInstanceActivityController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBillsInspectInstanceActivityController.java index 8d8fb400..c7325773 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBillsInspectInstanceActivityController.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBillsInspectInstanceActivityController.java @@ -105,6 +105,7 @@ public class DmsBillsInspectInstanceActivityController extends BaseController @GetMapping("/selectUserIdByDmsBillsInspectInstanceActivityId/{lubeInstanceId}/userId/{userId}") public boolean selectUserIdByDmsBillsInspectInstanceActivityId(@PathVariable("lubeInstanceId") Long lubeInstanceId,@PathVariable("userId") Long userId){ - return dmsBillsInspectInstanceActivityService.selectUserIdByDmsBillsInspectInstanceActivityId(lubeInstanceId,userId); + boolean b = dmsBillsInspectInstanceActivityService.selectUserIdByDmsBillsInspectInstanceActivityId(lubeInstanceId, userId); + return b; } } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsInspectInstanceDetailProjectController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsInspectInstanceDetailProjectController.java new file mode 100644 index 00000000..2bdc9e7c --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsInspectInstanceDetailProjectController.java @@ -0,0 +1,112 @@ +package com.hw.dms.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +import org.apache.poi.ss.formula.functions.T; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.hw.common.log.annotation.Log; +import com.hw.common.log.enums.BusinessType; +import com.hw.common.security.annotation.RequiresPermissions; +import com.hw.dms.domain.DmsInspectInstanceDetailProject; +import com.hw.dms.service.IDmsInspectInstanceDetailProjectService; +import com.hw.common.core.web.controller.BaseController; +import com.hw.common.core.web.domain.AjaxResult; +import com.hw.common.core.utils.poi.ExcelUtil; +import com.hw.common.core.web.page.TableDataInfo; + +/** + * 点巡检工单明细项目信息;质检检查每个项目的质检结果详情Controller + * + * @author xins + * @date 2024-04-10 + */ +@RestController +@RequestMapping("/inspectinstancedetailproject") +public class DmsInspectInstanceDetailProjectController extends BaseController +{ + @Autowired + private IDmsInspectInstanceDetailProjectService dmsInspectInstanceDetailProjectService; + + /** + * 查询点巡检工单明细项目信息;质检检查每个项目的质检结果详情列表 + */ + @RequiresPermissions("dms:inspectinstancedetailproject:list") + @GetMapping("/list") + public TableDataInfo list(DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject) + { + startPage(); + List list = dmsInspectInstanceDetailProjectService.selectDmsInspectInstanceDetailProjectList(dmsInspectInstanceDetailProject); + return getDataTable(list); + } + + @GetMapping("/selectDmsInspectInstanceDetailProjectByInspectInstanceId/{inspectInstanceId}/{lineStep}") + public TableDataInfo selectDmsInspectInstanceDetailProjectByInspectInstanceId(@PathVariable("inspectInstanceId") Long inspectInstanceId,@PathVariable("lineStep") Long lineStep){ + List dmsInspectInstanceDetailProjects = dmsInspectInstanceDetailProjectService.selectDmsInspectInstanceDetailProjectByInspectInstanceId(inspectInstanceId, lineStep); + return getDataTable(dmsInspectInstanceDetailProjects); + } + /** + * 导出点巡检工单明细项目信息;质检检查每个项目的质检结果详情列表 + */ + @RequiresPermissions("dms:inspectinstancedetailproject:export") + @Log(title = "点巡检工单明细项目信息;质检检查每个项目的质检结果详情", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject) + { + List list = dmsInspectInstanceDetailProjectService.selectDmsInspectInstanceDetailProjectList(dmsInspectInstanceDetailProject); + ExcelUtil util = new ExcelUtil(DmsInspectInstanceDetailProject.class); + util.exportExcel(response, list, "点巡检工单明细项目信息;质检检查每个项目的质检结果详情数据"); + } + + /** + * 获取点巡检工单明细项目信息;质检检查每个项目的质检结果详情详细信息 + */ + @RequiresPermissions("dms:inspectinstancedetailproject:query") + @GetMapping(value = "/{instanceDetailProjectId}") + public AjaxResult getInfo(@PathVariable("instanceDetailProjectId") Long instanceDetailProjectId) + { + return success(dmsInspectInstanceDetailProjectService.selectDmsInspectInstanceDetailProjectByInstanceDetailProjectId(instanceDetailProjectId)); + } + + /** + * 新增点巡检工单明细项目信息;质检检查每个项目的质检结果详情 + */ + @RequiresPermissions("dms:inspectinstancedetailproject:add") + @Log(title = "点巡检工单明细项目信息;质检检查每个项目的质检结果详情", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject) + { + return toAjax(dmsInspectInstanceDetailProjectService.insertDmsInspectInstanceDetailProject(dmsInspectInstanceDetailProject)); + } + + /** + * 修改点巡检工单明细项目信息;质检检查每个项目的质检结果详情 + */ + @RequiresPermissions("dms:inspectinstancedetailproject:edit") + @Log(title = "点巡检工单明细项目信息;质检检查每个项目的质检结果详情", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject) + { + return toAjax(dmsInspectInstanceDetailProjectService.updateDmsInspectInstanceDetailProject(dmsInspectInstanceDetailProject)); + } + + /** + * 删除点巡检工单明细项目信息;质检检查每个项目的质检结果详情 + */ + @RequiresPermissions("dms:inspectinstancedetailproject:remove") + @Log(title = "点巡检工单明细项目信息;质检检查每个项目的质检结果详情", businessType = BusinessType.DELETE) + @DeleteMapping("/{instanceDetailProjectIds}") + public AjaxResult remove(@PathVariable Long[] instanceDetailProjectIds) + { + return toAjax(dmsInspectInstanceDetailProjectService.deleteDmsInspectInstanceDetailProjectByInstanceDetailProjectIds(instanceDetailProjectIds)); + } +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsInspectRouteDetailController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsInspectRouteDetailController.java index 40464875..9083f1c6 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsInspectRouteDetailController.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsInspectRouteDetailController.java @@ -3,6 +3,8 @@ package com.hw.dms.controller; import java.util.List; import java.io.IOException; import javax.servlet.http.HttpServletResponse; + +import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -24,7 +26,7 @@ import com.hw.common.core.web.page.TableDataInfo; /** * 巡检线路明细Controller - * + * * @author Open Platform * @date 2024-01-16 */ @@ -47,6 +49,12 @@ public class DmsInspectRouteDetailController extends BaseController return getDataTable(list); } + /** 通过线路id查询线路明细列表*/ + @GetMapping("/selectInspectRouteListByInspectRouteId/{inspectRouteId}") + public TableDataInfo selectInspectRouteListByInspectRouteId(@PathVariable("inspectRouteId") Long inspectRouteId){ + List dmsInspectRouteDetails = dmsInspectRouteDetailService.selectInspectRouteListByInspectRouteId(inspectRouteId); + return getDataTable(dmsInspectRouteDetails); + } /** * 导出巡检线路明细列表 */ diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanLubeDetailController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanLubeDetailController.java index 1fbd35cc..262e2a85 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanLubeDetailController.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanLubeDetailController.java @@ -85,6 +85,15 @@ public class DmsPlanLubeDetailController extends BaseController { return success(dmsPlanLubeDetailService.selectDmsPlanLubeDetailByPlanLubeDetailId(planLubeDetailId)); } + /** + * 根据计划id查询明细 + * */ + @GetMapping("/getDmsPlanDetailByPlanLubeId/{planLubeId}") + public TableDataInfo selectPlanLubeDetailByPlanLubeId(@PathVariable("planLubeId") Long planLubeId){ + + List dmsPlanLubeDetails = dmsPlanLubeDetailService.selectPlanLubeDetailByPlanLubeId(planLubeId); + return getDataTable(dmsPlanLubeDetails); + } /** * 新增润滑计划明细 @@ -156,4 +165,6 @@ public class DmsPlanLubeDetailController extends BaseController return success(dmsBaseDeviceLedgerService.selectDmsBaseDeviceLedgerList(dmsBaseDeviceLedger)); } + + } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanMaintDetailController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanMaintDetailController.java index a5b66a71..4fc3cedf 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanMaintDetailController.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanMaintDetailController.java @@ -69,6 +69,14 @@ public class DmsPlanMaintDetailController extends BaseController { return success(dmsPlanMaintDetailService.selectDmsPlanMaintDetailByPlanMaintDetailId(planMaintDetailId)); } + /** + * 根据计划id获取保养计划明细列表 + * */ + @GetMapping("/getDmsPlanMaintDetail/{planMaintId}") + public TableDataInfo getDmsPlanMaintDetail(@PathVariable("planMaintId") Long planMaintId){ + List dmsPlanMaintDetails = dmsPlanMaintDetailService.selectDmsPlanMaintDetailListByPlanMaintId(planMaintId); + return getDataTable(dmsPlanMaintDetails); + } /** * 新增保养计划明细 diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanRepairDetailController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanRepairDetailController.java index 3de21b7d..cef7bdf6 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanRepairDetailController.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanRepairDetailController.java @@ -24,7 +24,7 @@ import com.hw.common.core.web.page.TableDataInfo; /** * 检修计划明细Controller - * + * * @author Open Platform * @date 2024-01-15 */ @@ -47,6 +47,14 @@ public class DmsPlanRepairDetailController extends BaseController return getDataTable(list); } + /** 根据计划id查询计划明细列表*/ + @GetMapping("/selectPlanRepairDetailByPlanRepairId/{planRepairId}") + public TableDataInfo selectPlanRepairDetailByPlanRepairId(@PathVariable("planRepairId") Long planRepairId){ + List dmsPlanRepairDetails = dmsPlanRepairDetailService.selectPlanRepairDetailByPlanRepairId(planRepairId); + return getDataTable(dmsPlanRepairDetails); + + } + /** * 导出检修计划明细列表 */ diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/BaseAttachInfo.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/BaseAttachInfo.java new file mode 100644 index 00000000..e80f5437 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/BaseAttachInfo.java @@ -0,0 +1,163 @@ +package com.hw.dms.domain; + +import com.hw.common.core.annotation.Excel; +import com.hw.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 附件信息对象 mes_base_attach_info + * + * @author Yinq + * @date 2024-01-26 + */ +public class BaseAttachInfo extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键标识 + */ + private Long attachId; + + /** + * 附件编号 + */ + @Excel(name = "附件编号") + private String attachCode; + + /** + * 附件名称 + */ + @Excel(name = "附件名称") + private String attachName; + + /** + * 附件类别：1-加工图纸；2-SOP；9-其他文件 + */ + @Excel(name = "附件类别") + private String attachType; + + /** + * 附件路径 + */ + @Excel(name = "附件路径") + private String attachPath; + + /** + * 所属工序 + */ + @Excel(name = "所属工序") + private Long processId; + + /** + * 激活标识 + */ + @Excel(name = "激活标识") + private String activeFlag; + + /**附件ID,多个以,隔开*/ + private String attachIdStr; + + /** 是否已下发图纸，下发dispatchFlag为true，下发dispatchFlag为true,默认为false*/ + private boolean dispatchFlag = false; + + private String url; + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public void setAttachId(Long attachId) { + this.attachId = attachId; + } + + public Long getAttachId() { + return attachId; + } + + public void setAttachCode(String attachCode) { + this.attachCode = attachCode; + } + + public String getAttachCode() { + return attachCode; + } + + public void setAttachName(String attachName) { + this.attachName = attachName; + } + + public String getAttachName() { + return attachName; + } + + public void setAttachType(String attachType) { + this.attachType = attachType; + } + + public String getAttachType() { + return attachType; + } + + public void setAttachPath(String attachPath) { + this.attachPath = attachPath; + } + + public String getAttachPath() { + return attachPath; + } + + public void setProcessId(Long processId) { + this.processId = processId; + } + + public Long getProcessId() { + return processId; + } + + public void setActiveFlag(String activeFlag) { + this.activeFlag = activeFlag; + } + + public String getActiveFlag() { + return activeFlag; + } + + public String getAttachIdStr() { + return attachIdStr; + } + + public void setAttachIdStr(String attachIdStr) { + this.attachIdStr = attachIdStr; + } + + public boolean isDispatchFlag() { + return dispatchFlag; + } + + public void setDispatchFlag(boolean dispatchFlag) { + this.dispatchFlag = dispatchFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("attachId", getAttachId()) + .append("attachCode", getAttachCode()) + .append("attachName", getAttachName()) + .append("attachType", getAttachType()) + .append("attachPath", getAttachPath()) + .append("processId", getProcessId()) + .append("activeFlag", getActiveFlag()) + .append("remark", getRemark()) + .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/DmsBaseDeviceInstall.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBaseDeviceInstall.java index 69b3671a..64151c11 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBaseDeviceInstall.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBaseDeviceInstall.java @@ -43,6 +43,26 @@ public class DmsBaseDeviceInstall extends BaseEntity private String deviceName; + private Date beginTime; + + private Date endTime; + + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + public String getDeviceName() { return deviceName; } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsInspectRouteDetail.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsInspectRouteDetail.java index e0fdc4dc..40409797 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsInspectRouteDetail.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsInspectRouteDetail.java @@ -7,7 +7,7 @@ import com.hw.common.core.web.domain.BaseEntity; /** * 巡检线路明细对象 dms_inspect_route_detail - * + * * @author Open Platform * @date 2024-01-16 */ @@ -38,57 +38,77 @@ public class DmsInspectRouteDetail extends BaseEntity @Excel(name = "是否标识：1-是；0-否") private String isFlag; - public void setRouteDetailId(Long routeDetailId) + private String deviceName; + + private String standardName; + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getStandardName() { + return standardName; + } + + public void setStandardName(String standardName) { + this.standardName = standardName; + } + + public void setRouteDetailId(Long routeDetailId) { this.routeDetailId = routeDetailId; } - public Long getRouteDetailId() + public Long getRouteDetailId() { return routeDetailId; } - public void setInspectRouteId(Long inspectRouteId) + public void setInspectRouteId(Long inspectRouteId) { this.inspectRouteId = inspectRouteId; } - public Long getInspectRouteId() + public Long getInspectRouteId() { return inspectRouteId; } - public void setLineStep(Long lineStep) + public void setLineStep(Long lineStep) { this.lineStep = lineStep; } - public Long getLineStep() + public Long getLineStep() { return lineStep; } - public void setDeviceId(Long deviceId) + public void setDeviceId(Long deviceId) { this.deviceId = deviceId; } - public Long getDeviceId() + public Long getDeviceId() { return deviceId; } - public void setInspectStandard(String inspectStandard) + public void setInspectStandard(String inspectStandard) { this.inspectStandard = inspectStandard; } - public String getInspectStandard() + public String getInspectStandard() { return inspectStandard; } - 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/DmsInstanceFile.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsInstanceFile.java index 0d39132c..345e8c06 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsInstanceFile.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsInstanceFile.java @@ -7,7 +7,7 @@ import com.hw.common.core.web.domain.BaseEntity; /** * 工单文件;手工创建，从故障报修开始对象 dms_instance_file - * + * * @author xins * @date 2024-03-13 */ @@ -30,39 +30,50 @@ public class DmsInstanceFile extends BaseEntity @Excel(name = "故障文件地址，一般是图片") private String filePath; - public void setInstanceFileId(Long instanceFileId) + //file-list中需要有url才能正确预览图片 + private String url; + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public void setInstanceFileId(Long instanceFileId) { this.instanceFileId = instanceFileId; } - public Long getInstanceFileId() + public Long getInstanceFileId() { return instanceFileId; } - public void setTargetType(String targetType) + public void setTargetType(String targetType) { this.targetType = targetType; } - public String getTargetType() + public String getTargetType() { return targetType; } - public void setTargetId(Long targetId) + public void setTargetId(Long targetId) { this.targetId = targetId; } - public Long getTargetId() + public Long getTargetId() { return targetId; } - public void setFilePath(String filePath) + public void setFilePath(String filePath) { this.filePath = filePath; } - public String getFilePath() + public String getFilePath() { return filePath; } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsKnowledgeLube.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsKnowledgeLube.java index d01a548f..e58789a2 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsKnowledgeLube.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsKnowledgeLube.java @@ -1,13 +1,16 @@ package com.hw.dms.domain; +import com.hw.system.api.domain.SysFile; 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; +import java.util.List; + /** * 润滑知识库对象 dms_knowledge_lube - * + * * @author caoql * @date 2024-02-26 */ @@ -42,66 +45,96 @@ public class DmsKnowledgeLube extends BaseEntity @Excel(name = "是否标识：1-是；0-否") private String isFlag; - public void setKnowledgeLubeId(Long knowledgeLubeId) + List fileUrls; + + List systemFiles; + + List attachments; + + public List getAttachments() { + return attachments; + } + + public void setAttachments(List attachments) { + this.attachments = attachments; + } + + public List getSystemFiles() { + return systemFiles; + } + + public void setSystemFiles(List systemFiles) { + this.systemFiles = systemFiles; + } + + public List getFileUrls() { + return fileUrls; + } + + public void setFileUrls(List fileUrls) { + this.fileUrls = fileUrls; + } + + public void setKnowledgeLubeId(Long knowledgeLubeId) { this.knowledgeLubeId = knowledgeLubeId; } - public Long getKnowledgeLubeId() + public Long getKnowledgeLubeId() { return knowledgeLubeId; } - public void setExperienceCode(String experienceCode) + public void setExperienceCode(String experienceCode) { this.experienceCode = experienceCode; } - public String getExperienceCode() + public String getExperienceCode() { return experienceCode; } - public void setDeviceTypeId(Long deviceTypeId) + public void setDeviceTypeId(Long deviceTypeId) { this.deviceTypeId = deviceTypeId; } - public Long getDeviceTypeId() + public Long getDeviceTypeId() { return deviceTypeId; } - public void setLubeStationId(Long lubeStationId) + public void setLubeStationId(Long lubeStationId) { this.lubeStationId = lubeStationId; } - public Long getLubeStationId() + public Long getLubeStationId() { return lubeStationId; } - public void setProtocolCode(String protocolCode) + public void setProtocolCode(String protocolCode) { this.protocolCode = protocolCode; } - public String getProtocolCode() + public String getProtocolCode() { return protocolCode; } - public void setOperationsDescription(String operationsDescription) + public void setOperationsDescription(String operationsDescription) { this.operationsDescription = operationsDescription; } - public String getOperationsDescription() + public String getOperationsDescription() { return operationsDescription; } - 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/DmsKnowledgeMaint.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsKnowledgeMaint.java index c288c6da..da5d98cc 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsKnowledgeMaint.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsKnowledgeMaint.java @@ -1,13 +1,16 @@ package com.hw.dms.domain; +import com.hw.system.api.domain.SysFile; 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; +import java.util.List; + /** * 保养知识库对象 dms_knowledge_maint - * + * * @author Open Platform * @date 2024-02-26 */ @@ -42,66 +45,86 @@ public class DmsKnowledgeMaint extends BaseEntity @Excel(name = "是否标识：1-是；0-否") private String isFlag; - public void setKnowledgeMaintId(Long knowledgeMaintId) + List fileUrls; + + List systemFiles; + + public List getFileUrls() { + return fileUrls; + } + + public void setFileUrls(List fileUrls) { + this.fileUrls = fileUrls; + } + + public List getSystemFiles() { + return systemFiles; + } + + public void setSystemFiles(List systemFiles) { + this.systemFiles = systemFiles; + } + + public void setKnowledgeMaintId(Long knowledgeMaintId) { this.knowledgeMaintId = knowledgeMaintId; } - public Long getKnowledgeMaintId() + public Long getKnowledgeMaintId() { return knowledgeMaintId; } - public void setExperienceCode(String experienceCode) + public void setExperienceCode(String experienceCode) { this.experienceCode = experienceCode; } - public String getExperienceCode() + public String getExperienceCode() { return experienceCode; } - public void setDeviceTypeId(Long deviceTypeId) + public void setDeviceTypeId(Long deviceTypeId) { this.deviceTypeId = deviceTypeId; } - public Long getDeviceTypeId() + public Long getDeviceTypeId() { return deviceTypeId; } - public void setMaintStationId(Long maintStationId) + public void setMaintStationId(Long maintStationId) { this.maintStationId = maintStationId; } - public Long getMaintStationId() + public Long getMaintStationId() { return maintStationId; } - public void setMaintProtocol(String maintProtocol) + public void setMaintProtocol(String maintProtocol) { this.maintProtocol = maintProtocol; } - public String getMaintProtocol() + public String getMaintProtocol() { return maintProtocol; } - public void setOperationDescription(String operationDescription) + public void setOperationDescription(String operationDescription) { this.operationDescription = operationDescription; } - public String getOperationDescription() + public String getOperationDescription() { return operationDescription; } - 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/DmsKnowledgeRepair.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsKnowledgeRepair.java index 94d03c8f..a4255fbf 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsKnowledgeRepair.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsKnowledgeRepair.java @@ -1,13 +1,16 @@ package com.hw.dms.domain; +import com.hw.system.api.domain.SysFile; 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; +import java.util.List; + /** * 维修知识库对象 dms_knowledge_repair - * + * * @author Open Platform * @date 2024-02-26 */ @@ -42,66 +45,86 @@ public class DmsKnowledgeRepair extends BaseEntity @Excel(name = "是否标识：1-是；0-否") private String isFlag; - public void setKnowledgeRepairId(Long knowledgeRepairId) + List fileUrls; + + List systemFiles; + + public List getFileUrls() { + return fileUrls; + } + + public void setFileUrls(List fileUrls) { + this.fileUrls = fileUrls; + } + + public List getSystemFiles() { + return systemFiles; + } + + public void setSystemFiles(List systemFiles) { + this.systemFiles = systemFiles; + } + + public void setKnowledgeRepairId(Long knowledgeRepairId) { this.knowledgeRepairId = knowledgeRepairId; } - public Long getKnowledgeRepairId() + public Long getKnowledgeRepairId() { return knowledgeRepairId; } - public void setExperienceCode(String experienceCode) + public void setExperienceCode(String experienceCode) { this.experienceCode = experienceCode; } - public String getExperienceCode() + public String getExperienceCode() { return experienceCode; } - public void setDeviceTypeId(Long deviceTypeId) + public void setDeviceTypeId(Long deviceTypeId) { this.deviceTypeId = deviceTypeId; } - public Long getDeviceTypeId() + public Long getDeviceTypeId() { return deviceTypeId; } - public void setFaultDescription(String faultDescription) + public void setFaultDescription(String faultDescription) { this.faultDescription = faultDescription; } - public String getFaultDescription() + public String getFaultDescription() { return faultDescription; } - public void setDesignOperations(String designOperations) + public void setDesignOperations(String designOperations) { this.designOperations = designOperations; } - public String getDesignOperations() + public String getDesignOperations() { return designOperations; } - public void setOperationsDescription(String operationsDescription) + public void setOperationsDescription(String operationsDescription) { this.operationsDescription = operationsDescription; } - public String getOperationsDescription() + public String getOperationsDescription() { return operationsDescription; } - 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/DmsPlanLubeDetail.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanLubeDetail.java index 3add2e06..2d3accc0 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanLubeDetail.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanLubeDetail.java @@ -7,7 +7,7 @@ import com.hw.common.core.web.domain.BaseEntity; /** * 润滑计划明细对象 dms_plan_lube_detail - * + * * @author xins * @date 2024-03-21 */ @@ -42,66 +42,96 @@ public class DmsPlanLubeDetail extends BaseEntity @Excel(name = "是否标识：1-是；2-否") private Long isFlag; - public void setPlanLubeDetailId(Long planLubeDetailId) + private String deviceName; + + private String lubeStationName; + + private String lubeStandardCode; + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getLubeStationName() { + return lubeStationName; + } + + public void setLubeStationName(String lubeStationName) { + this.lubeStationName = lubeStationName; + } + + public String getLubeStandardCode() { + return lubeStandardCode; + } + + public void setLubeStandardCode(String lubeStandardCode) { + this.lubeStandardCode = lubeStandardCode; + } + + public void setPlanLubeDetailId(Long planLubeDetailId) { this.planLubeDetailId = planLubeDetailId; } - public Long getPlanLubeDetailId() + public Long getPlanLubeDetailId() { return planLubeDetailId; } - public void setPlanLubeId(Long planLubeId) + public void setPlanLubeId(Long planLubeId) { this.planLubeId = planLubeId; } - public Long getPlanLubeId() + public Long getPlanLubeId() { return planLubeId; } - public void setDeviceId(Long deviceId) + public void setDeviceId(Long deviceId) { this.deviceId = deviceId; } - public Long getDeviceId() + public Long getDeviceId() { return deviceId; } - public void setLubeStationId(Long lubeStationId) + public void setLubeStationId(Long lubeStationId) { this.lubeStationId = lubeStationId; } - public Long getLubeStationId() + public Long getLubeStationId() { return lubeStationId; } - public void setLubeStandardId(Long lubeStandardId) + public void setLubeStandardId(Long lubeStandardId) { this.lubeStandardId = lubeStandardId; } - public Long getLubeStandardId() + public Long getLubeStandardId() { return lubeStandardId; } - public void setOperationDescription(String operationDescription) + public void setOperationDescription(String operationDescription) { this.operationDescription = operationDescription; } - public String getOperationDescription() + public String getOperationDescription() { return operationDescription; } - public void setIsFlag(Long isFlag) + public void setIsFlag(Long isFlag) { this.isFlag = isFlag; } - public Long getIsFlag() + public Long getIsFlag() { return isFlag; } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanMaintDetail.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanMaintDetail.java index 8b11c47d..3f758b24 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanMaintDetail.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanMaintDetail.java @@ -45,6 +45,26 @@ public class DmsPlanMaintDetail extends BaseEntity private String maintStationName; + private String deviceName; + + private String maintStationCode; + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getMaintStationCode() { + return maintStationCode; + } + + public void setMaintStationCode(String maintStationCode) { + this.maintStationCode = maintStationCode; + } + public Long getMaintStandardId() { return maintStandardId; } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanRepairDetail.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanRepairDetail.java index f79c1432..b4d929f4 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanRepairDetail.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanRepairDetail.java @@ -7,7 +7,7 @@ import com.hw.common.core.web.domain.BaseEntity; /** * 检修计划明细对象 dms_plan_repair_detail - * + * * @author Open Platform * @date 2024-01-15 */ @@ -22,9 +22,13 @@ public class DmsPlanRepairDetail extends BaseEntity @Excel(name = "计划ID，关联dms_plan_repair的plan_maint_id") private Long planRepairId; - /** 设备ID，关联dms_base_device_ledger的device_id */ - @Excel(name = "设备ID，关联dms_base_device_ledger的device_id") - private Long deviceId; + /** 检修计划明细ID,根据检修计划明细类型关联对应表的主键 */ + @Excel(name = "检修计划明细ID,根据检修计划明细类型关联对应表的主键") + private Long repairDetailTargetId; + + /** 检修计划明细类型(1设备，2设备类型) */ + @Excel(name = "检修计划明细类型(1设备，2设备类型)") + private String repairDetailTargetType; /** 故障类别（1、设备损坏） */ @Excel(name = "故障类别", readConverterExp = "1=、设备损坏") @@ -42,66 +46,94 @@ public class DmsPlanRepairDetail extends BaseEntity @Excel(name = "操作描述") private String operationDescription; - public void setPlanRepairDetailId(Long planRepairDetailId) + private String deviceName; + + private String planRepairCode; + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getPlanRepairCode() { + return planRepairCode; + } + + public void setPlanRepairCode(String planRepairCode) { + this.planRepairCode = planRepairCode; + } + + public Long getRepairDetailTargetId() { + return repairDetailTargetId; + } + + public void setRepairDetailTargetId(Long repairDetailTargetId) { + this.repairDetailTargetId = repairDetailTargetId; + } + + public String getRepairDetailTargetType() { + return repairDetailTargetType; + } + + public void setRepairDetailTargetType(String repairDetailTargetType) { + this.repairDetailTargetType = repairDetailTargetType; + } + + public void setPlanRepairDetailId(Long planRepairDetailId) { this.planRepairDetailId = planRepairDetailId; } - public Long getPlanRepairDetailId() + public Long getPlanRepairDetailId() { return planRepairDetailId; } - public void setPlanRepairId(Long planRepairId) + public void setPlanRepairId(Long planRepairId) { this.planRepairId = planRepairId; } - public Long getPlanRepairId() + public Long getPlanRepairId() { return planRepairId; } - public void setDeviceId(Long deviceId) - { - this.deviceId = deviceId; - } - public Long getDeviceId() - { - return deviceId; - } - public void setFaultType(String faultType) + public void setFaultType(String faultType) { this.faultType = faultType; } - public String getFaultType() + public String getFaultType() { return faultType; } - public void setRepairDesc(String repairDesc) + public void setRepairDesc(String repairDesc) { this.repairDesc = repairDesc; } - public String getRepairDesc() + public String getRepairDesc() { return repairDesc; } - public void setRepairProtocol(String repairProtocol) + public void setRepairProtocol(String repairProtocol) { this.repairProtocol = repairProtocol; } - public String getRepairProtocol() + public String getRepairProtocol() { return repairProtocol; } - public void setOperationDescription(String operationDescription) + public void setOperationDescription(String operationDescription) { this.operationDescription = operationDescription; } - public String getOperationDescription() + public String getOperationDescription() { return operationDescription; } @@ -111,7 +143,6 @@ public class DmsPlanRepairDetail extends BaseEntity return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("planRepairDetailId", getPlanRepairDetailId()) .append("planRepairId", getPlanRepairId()) - .append("deviceId", getDeviceId()) .append("faultType", getFaultType()) .append("repairDesc", getRepairDesc()) .append("repairProtocol", getRepairProtocol()) diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/BaseAttachInfoMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/BaseAttachInfoMapper.java new file mode 100644 index 00000000..9fb96717 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/BaseAttachInfoMapper.java @@ -0,0 +1,24 @@ +package com.hw.dms.mapper; + +import com.hw.dms.domain.BaseAttachInfo; +import com.hw.dms.domain.DmsInstanceFile; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @ClassName : BaseAttachInfo + * @Description : + * @Author : + * @Date: 2024-04-08 09:30 + */ +public interface BaseAttachInfoMapper { + //知识库存储文件 + int batchDmsKnowLedgeLubeFile(List baseAttachInfos); + + //根据知识库主键id查询文件路径 + List selectListBaseAttachInfos(@Param("attachType") String attachType,@Param("processId") Long processId); + + //更新时删除原有的图片 + int deleteListBaseAttachInfos(@Param("attachType") String attachType,@Param("processId") Long processId); +} 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 index ab4f15d0..a0f5d674 100644 --- 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 @@ -2,6 +2,8 @@ package com.hw.dms.mapper; import java.util.List; import com.hw.dms.domain.DmsInspectInstanceDetailProject; +import org.apache.ibatis.annotations.Param; +import org.springframework.web.bind.annotation.PathVariable; /** * 点巡检工单明细项目信息;质检检查每个项目的质检结果详情Mapper接口 @@ -73,4 +75,9 @@ public interface DmsInspectInstanceDetailProjectMapper public List selectDmsInspectInstanceDetailProjectJoinList(DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject); + /** + * 通过工单id与巡检步骤查询工单明细项目信息 + * */ + List selectDmsInspectInstanceDetailProjectByInspectInstanceId(@Param("inspectInstanceId") Long inspectInstanceId, @Param("lineStep") Long lineStep); + } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsInspectRouteDetailMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsInspectRouteDetailMapper.java index a29c7645..5726c13d 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsInspectRouteDetailMapper.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsInspectRouteDetailMapper.java @@ -5,15 +5,15 @@ import com.hw.dms.domain.DmsInspectRouteDetail; /** * 巡检线路明细Mapper接口 - * + * * @author Open Platform * @date 2024-01-16 */ -public interface DmsInspectRouteDetailMapper +public interface DmsInspectRouteDetailMapper { /** * 查询巡检线路明细 - * + * * @param routeDetailId 巡检线路明细主键 * @return 巡检线路明细 */ @@ -21,7 +21,7 @@ public interface DmsInspectRouteDetailMapper /** * 查询巡检线路明细列表 - * + * * @param dmsInspectRouteDetail 巡检线路明细 * @return 巡检线路明细集合 */ @@ -29,7 +29,7 @@ public interface DmsInspectRouteDetailMapper /** * 新增巡检线路明细 - * + * * @param dmsInspectRouteDetail 巡检线路明细 * @return 结果 */ @@ -37,7 +37,7 @@ public interface DmsInspectRouteDetailMapper /** * 修改巡检线路明细 - * + * * @param dmsInspectRouteDetail 巡检线路明细 * @return 结果 */ @@ -45,7 +45,7 @@ public interface DmsInspectRouteDetailMapper /** * 删除巡检线路明细 - * + * * @param routeDetailId 巡检线路明细主键 * @return 结果 */ @@ -53,9 +53,12 @@ public interface DmsInspectRouteDetailMapper /** * 批量删除巡检线路明细 - * + * * @param routeDetailIds 需要删除的数据主键集合 * @return 结果 */ public int deleteDmsInspectRouteDetailByRouteDetailIds(Long[] routeDetailIds); + + List selectInspectRouteListByInspectRouteId(Long inspectRouteId); + } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsInstanceFileMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsInstanceFileMapper.java index 4e70cfe6..d637578f 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsInstanceFileMapper.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsInstanceFileMapper.java @@ -69,4 +69,10 @@ public interface DmsInstanceFileMapper * @return 结果 */ public int batchDmsInstanceFile(List dmsInstanceFileList); + + + /** + * 更新时删除原有文件 + * */ + int deleteDmsInstanceFileByUpdate(Long targetId); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsPlanLubeDetailMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsPlanLubeDetailMapper.java index 608386c2..a4acfc64 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsPlanLubeDetailMapper.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsPlanLubeDetailMapper.java @@ -5,15 +5,15 @@ import com.hw.dms.domain.DmsPlanLubeDetail; /** * 润滑计划明细Mapper接口 - * + * * @author xins * @date 2024-03-21 */ -public interface DmsPlanLubeDetailMapper +public interface DmsPlanLubeDetailMapper { /** * 查询润滑计划明细 - * + * * @param planLubeDetailId 润滑计划明细主键 * @return 润滑计划明细 */ @@ -21,7 +21,7 @@ public interface DmsPlanLubeDetailMapper /** * 查询润滑计划明细列表 - * + * * @param dmsPlanLubeDetail 润滑计划明细 * @return 润滑计划明细集合 */ @@ -29,7 +29,7 @@ public interface DmsPlanLubeDetailMapper /** * 新增润滑计划明细 - * + * * @param dmsPlanLubeDetail 润滑计划明细 * @return 结果 */ @@ -37,7 +37,7 @@ public interface DmsPlanLubeDetailMapper /** * 修改润滑计划明细 - * + * * @param dmsPlanLubeDetail 润滑计划明细 * @return 结果 */ @@ -45,7 +45,7 @@ public interface DmsPlanLubeDetailMapper /** * 删除润滑计划明细 - * + * * @param planLubeDetailId 润滑计划明细主键 * @return 结果 */ @@ -53,9 +53,12 @@ public interface DmsPlanLubeDetailMapper /** * 批量删除润滑计划明细 - * + * * @param planLubeDetailIds 需要删除的数据主键集合 * @return 结果 */ public int deleteDmsPlanLubeDetailByPlanLubeDetailIds(Long[] planLubeDetailIds); + + List selectPlanLubeDetailByPlanLubeId(Long planLubeId); + } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsPlanMaintDetailMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsPlanMaintDetailMapper.java index 5391c35c..a0429c15 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsPlanMaintDetailMapper.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsPlanMaintDetailMapper.java @@ -68,4 +68,8 @@ public interface DmsPlanMaintDetailMapper * @return 保养计划明细集合 */ public List selectDmsPlanMaintDetailJoinList(DmsPlanMaintDetail dmsPlanMaintDetail); + + List selectDmsPlanMaintDetailListByPlanMaintId(Long planMaintId); + + } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsPlanRepairDetailMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsPlanRepairDetailMapper.java index ee3008c5..80addc08 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsPlanRepairDetailMapper.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsPlanRepairDetailMapper.java @@ -5,15 +5,15 @@ import com.hw.dms.domain.DmsPlanRepairDetail; /** * 检修计划明细Mapper接口 - * + * * @author Open Platform * @date 2024-01-15 */ -public interface DmsPlanRepairDetailMapper +public interface DmsPlanRepairDetailMapper { /** * 查询检修计划明细 - * + * * @param planRepairDetailId 检修计划明细主键 * @return 检修计划明细 */ @@ -21,7 +21,7 @@ public interface DmsPlanRepairDetailMapper /** * 查询检修计划明细列表 - * + * * @param dmsPlanRepairDetail 检修计划明细 * @return 检修计划明细集合 */ @@ -29,7 +29,7 @@ public interface DmsPlanRepairDetailMapper /** * 新增检修计划明细 - * + * * @param dmsPlanRepairDetail 检修计划明细 * @return 结果 */ @@ -37,7 +37,7 @@ public interface DmsPlanRepairDetailMapper /** * 修改检修计划明细 - * + * * @param dmsPlanRepairDetail 检修计划明细 * @return 结果 */ @@ -45,7 +45,7 @@ public interface DmsPlanRepairDetailMapper /** * 删除检修计划明细 - * + * * @param planRepairDetailId 检修计划明细主键 * @return 结果 */ @@ -53,9 +53,11 @@ public interface DmsPlanRepairDetailMapper /** * 批量删除检修计划明细 - * + * * @param planRepairDetailIds 需要删除的数据主键集合 * @return 结果 */ public int deleteDmsPlanRepairDetailByPlanRepairDetailIds(Long[] planRepairDetailIds); + + List selectPlanRepairDetailByPlanRepairId(Long planRepairId); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsInspectInstanceDetailProjectService.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsInspectInstanceDetailProjectService.java new file mode 100644 index 00000000..4e72f58e --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsInspectInstanceDetailProjectService.java @@ -0,0 +1,63 @@ +package com.hw.dms.service; + +import java.util.List; +import com.hw.dms.domain.DmsInspectInstanceDetailProject; + +/** + * 点巡检工单明细项目信息;质检检查每个项目的质检结果详情Service接口 + * + * @author xins + * @date 2024-04-10 + */ +public interface IDmsInspectInstanceDetailProjectService +{ + /** + * 查询点巡检工单明细项目信息;质检检查每个项目的质检结果详情 + * + * @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 instanceDetailProjectIds 需要删除的点巡检工单明细项目信息;质检检查每个项目的质检结果详情主键集合 + * @return 结果 + */ + public int deleteDmsInspectInstanceDetailProjectByInstanceDetailProjectIds(Long[] instanceDetailProjectIds); + + /** + * 删除点巡检工单明细项目信息;质检检查每个项目的质检结果详情信息 + * + * @param instanceDetailProjectId 点巡检工单明细项目信息;质检检查每个项目的质检结果详情主键 + * @return 结果 + */ + public int deleteDmsInspectInstanceDetailProjectByInstanceDetailProjectId(Long instanceDetailProjectId); + + List selectDmsInspectInstanceDetailProjectByInspectInstanceId(Long inspectInstanceId,Long lineStep); +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsInspectRouteDetailService.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsInspectRouteDetailService.java index 3a879d51..530249d4 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsInspectRouteDetailService.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsInspectRouteDetailService.java @@ -5,15 +5,15 @@ import com.hw.dms.domain.DmsInspectRouteDetail; /** * 巡检线路明细Service接口 - * + * * @author Open Platform * @date 2024-01-16 */ -public interface IDmsInspectRouteDetailService +public interface IDmsInspectRouteDetailService { /** * 查询巡检线路明细 - * + * * @param routeDetailId 巡检线路明细主键 * @return 巡检线路明细 */ @@ -21,7 +21,7 @@ public interface IDmsInspectRouteDetailService /** * 查询巡检线路明细列表 - * + * * @param dmsInspectRouteDetail 巡检线路明细 * @return 巡检线路明细集合 */ @@ -29,7 +29,7 @@ public interface IDmsInspectRouteDetailService /** * 新增巡检线路明细 - * + * * @param dmsInspectRouteDetail 巡检线路明细 * @return 结果 */ @@ -37,7 +37,7 @@ public interface IDmsInspectRouteDetailService /** * 修改巡检线路明细 - * + * * @param dmsInspectRouteDetail 巡检线路明细 * @return 结果 */ @@ -45,7 +45,7 @@ public interface IDmsInspectRouteDetailService /** * 批量删除巡检线路明细 - * + * * @param routeDetailIds 需要删除的巡检线路明细主键集合 * @return 结果 */ @@ -53,9 +53,11 @@ public interface IDmsInspectRouteDetailService /** * 删除巡检线路明细信息 - * + * * @param routeDetailId 巡检线路明细主键 * @return 结果 */ public int deleteDmsInspectRouteDetailByRouteDetailId(Long routeDetailId); + + List selectInspectRouteListByInspectRouteId(Long inspectRouteId); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsPlanLubeDetailService.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsPlanLubeDetailService.java index 93aae632..bc3dd224 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsPlanLubeDetailService.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsPlanLubeDetailService.java @@ -5,15 +5,15 @@ import com.hw.dms.domain.DmsPlanLubeDetail; /** * 润滑计划明细Service接口 - * + * * @author xins * @date 2024-03-21 */ -public interface IDmsPlanLubeDetailService +public interface IDmsPlanLubeDetailService { /** * 查询润滑计划明细 - * + * * @param planLubeDetailId 润滑计划明细主键 * @return 润滑计划明细 */ @@ -21,7 +21,7 @@ public interface IDmsPlanLubeDetailService /** * 查询润滑计划明细列表 - * + * * @param dmsPlanLubeDetail 润滑计划明细 * @return 润滑计划明细集合 */ @@ -29,7 +29,7 @@ public interface IDmsPlanLubeDetailService /** * 新增润滑计划明细 - * + * * @param dmsPlanLubeDetail 润滑计划明细 * @return 结果 */ @@ -37,7 +37,7 @@ public interface IDmsPlanLubeDetailService /** * 修改润滑计划明细 - * + * * @param dmsPlanLubeDetail 润滑计划明细 * @return 结果 */ @@ -45,7 +45,7 @@ public interface IDmsPlanLubeDetailService /** * 批量删除润滑计划明细 - * + * * @param planLubeDetailIds 需要删除的润滑计划明细主键集合 * @return 结果 */ @@ -53,9 +53,11 @@ public interface IDmsPlanLubeDetailService /** * 删除润滑计划明细信息 - * + * * @param planLubeDetailId 润滑计划明细主键 * @return 结果 */ public int deleteDmsPlanLubeDetailByPlanLubeDetailId(Long planLubeDetailId); + + List selectPlanLubeDetailByPlanLubeId(Long planLubeId); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsPlanMaintDetailService.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsPlanMaintDetailService.java index 7c0816c8..bdf78d99 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsPlanMaintDetailService.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsPlanMaintDetailService.java @@ -67,4 +67,7 @@ public interface IDmsPlanMaintDetailService * @return 保养计划明细 */ public List selectDmsPlanMaintDetailJoinList(DmsPlanMaintDetail dmsPlanMaintDetail); + + List selectDmsPlanMaintDetailListByPlanMaintId(Long planMaintId); + } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsPlanRepairDetailService.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsPlanRepairDetailService.java index 61ce4743..74dfb2a2 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsPlanRepairDetailService.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsPlanRepairDetailService.java @@ -5,15 +5,15 @@ import com.hw.dms.domain.DmsPlanRepairDetail; /** * 检修计划明细Service接口 - * + * * @author Open Platform * @date 2024-01-15 */ -public interface IDmsPlanRepairDetailService +public interface IDmsPlanRepairDetailService { /** * 查询检修计划明细 - * + * * @param planRepairDetailId 检修计划明细主键 * @return 检修计划明细 */ @@ -21,7 +21,7 @@ public interface IDmsPlanRepairDetailService /** * 查询检修计划明细列表 - * + * * @param dmsPlanRepairDetail 检修计划明细 * @return 检修计划明细集合 */ @@ -29,7 +29,7 @@ public interface IDmsPlanRepairDetailService /** * 新增检修计划明细 - * + * * @param dmsPlanRepairDetail 检修计划明细 * @return 结果 */ @@ -37,7 +37,7 @@ public interface IDmsPlanRepairDetailService /** * 修改检修计划明细 - * + * * @param dmsPlanRepairDetail 检修计划明细 * @return 结果 */ @@ -45,7 +45,7 @@ public interface IDmsPlanRepairDetailService /** * 批量删除检修计划明细 - * + * * @param planRepairDetailIds 需要删除的检修计划明细主键集合 * @return 结果 */ @@ -53,9 +53,12 @@ public interface IDmsPlanRepairDetailService /** * 删除检修计划明细信息 - * + * * @param planRepairDetailId 检修计划明细主键 * @return 结果 */ public int deleteDmsPlanRepairDetailByPlanRepairDetailId(Long planRepairDetailId); + + List selectPlanRepairDetailByPlanRepairId(Long planRepairId); + } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseDeviceDepreciationServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseDeviceDepreciationServiceImpl.java index 81c541fa..04d5b1b9 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseDeviceDepreciationServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseDeviceDepreciationServiceImpl.java @@ -2,6 +2,7 @@ package com.hw.dms.service.impl; import java.util.List; import com.hw.common.core.utils.DateUtils; +import com.hw.common.security.utils.SecurityUtils; import com.hw.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -54,7 +55,7 @@ public class DmsBaseDeviceDepreciationServiceImpl implements IDmsBaseDeviceDepre @Override public int insertDmsBaseDeviceDepreciation(DmsBaseDeviceDepreciation dmsBaseDeviceDepreciation) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsBaseDeviceDepreciation.setCreateBy(user.getUsername()); dmsBaseDeviceDepreciation.setIsFlag(1l); dmsBaseDeviceDepreciation.setCreateTime(DateUtils.getNowDate()); @@ -70,7 +71,7 @@ public class DmsBaseDeviceDepreciationServiceImpl implements IDmsBaseDeviceDepre @Override public int updateDmsBaseDeviceDepreciation(DmsBaseDeviceDepreciation dmsBaseDeviceDepreciation) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsBaseDeviceDepreciation.setUpdateBy(user.getUsername()); dmsBaseDeviceDepreciation.setUpdateTime(DateUtils.getNowDate()); return dmsBaseDeviceDepreciationMapper.updateDmsBaseDeviceDepreciation(dmsBaseDeviceDepreciation); diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseDeviceFilesServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseDeviceFilesServiceImpl.java index fa38483a..8a29f029 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseDeviceFilesServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseDeviceFilesServiceImpl.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Map; import com.hw.common.core.utils.DateUtils; +import com.hw.common.security.utils.SecurityUtils; import com.hw.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -64,7 +65,7 @@ public class DmsBaseDeviceFilesServiceImpl implements IDmsBaseDeviceFilesService dmsBaseDeviceFiles.setFilesPath(url); dmsBaseDeviceFiles.setCreateTime(DateUtils.getNowDate()); dmsBaseDeviceFiles.setIsFlag(1l); - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsBaseDeviceFiles.setCreateBy(user.getUsername()); return dmsBaseDeviceFilesMapper.insertDmsBaseDeviceFiles(dmsBaseDeviceFiles); } @@ -79,7 +80,8 @@ public class DmsBaseDeviceFilesServiceImpl implements IDmsBaseDeviceFilesService public int updateDmsBaseDeviceFiles(DmsBaseDeviceFiles dmsBaseDeviceFiles) { - LoginUser user = new LoginUser(); + + LoginUser user = SecurityUtils.getLoginUser(); int index = dmsBaseDeviceFiles.getFilesPath().lastIndexOf("/"); String name = dmsBaseDeviceFiles.getFilesPath().substring(index+1); dmsBaseDeviceFiles.setFilesName(name); diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseDeviceParamServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseDeviceParamServiceImpl.java index a6bfbbaa..c75681d0 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseDeviceParamServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseDeviceParamServiceImpl.java @@ -2,6 +2,7 @@ package com.hw.dms.service.impl; import java.util.List; import com.hw.common.core.utils.DateUtils; +import com.hw.common.security.utils.SecurityUtils; import com.hw.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -54,7 +55,7 @@ public class DmsBaseDeviceParamServiceImpl implements IDmsBaseDeviceParamService @Override public int insertDmsBaseDeviceParam(DmsBaseDeviceParam dmsBaseDeviceParam) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsBaseDeviceParam.setCreateBy(user.getUsername()); dmsBaseDeviceParam.setIsFlag(1l); dmsBaseDeviceParam.setCreateTime(DateUtils.getNowDate()); @@ -70,7 +71,7 @@ public class DmsBaseDeviceParamServiceImpl implements IDmsBaseDeviceParamService @Override public int updateDmsBaseDeviceParam(DmsBaseDeviceParam dmsBaseDeviceParam) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsBaseDeviceParam.setUpdateBy(user.getUsername()); dmsBaseDeviceParam.setIsFlag(1l); dmsBaseDeviceParam.setUpdateTime(DateUtils.getNowDate()); diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseDeviceTypeServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseDeviceTypeServiceImpl.java index 0b240f50..8ae27c94 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseDeviceTypeServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseDeviceTypeServiceImpl.java @@ -2,6 +2,7 @@ package com.hw.dms.service.impl; import java.util.List; import com.hw.common.core.utils.DateUtils; +import com.hw.common.security.utils.SecurityUtils; import com.hw.dms.domain.DmsBaseDeviceBom; import com.hw.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; @@ -55,7 +56,7 @@ public class DmsBaseDeviceTypeServiceImpl implements IDmsBaseDeviceTypeService @Override public int insertDmsBaseDeviceType(DmsBaseDeviceType dmsBaseDeviceType) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsBaseDeviceType.setCreateBy(user.getUsername()); dmsBaseDeviceType.setIsFlag(1l); dmsBaseDeviceType.setCreateTime(DateUtils.getNowDate()); @@ -65,7 +66,7 @@ public class DmsBaseDeviceTypeServiceImpl implements IDmsBaseDeviceTypeService } else{ DmsBaseDeviceType dmsBaseDeviceType1 = new DmsBaseDeviceType(); - dmsBaseDeviceType1.setParentId(dmsBaseDeviceType.getParentId()); + dmsBaseDeviceType1.setDeviceTypeId(dmsBaseDeviceType.getParentId()); String ancestors = dmsBaseDeviceTypeMapper.selectDmsBaseDeviceTypeList(dmsBaseDeviceType1).get(0).getAncestors(); dmsBaseDeviceType.setAncestors(ancestors+","+dmsBaseDeviceType.getParentId()); } @@ -81,7 +82,7 @@ public class DmsBaseDeviceTypeServiceImpl implements IDmsBaseDeviceTypeService @Override public int updateDmsBaseDeviceType(DmsBaseDeviceType dmsBaseDeviceType) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsBaseDeviceType.setUpdateBy(user.getUsername()); dmsBaseDeviceType.setUpdateTime(DateUtils.getNowDate()); //如果有父级 则查询父级祖籍列表 +父级编号 diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseInspectProjectServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseInspectProjectServiceImpl.java index db27cea6..2eec8d51 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseInspectProjectServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseInspectProjectServiceImpl.java @@ -2,6 +2,7 @@ package com.hw.dms.service.impl; import java.util.List; import com.hw.common.core.utils.DateUtils; +import com.hw.common.security.utils.SecurityUtils; import com.hw.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -57,7 +58,7 @@ public class DmsBaseInspectProjectServiceImpl implements IDmsBaseInspectProjectS if (dmsBaseInspectProject.getInspectType()==null){ dmsBaseInspectProject.setInspectType("1"); } - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsBaseInspectProject.setIsFlag("1"); dmsBaseInspectProject.setCreateBy(user.getUsername()); dmsBaseInspectProject.setCreateTime(DateUtils.getNowDate()); @@ -73,7 +74,7 @@ public class DmsBaseInspectProjectServiceImpl implements IDmsBaseInspectProjectS @Override public int updateDmsBaseInspectProject(DmsBaseInspectProject dmsBaseInspectProject) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsBaseInspectProject.setUpdateBy(user.getUsername()); dmsBaseInspectProject.setUpdateTime(DateUtils.getNowDate()); return dmsBaseInspectProjectMapper.updateDmsBaseInspectProject(dmsBaseInspectProject); diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseInspectRouteServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseInspectRouteServiceImpl.java index 4afb3f14..232d9103 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseInspectRouteServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseInspectRouteServiceImpl.java @@ -3,6 +3,7 @@ package com.hw.dms.service.impl; import java.util.List; import com.hw.common.core.utils.DateUtils; import com.hw.common.log.annotation.Log; +import com.hw.common.security.utils.SecurityUtils; import com.hw.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -58,7 +59,7 @@ public class DmsBaseInspectRouteServiceImpl implements IDmsBaseInspectRouteServi if (dmsBaseInspectRoute.getInspectType()==null){ dmsBaseInspectRoute.setInspectType("1"); } - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsBaseInspectRoute.setCreateBy(user.getUsername()); dmsBaseInspectRoute.setIsFlag("1"); dmsBaseInspectRoute.setCreateTime(DateUtils.getNowDate()); @@ -74,7 +75,7 @@ public class DmsBaseInspectRouteServiceImpl implements IDmsBaseInspectRouteServi @Override public int updateDmsBaseInspectRoute(DmsBaseInspectRoute dmsBaseInspectRoute) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsBaseInspectRoute.setUpdateBy(user.getUsername()); dmsBaseInspectRoute.setUpdateTime(DateUtils.getNowDate()); return dmsBaseInspectRouteMapper.updateDmsBaseInspectRoute(dmsBaseInspectRoute); diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseInspectStandardServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseInspectStandardServiceImpl.java index f7fd628a..d395d942 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseInspectStandardServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseInspectStandardServiceImpl.java @@ -2,6 +2,7 @@ package com.hw.dms.service.impl; import java.util.List; import com.hw.common.core.utils.DateUtils; +import com.hw.common.security.utils.SecurityUtils; import com.hw.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -55,7 +56,7 @@ public class DmsBaseInspectStandardServiceImpl implements IDmsBaseInspectStandar public int insertDmsBaseInspectStandard(DmsBaseInspectStandard dmsBaseInspectStandard) { dmsBaseInspectStandard.setIsFlag("1"); - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsBaseInspectStandard.setCreateBy(user.getUsername()); dmsBaseInspectStandard.setCreateTime(DateUtils.getNowDate()); return dmsBaseInspectStandardMapper.insertDmsBaseInspectStandard(dmsBaseInspectStandard); @@ -70,7 +71,7 @@ public class DmsBaseInspectStandardServiceImpl implements IDmsBaseInspectStandar @Override public int updateDmsBaseInspectStandard(DmsBaseInspectStandard dmsBaseInspectStandard) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsBaseInspectStandard.setUpdateBy(user.getUsername()); dmsBaseInspectStandard.setUpdateTime(DateUtils.getNowDate()); return dmsBaseInspectStandardMapper.updateDmsBaseInspectStandard(dmsBaseInspectStandard); diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseLubeStandardServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseLubeStandardServiceImpl.java index 3bf40204..3427f870 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseLubeStandardServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseLubeStandardServiceImpl.java @@ -2,6 +2,7 @@ package com.hw.dms.service.impl; import java.util.List; import com.hw.common.core.utils.DateUtils; +import com.hw.common.security.utils.SecurityUtils; import com.hw.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -54,7 +55,7 @@ public class DmsBaseLubeStandardServiceImpl implements IDmsBaseLubeStandardServi @Override public int insertDmsBaseLubeStandard(DmsBaseLubeStandard dmsBaseLubeStandard) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsBaseLubeStandard.setIsFlag("1"); dmsBaseLubeStandard.setCreateBy(user.getUsername()); dmsBaseLubeStandard.setCreateTime(DateUtils.getNowDate()); @@ -70,7 +71,8 @@ public class DmsBaseLubeStandardServiceImpl implements IDmsBaseLubeStandardServi @Override public int updateDmsBaseLubeStandard(DmsBaseLubeStandard dmsBaseLubeStandard) { - LoginUser user = new LoginUser(); + + LoginUser user = SecurityUtils.getLoginUser(); dmsBaseLubeStandard.setUpdateBy(user.getUsername()); dmsBaseLubeStandard.setUpdateTime(DateUtils.getNowDate()); return dmsBaseLubeStandardMapper.updateDmsBaseLubeStandard(dmsBaseLubeStandard); diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseLubeStationServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseLubeStationServiceImpl.java index 357525e3..7c2eafa3 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseLubeStationServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseLubeStationServiceImpl.java @@ -2,6 +2,7 @@ package com.hw.dms.service.impl; import java.util.List; import com.hw.common.core.utils.DateUtils; +import com.hw.common.security.utils.SecurityUtils; import com.hw.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -70,7 +71,7 @@ public class DmsBaseLubeStationServiceImpl implements IDmsBaseLubeStationService @Override public int updateDmsBaseLubeStation(DmsBaseLubeStation dmsBaseLubeStation) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsBaseLubeStation.setUpdateBy(user.getUsername()); dmsBaseLubeStation.setUpdateTime(DateUtils.getNowDate()); return dmsBaseLubeStationMapper.updateDmsBaseLubeStation(dmsBaseLubeStation); diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseMaintStandardServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseMaintStandardServiceImpl.java index 6897d1f3..992fb346 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseMaintStandardServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseMaintStandardServiceImpl.java @@ -2,6 +2,7 @@ package com.hw.dms.service.impl; import java.util.List; import com.hw.common.core.utils.DateUtils; +import com.hw.common.security.utils.SecurityUtils; import com.hw.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -55,7 +56,7 @@ public class DmsBaseMaintStandardServiceImpl implements IDmsBaseMaintStandardSer public int insertDmsBaseMaintStandard(DmsBaseMaintStandard dmsBaseMaintStandard) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsBaseMaintStandard.setIsFlag(1l); dmsBaseMaintStandard.setDeviceTypeId(0l); dmsBaseMaintStandard.setCreateBy(user.getUsername()); @@ -72,7 +73,7 @@ public class DmsBaseMaintStandardServiceImpl implements IDmsBaseMaintStandardSer @Override public int updateDmsBaseMaintStandard(DmsBaseMaintStandard dmsBaseMaintStandard) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsBaseMaintStandard.setUpdateBy(user.getUsername()); dmsBaseMaintStandard.setUpdateTime(DateUtils.getNowDate()); diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseMaintStationServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseMaintStationServiceImpl.java index a4c616c9..b582595a 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseMaintStationServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseMaintStationServiceImpl.java @@ -2,6 +2,7 @@ package com.hw.dms.service.impl; import java.util.List; import com.hw.common.core.utils.DateUtils; +import com.hw.common.security.utils.SecurityUtils; import com.hw.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -54,7 +55,7 @@ public class DmsBaseMaintStationServiceImpl implements IDmsBaseMaintStationServi @Override public int insertDmsBaseMaintStation(DmsBaseMaintStation dmsBaseMaintStation) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsBaseMaintStation.setIsFlag(1l); dmsBaseMaintStation.setCreateBy(user.getUsername()); dmsBaseMaintStation.setCreateTime(DateUtils.getNowDate()); @@ -70,7 +71,7 @@ public class DmsBaseMaintStationServiceImpl implements IDmsBaseMaintStationServi @Override public int updateDmsBaseMaintStation(DmsBaseMaintStation dmsBaseMaintStation) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsBaseMaintStation.setUpdateBy(user.getUsername()); dmsBaseMaintStation.setUpdateTime(DateUtils.getNowDate()); return dmsBaseMaintStationMapper.updateDmsBaseMaintStation(dmsBaseMaintStation); diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseOutsrcInfoServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseOutsrcInfoServiceImpl.java index c5a6a56b..435954d4 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseOutsrcInfoServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseOutsrcInfoServiceImpl.java @@ -2,6 +2,7 @@ package com.hw.dms.service.impl; import java.util.List; import com.hw.common.core.utils.DateUtils; +import com.hw.common.security.utils.SecurityUtils; import com.hw.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -54,7 +55,7 @@ public class DmsBaseOutsrcInfoServiceImpl implements IDmsBaseOutsrcInfoService @Override public int insertDmsBaseOutsrcInfo(DmsBaseOutsrcInfo dmsBaseOutsrcInfo) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsBaseOutsrcInfo.setIsFlag(1l); dmsBaseOutsrcInfo.setCreateBy(user.getUsername()); dmsBaseOutsrcInfo.setCreateTime(DateUtils.getNowDate()); @@ -70,7 +71,7 @@ public class DmsBaseOutsrcInfoServiceImpl implements IDmsBaseOutsrcInfoService @Override public int updateDmsBaseOutsrcInfo(DmsBaseOutsrcInfo dmsBaseOutsrcInfo) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsBaseOutsrcInfo.setUpdateBy(user.getUsername()); dmsBaseOutsrcInfo.setUpdateTime(DateUtils.getNowDate()); return dmsBaseOutsrcInfoMapper.updateDmsBaseOutsrcInfo(dmsBaseOutsrcInfo); diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseShutReasonServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseShutReasonServiceImpl.java index d7fc8843..2d8a5251 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseShutReasonServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseShutReasonServiceImpl.java @@ -2,6 +2,7 @@ package com.hw.dms.service.impl; import java.util.List; import com.hw.common.core.utils.DateUtils; +import com.hw.common.security.utils.SecurityUtils; import com.hw.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -54,7 +55,7 @@ public class DmsBaseShutReasonServiceImpl implements IDmsBaseShutReasonService @Override public int insertDmsBaseShutReason(DmsBaseShutReason dmsBaseShutReason) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsBaseShutReason.setIsFlag("1"); dmsBaseShutReason.setCreateBy(user.getUsername()); dmsBaseShutReason.setCreateTime(DateUtils.getNowDate()); @@ -70,7 +71,7 @@ public class DmsBaseShutReasonServiceImpl implements IDmsBaseShutReasonService @Override public int updateDmsBaseShutReason(DmsBaseShutReason dmsBaseShutReason) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsBaseShutReason.setUpdateBy(user.getUsername()); dmsBaseShutReason.setUpdateTime(DateUtils.getNowDate()); return dmsBaseShutReasonMapper.updateDmsBaseShutReason(dmsBaseShutReason); diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseShutTypeServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseShutTypeServiceImpl.java index d0feb7ea..8291ac92 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseShutTypeServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseShutTypeServiceImpl.java @@ -2,6 +2,7 @@ package com.hw.dms.service.impl; import java.util.List; import com.hw.common.core.utils.DateUtils; +import com.hw.common.security.utils.SecurityUtils; import com.hw.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -54,7 +55,7 @@ public class DmsBaseShutTypeServiceImpl implements IDmsBaseShutTypeService @Override public int insertDmsBaseShutType(DmsBaseShutType dmsBaseShutType) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsBaseShutType.setIsFlag("1"); dmsBaseShutType.setCreateBy(user.getUsername()); dmsBaseShutType.setCreateTime(DateUtils.getNowDate()); diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseSpecialdeviceParamServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseSpecialdeviceParamServiceImpl.java index 8164cd18..8201c099 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseSpecialdeviceParamServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBaseSpecialdeviceParamServiceImpl.java @@ -2,6 +2,7 @@ package com.hw.dms.service.impl; import java.util.List; import com.hw.common.core.utils.DateUtils; +import com.hw.common.security.utils.SecurityUtils; import com.hw.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -54,7 +55,7 @@ public class DmsBaseSpecialdeviceParamServiceImpl implements IDmsBaseSpecialdevi @Override public int insertDmsBaseSpecialdeviceParam(DmsBaseSpecialdeviceParam dmsBaseSpecialdeviceParam) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsBaseSpecialdeviceParam.setCreateBy(user.getUsername()); dmsBaseSpecialdeviceParam.setIsFlag(1l); dmsBaseSpecialdeviceParam.setCreateTime(DateUtils.getNowDate()); 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 a94b6d43..e057b737 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 @@ -1,5 +1,6 @@ package com.hw.dms.service.impl; +import java.nio.file.Files; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -54,7 +55,13 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS queryInstanceFile.setTargetType(DmsConstants.DMS_INSTANCE_FILE_TARGET_TYPE_FAULT_INSTANCE_ACTIVITY); queryInstanceFile.setTargetId(dmsBillsFaultInstance.getInstanceActivityId()); List dmsInstanceFiles = dmsInstanceFileMapper.selectDmsInstanceFileList(queryInstanceFile); + + for (DmsInstanceFile dmsInstanceFile : dmsInstanceFiles){ + dmsInstanceFile.setUrl(dmsInstanceFile.getFilePath()); + } dmsBillsFaultInstance.setDmsInstanceFiles(dmsInstanceFiles); + + // dmsBillsFaultInstance.setFaultType(dmsFaultInstanceActivity.getFaultType()); // dmsBillsFaultInstance.setFaultDescription(dmsFaultInstanceActivity.getFaultDescription()); // dmsBillsFaultInstance.setDesignOperations(dmsFaultInstanceActivity.getDesignOperations()); @@ -128,8 +135,14 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS */ @Override public int updateDmsBillsFaultInstance(DmsBillsFaultInstance dmsBillsFaultInstance) { + dmsBillsFaultInstance.setUpdateTime(DateUtils.getNowDate()); - return dmsBillsFaultInstanceMapper.updateDmsBillsFaultInstance(dmsBillsFaultInstance); + dmsInstanceFileMapper.deleteDmsInstanceFileByUpdate(dmsBillsFaultInstance.getRepairInstanceId()); + int i = dmsBillsFaultInstanceMapper.updateDmsBillsFaultInstance(dmsBillsFaultInstance); + //存储图片 + List fileUrls = dmsBillsFaultInstance.getFileUrls(); + batchInsertInstanceFiles(fileUrls, dmsBillsFaultInstance.getInstanceActivityId()); + return i; } /** @@ -238,9 +251,7 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS @Override @Transactional(rollbackFor = Exception.class) public int updateDmsFaultInstanceActivity(DmsFaultInstanceActivity dmsFaultInstanceActivity) { - //存储图片 - List fileUrls = dmsFaultInstanceActivity.getFileUrls(); - batchInsertInstanceFiles(fileUrls, dmsFaultInstanceActivity.getInstanceActivityId()); + return dmsFaultInstanceActivityMapper.updateDmsFaultInstanceActivity(dmsFaultInstanceActivity); } 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 3bd82b79..0b29a750 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 @@ -89,7 +89,7 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta */ @Override public int insertDmsBillsInspectInstance(DmsBillsInspectInstance dmsBillsInspectInstance) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); //写死105，也可根据传入对象的wfprocessid作为传参。 Long aLong = dmsRepairInstanceMapper.selectWfProcessActivityId(105l); if (dmsBillsInspectInstance.getInspectType().equals("1")) { @@ -99,12 +99,13 @@ public class DmsBillsInspectInstanceServiceImpl implements IDmsBillsInspectInsta } dmsBillsInspectInstance.setCreateTime(DateUtils.getNowDate()); dmsBillsInspectInstance.setIsFlag("1"); + dmsBillsInspectInstance.setInspectStatus(DmsConstants.DMS_BILLS_INSPECT_INSTANCE_INSPECT_STATUS_TO_INSPECT); dmsBillsInspectInstance.setCreateBy(user.getUsername()); int i = dmsBillsInspectInstanceMapper.insertDmsBillsInspectInstance(dmsBillsInspectInstance); List dmsBillsInspectInstances = dmsBillsInspectInstanceMapper.selectDmsBillsInspectInstanceList(dmsBillsInspectInstance); //新建第一步工单实例节点 DmsBillsInspectInstanceActivity dmsBillsInspectInstanceActivity = new DmsBillsInspectInstanceActivity(); - dmsBillsInspectInstanceActivity.setInspectInstanceId(dmsBillsInspectInstances.get(0).getInspectInstanceId()); + dmsBillsInspectInstanceActivity.setInspectInstanceId(dmsBillsInspectInstance.getInspectInstanceId()); dmsBillsInspectInstanceActivity.setInspectRouteId(dmsBillsInspectInstance.getInspectRouteId()); dmsBillsInspectInstanceActivity.setDeviceAmount(dmsBillsInspectInstance.getDeviceAmount()); dmsBillsInspectInstanceActivity.setPerformer(dmsBillsInspectInstance.getPerformer()); diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsLubeInstanceActivityServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsLubeInstanceActivityServiceImpl.java index 254ce7c8..72a0b681 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsLubeInstanceActivityServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsLubeInstanceActivityServiceImpl.java @@ -3,6 +3,7 @@ package com.hw.dms.service.impl; import java.util.Arrays; import java.util.List; import com.hw.common.core.utils.DateUtils; +import com.hw.common.security.utils.SecurityUtils; import com.hw.dms.domain.*; import com.hw.dms.mapper.DmsBillsLubeInstanceMapper; import com.hw.dms.service.IDmsPlanLubeService; @@ -61,7 +62,7 @@ public class DmsBillsLubeInstanceActivityServiceImpl implements IDmsBillsLubeIns @Override public int insertDmsBillsLubeInstanceActivity(DmsBillsLubeInstanceActivity dmsBillsLubeInstanceActivity) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsBillsLubeInstanceActivity.setCreateBy(user.getUsername()); dmsBillsLubeInstanceActivity.setStartTime(DateUtils.getNowDate()); dmsBillsLubeInstanceActivity.setCreateTime(DateUtils.getNowDate()); diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsFaultInstanceActivityServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsFaultInstanceActivityServiceImpl.java index 876d8551..e16f01ce 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsFaultInstanceActivityServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsFaultInstanceActivityServiceImpl.java @@ -3,6 +3,7 @@ package com.hw.dms.service.impl; import java.util.Arrays; import java.util.List; import com.hw.common.core.utils.DateUtils; +import com.hw.common.security.utils.SecurityUtils; import com.hw.dms.domain.*; import com.hw.dms.mapper.DmsBillsFaultInstanceMapper; import com.hw.system.api.model.LoginUser; @@ -58,7 +59,7 @@ public class DmsFaultInstanceActivityServiceImpl implements IDmsFaultInstanceAct @Override public int insertDmsFaultInstanceActivity(DmsFaultInstanceActivity dmsFaultInstanceActivity) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsFaultInstanceActivity.setCreateBy(user.getUsername()); dmsFaultInstanceActivity.setStartTime(DateUtils.getNowDate()); dmsFaultInstanceActivity.setCreateTime(DateUtils.getNowDate()); diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsInspectInstanceDetailProjectServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsInspectInstanceDetailProjectServiceImpl.java new file mode 100644 index 00000000..8f325cc3 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsInspectInstanceDetailProjectServiceImpl.java @@ -0,0 +1,101 @@ +package com.hw.dms.service.impl; + +import java.util.List; +import com.hw.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.hw.dms.mapper.DmsInspectInstanceDetailProjectMapper; +import com.hw.dms.domain.DmsInspectInstanceDetailProject; +import com.hw.dms.service.IDmsInspectInstanceDetailProjectService; + +/** + * 点巡检工单明细项目信息;质检检查每个项目的质检结果详情Service业务层处理 + * + * @author xins + * @date 2024-04-10 + */ +@Service +public class DmsInspectInstanceDetailProjectServiceImpl implements IDmsInspectInstanceDetailProjectService +{ + @Autowired + private DmsInspectInstanceDetailProjectMapper dmsInspectInstanceDetailProjectMapper; + + /** + * 查询点巡检工单明细项目信息;质检检查每个项目的质检结果详情 + * + * @param instanceDetailProjectId 点巡检工单明细项目信息;质检检查每个项目的质检结果详情主键 + * @return 点巡检工单明细项目信息;质检检查每个项目的质检结果详情 + */ + @Override + public DmsInspectInstanceDetailProject selectDmsInspectInstanceDetailProjectByInstanceDetailProjectId(Long instanceDetailProjectId) + { + return dmsInspectInstanceDetailProjectMapper.selectDmsInspectInstanceDetailProjectByInstanceDetailProjectId(instanceDetailProjectId); + } + + /** + * 查询点巡检工单明细项目信息;质检检查每个项目的质检结果详情列表 + * + * @param dmsInspectInstanceDetailProject 点巡检工单明细项目信息;质检检查每个项目的质检结果详情 + * @return 点巡检工单明细项目信息;质检检查每个项目的质检结果详情 + */ + @Override + public List selectDmsInspectInstanceDetailProjectList(DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject) + { + return dmsInspectInstanceDetailProjectMapper.selectDmsInspectInstanceDetailProjectList(dmsInspectInstanceDetailProject); + } + + /** + * 新增点巡检工单明细项目信息;质检检查每个项目的质检结果详情 + * + * @param dmsInspectInstanceDetailProject 点巡检工单明细项目信息;质检检查每个项目的质检结果详情 + * @return 结果 + */ + @Override + public int insertDmsInspectInstanceDetailProject(DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject) + { + dmsInspectInstanceDetailProject.setCreateTime(DateUtils.getNowDate()); + return dmsInspectInstanceDetailProjectMapper.insertDmsInspectInstanceDetailProject(dmsInspectInstanceDetailProject); + } + + /** + * 修改点巡检工单明细项目信息;质检检查每个项目的质检结果详情 + * + * @param dmsInspectInstanceDetailProject 点巡检工单明细项目信息;质检检查每个项目的质检结果详情 + * @return 结果 + */ + @Override + public int updateDmsInspectInstanceDetailProject(DmsInspectInstanceDetailProject dmsInspectInstanceDetailProject) + { + dmsInspectInstanceDetailProject.setUpdateTime(DateUtils.getNowDate()); + return dmsInspectInstanceDetailProjectMapper.updateDmsInspectInstanceDetailProject(dmsInspectInstanceDetailProject); + } + + /** + * 批量删除点巡检工单明细项目信息;质检检查每个项目的质检结果详情 + * + * @param instanceDetailProjectIds 需要删除的点巡检工单明细项目信息;质检检查每个项目的质检结果详情主键 + * @return 结果 + */ + @Override + public int deleteDmsInspectInstanceDetailProjectByInstanceDetailProjectIds(Long[] instanceDetailProjectIds) + { + return dmsInspectInstanceDetailProjectMapper.deleteDmsInspectInstanceDetailProjectByInstanceDetailProjectIds(instanceDetailProjectIds); + } + + /** + * 删除点巡检工单明细项目信息;质检检查每个项目的质检结果详情信息 + * + * @param instanceDetailProjectId 点巡检工单明细项目信息;质检检查每个项目的质检结果详情主键 + * @return 结果 + */ + @Override + public int deleteDmsInspectInstanceDetailProjectByInstanceDetailProjectId(Long instanceDetailProjectId) + { + return dmsInspectInstanceDetailProjectMapper.deleteDmsInspectInstanceDetailProjectByInstanceDetailProjectId(instanceDetailProjectId); + } + + @Override + public List selectDmsInspectInstanceDetailProjectByInspectInstanceId(Long inspectInstanceId, Long lineStep) { + return dmsInspectInstanceDetailProjectMapper.selectDmsInspectInstanceDetailProjectByInspectInstanceId(inspectInstanceId,lineStep); + } +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsInspectRouteDetailServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsInspectRouteDetailServiceImpl.java index ae5ccf81..1bf10e2d 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsInspectRouteDetailServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsInspectRouteDetailServiceImpl.java @@ -9,19 +9,19 @@ import com.hw.dms.service.IDmsInspectRouteDetailService; /** * 巡检线路明细Service业务层处理 - * + * * @author Open Platform * @date 2024-01-16 */ @Service -public class DmsInspectRouteDetailServiceImpl implements IDmsInspectRouteDetailService +public class DmsInspectRouteDetailServiceImpl implements IDmsInspectRouteDetailService { @Autowired private DmsInspectRouteDetailMapper dmsInspectRouteDetailMapper; /** * 查询巡检线路明细 - * + * * @param routeDetailId 巡检线路明细主键 * @return 巡检线路明细 */ @@ -33,7 +33,7 @@ public class DmsInspectRouteDetailServiceImpl implements IDmsInspectRouteDetailS /** * 查询巡检线路明细列表 - * + * * @param dmsInspectRouteDetail 巡检线路明细 * @return 巡检线路明细 */ @@ -45,7 +45,7 @@ public class DmsInspectRouteDetailServiceImpl implements IDmsInspectRouteDetailS /** * 新增巡检线路明细 - * + * * @param dmsInspectRouteDetail 巡检线路明细 * @return 结果 */ @@ -57,7 +57,7 @@ public class DmsInspectRouteDetailServiceImpl implements IDmsInspectRouteDetailS /** * 修改巡检线路明细 - * + * * @param dmsInspectRouteDetail 巡检线路明细 * @return 结果 */ @@ -69,7 +69,7 @@ public class DmsInspectRouteDetailServiceImpl implements IDmsInspectRouteDetailS /** * 批量删除巡检线路明细 - * + * * @param routeDetailIds 需要删除的巡检线路明细主键 * @return 结果 */ @@ -81,7 +81,7 @@ public class DmsInspectRouteDetailServiceImpl implements IDmsInspectRouteDetailS /** * 删除巡检线路明细信息 - * + * * @param routeDetailId 巡检线路明细主键 * @return 结果 */ @@ -90,4 +90,9 @@ public class DmsInspectRouteDetailServiceImpl implements IDmsInspectRouteDetailS { return dmsInspectRouteDetailMapper.deleteDmsInspectRouteDetailByRouteDetailId(routeDetailId); } + + @Override + public List selectInspectRouteListByInspectRouteId(Long inspectRouteId) { + return dmsInspectRouteDetailMapper.selectInspectRouteListByInspectRouteId(inspectRouteId); + } } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsKnowledgeLubeServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsKnowledgeLubeServiceImpl.java index 61cb6019..e249b473 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsKnowledgeLubeServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsKnowledgeLubeServiceImpl.java @@ -1,15 +1,23 @@ package com.hw.dms.service.impl; +import java.util.ArrayList; import java.util.List; + +import com.hw.common.core.constant.DmsConstants; import com.hw.common.core.utils.DateUtils; -import com.hw.dms.domain.DmsBaseLubeStation; +import com.hw.dms.domain.BaseAttachInfo; +import com.hw.dms.domain.DmsInstanceFile; +import com.hw.dms.mapper.BaseAttachInfoMapper; import com.hw.dms.mapper.DmsBaseLubeStationMapper; +import com.hw.system.api.domain.SysFile; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.hw.dms.mapper.DmsKnowledgeLubeMapper; import com.hw.dms.domain.DmsKnowledgeLube; import com.hw.dms.service.IDmsKnowledgeLubeService; +import javax.security.auth.login.Configuration; + /** * 润滑知识库Service业务层处理 * @@ -23,6 +31,8 @@ public class DmsKnowledgeLubeServiceImpl implements IDmsKnowledgeLubeService private DmsKnowledgeLubeMapper dmsKnowledgeLubeMapper; @Autowired private DmsBaseLubeStationMapper dmsBaseLubeStationMapper; + @Autowired + private BaseAttachInfoMapper baseAttachInfoMapper; /** * 查询润滑知识库 @@ -33,7 +43,17 @@ public class DmsKnowledgeLubeServiceImpl implements IDmsKnowledgeLubeService @Override public DmsKnowledgeLube selectDmsKnowledgeLubeByKnowledgeLubeId(Long knowledgeLubeId) { - return dmsKnowledgeLubeMapper.selectDmsKnowledgeLubeByKnowledgeLubeId(knowledgeLubeId); + DmsKnowledgeLube dmsKnowledgeLube = dmsKnowledgeLubeMapper.selectDmsKnowledgeLubeByKnowledgeLubeId(knowledgeLubeId); + List baseAttachInfos = baseAttachInfoMapper.selectListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGELUBE,dmsKnowledgeLube.getKnowledgeLubeId()); + List sysFiles = new ArrayList(); + + for (String string:baseAttachInfos){ + SysFile sysFile = new SysFile(); + sysFile.setUrl(string); + sysFiles.add(sysFile); + } + dmsKnowledgeLube.setSystemFiles(sysFiles); + return dmsKnowledgeLube; } /** @@ -60,7 +80,13 @@ public class DmsKnowledgeLubeServiceImpl implements IDmsKnowledgeLubeService dmsKnowledgeLube.setCreateTime(DateUtils.getNowDate()); dmsKnowledgeLube.setIsFlag("1"); - return dmsKnowledgeLubeMapper.insertDmsKnowledgeLube(dmsKnowledgeLube); + int i = dmsKnowledgeLubeMapper.insertDmsKnowledgeLube(dmsKnowledgeLube); + + //存储图片 + List fileUrls = dmsKnowledgeLube.getFileUrls(); + batchInsertInstanceFiles(fileUrls,dmsKnowledgeLube.getKnowledgeLubeId()); + return i; + } /** @@ -73,7 +99,14 @@ public class DmsKnowledgeLubeServiceImpl implements IDmsKnowledgeLubeService public int updateDmsKnowledgeLube(DmsKnowledgeLube dmsKnowledgeLube) { dmsKnowledgeLube.setUpdateTime(DateUtils.getNowDate()); - return dmsKnowledgeLubeMapper.updateDmsKnowledgeLube(dmsKnowledgeLube); + int i = dmsKnowledgeLubeMapper.updateDmsKnowledgeLube(dmsKnowledgeLube); + baseAttachInfoMapper.deleteListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGELUBE,dmsKnowledgeLube.getKnowledgeLubeId()); + //存储图片 + List fileUrls = dmsKnowledgeLube.getFileUrls(); + if (fileUrls!=null) { + batchInsertInstanceFiles(fileUrls, dmsKnowledgeLube.getKnowledgeLubeId()); + } + return i; } /** @@ -99,4 +132,26 @@ public class DmsKnowledgeLubeServiceImpl implements IDmsKnowledgeLubeService { return dmsKnowledgeLubeMapper.deleteDmsKnowledgeLubeByKnowledgeLubeId(knowledgeLubeId); } + public void batchInsertInstanceFiles(List fileUrls, Long knowledgeLubeId ) { + 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); +// } + List baseAttachInfos = new ArrayList<>(); + for (String fileUrl : fileUrls){ + BaseAttachInfo baseAttachInfo = new BaseAttachInfo(); + baseAttachInfo.setAttachType(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGELUBE); + baseAttachInfo.setAttachName("name"); + baseAttachInfo.setAttachPath(fileUrl); + baseAttachInfo.setProcessId(knowledgeLubeId); + baseAttachInfos.add(baseAttachInfo); + } + baseAttachInfoMapper.batchDmsKnowLedgeLubeFile(baseAttachInfos); + } + } } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsKnowledgeMaintServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsKnowledgeMaintServiceImpl.java index d6f8ab20..dd252234 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsKnowledgeMaintServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsKnowledgeMaintServiceImpl.java @@ -1,9 +1,15 @@ package com.hw.dms.service.impl; +import java.util.ArrayList; import java.util.List; + +import com.hw.common.core.constant.DmsConstants; import com.hw.common.core.utils.DateUtils; +import com.hw.dms.domain.BaseAttachInfo; import com.hw.dms.domain.DmsBaseMaintStation; +import com.hw.dms.mapper.BaseAttachInfoMapper; import com.hw.dms.mapper.DmsBaseMaintStationMapper; +import com.hw.system.api.domain.SysFile; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.hw.dms.mapper.DmsKnowledgeMaintMapper; @@ -24,6 +30,8 @@ public class DmsKnowledgeMaintServiceImpl implements IDmsKnowledgeMaintService @Autowired private DmsBaseMaintStationMapper dmsBaseMaintStationMapper; + @Autowired + private BaseAttachInfoMapper baseAttachInfoMapper; /** * 查询保养知识库 * @@ -33,7 +41,17 @@ public class DmsKnowledgeMaintServiceImpl implements IDmsKnowledgeMaintService @Override public DmsKnowledgeMaint selectDmsKnowledgeMaintByKnowledgeMaintId(Long knowledgeMaintId) { - return dmsKnowledgeMaintMapper.selectDmsKnowledgeMaintByKnowledgeMaintId(knowledgeMaintId); + DmsKnowledgeMaint dmsKnowledgeMaint = dmsKnowledgeMaintMapper.selectDmsKnowledgeMaintByKnowledgeMaintId(knowledgeMaintId); + List baseAttachInfos = baseAttachInfoMapper.selectListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEMAINT,dmsKnowledgeMaint.getKnowledgeMaintId()); + List sysFiles = new ArrayList(); + + for (String string:baseAttachInfos){ + SysFile sysFile = new SysFile(); + sysFile.setUrl(string); + sysFiles.add(sysFile); + } + dmsKnowledgeMaint.setSystemFiles(sysFiles); + return dmsKnowledgeMaint; } /** @@ -60,7 +78,11 @@ public class DmsKnowledgeMaintServiceImpl implements IDmsKnowledgeMaintService dmsKnowledgeMaint.setCreateTime(DateUtils.getNowDate()); dmsKnowledgeMaint.setIsFlag("1"); - return dmsKnowledgeMaintMapper.insertDmsKnowledgeMaint(dmsKnowledgeMaint); + int i = dmsKnowledgeMaintMapper.insertDmsKnowledgeMaint(dmsKnowledgeMaint); + //存储图片 + List fileUrls = dmsKnowledgeMaint.getFileUrls(); + batchInsertInstanceFiles(fileUrls, dmsKnowledgeMaint.getKnowledgeMaintId()); + return i; } /** @@ -73,7 +95,13 @@ public class DmsKnowledgeMaintServiceImpl implements IDmsKnowledgeMaintService public int updateDmsKnowledgeMaint(DmsKnowledgeMaint dmsKnowledgeMaint) { dmsKnowledgeMaint.setUpdateTime(DateUtils.getNowDate()); - return dmsKnowledgeMaintMapper.updateDmsKnowledgeMaint(dmsKnowledgeMaint); + int i = dmsKnowledgeMaintMapper.updateDmsKnowledgeMaint(dmsKnowledgeMaint); + baseAttachInfoMapper.deleteListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEMAINT,dmsKnowledgeMaint.getKnowledgeMaintId()); + List fileUrls = dmsKnowledgeMaint.getFileUrls(); + if (fileUrls!=null) { + batchInsertInstanceFiles(fileUrls, dmsKnowledgeMaint.getKnowledgeMaintId()); + } + return i; } /** @@ -99,4 +127,19 @@ public class DmsKnowledgeMaintServiceImpl implements IDmsKnowledgeMaintService { return dmsKnowledgeMaintMapper.deleteDmsKnowledgeMaintByKnowledgeMaintId(knowledgeMaintId); } + public void batchInsertInstanceFiles(List fileUrls, Long knowledgeLubeId ) { + if (fileUrls != null && !fileUrls.isEmpty()) { + + List baseAttachInfos = new ArrayList<>(); + for (String fileUrl : fileUrls){ + BaseAttachInfo baseAttachInfo = new BaseAttachInfo(); + baseAttachInfo.setAttachType(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEMAINT); + baseAttachInfo.setAttachName("name"); + baseAttachInfo.setAttachPath(fileUrl); + baseAttachInfo.setProcessId(knowledgeLubeId); + baseAttachInfos.add(baseAttachInfo); + } + baseAttachInfoMapper.batchDmsKnowLedgeLubeFile(baseAttachInfos); + } + } } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsKnowledgeRepairServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsKnowledgeRepairServiceImpl.java index 7162c429..74a998e3 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsKnowledgeRepairServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsKnowledgeRepairServiceImpl.java @@ -1,7 +1,13 @@ package com.hw.dms.service.impl; +import java.util.ArrayList; import java.util.List; + +import com.hw.common.core.constant.DmsConstants; import com.hw.common.core.utils.DateUtils; +import com.hw.dms.domain.BaseAttachInfo; +import com.hw.dms.mapper.BaseAttachInfoMapper; +import com.hw.system.api.domain.SysFile; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.hw.dms.mapper.DmsKnowledgeRepairMapper; @@ -20,6 +26,9 @@ public class DmsKnowledgeRepairServiceImpl implements IDmsKnowledgeRepairService @Autowired private DmsKnowledgeRepairMapper dmsKnowledgeRepairMapper; + @Autowired + private BaseAttachInfoMapper baseAttachInfoMapper; + /** * 查询维修知识库 * @@ -29,7 +38,17 @@ public class DmsKnowledgeRepairServiceImpl implements IDmsKnowledgeRepairService @Override public DmsKnowledgeRepair selectDmsKnowledgeRepairByKnowledgeRepairId(Long knowledgeRepairId) { - return dmsKnowledgeRepairMapper.selectDmsKnowledgeRepairByKnowledgeRepairId(knowledgeRepairId); + DmsKnowledgeRepair dmsKnowledgeRepair = dmsKnowledgeRepairMapper.selectDmsKnowledgeRepairByKnowledgeRepairId(knowledgeRepairId); + List baseAttachInfos = baseAttachInfoMapper.selectListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEREPAIR,dmsKnowledgeRepair.getKnowledgeRepairId()); + List sysFiles = new ArrayList(); + + for (String string:baseAttachInfos){ + SysFile sysFile = new SysFile(); + sysFile.setUrl(string); + sysFiles.add(sysFile); + } + dmsKnowledgeRepair.setSystemFiles(sysFiles); + return dmsKnowledgeRepair; } /** @@ -55,7 +74,12 @@ public class DmsKnowledgeRepairServiceImpl implements IDmsKnowledgeRepairService { dmsKnowledgeRepair.setCreateTime(DateUtils.getNowDate()); dmsKnowledgeRepair.setIsFlag("1"); - return dmsKnowledgeRepairMapper.insertDmsKnowledgeRepair(dmsKnowledgeRepair); + int i = dmsKnowledgeRepairMapper.insertDmsKnowledgeRepair(dmsKnowledgeRepair); + //存储图片 + List fileUrls = dmsKnowledgeRepair.getFileUrls(); + batchInsertInstanceFiles(fileUrls, dmsKnowledgeRepair.getKnowledgeRepairId()); + + return i; } /** @@ -68,7 +92,15 @@ public class DmsKnowledgeRepairServiceImpl implements IDmsKnowledgeRepairService public int updateDmsKnowledgeRepair(DmsKnowledgeRepair dmsKnowledgeRepair) { dmsKnowledgeRepair.setUpdateTime(DateUtils.getNowDate()); - return dmsKnowledgeRepairMapper.updateDmsKnowledgeRepair(dmsKnowledgeRepair); + int i = dmsKnowledgeRepairMapper.updateDmsKnowledgeRepair(dmsKnowledgeRepair); + baseAttachInfoMapper.deleteListBaseAttachInfos(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEREPAIR,dmsKnowledgeRepair.getKnowledgeRepairId()); + + //存储图片 + List fileUrls = dmsKnowledgeRepair.getFileUrls(); + if(fileUrls!=null) { + batchInsertInstanceFiles(fileUrls, dmsKnowledgeRepair.getKnowledgeRepairId()); + } + return i; } /** @@ -94,4 +126,20 @@ public class DmsKnowledgeRepairServiceImpl implements IDmsKnowledgeRepairService { return dmsKnowledgeRepairMapper.deleteDmsKnowledgeRepairByKnowledgeRepairId(knowledgeRepairId); } + + public void batchInsertInstanceFiles(List fileUrls, Long knowledgeLubeId ) { + if (fileUrls != null && !fileUrls.isEmpty()) { + + List baseAttachInfos = new ArrayList<>(); + for (String fileUrl : fileUrls){ + BaseAttachInfo baseAttachInfo = new BaseAttachInfo(); + baseAttachInfo.setAttachType(DmsConstants.MES_BASE_ATTACH_INFO_KNOWLEDGEREPAIR); + baseAttachInfo.setAttachName("name"); + baseAttachInfo.setAttachPath(fileUrl); + baseAttachInfo.setProcessId(knowledgeLubeId); + baseAttachInfos.add(baseAttachInfo); + } + baseAttachInfoMapper.batchDmsKnowLedgeLubeFile(baseAttachInfos); + } + } } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsMaintInstanceActivityServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsMaintInstanceActivityServiceImpl.java index f74fddf6..32a5b157 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsMaintInstanceActivityServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsMaintInstanceActivityServiceImpl.java @@ -3,6 +3,7 @@ package com.hw.dms.service.impl; import java.util.Arrays; import java.util.List; import com.hw.common.core.utils.DateUtils; +import com.hw.common.security.utils.SecurityUtils; import com.hw.dms.domain.DmsBillsMaintInstance; import com.hw.dms.domain.DmsRepairInstance; import com.hw.dms.domain.DmsRepairInstanceActivity; @@ -61,7 +62,7 @@ public class DmsMaintInstanceActivityServiceImpl implements IDmsMaintInstanceAct @Override public int insertDmsMaintInstanceActivity(DmsMaintInstanceActivity dmsMaintInstanceActivity) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsMaintInstanceActivity.setCreateBy(user.getUsername()); dmsMaintInstanceActivity.setCreateTime(DateUtils.getNowDate()); dmsMaintInstanceActivity.setStartTime(DateUtils.getNowDate()); diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanInspectServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanInspectServiceImpl.java index a1a62168..6b50c5de 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanInspectServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanInspectServiceImpl.java @@ -6,6 +6,7 @@ import java.util.List; import com.hw.common.core.constant.SecurityConstants; import com.hw.common.core.utils.DateUtils; import com.hw.common.core.web.domain.AjaxResult; +import com.hw.common.security.utils.SecurityUtils; import com.hw.job.api.RemoteJobService; import com.hw.job.api.domain.SysJob; import com.hw.job.api.util.CronUtils; @@ -67,7 +68,7 @@ public class DmsPlanInspectServiceImpl implements IDmsPlanInspectService //通过cron表达式获取下一次执行时间 Date nextExecution = CronUtils.getNextExecution(time); dmsPlanInspect.setPlanTime(nextExecution); - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsPlanInspect.setCreateBy(user.getUsername()); dmsPlanInspect.setIsFlag("1"); dmsPlanInspect.setCreateTime(DateUtils.getNowDate()); @@ -97,7 +98,7 @@ public class DmsPlanInspectServiceImpl implements IDmsPlanInspectService @Override public int updateDmsPlanInspect(DmsPlanInspect dmsPlanInspect) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsPlanInspect.setUpdateBy(user.getUsername()); dmsPlanInspect.setUpdateTime(DateUtils.getNowDate()); return dmsPlanInspectMapper.updateDmsPlanInspect(dmsPlanInspect); diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanLubeDetailServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanLubeDetailServiceImpl.java index 9e18b848..f65cde3a 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanLubeDetailServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanLubeDetailServiceImpl.java @@ -97,4 +97,9 @@ public class DmsPlanLubeDetailServiceImpl implements IDmsPlanLubeDetailService { return dmsPlanLubeDetailMapper.deleteDmsPlanLubeDetailByPlanLubeDetailId(planLubeDetailId); } + + @Override + public List selectPlanLubeDetailByPlanLubeId(Long planLubeId) { + return dmsPlanLubeDetailMapper.selectPlanLubeDetailByPlanLubeId(planLubeId); + } } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanMaintDetailServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanMaintDetailServiceImpl.java index 3a6f3369..caf41ef7 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanMaintDetailServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanMaintDetailServiceImpl.java @@ -113,4 +113,9 @@ public class DmsPlanMaintDetailServiceImpl implements IDmsPlanMaintDetailService { return dmsPlanMaintDetailMapper.selectDmsPlanMaintDetailJoinList(dmsPlanMaintDetail); } + + @Override + public List selectDmsPlanMaintDetailListByPlanMaintId(Long planMaintId) { + return dmsPlanMaintDetailMapper.selectDmsPlanMaintDetailListByPlanMaintId(planMaintId); + } } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanMaintServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanMaintServiceImpl.java index cb4633ac..594186a2 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanMaintServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanMaintServiceImpl.java @@ -208,12 +208,13 @@ public class DmsPlanMaintServiceImpl implements IDmsPlanMaintService { public void insertDmsPlanMaintDetail(DmsPlanMaint dmsPlanMaint) { List dmsPlanMaintDetailList = dmsPlanMaint.getDmsPlanMaintDetailList(); Long planMaintId = dmsPlanMaint.getPlanMaintId(); - LoginUser user = new LoginUser(); + + LoginUser loginUser = SecurityUtils.getLoginUser(); if (StringUtils.isNotNull(dmsPlanMaintDetailList)) { List list = new ArrayList(); for (DmsPlanMaintDetail dmsPlanMaintDetail : dmsPlanMaintDetailList) { dmsPlanMaintDetail.setIsFlag(1l); - dmsPlanMaintDetail.setCreateBy(user.getUsername()); + dmsPlanMaintDetail.setCreateBy(loginUser.getUsername()); dmsPlanMaintDetail.setPlanMaintId(planMaintId); list.add(dmsPlanMaintDetail); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanRepairDetailServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanRepairDetailServiceImpl.java index a4596777..991f9976 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanRepairDetailServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanRepairDetailServiceImpl.java @@ -10,19 +10,19 @@ import com.hw.dms.service.IDmsPlanRepairDetailService; /** * 检修计划明细Service业务层处理 - * + * * @author Open Platform * @date 2024-01-15 */ @Service -public class DmsPlanRepairDetailServiceImpl implements IDmsPlanRepairDetailService +public class DmsPlanRepairDetailServiceImpl implements IDmsPlanRepairDetailService { @Autowired private DmsPlanRepairDetailMapper dmsPlanRepairDetailMapper; /** * 查询检修计划明细 - * + * * @param planRepairDetailId 检修计划明细主键 * @return 检修计划明细 */ @@ -34,7 +34,7 @@ public class DmsPlanRepairDetailServiceImpl implements IDmsPlanRepairDetailServi /** * 查询检修计划明细列表 - * + * * @param dmsPlanRepairDetail 检修计划明细 * @return 检修计划明细 */ @@ -46,7 +46,7 @@ public class DmsPlanRepairDetailServiceImpl implements IDmsPlanRepairDetailServi /** * 新增检修计划明细 - * + * * @param dmsPlanRepairDetail 检修计划明细 * @return 结果 */ @@ -59,7 +59,7 @@ public class DmsPlanRepairDetailServiceImpl implements IDmsPlanRepairDetailServi /** * 修改检修计划明细 - * + * * @param dmsPlanRepairDetail 检修计划明细 * @return 结果 */ @@ -72,7 +72,7 @@ public class DmsPlanRepairDetailServiceImpl implements IDmsPlanRepairDetailServi /** * 批量删除检修计划明细 - * + * * @param planRepairDetailIds 需要删除的检修计划明细主键 * @return 结果 */ @@ -84,7 +84,7 @@ public class DmsPlanRepairDetailServiceImpl implements IDmsPlanRepairDetailServi /** * 删除检修计划明细信息 - * + * * @param planRepairDetailId 检修计划明细主键 * @return 结果 */ @@ -93,4 +93,9 @@ public class DmsPlanRepairDetailServiceImpl implements IDmsPlanRepairDetailServi { return dmsPlanRepairDetailMapper.deleteDmsPlanRepairDetailByPlanRepairDetailId(planRepairDetailId); } + + @Override + public List selectPlanRepairDetailByPlanRepairId(Long planRepairId) { + return dmsPlanRepairDetailMapper.selectPlanRepairDetailByPlanRepairId(planRepairId); + } } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRecordInspectServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRecordInspectServiceImpl.java index 1c670574..b9df00c2 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRecordInspectServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRecordInspectServiceImpl.java @@ -2,6 +2,7 @@ package com.hw.dms.service.impl; import java.util.List; import com.hw.common.core.utils.DateUtils; +import com.hw.common.security.utils.SecurityUtils; import com.hw.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -54,7 +55,7 @@ public class DmsRecordInspectServiceImpl implements IDmsRecordInspectService @Override public int insertDmsRecordInspect(DmsRecordInspect dmsRecordInspect) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsRecordInspect.setIsFlag("1"); dmsRecordInspect.setCreateBy(user.getUsername()); dmsRecordInspect.setCreateTime(DateUtils.getNowDate()); @@ -70,7 +71,7 @@ public class DmsRecordInspectServiceImpl implements IDmsRecordInspectService @Override public int updateDmsRecordInspect(DmsRecordInspect dmsRecordInspect) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsRecordInspect.setUpdateBy(user.getUsername()); dmsRecordInspect.setUpdateTime(DateUtils.getNowDate()); return dmsRecordInspectMapper.updateDmsRecordInspect(dmsRecordInspect); diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRecordLubeServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRecordLubeServiceImpl.java index ec5dc3b2..a5a3bbf2 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRecordLubeServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRecordLubeServiceImpl.java @@ -2,6 +2,7 @@ package com.hw.dms.service.impl; import java.util.List; import com.hw.common.core.utils.DateUtils; +import com.hw.common.security.utils.SecurityUtils; import com.hw.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -54,7 +55,7 @@ public class DmsRecordLubeServiceImpl implements IDmsRecordLubeService @Override public int insertDmsRecordLube(DmsRecordLube dmsRecordLube) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsRecordLube.setCreateBy(user.getUsername()); dmsRecordLube.setCreateTime(DateUtils.getNowDate()); dmsRecordLube.setIsFlag("1"); @@ -70,7 +71,7 @@ public class DmsRecordLubeServiceImpl implements IDmsRecordLubeService @Override public int updateDmsRecordLube(DmsRecordLube dmsRecordLube) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsRecordLube.setUpdateBy(user.getUsername()); dmsRecordLube.setUpdateTime(DateUtils.getNowDate()); return dmsRecordLubeMapper.updateDmsRecordLube(dmsRecordLube); diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRecordShutDownServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRecordShutDownServiceImpl.java index bdf94d83..cd1a648b 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRecordShutDownServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRecordShutDownServiceImpl.java @@ -2,6 +2,7 @@ package com.hw.dms.service.impl; import java.util.List; import com.hw.common.core.utils.DateUtils; +import com.hw.common.security.utils.SecurityUtils; import com.hw.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -54,7 +55,7 @@ public class DmsRecordShutDownServiceImpl implements IDmsRecordShutDownService @Override public int insertDmsRecordShutDown(DmsRecordShutDown dmsRecordShutDown) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsRecordShutDown.setIsFlag(1l); dmsRecordShutDown.setCreateBy(user.getUsername()); dmsRecordShutDown.setCreateTime(DateUtils.getNowDate()); @@ -70,7 +71,7 @@ public class DmsRecordShutDownServiceImpl implements IDmsRecordShutDownService @Override public int updateDmsRecordShutDown(DmsRecordShutDown dmsRecordShutDown) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsRecordShutDown.setUpdateBy(user.getUsername()); dmsRecordShutDown.setUpdateTime(DateUtils.getNowDate()); return dmsRecordShutDownMapper.updateDmsRecordShutDown(dmsRecordShutDown); diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRepairInstanceActivityServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRepairInstanceActivityServiceImpl.java index 75843dfd..7a0bac58 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRepairInstanceActivityServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRepairInstanceActivityServiceImpl.java @@ -5,6 +5,7 @@ import java.util.Arrays; import java.util.Date; import java.util.List; import com.hw.common.core.utils.DateUtils; +import com.hw.common.security.utils.SecurityUtils; import com.hw.dms.domain.DmsPlanRepair; import com.hw.dms.domain.DmsRepairInstance; import com.hw.dms.mapper.DmsPlanRepairMapper; @@ -67,7 +68,7 @@ public class DmsRepairInstanceActivityServiceImpl implements IDmsRepairInstanceA public int insertDmsRepairInstanceActivity(DmsRepairInstanceActivity dmsRepairInstanceActivity) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); dmsRepairInstanceActivity.setCreateTime(DateUtils.getNowDate()); dmsRepairInstanceActivity.setCreateBy(user.getUsername()); dmsRepairInstanceActivity.setStartTime(DateUtils.getNowDate()); @@ -131,7 +132,7 @@ public class DmsRepairInstanceActivityServiceImpl implements IDmsRepairInstanceA @Override public int updateDmsRepairInstanceActivity(DmsRepairInstanceActivity dmsRepairInstanceActivity) { - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); //第一步 if (dmsRepairInstanceActivity.getProcessStepOrder()==1){ dmsRepairInstanceActivity.setProcessHandleStatus("2"); diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRepairInstanceServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRepairInstanceServiceImpl.java index 5a9761e1..f9b90794 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRepairInstanceServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsRepairInstanceServiceImpl.java @@ -7,6 +7,7 @@ import java.util.List; import com.hw.common.core.constant.SecurityConstants; import com.hw.common.core.domain.R; import com.hw.common.core.utils.DateUtils; +import com.hw.common.security.utils.SecurityUtils; import com.hw.dms.domain.DmsPlanRepair; import com.hw.dms.domain.DmsRepairInstanceActivity; import com.hw.dms.mapper.DmsPlanRepairMapper; @@ -101,7 +102,7 @@ public class DmsRepairInstanceServiceImpl implements IDmsRepairInstanceService String dailyCode = format + serialNumberStr; dmsRepairInstance.setBillsRepairCode(dailyCode); - LoginUser user = new LoginUser(); + LoginUser user = SecurityUtils.getLoginUser(); if (dmsRepairInstance.getPlanBeginTime()!=null){ DmsPlanRepair dmsPlanRepair = dmsPlanRepairMapper.selectDmsPlanRepairByPlanRepairId(dmsRepairInstance.getPlanRepairId()); Long timeLimit = dmsPlanRepair.getTimeLimit(); diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/BaseAttachInfoMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/BaseAttachInfoMapper.xml new file mode 100644 index 00000000..3cd28992 --- /dev/null +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/BaseAttachInfoMapper.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + insert into mes_base_attach_info( attach_type, attach_name, attach_path, process_id) values + + ( #{item.attachType}, #{item.attachName}, #{item.attachPath}, #{item.processId}) + + + + + + + + delete from mes_base_attach_info + where attach_type = #{attachType} and process_id = #{processId} + + diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseDeviceInstallMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseDeviceInstallMapper.xml index 875f4092..4dd6a556 100644 --- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseDeviceInstallMapper.xml +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseDeviceInstallMapper.xml @@ -28,8 +28,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join dms_base_device_ledger b on a.device_id = b.device_id and a.device_id = #{deviceId} - and a.install_position = #{installPosition} - and a.install_time = #{installTime} + and a.install_position like concat( '%',#{installPosition},'%') + and a.install_time between #{params.beginTime} and #{params.endTime} and a.install_persion = #{installPersion} and a.work_order = #{workOrder} and b.device_name like concat('%', #{deviceName},'%') diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseSpecialdeviceParamMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseSpecialdeviceParamMapper.xml index fb21bb5c..2ebfb8c3 100644 --- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseSpecialdeviceParamMapper.xml +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseSpecialdeviceParamMapper.xml @@ -28,13 +28,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from dms_base_specialdevice_param a left join dms_base_device_ledger b on a.device_id = b.device_id - and device_id = #{deviceId} - and device_name like concat('%', #{deviceName},'%') - and param_code = #{paramCode} - and param_name like concat('%', #{paramName}, '%') - and param_value = #{paramValue} - and param_unit = #{paramUnit} - and is_flag = #{isFlag} + and a.device_id = #{deviceId} + and b.device_name like concat('%', #{deviceName},'%') + and a.param_code = #{paramCode} + and a.param_name like concat('%', #{paramName}, '%') + and a.param_value = #{paramValue} + and a.param_unit = #{paramUnit} + and a.is_flag = #{isFlag} diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseTransferInfoMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseTransferInfoMapper.xml index 4373070b..3e665460 100644 --- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseTransferInfoMapper.xml +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseTransferInfoMapper.xml @@ -29,11 +29,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join dms_base_device_ledger b on a.device_id = b.device_id and a.device_id = #{deviceId} - and a.device_position = #{devicePosition} - and a.device_position_new = #{devicePositionNew} + and a.device_position like concat('%',#{devicePosition},'%') + and a.device_position_new like concat('%',#{devicePositionNew},'%') and a.device_position_operator = #{devicePositionOperator} and a.device_position_reason = #{devicePositionReason} - and a.device_transfer_time = #{deviceTransferTime} + and a.device_transfer_time between #{params.beginTime} and #{params.endTime} and b.device_name like concat('%', #{deviceName},'%') diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceActivityMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceActivityMapper.xml index e44e1c48..fc6fb212 100644 --- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceActivityMapper.xml +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceActivityMapper.xml @@ -143,7 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - and plan_inspect_id = #{planInspectId} + and plan_inspect_id like concat('%',#{planInspectId},'%') and inspect_instance_id = #{inspectInstanceId} and wf_process_id = #{wfProcessId} and inspect_type = #{inspectType} and bills_inspect_code = #{billsInspectCode} - and plan_begin_time = #{planBeginTime} - and plan_end_time = #{planEndTime} - and real_begin_time = #{realBeginTime} - and real_end_time = #{realEndTime} + and plan_begin_time > #{planBeginTime} + and #{planEndTime}>plan_end_time + and real_begin_time > #{realBeginTime} + and #{realEndTime}>real_end_time and inspect_status = #{inspectStatus} and is_flag = #{isFlag} diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsLubeInstanceMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsLubeInstanceMapper.xml index af5a39aa..44043322 100644 --- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsLubeInstanceMapper.xml +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsLubeInstanceMapper.xml @@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and plan_lube_id = #{planLubeId} + and lube_instance_id = #{lubeInstanceId} and bills_lube_code = #{billsLubeCode} and plan_begin_time = #{planBeginTime} and real_begin_time = #{realBeginTime} diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml index 26fc7471..0e65977f 100644 --- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml @@ -36,12 +36,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and plan_maint_id = #{planMaintId} + and maint_instance_id = #{maintInstanceId} and wf_process_id = #{wfProcessId} - and bills_maint_code = #{billsMaintCode} - and plan_begin_time = #{planBeginTime} - and real_begin_time = #{realBeginTime} - and plan_end_time = #{planEndTime} - and real_end_time = #{realEndTime} + and bills_maint_code like concat('%',#{billsMaintCode},'%') + and plan_begin_time > #{planBeginTime} + and #{planEndTime}>plan_end_time + and real_begin_time > #{realBeginTime} + and #{realEndTime} > real_end_time and maint_status = #{maintStatus} and maint_comp_rate = #{maintCompRate} and is_flag = #{isFlag} 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 index cba4ce92..5fd27453 100644 --- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsInspectInstanceDetailProjectMapper.xml +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsInspectInstanceDetailProjectMapper.xml @@ -146,4 +146,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsInspectRouteDetailMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsInspectRouteDetailMapper.xml index 25d1601c..f9f7b6ab 100644 --- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsInspectRouteDetailMapper.xml +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsInspectRouteDetailMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -12,6 +12,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -20,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + insert into dms_inspect_route_detail @@ -72,9 +74,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from dms_inspect_route_detail where route_detail_id in + delete from dms_inspect_route_detail where route_detail_id in #{routeDetailId} - \ No newline at end of file + + + diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsInstanceFileMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsInstanceFileMapper.xml index 54930126..c096d24d 100644 --- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsInstanceFileMapper.xml +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsInstanceFileMapper.xml @@ -73,4 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ( #{item.instanceFileId}, #{item.targetType}, #{item.targetId}, #{item.filePath}) + + delete from dms_instance_file where target_type = 1 and target_id =#{targetId} + diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanLubeDetailMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanLubeDetailMapper.xml index 16fb46b3..3a877825 100644 --- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanLubeDetailMapper.xml +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanLubeDetailMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -17,6 +17,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + @@ -25,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + insert into dms_plan_lube_detail @@ -93,9 +96,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from dms_plan_lube_detail where plan_lube_detail_id in + delete from dms_plan_lube_detail where plan_lube_detail_id in #{planLubeDetailId} - \ No newline at end of file + + diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanMaintDetailMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanMaintDetailMapper.xml index 8d204713..7f515819 100644 --- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanMaintDetailMapper.xml +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanMaintDetailMapper.xml @@ -20,6 +20,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -132,5 +134,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and is_flag = #{isFlag} + diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanRepairDetailMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanRepairDetailMapper.xml index 637e8a5c..886a48a9 100644 --- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanRepairDetailMapper.xml +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanRepairDetailMapper.xml @@ -3,11 +3,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - + + @@ -16,35 +17,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select plan_repair_detail_id, plan_repair_id, device_id, fault_type, repair_desc, repair_protocol, operation_description, create_by, create_time, update_by, update_time from dms_plan_repair_detail + select plan_repair_detail_id, plan_repair_id, repair_detail_target_type, repair_detail_target_id , fault_type, repair_desc, repair_protocol, operation_description, create_by, create_time, update_by, update_time from dms_plan_repair_detail - + - + insert into dms_plan_repair_detail plan_repair_id, - device_id, fault_type, + repair_detail_target_type, + repair_detail_target_id, repair_desc, repair_protocol, operation_description, @@ -55,8 +58,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{planRepairId}, - #{deviceId}, #{faultType}, + #{repairDetailTargetType}, + #{repairDetailTargetId}, #{repairDesc}, #{repairProtocol}, #{operationDescription}, @@ -71,8 +75,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update dms_plan_repair_detail plan_repair_id = #{planRepairId}, - device_id = #{deviceId}, fault_type = #{faultType}, + repair_detail_target_type = #{repairDetailTargetType}, + repair_detail_target_id = #{repairDetailTargetId}, repair_desc = #{repairDesc}, repair_protocol = #{repairProtocol}, operation_description = #{operationDescription}, @@ -89,9 +94,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from dms_plan_repair_detail where plan_repair_detail_id in + delete from dms_plan_repair_detail where plan_repair_detail_id in #{planRepairDetailId} - \ No newline at end of file + + diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanRepairMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanRepairMapper.xml index 591f9585..c7a6c6da 100644 --- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanRepairMapper.xml +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanRepairMapper.xml @@ -31,7 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + @@ -62,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"