diff --git a/hw-api/hw-api-dms/src/main/java/com/hw/dms/api/RemoteDmsService.java b/hw-api/hw-api-dms/src/main/java/com/hw/dms/api/RemoteDmsService.java index 05b187e8..4999b398 100644 --- a/hw-api/hw-api-dms/src/main/java/com/hw/dms/api/RemoteDmsService.java +++ b/hw-api/hw-api-dms/src/main/java/com/hw/dms/api/RemoteDmsService.java @@ -4,7 +4,6 @@ import com.hw.common.core.constant.SecurityConstants; import com.hw.common.core.constant.ServiceNameConstants; import com.hw.common.core.domain.R; import com.hw.dms.api.factory.RemoteDmsFallbackFactory; -import oracle.jdbc.proxy.annotation.Post; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestHeader; @@ -27,6 +26,6 @@ public interface RemoteDmsService { R getDmsBillsLube(@RequestHeader(SecurityConstants.FROM_SOURCE) String source,String planInspectId); @PostMapping("/dmsBillsMaintInstance/autoAdd") - R getDmsBillsMaintInstance(@RequestHeader(SecurityConstants.FROM_SOURCE) String source,String dmsBillsMaintId); + R getDmsBillsMaintInstance(@RequestHeader(SecurityConstants.FROM_SOURCE) String source,String planMaintCode); } diff --git a/hw-api/hw-api-dms/src/main/java/com/hw/dms/api/factory/RemoteDmsFallbackFactory.java b/hw-api/hw-api-dms/src/main/java/com/hw/dms/api/factory/RemoteDmsFallbackFactory.java index 99f84dc5..690aa181 100644 --- a/hw-api/hw-api-dms/src/main/java/com/hw/dms/api/factory/RemoteDmsFallbackFactory.java +++ b/hw-api/hw-api-dms/src/main/java/com/hw/dms/api/factory/RemoteDmsFallbackFactory.java @@ -31,7 +31,7 @@ public class RemoteDmsFallbackFactory implements FallbackFactory getDmsBillsMaintInstance(String source, String dmsBillsMaintId) { + public R getDmsBillsMaintInstance(String source, String planMaintCode) { return null; } }; diff --git a/hw-api/hw-api-job/src/main/java/com/hw/job/api/RemoteJobService.java b/hw-api/hw-api-job/src/main/java/com/hw/job/api/RemoteJobService.java index 9f95e961..65f55685 100644 --- a/hw-api/hw-api-job/src/main/java/com/hw/job/api/RemoteJobService.java +++ b/hw-api/hw-api-job/src/main/java/com/hw/job/api/RemoteJobService.java @@ -6,10 +6,7 @@ import com.hw.common.core.domain.R; import com.hw.job.api.domain.SysJob; import com.hw.job.api.factory.RemoteJobFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.*; import java.util.Date; @@ -21,10 +18,11 @@ import java.util.Date; */ @FeignClient(contextId = "remoteJobService", value = ServiceNameConstants.JOB_SERVICE, fallbackFactory = RemoteJobFallbackFactory.class) public interface RemoteJobService { - @PostMapping("/job") - R add(@RequestHeader(SecurityConstants.FROM_SOURCE) String source, SysJob job); - @PostMapping("/job/jobByPlanRepairId") + @PostMapping("/jobinner") + R add(@RequestHeader(SecurityConstants.FROM_SOURCE) String source, SysJob job); + @PostMapping("/jobinner/jobByPlanRepairId") SysJob selectJobList(Long planRepairId); - + @PostMapping("/jobinner/remove/{jobIds}") + R remove(@RequestHeader(SecurityConstants.FROM_SOURCE) String source, @PathVariable("jobIds") Long[] jobIds); } diff --git a/hw-api/hw-api-job/src/main/java/com/hw/job/api/factory/RemoteJobFallbackFactory.java b/hw-api/hw-api-job/src/main/java/com/hw/job/api/factory/RemoteJobFallbackFactory.java index 994f3320..27f04845 100644 --- a/hw-api/hw-api-job/src/main/java/com/hw/job/api/factory/RemoteJobFallbackFactory.java +++ b/hw-api/hw-api-job/src/main/java/com/hw/job/api/factory/RemoteJobFallbackFactory.java @@ -21,7 +21,7 @@ public class RemoteJobFallbackFactory implements FallbackFactory add(String source, SysJob job) { + public R add(String source, SysJob job) { return null; } @@ -30,6 +30,11 @@ public class RemoteJobFallbackFactory implements FallbackFactory remove(String source, Long[] jobIds) { + return null; + } + }; } 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 e1ffe50d..7a89bda0 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 @@ -58,4 +58,17 @@ public class DmsConstants { public static final String DMS_INSTANCE_FILE_TARGET_TYPE_FAULT_INSTANCE_ACTIVITY = "1";//故障报修工单实例节点 + + + /**保养工单保养状态*/ + public static final Long DMS_BILLS_MAINT_INSTANCE_STATUS_TO_MAINT=1L;//待保养 + public static final Long DMS_BILLS_MAINT_INSTANCE_STATUS_MAINTING=2L;//保养中 + public static final Long DMS_BILLS_MAINT_INSTANCE_STATUS_COMPLETE=3L;//保养完成 + + + /**润滑工单润滑状态*/ + public static final String DMS_BILLS_LUBE_INSTANCE_STATUS_TO_LUBE="1";//待润滑 + public static final String DMS_BILLS_LUBE_INSTANCE_STATUS_LUBING="2";//润滑中 + public static final String DMS_BILLS_LUBE_INSTANCE_STATUS_COMPLETE="3";//润滑完成 + } diff --git a/hw-common/hw-common-core/src/main/java/com/hw/common/core/utils/uuid/Seq.java b/hw-common/hw-common-core/src/main/java/com/hw/common/core/utils/uuid/Seq.java index 9f532bcf..a6f81457 100644 --- a/hw-common/hw-common-core/src/main/java/com/hw/common/core/utils/uuid/Seq.java +++ b/hw-common/hw-common-core/src/main/java/com/hw/common/core/utils/uuid/Seq.java @@ -129,6 +129,51 @@ public class Seq { // 物料转库记录标识 public static final String wmsTransferSeqCode = "TF"; + + + + // 保养计划序列类型 + public static final String planMaintSeqType = "PLANMAINT"; + + // 保养计划接口序列数 + private static AtomicInteger planMaintSeq = new AtomicInteger(1); + + // 保养记录标识 + public static final String planMaintCode = "PM"; + + + // 保养工单序列类型 + public static final String maintInstanceSeqType = "MAINTINSTANCE"; + + // 保养工单接口序列数 + private static AtomicInteger maintInstanceSeq = new AtomicInteger(1); + + // 保养工单标识 + public static final String maintInstanceCode = "MI"; + + + + + // 润滑计划序列类型 + public static final String planLubeSeqType = "PLANLUBE"; + + // 润滑计划接口序列数 + private static AtomicInteger planLubeSeq = new AtomicInteger(1); + + // 润滑记录标识 + public static final String planLubeCode = "PL"; + + + // 润滑工单序列类型 + public static final String lubeInstanceSeqType = "LUBEINSTANCE"; + + // 润滑工单接口序列数 + private static AtomicInteger lubeInstanceSeq = new AtomicInteger(1); + + // 润滑工单标识 + public static final String lubeInstanceCode = "LI"; + + /** * 获取通用序列号 * @@ -213,6 +258,14 @@ public class Seq { atomicInt = rawOutstockSeq; }else if (wmsTransferSeqType.equals(type)) { atomicInt = wmsTransferSeq; + }else if (planMaintSeqType.equals(type)) { + atomicInt = planMaintSeq; + }else if(maintInstanceSeqType.equals(type)) { + atomicInt = maintInstanceSeq; + }else if (planLubeSeqType.equals(type)) { + atomicInt = planLubeSeq; + }else if(lubeInstanceSeqType.equals(type)) { + atomicInt = lubeInstanceSeq; } return getId(atomicInt, 3, code); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsApiController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsApiController.java index 45cfbe21..ded84786 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsApiController.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsApiController.java @@ -64,14 +64,14 @@ public class DmsApiController extends BaseController { public AjaxResult PDAInspect(@RequestBody DmsBillsInspectInstance dmsBillsInspectInstance){ return toAjax(dmsBillsInspectInstanceService.insertDmsBillsInspectInstance(dmsBillsInspectInstance)); } - /** - * PDA-保养 - * */ - @PostMapping("/PDAMaint") - @ResponseBody - public AjaxResult PDAMaint(@RequestBody DmsBillsMaintInstance dmsBillsMaintInstance){ - return toAjax(dmsBillsMaintInstanceService.insertDmsBillsMaintInstance(dmsBillsMaintInstance)); - } +// /** +// * PDA-保养 +// * */ +// @PostMapping("/PDAMaint") +// @ResponseBody +// public AjaxResult PDAMaint(@RequestBody DmsBillsMaintInstance dmsBillsMaintInstance){ +// return toAjax(dmsBillsMaintInstanceService.insertDmsBillsMaintInstance(dmsBillsMaintInstance)); +// } /** * PDA-润滑 * */ diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBillsMaintInstanceController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBillsMaintInstanceController.java index 56d1c2fa..324c6c51 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBillsMaintInstanceController.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBillsMaintInstanceController.java @@ -6,6 +6,7 @@ import java.io.IOException; import javax.servlet.http.HttpServletResponse; import com.hw.common.core.utils.DateUtils; +import com.hw.common.security.annotation.InnerAuth; import com.hw.dms.domain.DmsPlanMaint; import com.hw.dms.service.IDmsPlanMaintService; import org.springframework.beans.factory.annotation.Autowired; @@ -85,20 +86,17 @@ public class DmsBillsMaintInstanceController extends BaseController @PostMapping public AjaxResult add(@RequestBody DmsBillsMaintInstance dmsBillsMaintInstance) { - return toAjax(dmsBillsMaintInstanceService.insertDmsBillsMaintInstance(dmsBillsMaintInstance)); + return null; +// return toAjax(dmsBillsMaintInstanceService.insertDmsBillsMaintInstance(dmsBillsMaintInstance)); } + +// @InnerAuth @PostMapping("/autoAdd") - public AjaxResult autoAdd(@RequestBody String dmsBillsMaintId) + public AjaxResult autoAdd(@RequestBody String planMaintCode) { - String s = dmsBillsMaintId.replaceAll("\"", ""); - DmsPlanMaint dmsPlanMaint = dmsPlanMaintService.selectDmsPlanMaintByPlanMaintId(Long.valueOf(s)); - DmsBillsMaintInstance dmsBillsMaintInstance = new DmsBillsMaintInstance(); - dmsBillsMaintInstance.setPlanMaintId(dmsPlanMaint.getPlanMaintId()); - SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddhh"); - - dmsBillsMaintInstance.setBillsMaintCode(sdf.format(DateUtils.getNowDate())); - return toAjax(dmsBillsMaintInstanceService.insertDmsBillsMaintInstance(dmsBillsMaintInstance)); - + String planMaintCodeS = planMaintCode.replaceAll("\"", ""); + DmsPlanMaint dmsPlanMaint = dmsPlanMaintService.selectDmsPlanMaintJoinByPlanMaintCode(planMaintCodeS); + return toAjax(dmsBillsMaintInstanceService.insertDmsBillsMaintInstance(dmsPlanMaint)); } /** diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsMobileController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsMobileController.java index 64a7329e..a834b0c4 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsMobileController.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsMobileController.java @@ -10,10 +10,7 @@ import com.hw.common.log.enums.BusinessType; import com.hw.dms.domain.*; import com.hw.dms.domain.vo.DmsBillsFaultInstanceScanVo; import com.hw.dms.domain.vo.DmsBillsInspectInstanceScanVo; -import com.hw.dms.service.IDmsBaseDeviceLedgerService; -import com.hw.dms.service.IDmsBaseOutsrcInfoService; -import com.hw.dms.service.IDmsBillsFaultInstanceService; -import com.hw.dms.service.IDmsBillsInspectInstanceService; +import com.hw.dms.service.*; import com.hw.system.api.RemoteFileService; import com.hw.system.api.domain.SysFile; import org.springframework.beans.factory.annotation.Autowired; @@ -47,6 +44,12 @@ public class DmsMobileController extends BaseController { @Autowired private IDmsBaseOutsrcInfoService dmsBaseOutsrcInfoService; + @Autowired + private IDmsBillsMaintInstanceService dmsBillsMaintInstanceService; + + @Autowired + private IDmsBillsLubeInstanceService dmsBillsLubeInstanceService; + @Resource private RemoteFileService remoteFileService; @@ -197,7 +200,7 @@ public class DmsMobileController extends BaseController { /** - * 获取最新一条待巡检的巡检或点检工单(检查类型inspectType(1巡检,2点检)) + * 获取最新一条待巡检或巡检中的巡检或点检工单(检查类型inspectType(1巡检,2点检)) * * @return */ @@ -229,4 +232,75 @@ public class DmsMobileController extends BaseController { } + + + + /** + * 获取最新一条待保养或保养中的保养工单 + * + * @return + */ + // @RequiresPermissions("qms:checkrule:list") + @GetMapping("/getNewestMaintInstance") + public AjaxResult getNewestMaintInstance(DmsBillsMaintInstance dmsBillsMaintInstance) { + DmsBillsMaintInstance newestMaintInstance = dmsBillsMaintInstanceService.getNewestBillsMaintInstance(dmsBillsMaintInstance); + return success(newestMaintInstance); + } + + + /** + * 开始保养 + */ +// @RequiresPermissions("qms:checkresultdetail:add") + @Log(title = "保养工单", businessType = BusinessType.START) + @PostMapping("/startMaint") + public AjaxResult startMaint(@RequestBody DmsBillsMaintDetail dmsBillsMaintDetail) { + return success(dmsBillsMaintInstanceService.startMaint(dmsBillsMaintDetail)); + } + + /** + * 完成保养 + */ +// @RequiresPermissions("qms:checkresultdetail:add") + @Log(title = "保养工单", businessType = BusinessType.COMPLETE) + @PostMapping("/completeMaint") + public AjaxResult completeMaint(@RequestBody DmsBillsMaintDetail dmsBillsMaintDetail) { + + return success(dmsBillsMaintInstanceService.completeMaint(dmsBillsMaintDetail)); + } + + + + /** + * 获取最新一条待润滑或润滑中的润滑工单 + * + * @return + */ + // @RequiresPermissions("qms:checkrule:list") + @GetMapping("/getNewestLubeInstance") + public AjaxResult getNewestLubeInstance(DmsBillsLubeInstance dmsBillsLubeInstance) { + DmsBillsLubeInstance newestLubeInstance = dmsBillsLubeInstanceService.getNewestBillsLubeInstance(dmsBillsLubeInstance); + return success(newestLubeInstance); + } + + /** + * 开始润滑 + */ +// @RequiresPermissions("qms:checkresultdetail:add") + @Log(title = "润滑工单", businessType = BusinessType.START) + @PostMapping("/startLube") + public AjaxResult startLube(@RequestBody DmsBillsLubeDetail dmsBillsLubeDetail) { + + return success(dmsBillsLubeInstanceService.startLube(dmsBillsLubeDetail)); + } + + /** + * 完成润滑 + */ +// @RequiresPermissions("qms:checkresultdetail:add") + @Log(title = "润滑工单", businessType = BusinessType.COMPLETE) + @PostMapping("/completeLube") + public AjaxResult completeLube(@RequestBody DmsBillsLubeDetail dmsBillsLubeDetail) { + return success(dmsBillsLubeInstanceService.completeLube(dmsBillsLubeDetail)); + } } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanLubeController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanLubeController.java index 5a0d505f..932123ba 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanLubeController.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanLubeController.java @@ -88,25 +88,7 @@ public class DmsPlanLubeController extends BaseController @PostMapping public AjaxResult add(@RequestBody DmsPlanLube dmsPlanLube) { - String time = dmsPlanLube.getCronExpression(); - //通过cron表达式获取下一次执行时间 - Date nextExecution = CronUtils.getNextExecution(time); - dmsPlanLube.setLubeTime(nextExecution); int i = dmsPlanLubeService.insertDmsPlanLube(dmsPlanLube); - - - SysJob job = new SysJob(); - job.setJobName("创建计划编号为"+dmsPlanLube.getPlanLubeCode()+"工单"); - job.setJobGroup("DEFAULT"); - job.setInvokeTarget("ryTask.getDmsBillsLube(\""+dmsPlanLube.getPlanLubeId()+"\")"); - job.setCronExpression(dmsPlanLube.getCronExpression()); - job.setMisfirePolicy("1"); - job.setConcurrent("1"); - job.setStatus("1"); - remoteJobService.add(SecurityConstants.INNER,job); - SysJob job1 = remoteJobService.selectJobList(dmsPlanLube.getPlanLubeId()); - dmsPlanLube.setJobId(job1.getJobId()); - dmsPlanLubeService.updateDmsPlanLube(dmsPlanLube); return toAjax(i); } 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 new file mode 100644 index 00000000..5fd5c345 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanLubeDetailController.java @@ -0,0 +1,158 @@ +package com.hw.dms.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +import com.hw.dms.domain.DmsBaseDeviceLedger; +import com.hw.dms.domain.DmsBaseLubeStandard; +import com.hw.dms.domain.DmsBaseLubeStation; +import com.hw.dms.service.IDmsBaseDeviceLedgerService; +import com.hw.dms.service.IDmsBaseLubeStandardService; +import com.hw.dms.service.IDmsBaseLubeStationService; +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.DmsPlanLubeDetail; +import com.hw.dms.service.IDmsPlanLubeDetailService; +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-03-21 + */ +@RestController +@RequestMapping("/dmsPlanLubeDetail") +public class DmsPlanLubeDetailController extends BaseController +{ + @Autowired + private IDmsPlanLubeDetailService dmsPlanLubeDetailService; + + @Autowired + private IDmsBaseLubeStandardService dmsBaseLubeStandardService; + + @Autowired + private IDmsBaseLubeStationService dmsBaseLubeStationService; + + @Autowired + private IDmsBaseDeviceLedgerService dmsBaseDeviceLedgerService; + + /** + * 查询润滑计划明细列表 + */ + @RequiresPermissions("dms:dmsPlanLubeDetail:list") + @GetMapping("/list") + public TableDataInfo list(DmsPlanLubeDetail dmsPlanLubeDetail) + { + startPage(); + List list = dmsPlanLubeDetailService.selectDmsPlanLubeDetailList(dmsPlanLubeDetail); + return getDataTable(list); + } + + /** + * 导出润滑计划明细列表 + */ + @RequiresPermissions("dms:dmsPlanLubeDetail:export") + @Log(title = "润滑计划明细", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, DmsPlanLubeDetail dmsPlanLubeDetail) + { + List list = dmsPlanLubeDetailService.selectDmsPlanLubeDetailList(dmsPlanLubeDetail); + ExcelUtil util = new ExcelUtil(DmsPlanLubeDetail.class); + util.exportExcel(response, list, "润滑计划明细数据"); + } + + /** + * 获取润滑计划明细详细信息 + */ + @RequiresPermissions("dms:dmsPlanLubeDetail:query") + @GetMapping(value = "/{planLubeDetailId}") + public AjaxResult getInfo(@PathVariable("planLubeDetailId") Long planLubeDetailId) + { + return success(dmsPlanLubeDetailService.selectDmsPlanLubeDetailByPlanLubeDetailId(planLubeDetailId)); + } + + /** + * 新增润滑计划明细 + */ + @RequiresPermissions("dms:dmsPlanLubeDetail:add") + @Log(title = "润滑计划明细", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DmsPlanLubeDetail dmsPlanLubeDetail) + { + return toAjax(dmsPlanLubeDetailService.insertDmsPlanLubeDetail(dmsPlanLubeDetail)); + } + + /** + * 修改润滑计划明细 + */ + @RequiresPermissions("dms:dmsPlanLubeDetail:edit") + @Log(title = "润滑计划明细", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DmsPlanLubeDetail dmsPlanLubeDetail) + { + return toAjax(dmsPlanLubeDetailService.updateDmsPlanLubeDetail(dmsPlanLubeDetail)); + } + + /** + * 删除润滑计划明细 + */ + @RequiresPermissions("dms:dmsPlanLubeDetail:remove") + @Log(title = "润滑计划明细", businessType = BusinessType.DELETE) + @DeleteMapping("/{planLubeDetailIds}") + public AjaxResult remove(@PathVariable Long[] planLubeDetailIds) + { + return toAjax(dmsPlanLubeDetailService.deleteDmsPlanLubeDetailByPlanLubeDetailIds(planLubeDetailIds)); + } + + + + + + /** + * 获取润滑标准列表 + */ + @RequiresPermissions("dms:dmsPlanLubeDetail:query") + @GetMapping(value = "/getLubeStations") + public AjaxResult getLubeStations(DmsBaseLubeStation dmsBaseLubeStation) + { + return success(dmsBaseLubeStationService.selectDmsBaseLubeStationList(dmsBaseLubeStation)); + } + + + /** + * 获取润滑部位列表 + */ + @RequiresPermissions("dms:dmsPlanLubeDetail:query") + @GetMapping(value = "/getLubeStandards") + public AjaxResult getLubeStandards(DmsBaseLubeStandard dmsBaseLubeStandard) + { + return success(dmsBaseLubeStandardService.selectDmsBaseLubeStandardList(dmsBaseLubeStandard)); + } + + + /** + * 获取设备列表 + */ + @RequiresPermissions("dms:dmsPlanLubeDetail:query") + @GetMapping(value = "/getBaseDeviceLedgers") + public AjaxResult getBaseDeviceLedgers(DmsBaseDeviceLedger dmsBaseDeviceLedger) + { + return success(dmsBaseDeviceLedgerService.selectDmsBaseDeviceLedgerList(dmsBaseDeviceLedger)); + } + +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanMaintController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanMaintController.java index 950e0fca..e2949cd1 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanMaintController.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsPlanMaintController.java @@ -40,8 +40,7 @@ public class DmsPlanMaintController extends BaseController { @Autowired private IDmsPlanMaintService dmsPlanMaintService; - @Autowired - private RemoteJobService remoteJobService; + /** * 查询保养计划信息列表 @@ -86,24 +85,7 @@ public class DmsPlanMaintController extends BaseController @PostMapping public AjaxResult add(@RequestBody DmsPlanMaint dmsPlanMaint) { - String time = dmsPlanMaint.getCronExpression(); - //通过cron表达式获取下一次执行时间 - Date nextExecution = CronUtils.getNextExecution(time); - dmsPlanMaint.setMaintTime(nextExecution); int i = dmsPlanMaintService.insertDmsPlanMaint(dmsPlanMaint); - - SysJob job = new SysJob(); - job.setJobName("创建计划编号为"+dmsPlanMaint.getPlanMaintCode()+"工单"); - job.setJobGroup("DEFAULT"); - job.setInvokeTarget("ryTask.getDmsBillsLube(\""+dmsPlanMaint.getPlanMaintId()+"\")"); - job.setCronExpression(dmsPlanMaint.getCronExpression()); - job.setMisfirePolicy("1"); - job.setConcurrent("1"); - job.setStatus("1"); - remoteJobService.add(SecurityConstants.INNER,job); - SysJob job1 = remoteJobService.selectJobList(dmsPlanMaint.getPlanMaintId()); - dmsPlanMaint.setJobId(job1.getJobId()); - dmsPlanMaintService.updateDmsPlanMaint(dmsPlanMaint); return toAjax(i); } 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 fa1c018f..a5b66a71 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 @@ -24,7 +24,7 @@ import com.hw.common.core.web.page.TableDataInfo; /** * 保养计划明细Controller - * + * * @author xins * @date 2024-01-10 */ @@ -43,7 +43,7 @@ public class DmsPlanMaintDetailController extends BaseController public TableDataInfo list(DmsPlanMaintDetail dmsPlanMaintDetail) { startPage(); - List list = dmsPlanMaintDetailService.selectDmsPlanMaintDetailList(dmsPlanMaintDetail); + List list = dmsPlanMaintDetailService.selectDmsPlanMaintDetailJoinList(dmsPlanMaintDetail); return getDataTable(list); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBaseMaintStation.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBaseMaintStation.java index 42f4c355..8666b5a8 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBaseMaintStation.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBaseMaintStation.java @@ -26,6 +26,10 @@ public class DmsBaseMaintStation extends BaseEntity @Excel(name = "部位编号") private String maintStationCode; + /** 部位编号 */ + @Excel(name = "部位名称") + private String maintStationName; + /** 保养标准 */ @Excel(name = "保养标准") private String protocolCode; @@ -71,6 +75,15 @@ public class DmsBaseMaintStation extends BaseEntity { return maintStationCode; } + + public String getMaintStationName() { + return maintStationName; + } + + public void setMaintStationName(String maintStationName) { + this.maintStationName = maintStationName; + } + public void setProtocolCode(String protocolCode) { this.protocolCode = protocolCode; diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsLubeDetail.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsLubeDetail.java new file mode 100644 index 00000000..a743aa19 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsLubeDetail.java @@ -0,0 +1,224 @@ +package com.hw.dms.domain; + +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.Date; + +/** + * 润滑工单明细对象 dms_bills_lube_detail + * + * @author xins + * @date 2024-03-20 + */ +public class DmsBillsLubeDetail extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键标识 */ + private Long billsLubeDetailId; + + /** 润滑工单ID，关联润滑工单主键 */ + @Excel(name = "润滑工单ID，关联润滑工单主键") + private Long lubeInstanceId; + + /** 设备ID，关联dms_base_device_ledger的device_id */ + @Excel(name = "设备ID，关联dms_base_device_ledger的device_id") + private Long deviceId; + + /** 润滑部位,关联润滑部位主键 */ + @Excel(name = "润滑部位,关联润滑部位主键") + private Long lubeStationId; + + /** 润滑标准ID，关联润滑标准主键 */ + @Excel(name = "润滑标准ID，关联润滑标准主键") + private Long lubeStandardId; + + /** 操作描述 */ + @Excel(name = "操作描述") + private String operationDescription; + + /** 保养状态：1-待保养；2-保养中；3-已完成 */ + @Excel(name = "保养状态：1-待保养；2-保养中；3-已完成") + private Long maintStatus; + + /** 是否标识：1-是；2-否 */ + @Excel(name = "是否标识：1-是；2-否") + private Long isFlag; + + private Date beginTime; + + private Date endTime; + + + private String typeName; + private String deviceCode; + + private String deviceName; + + private String lubeStationName; + + private String lubeProtocol; + + private String lubeOperationDescription;//润滑标准中的操作描述 + + + + public void setBillsLubeDetailId(Long billsLubeDetailId) + { + this.billsLubeDetailId = billsLubeDetailId; + } + + public Long getBillsLubeDetailId() + { + return billsLubeDetailId; + } + public void setLubeInstanceId(Long lubeInstanceId) + { + this.lubeInstanceId = lubeInstanceId; + } + + public Long getLubeInstanceId() + { + return lubeInstanceId; + } + public void setDeviceId(Long deviceId) + { + this.deviceId = deviceId; + } + + public Long getDeviceId() + { + return deviceId; + } + public void setLubeStationId(Long lubeStationId) + { + this.lubeStationId = lubeStationId; + } + + public Long getLubeStationId() + { + return lubeStationId; + } + public void setLubeStandardId(Long lubeStandardId) + { + this.lubeStandardId = lubeStandardId; + } + + public Long getLubeStandardId() + { + return lubeStandardId; + } + public void setOperationDescription(String operationDescription) + { + this.operationDescription = operationDescription; + } + + public String getOperationDescription() + { + return operationDescription; + } + public void setMaintStatus(Long maintStatus) + { + this.maintStatus = maintStatus; + } + + public Long getMaintStatus() + { + return maintStatus; + } + public void setIsFlag(Long isFlag) + { + this.isFlag = isFlag; + } + + public Long getIsFlag() + { + return isFlag; + } + + 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 getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + public String getDeviceCode() { + return deviceCode; + } + + public void setDeviceCode(String deviceCode) { + this.deviceCode = deviceCode; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getLubeStationName() { + return lubeStationName; + } + + public void setLubeStationName(String lubeStationName) { + this.lubeStationName = lubeStationName; + } + + public String getLubeProtocol() { + return lubeProtocol; + } + + public void setLubeProtocol(String lubeProtocol) { + this.lubeProtocol = lubeProtocol; + } + + public String getLubeOperationDescription() { + return lubeOperationDescription; + } + + public void setLubeOperationDescription(String lubeOperationDescription) { + this.lubeOperationDescription = lubeOperationDescription; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("billsLubeDetailId", getBillsLubeDetailId()) + .append("lubeInstanceId", getLubeInstanceId()) + .append("deviceId", getDeviceId()) + .append("lubeStationId", getLubeStationId()) + .append("lubeStandardId", getLubeStandardId()) + .append("operationDescription", getOperationDescription()) + .append("maintStatus", getMaintStatus()) + .append("isFlag", getIsFlag()) + .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/DmsBillsLubeInstance.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsLubeInstance.java index e8fa1f62..6336321b 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsLubeInstance.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsLubeInstance.java @@ -1,6 +1,8 @@ package com.hw.dms.domain; import java.util.Date; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -62,6 +64,10 @@ public class DmsBillsLubeInstance extends BaseEntity private String lubeLevel; + private String lubeStatusStr; + + private List dmsBillsLubeDetailList; + public String getLubeGroup() { return lubeGroup; } @@ -168,6 +174,22 @@ public class DmsBillsLubeInstance extends BaseEntity return isFlag; } + public String getLubeStatusStr() { + return lubeStatusStr; + } + + public void setLubeStatusStr(String lubeStatusStr) { + this.lubeStatusStr = lubeStatusStr; + } + + public List getDmsBillsLubeDetailList() { + return dmsBillsLubeDetailList; + } + + public void setDmsBillsLubeDetailList(List dmsBillsLubeDetailList) { + this.dmsBillsLubeDetailList = dmsBillsLubeDetailList; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsMaintDetail.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsMaintDetail.java new file mode 100644 index 00000000..ec710971 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsMaintDetail.java @@ -0,0 +1,222 @@ +package com.hw.dms.domain; + +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.Date; + +/** + * 保养工单明细对象 dms_bills_maint_detail + * + * @author xins + * @date 2024-03-20 + */ +public class DmsBillsMaintDetail extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键标识 */ + private Long billsMaintDetailId; + + /** 保养工单ID，关联dms_bills_maint_instance的maint_instance_id */ + @Excel(name = "保养工单ID，关联dms_bills_maint_instance的maint_instance_id") + private Long maintInstanceId; + + /** 设备ID，关联dms_base_device_ledger的device_id */ + @Excel(name = "设备ID，关联dms_base_device_ledger的device_id") + private Long deviceId; + + /** 保养部位,关联dms_base_maint_station的maint_station_id */ + @Excel(name = "保养部位,关联dms_base_maint_station的maint_station_id") + private Long stationId; + + /** 保养标准ID，关联保养标准主键 */ + @Excel(name = "保养标准ID，关联保养标准主键") + private Long maintStandardId; + + /** 操作描述 */ + @Excel(name = "操作描述") + private String operationDescription; + + /** 保养状态：1-待保养；2-保养中；3-已完成 */ + @Excel(name = "保养状态：1-待保养；2-保养中；3-已完成") + private Long maintStatus; + + /** 是否标识：1-是；2-否 */ + @Excel(name = "是否标识：1-是；2-否") + private Long isFlag; + + private Date beginTime; + + private Date endTime; + + private String deviceCode; + + private String deviceName; + + private String maintStationName; + + private String maintProtocol; + + private String maintOperationDescription;//保养标准中的操作描述 + + private String typeName;//设备类型名称 + + public void setBillsMaintDetailId(Long billsMaintDetailId) + { + this.billsMaintDetailId = billsMaintDetailId; + } + + public Long getBillsMaintDetailId() + { + return billsMaintDetailId; + } + public void setMaintInstanceId(Long maintInstanceId) + { + this.maintInstanceId = maintInstanceId; + } + + public Long getMaintInstanceId() + { + return maintInstanceId; + } + public void setDeviceId(Long deviceId) + { + this.deviceId = deviceId; + } + + public Long getDeviceId() + { + return deviceId; + } + public void setStationId(Long stationId) + { + this.stationId = stationId; + } + + public Long getStationId() + { + return stationId; + } + public void setMaintStandardId(Long maintStandardId) + { + this.maintStandardId = maintStandardId; + } + + public Long getMaintStandardId() + { + return maintStandardId; + } + public void setOperationDescription(String operationDescription) + { + this.operationDescription = operationDescription; + } + + public String getOperationDescription() + { + return operationDescription; + } + public void setMaintStatus(Long maintStatus) + { + this.maintStatus = maintStatus; + } + + public Long getMaintStatus() + { + return maintStatus; + } + public void setIsFlag(Long isFlag) + { + this.isFlag = isFlag; + } + + public Long getIsFlag() + { + return isFlag; + } + + public String getDeviceCode() { + return deviceCode; + } + + public void setDeviceCode(String deviceCode) { + this.deviceCode = deviceCode; + } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public String getMaintStationName() { + return maintStationName; + } + + public void setMaintStationName(String maintStationName) { + this.maintStationName = maintStationName; + } + + public String getMaintProtocol() { + return maintProtocol; + } + + public void setMaintProtocol(String maintProtocol) { + this.maintProtocol = maintProtocol; + } + + public String getMaintOperationDescription() { + return maintOperationDescription; + } + + public void setMaintOperationDescription(String maintOperationDescription) { + this.maintOperationDescription = maintOperationDescription; + } + + public String getTypeName() { + return typeName; + } + + public void setTypeName(String typeName) { + this.typeName = typeName; + } + + 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; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("billsMaintDetailId", getBillsMaintDetailId()) + .append("maintInstanceId", getMaintInstanceId()) + .append("deviceId", getDeviceId()) + .append("stationId", getStationId()) + .append("maintStandardId", getMaintStandardId()) + .append("operationDescription", getOperationDescription()) + .append("maintStatus", getMaintStatus()) + .append("isFlag", getIsFlag()) + .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/DmsBillsMaintInstance.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsMaintInstance.java index 92347d89..d6c85416 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsMaintInstance.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsBillsMaintInstance.java @@ -2,6 +2,8 @@ package com.hw.dms.domain; import java.math.BigDecimal; import java.util.Date; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -68,6 +70,10 @@ public class DmsBillsMaintInstance extends BaseEntity private String maintGroup; private String maintSupervisor; + private String maintStatusStr; + + private List dmsBillsMaintDetailList; + public Long getMaintLevel() { return maintLevel; } @@ -192,6 +198,22 @@ public class DmsBillsMaintInstance extends BaseEntity return isFlag; } + public String getMaintStatusStr() { + return maintStatusStr; + } + + public void setMaintStatusStr(String maintStatusStr) { + this.maintStatusStr = maintStatusStr; + } + + public List getDmsBillsMaintDetailList() { + return dmsBillsMaintDetailList; + } + + public void setDmsBillsMaintDetailList(List dmsBillsMaintDetailList) { + this.dmsBillsMaintDetailList = dmsBillsMaintDetailList; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsInspectInstanceDetail.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsInspectInstanceDetail.java index ae0146ab..d0125a57 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsInspectInstanceDetail.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsInspectInstanceDetail.java @@ -1,6 +1,7 @@ package com.hw.dms.domain; import java.math.BigDecimal; +import java.util.Date; import java.util.List; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -57,6 +58,10 @@ public class DmsInspectInstanceDetail extends BaseEntity @Excel(name = "巡检状态", readConverterExp = "1=正常,0=异常") private String inspectStatus; + private Date beginTime; + + private Date endTime; + private String deviceCode; private String deviceName; @@ -154,6 +159,22 @@ public class DmsInspectInstanceDetail extends BaseEntity return inspectStatus; } + 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 getDeviceCode() { return deviceCode; } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanLube.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanLube.java index 12d10017..2dfbce96 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanLube.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanLube.java @@ -24,10 +24,6 @@ public class DmsPlanLube extends BaseEntity @Excel(name = "计划编号") private String planLubeCode; - /** 润滑设备ID,关联dms_base_device_ledger的device_id */ - @Excel(name = "润滑设备ID,关联dms_base_device_ledger的device_id") - private Long deviceId; - /** 润滑级别：1-日常润滑；2-月度润滑；3-年度润滑 */ @Excel(name = "润滑级别：1-日常润滑；2-月度润滑；3-年度润滑") private String lubeLevel; @@ -110,15 +106,6 @@ public class DmsPlanLube extends BaseEntity { return planLubeCode; } - public void setDeviceId(Long deviceId) - { - this.deviceId = deviceId; - } - - public Long getDeviceId() - { - return deviceId; - } public void setLubeLevel(String lubeLevel) { this.lubeLevel = lubeLevel; @@ -206,7 +193,6 @@ public class DmsPlanLube extends BaseEntity return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("planLubeId", getPlanLubeId()) .append("planLubeCode", getPlanLubeCode()) - .append("deviceId", getDeviceId()) .append("lubeLevel", getLubeLevel()) .append("lubeGroup", getLubeGroup()) .append("lubeSupervisor", getLubeSupervisor()) 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 new file mode 100644 index 00000000..3add2e06 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanLubeDetail.java @@ -0,0 +1,126 @@ +package com.hw.dms.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.hw.common.core.annotation.Excel; +import com.hw.common.core.web.domain.BaseEntity; + +/** + * 润滑计划明细对象 dms_plan_lube_detail + * + * @author xins + * @date 2024-03-21 + */ +public class DmsPlanLubeDetail extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键标识 */ + private Long planLubeDetailId; + + /** 计划ID，关联润滑计划ID */ + @Excel(name = "计划ID，关联润滑计划ID") + private Long planLubeId; + + /** 设备ID，关联dms_base_device_ledger的device_id */ + @Excel(name = "设备ID，关联dms_base_device_ledger的device_id") + private Long deviceId; + + /** 润滑部位,关联润滑部位主键 */ + @Excel(name = "润滑部位,关联润滑部位主键") + private Long lubeStationId; + + /** 润滑标准ID，关联润滑标准主键 */ + @Excel(name = "润滑标准ID，关联润滑标准主键") + private Long lubeStandardId; + + /** 操作描述 */ + @Excel(name = "操作描述") + private String operationDescription; + + /** 是否标识：1-是；2-否 */ + @Excel(name = "是否标识：1-是；2-否") + private Long isFlag; + + public void setPlanLubeDetailId(Long planLubeDetailId) + { + this.planLubeDetailId = planLubeDetailId; + } + + public Long getPlanLubeDetailId() + { + return planLubeDetailId; + } + public void setPlanLubeId(Long planLubeId) + { + this.planLubeId = planLubeId; + } + + public Long getPlanLubeId() + { + return planLubeId; + } + public void setDeviceId(Long deviceId) + { + this.deviceId = deviceId; + } + + public Long getDeviceId() + { + return deviceId; + } + public void setLubeStationId(Long lubeStationId) + { + this.lubeStationId = lubeStationId; + } + + public Long getLubeStationId() + { + return lubeStationId; + } + public void setLubeStandardId(Long lubeStandardId) + { + this.lubeStandardId = lubeStandardId; + } + + public Long getLubeStandardId() + { + return lubeStandardId; + } + public void setOperationDescription(String operationDescription) + { + this.operationDescription = operationDescription; + } + + public String getOperationDescription() + { + return operationDescription; + } + public void setIsFlag(Long isFlag) + { + this.isFlag = isFlag; + } + + public Long getIsFlag() + { + return isFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("planLubeDetailId", getPlanLubeDetailId()) + .append("planLubeId", getPlanLubeId()) + .append("deviceId", getDeviceId()) + .append("lubeStationId", getLubeStationId()) + .append("lubeStandardId", getLubeStandardId()) + .append("operationDescription", getOperationDescription()) + .append("isFlag", getIsFlag()) + .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/DmsPlanMaintDetail.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/domain/DmsPlanMaintDetail.java index ea630da8..8b11c47d 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 @@ -30,10 +30,6 @@ public class DmsPlanMaintDetail extends BaseEntity @Excel(name = "保养部位,关联dms_base_maint_station的maint_station_id") private Long maintStationId; -// /** 保养标准 */ -// @Excel(name = "保养标准") -// private String maintProtocol; - @Excel(name = "保养标准id") private Long maintStandardId; /** 操作描述 */ @@ -44,6 +40,11 @@ public class DmsPlanMaintDetail extends BaseEntity @Excel(name = "是否标识：1-是；2-否") private Long isFlag; + // /** 保养标准 */ + private String maintProtocol; + + private String maintStationName; + public Long getMaintStandardId() { return maintStandardId; } @@ -110,6 +111,22 @@ public class DmsPlanMaintDetail extends BaseEntity return isFlag; } + public String getMaintProtocol() { + return maintProtocol; + } + + public void setMaintProtocol(String maintProtocol) { + this.maintProtocol = maintProtocol; + } + + public String getMaintStationName() { + return maintStationName; + } + + public void setMaintStationName(String maintStationName) { + this.maintStationName = maintStationName; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsLubeDetailMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsLubeDetailMapper.java new file mode 100644 index 00000000..49c2c875 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsLubeDetailMapper.java @@ -0,0 +1,75 @@ +package com.hw.dms.mapper; + +import java.util.List; +import com.hw.dms.domain.DmsBillsLubeDetail; + +/** + * 润滑工单明细Mapper接口 + * + * @author xins + * @date 2024-03-20 + */ +public interface DmsBillsLubeDetailMapper +{ + /** + * 查询润滑工单明细 + * + * @param billsLubeDetailId 润滑工单明细主键 + * @return 润滑工单明细 + */ + public DmsBillsLubeDetail selectDmsBillsLubeDetailByBillsLubeDetailId(Long billsLubeDetailId); + + /** + * 查询润滑工单明细列表 + * + * @param dmsBillsLubeDetail 润滑工单明细 + * @return 润滑工单明细集合 + */ + public List selectDmsBillsLubeDetailList(DmsBillsLubeDetail dmsBillsLubeDetail); + + /** + * 新增润滑工单明细 + * + * @param dmsBillsLubeDetail 润滑工单明细 + * @return 结果 + */ + public int insertDmsBillsLubeDetail(DmsBillsLubeDetail dmsBillsLubeDetail); + + /** + * 修改润滑工单明细 + * + * @param dmsBillsLubeDetail 润滑工单明细 + * @return 结果 + */ + public int updateDmsBillsLubeDetail(DmsBillsLubeDetail dmsBillsLubeDetail); + + /** + * 删除润滑工单明细 + * + * @param billsLubeDetailId 润滑工单明细主键 + * @return 结果 + */ + public int deleteDmsBillsLubeDetailByBillsLubeDetailId(Long billsLubeDetailId); + + /** + * 批量删除润滑工单明细 + * + * @param billsLubeDetailIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDmsBillsLubeDetailByBillsLubeDetailIds(Long[] billsLubeDetailIds); + + + + + + + + /** + * 查询润滑工单明细列表,join device,devicetype,lube_station和lube_standard + * + * @param dmsBillsLubeDetail 润滑工单明细 + * @return 润滑工单明细集合 + */ + public List selectDmsBillsLubeDetailJoinList(DmsBillsLubeDetail dmsBillsLubeDetail); +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsLubeInstanceMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsLubeInstanceMapper.java index 97106c3a..419da30d 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsLubeInstanceMapper.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsLubeInstanceMapper.java @@ -59,4 +59,16 @@ public interface DmsBillsLubeInstanceMapper */ public int deleteDmsBillsLubeInstanceByLubeInstanceIds(Long[] lubeInstanceIds); + + + + + /** + * 查询最新一条润滑工单,Join 第一步实例节点 + * + * @param dmsBillsLubeInstance 润滑工单 + * @return 润滑工单 + */ + public DmsBillsLubeInstance selectNewestDmsBillsLubeInstance(DmsBillsLubeInstance dmsBillsLubeInstance); + } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsMaintDetailMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsMaintDetailMapper.java new file mode 100644 index 00000000..74c647e7 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsMaintDetailMapper.java @@ -0,0 +1,78 @@ +package com.hw.dms.mapper; + +import java.util.List; +import com.hw.dms.domain.DmsBillsMaintDetail; + +/** + * 保养工单明细Mapper接口 + * + * @author xins + * @date 2024-03-20 + */ +public interface DmsBillsMaintDetailMapper +{ + /** + * 查询保养工单明细 + * + * @param billsMaintDetailId 保养工单明细主键 + * @return 保养工单明细 + */ + public DmsBillsMaintDetail selectDmsBillsMaintDetailByBillsMaintDetailId(Long billsMaintDetailId); + + /** + * 查询保养工单明细列表 + * + * @param dmsBillsMaintDetail 保养工单明细 + * @return 保养工单明细集合 + */ + public List selectDmsBillsMaintDetailList(DmsBillsMaintDetail dmsBillsMaintDetail); + + /** + * 新增保养工单明细 + * + * @param dmsBillsMaintDetail 保养工单明细 + * @return 结果 + */ + public int insertDmsBillsMaintDetail(DmsBillsMaintDetail dmsBillsMaintDetail); + + /** + * 修改保养工单明细 + * + * @param dmsBillsMaintDetail 保养工单明细 + * @return 结果 + */ + public int updateDmsBillsMaintDetail(DmsBillsMaintDetail dmsBillsMaintDetail); + + /** + * 删除保养工单明细 + * + * @param billsMaintDetailId 保养工单明细主键 + * @return 结果 + */ + public int deleteDmsBillsMaintDetailByBillsMaintDetailId(Long billsMaintDetailId); + + /** + * 批量删除保养工单明细 + * + * @param billsMaintDetailIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDmsBillsMaintDetailByBillsMaintDetailIds(Long[] billsMaintDetailIds); + + + + + + + + + + /** + * 查询保养工单明细列表，Join 设备，保养部位和保养标准 + * + * @param dmsBillsMaintDetail 保养工单明细 + * @return 保养工单明细集合 + */ + public List selectDmsBillsMaintDetailJoinList(DmsBillsMaintDetail dmsBillsMaintDetail); + +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsMaintInstanceMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsMaintInstanceMapper.java index e4ac689a..36b13508 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsMaintInstanceMapper.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsBillsMaintInstanceMapper.java @@ -1,19 +1,20 @@ package com.hw.dms.mapper; import java.util.List; + +import com.hw.dms.domain.DmsBillsMaintDetail; import com.hw.dms.domain.DmsBillsMaintInstance; /** * 保养工单Mapper接口 - * + * * @author Open Platform * @date 2024-02-29 */ -public interface DmsBillsMaintInstanceMapper -{ +public interface DmsBillsMaintInstanceMapper { /** * 查询保养工单 - * + * * @param maintInstanceId 保养工单主键 * @return 保养工单 */ @@ -21,7 +22,7 @@ public interface DmsBillsMaintInstanceMapper /** * 查询保养工单列表 - * + * * @param dmsBillsMaintInstance 保养工单 * @return 保养工单集合 */ @@ -29,7 +30,7 @@ public interface DmsBillsMaintInstanceMapper /** * 新增保养工单 - * + * * @param dmsBillsMaintInstance 保养工单 * @return 结果 */ @@ -37,7 +38,7 @@ public interface DmsBillsMaintInstanceMapper /** * 修改保养工单 - * + * * @param dmsBillsMaintInstance 保养工单 * @return 结果 */ @@ -45,7 +46,7 @@ public interface DmsBillsMaintInstanceMapper /** * 删除保养工单 - * + * * @param maintInstanceId 保养工单主键 * @return 结果 */ @@ -53,9 +54,28 @@ public interface DmsBillsMaintInstanceMapper /** * 批量删除保养工单 - * + * * @param maintInstanceIds 需要删除的数据主键集合 * @return 结果 */ public int deleteDmsBillsMaintInstanceByMaintInstanceIds(Long[] maintInstanceIds); + + + + + /** + * 批量新增保养工单明细 + * + * @param dmsBillsMaintDetailList 保养工单明细列表 + * @return 结果 + */ + public int batchDmsBillsMaintDetail(List dmsBillsMaintDetailList); + + /** + * 查询最新一条保养工单，Join 第一步节点 + * + * @param dmsBillsMaintInstance 保养工单 + * @return 保养工单 + */ + public DmsBillsMaintInstance selectNewestDmsBillsMaintInstance(DmsBillsMaintInstance dmsBillsMaintInstance); } 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 new file mode 100644 index 00000000..608386c2 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsPlanLubeDetailMapper.java @@ -0,0 +1,61 @@ +package com.hw.dms.mapper; + +import java.util.List; +import com.hw.dms.domain.DmsPlanLubeDetail; + +/** + * 润滑计划明细Mapper接口 + * + * @author xins + * @date 2024-03-21 + */ +public interface DmsPlanLubeDetailMapper +{ + /** + * 查询润滑计划明细 + * + * @param planLubeDetailId 润滑计划明细主键 + * @return 润滑计划明细 + */ + public DmsPlanLubeDetail selectDmsPlanLubeDetailByPlanLubeDetailId(Long planLubeDetailId); + + /** + * 查询润滑计划明细列表 + * + * @param dmsPlanLubeDetail 润滑计划明细 + * @return 润滑计划明细集合 + */ + public List selectDmsPlanLubeDetailList(DmsPlanLubeDetail dmsPlanLubeDetail); + + /** + * 新增润滑计划明细 + * + * @param dmsPlanLubeDetail 润滑计划明细 + * @return 结果 + */ + public int insertDmsPlanLubeDetail(DmsPlanLubeDetail dmsPlanLubeDetail); + + /** + * 修改润滑计划明细 + * + * @param dmsPlanLubeDetail 润滑计划明细 + * @return 结果 + */ + public int updateDmsPlanLubeDetail(DmsPlanLubeDetail dmsPlanLubeDetail); + + /** + * 删除润滑计划明细 + * + * @param planLubeDetailId 润滑计划明细主键 + * @return 结果 + */ + public int deleteDmsPlanLubeDetailByPlanLubeDetailId(Long planLubeDetailId); + + /** + * 批量删除润滑计划明细 + * + * @param planLubeDetailIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDmsPlanLubeDetailByPlanLubeDetailIds(Long[] planLubeDetailIds); +} diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsPlanLubeMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsPlanLubeMapper.java index b9d567a0..938800ea 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsPlanLubeMapper.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsPlanLubeMapper.java @@ -5,15 +5,15 @@ import com.hw.dms.domain.DmsPlanLube; /** * 润滑计划Mapper接口 - * + * * @author Open Platform * @date 2024-01-12 */ -public interface DmsPlanLubeMapper +public interface DmsPlanLubeMapper { /** * 查询润滑计划 - * + * * @param planLubeId 润滑计划主键 * @return 润滑计划 */ @@ -21,7 +21,7 @@ public interface DmsPlanLubeMapper /** * 查询润滑计划列表 - * + * * @param dmsPlanLube 润滑计划 * @return 润滑计划集合 */ @@ -29,7 +29,7 @@ public interface DmsPlanLubeMapper /** * 新增润滑计划 - * + * * @param dmsPlanLube 润滑计划 * @return 结果 */ @@ -37,7 +37,7 @@ public interface DmsPlanLubeMapper /** * 修改润滑计划 - * + * * @param dmsPlanLube 润滑计划 * @return 结果 */ @@ -45,7 +45,7 @@ public interface DmsPlanLubeMapper /** * 删除润滑计划 - * + * * @param planLubeId 润滑计划主键 * @return 结果 */ @@ -53,9 +53,22 @@ public interface DmsPlanLubeMapper /** * 批量删除润滑计划 - * + * * @param planLubeIds 需要删除的数据主键集合 * @return 结果 */ public int deleteDmsPlanLubeByPlanLubeIds(Long[] planLubeIds); + + + + + + + /** + * 查询润滑计划 + * + * @param planLubeCode 润滑计划Code + * @return 润滑计划 + */ + public DmsPlanLube selectDmsPlanLubeJoinByPlanLubeCode(String planLubeCode); } 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 05236aa9..5391c35c 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 @@ -5,15 +5,15 @@ import com.hw.dms.domain.DmsPlanMaintDetail; /** * 保养计划明细Mapper接口 - * + * * @author xins * @date 2024-01-10 */ -public interface DmsPlanMaintDetailMapper +public interface DmsPlanMaintDetailMapper { /** * 查询保养计划明细 - * + * * @param planMaintDetailId 保养计划明细主键 * @return 保养计划明细 */ @@ -21,7 +21,7 @@ public interface DmsPlanMaintDetailMapper /** * 查询保养计划明细列表 - * + * * @param dmsPlanMaintDetail 保养计划明细 * @return 保养计划明细集合 */ @@ -29,7 +29,7 @@ public interface DmsPlanMaintDetailMapper /** * 新增保养计划明细 - * + * * @param dmsPlanMaintDetail 保养计划明细 * @return 结果 */ @@ -37,7 +37,7 @@ public interface DmsPlanMaintDetailMapper /** * 修改保养计划明细 - * + * * @param dmsPlanMaintDetail 保养计划明细 * @return 结果 */ @@ -45,7 +45,7 @@ public interface DmsPlanMaintDetailMapper /** * 删除保养计划明细 - * + * * @param planMaintDetailId 保养计划明细主键 * @return 结果 */ @@ -53,9 +53,19 @@ public interface DmsPlanMaintDetailMapper /** * 批量删除保养计划明细 - * + * * @param planMaintDetailIds 需要删除的数据主键集合 * @return 结果 */ public int deleteDmsPlanMaintDetailByPlanMaintDetailIds(Long[] planMaintDetailIds); + + + + /** + * 查询保养计划明细列表,join standard和station + * + * @param dmsPlanMaintDetail 保养计划明细 + * @return 保养计划明细集合 + */ + public List selectDmsPlanMaintDetailJoinList(DmsPlanMaintDetail dmsPlanMaintDetail); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsPlanMaintMapper.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsPlanMaintMapper.java index 55c2cb25..6a402d0d 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsPlanMaintMapper.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/mapper/DmsPlanMaintMapper.java @@ -6,15 +6,15 @@ import com.hw.dms.domain.DmsPlanMaintDetail; /** * 保养计划信息Mapper接口 - * + * * @author xins * @date 2024-01-08 */ -public interface DmsPlanMaintMapper +public interface DmsPlanMaintMapper { /** * 查询保养计划信息 - * + * * @param planMaintId 保养计划信息主键 * @return 保养计划信息 */ @@ -22,7 +22,7 @@ public interface DmsPlanMaintMapper /** * 查询保养计划信息列表 - * + * * @param dmsPlanMaint 保养计划信息 * @return 保养计划信息集合 */ @@ -30,7 +30,7 @@ public interface DmsPlanMaintMapper /** * 新增保养计划信息 - * + * * @param dmsPlanMaint 保养计划信息 * @return 结果 */ @@ -38,7 +38,7 @@ public interface DmsPlanMaintMapper /** * 修改保养计划信息 - * + * * @param dmsPlanMaint 保养计划信息 * @return 结果 */ @@ -46,7 +46,7 @@ public interface DmsPlanMaintMapper /** * 删除保养计划信息 - * + * * @param planMaintId 保养计划信息主键 * @return 结果 */ @@ -54,7 +54,7 @@ public interface DmsPlanMaintMapper /** * 批量删除保养计划信息 - * + * * @param planMaintIds 需要删除的数据主键集合 * @return 结果 */ @@ -62,26 +62,37 @@ public interface DmsPlanMaintMapper /** * 批量删除保养计划明细 - * + * * @param planMaintIds 需要删除的数据主键集合 * @return 结果 */ public int deleteDmsPlanMaintDetailByPlanMaintIds(Long[] planMaintIds); - + /** * 批量新增保养计划明细 - * + * * @param dmsPlanMaintDetailList 保养计划明细列表 * @return 结果 */ public int batchDmsPlanMaintDetail(List dmsPlanMaintDetailList); - + /** * 通过保养计划信息主键删除保养计划明细信息 - * + * * @param planMaintId 保养计划信息ID * @return 结果 */ public int deleteDmsPlanMaintDetailByPlanMaintId(Long planMaintId); + + + + /** + * 查询保养计划信息 + * + * @param planMaintCode 保养计划信息Code + * @return 保养计划信息 + */ + public DmsPlanMaint selectDmsPlanMaintJoinByPlanMaintCode(String planMaintCode); + } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsLubeInstanceService.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsLubeInstanceService.java index 0de50b13..2783feda 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsLubeInstanceService.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsLubeInstanceService.java @@ -1,7 +1,10 @@ package com.hw.dms.service; import java.util.List; + +import com.hw.dms.domain.DmsBillsLubeDetail; import com.hw.dms.domain.DmsBillsLubeInstance; +import org.springframework.transaction.annotation.Transactional; /** * 润滑工单Service接口 @@ -61,4 +64,28 @@ public interface IDmsBillsLubeInstanceService int insertDmsBillsLubeInstancePDA(DmsBillsLubeInstance dmsBillsLubeInstance); + + /** + * 获取最新一条未完成的润滑工单 + * + * @param dmsBillsLubeInstance + * @return + */ + public DmsBillsLubeInstance getNewestBillsLubeInstance(DmsBillsLubeInstance dmsBillsLubeInstance); + + /** + * 开始润滑 + * + * @param dmsBillsLubeDetail 润滑工单明细 + * @return 结果 + */ + public int startLube(DmsBillsLubeDetail dmsBillsLubeDetail); + + /** + * 完成润滑 + * + * @param dmsBillsLubeDetail 润滑工单明细 + * @return 结果 + */ + public int completeLube(DmsBillsLubeDetail dmsBillsLubeDetail); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsMaintInstanceService.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsMaintInstanceService.java index 2c3bbe86..1ab6c10f 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsMaintInstanceService.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsBillsMaintInstanceService.java @@ -1,7 +1,11 @@ package com.hw.dms.service; import java.util.List; + +import com.hw.dms.domain.DmsBillsMaintDetail; import com.hw.dms.domain.DmsBillsMaintInstance; +import com.hw.dms.domain.DmsPlanMaint; +import org.springframework.transaction.annotation.Transactional; /** * 保养工单Service接口 @@ -30,10 +34,10 @@ public interface IDmsBillsMaintInstanceService /** * 新增保养工单 * - * @param dmsBillsMaintInstance 保养工单 + * @param dmsPlanMaint 保养计划 * @return 结果 */ - public int insertDmsBillsMaintInstance(DmsBillsMaintInstance dmsBillsMaintInstance); + public int insertDmsBillsMaintInstance(DmsPlanMaint dmsPlanMaint); /** * 修改保养工单 @@ -60,4 +64,31 @@ public interface IDmsBillsMaintInstanceService public int deleteDmsBillsMaintInstanceByMaintInstanceId(Long maintInstanceId); int insertDmsBillsMaintInstancePDA(DmsBillsMaintInstance dmsBillsMaintInstance); + + + /** + * 获取最新一条未完成的保养工单 + * + * @param dmsBillsMaintInstance + * @return + */ + public DmsBillsMaintInstance getNewestBillsMaintInstance(DmsBillsMaintInstance dmsBillsMaintInstance); + + + /** + * 开始保养 + * + * @param dmsBillsMaintDetail 保养工单明细 + * @return 结果 + */ + public int startMaint(DmsBillsMaintDetail dmsBillsMaintDetail); + + + /** + * 完成保养 + * + * @param dmsBillsMaintDetail 保养工单明细 + * @return 结果 + */ + public int completeMaint(DmsBillsMaintDetail dmsBillsMaintDetail); } 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 new file mode 100644 index 00000000..93aae632 --- /dev/null +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsPlanLubeDetailService.java @@ -0,0 +1,61 @@ +package com.hw.dms.service; + +import java.util.List; +import com.hw.dms.domain.DmsPlanLubeDetail; + +/** + * 润滑计划明细Service接口 + * + * @author xins + * @date 2024-03-21 + */ +public interface IDmsPlanLubeDetailService +{ + /** + * 查询润滑计划明细 + * + * @param planLubeDetailId 润滑计划明细主键 + * @return 润滑计划明细 + */ + public DmsPlanLubeDetail selectDmsPlanLubeDetailByPlanLubeDetailId(Long planLubeDetailId); + + /** + * 查询润滑计划明细列表 + * + * @param dmsPlanLubeDetail 润滑计划明细 + * @return 润滑计划明细集合 + */ + public List selectDmsPlanLubeDetailList(DmsPlanLubeDetail dmsPlanLubeDetail); + + /** + * 新增润滑计划明细 + * + * @param dmsPlanLubeDetail 润滑计划明细 + * @return 结果 + */ + public int insertDmsPlanLubeDetail(DmsPlanLubeDetail dmsPlanLubeDetail); + + /** + * 修改润滑计划明细 + * + * @param dmsPlanLubeDetail 润滑计划明细 + * @return 结果 + */ + public int updateDmsPlanLubeDetail(DmsPlanLubeDetail dmsPlanLubeDetail); + + /** + * 批量删除润滑计划明细 + * + * @param planLubeDetailIds 需要删除的润滑计划明细主键集合 + * @return 结果 + */ + public int deleteDmsPlanLubeDetailByPlanLubeDetailIds(Long[] planLubeDetailIds); + + /** + * 删除润滑计划明细信息 + * + * @param planLubeDetailId 润滑计划明细主键 + * @return 结果 + */ + public int deleteDmsPlanLubeDetailByPlanLubeDetailId(Long planLubeDetailId); +} 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 ced6aef7..7c0816c8 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 @@ -5,15 +5,15 @@ import com.hw.dms.domain.DmsPlanMaintDetail; /** * 保养计划明细Service接口 - * + * * @author xins * @date 2024-01-10 */ -public interface IDmsPlanMaintDetailService +public interface IDmsPlanMaintDetailService { /** * 查询保养计划明细 - * + * * @param planMaintDetailId 保养计划明细主键 * @return 保养计划明细 */ @@ -21,7 +21,7 @@ public interface IDmsPlanMaintDetailService /** * 查询保养计划明细列表 - * + * * @param dmsPlanMaintDetail 保养计划明细 * @return 保养计划明细集合 */ @@ -29,7 +29,7 @@ public interface IDmsPlanMaintDetailService /** * 新增保养计划明细 - * + * * @param dmsPlanMaintDetail 保养计划明细 * @return 结果 */ @@ -37,7 +37,7 @@ public interface IDmsPlanMaintDetailService /** * 修改保养计划明细 - * + * * @param dmsPlanMaintDetail 保养计划明细 * @return 结果 */ @@ -45,7 +45,7 @@ public interface IDmsPlanMaintDetailService /** * 批量删除保养计划明细 - * + * * @param planMaintDetailIds 需要删除的保养计划明细主键集合 * @return 结果 */ @@ -53,9 +53,18 @@ public interface IDmsPlanMaintDetailService /** * 删除保养计划明细信息 - * + * * @param planMaintDetailId 保养计划明细主键 * @return 结果 */ public int deleteDmsPlanMaintDetailByPlanMaintDetailId(Long planMaintDetailId); + + + /** + * 查询保养计划明细列表，Join station and standard + * + * @param dmsPlanMaintDetail 保养计划明细 + * @return 保养计划明细 + */ + public List selectDmsPlanMaintDetailJoinList(DmsPlanMaintDetail dmsPlanMaintDetail); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsPlanMaintService.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsPlanMaintService.java index 4dbff9f3..743d0349 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsPlanMaintService.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/IDmsPlanMaintService.java @@ -5,15 +5,15 @@ import com.hw.dms.domain.DmsPlanMaint; /** * 保养计划信息Service接口 - * + * * @author xins * @date 2024-01-08 */ -public interface IDmsPlanMaintService +public interface IDmsPlanMaintService { /** * 查询保养计划信息 - * + * * @param planMaintId 保养计划信息主键 * @return 保养计划信息 */ @@ -21,7 +21,7 @@ public interface IDmsPlanMaintService /** * 查询保养计划信息列表 - * + * * @param dmsPlanMaint 保养计划信息 * @return 保养计划信息集合 */ @@ -29,7 +29,7 @@ public interface IDmsPlanMaintService /** * 新增保养计划信息 - * + * * @param dmsPlanMaint 保养计划信息 * @return 结果 */ @@ -37,7 +37,7 @@ public interface IDmsPlanMaintService /** * 修改保养计划信息 - * + * * @param dmsPlanMaint 保养计划信息 * @return 结果 */ @@ -45,7 +45,7 @@ public interface IDmsPlanMaintService /** * 批量删除保养计划信息 - * + * * @param planMaintIds 需要删除的保养计划信息主键集合 * @return 结果 */ @@ -53,9 +53,21 @@ public interface IDmsPlanMaintService /** * 删除保养计划信息信息 - * + * * @param planMaintId 保养计划信息主键 * @return 结果 */ public int deleteDmsPlanMaintByPlanMaintId(Long planMaintId); + + + + + + /** + * 查询保养计划信息 Join detail + * + * @param planMaintCode 保养计划信息Code + * @return 保养计划信息 + */ + public DmsPlanMaint selectDmsPlanMaintJoinByPlanMaintCode(String planMaintCode); } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsLubeInstanceServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsLubeInstanceServiceImpl.java index 6c981bb9..43c1e132 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsLubeInstanceServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsLubeInstanceServiceImpl.java @@ -4,18 +4,22 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; +import com.hw.common.core.constant.DmsConstants; import com.hw.common.core.constant.SecurityConstants; +import com.hw.common.core.exception.ServiceException; import com.hw.common.core.utils.DateUtils; -import com.hw.dms.domain.DmsBillsLubeInstanceActivity; -import com.hw.dms.domain.DmsPlanLube; +import com.hw.common.core.utils.StringUtils; +import com.hw.common.security.utils.SecurityUtils; +import com.hw.dms.domain.*; +import com.hw.dms.mapper.DmsBillsLubeDetailMapper; import com.hw.dms.mapper.DmsBillsLubeInstanceActivityMapper; import com.hw.dms.mapper.DmsPlanLubeMapper; import com.hw.system.api.RemoteSysCommonService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.hw.dms.mapper.DmsBillsLubeInstanceMapper; -import com.hw.dms.domain.DmsBillsLubeInstance; import com.hw.dms.service.IDmsBillsLubeInstanceService; +import org.springframework.transaction.annotation.Transactional; /** * 润滑工单Service业务层处理 @@ -24,19 +28,23 @@ import com.hw.dms.service.IDmsBillsLubeInstanceService; * @date 2024-02-26 */ @Service -public class DmsBillsLubeInstanceServiceImpl implements IDmsBillsLubeInstanceService -{ +public class DmsBillsLubeInstanceServiceImpl implements IDmsBillsLubeInstanceService { @Autowired private DmsBillsLubeInstanceMapper dmsBillsLubeInstanceMapper; + @Autowired + private DmsBillsLubeDetailMapper dmsBillsLubeDetailMapper; + @Autowired private DmsPlanLubeMapper dmsPlanLubeMapper; @Autowired - private DmsBillsLubeInstanceActivityMapper dmsBillsLubeInstanceActivityMapper;; + private DmsBillsLubeInstanceActivityMapper dmsBillsLubeInstanceActivityMapper; + ; @Autowired private RemoteSysCommonService remoteSysCommonService; + /** * 查询润滑工单 * @@ -44,8 +52,7 @@ public class DmsBillsLubeInstanceServiceImpl implements IDmsBillsLubeInstanceSer * @return 润滑工单 */ @Override - public DmsBillsLubeInstance selectDmsBillsLubeInstanceByLubeInstanceId(Long lubeInstanceId) - { + public DmsBillsLubeInstance selectDmsBillsLubeInstanceByLubeInstanceId(Long lubeInstanceId) { return dmsBillsLubeInstanceMapper.selectDmsBillsLubeInstanceByLubeInstanceId(lubeInstanceId); } @@ -56,8 +63,7 @@ public class DmsBillsLubeInstanceServiceImpl implements IDmsBillsLubeInstanceSer * @return 润滑工单 */ @Override - public List selectDmsBillsLubeInstanceList(DmsBillsLubeInstance dmsBillsLubeInstance) - { + public List selectDmsBillsLubeInstanceList(DmsBillsLubeInstance dmsBillsLubeInstance) { return dmsBillsLubeInstanceMapper.selectDmsBillsLubeInstanceList(dmsBillsLubeInstance); } @@ -68,15 +74,14 @@ public class DmsBillsLubeInstanceServiceImpl implements IDmsBillsLubeInstanceSer * @return 结果 */ @Override - public int insertDmsBillsLubeInstance(DmsBillsLubeInstance dmsBillsLubeInstance) - { + public int insertDmsBillsLubeInstance(DmsBillsLubeInstance dmsBillsLubeInstance) { dmsBillsLubeInstance.setCreateTime(DateUtils.getNowDate()); DmsPlanLube dmsPlanLube = dmsPlanLubeMapper.selectDmsPlanLubeByPlanLubeId(dmsBillsLubeInstance.getPlanLubeId()); dmsBillsLubeInstance.setPlanBeginTime(dmsPlanLube.getLubeTime()); dmsBillsLubeInstance.setLubeStatus("1"); Date lubeTime = dmsPlanLube.getLubeTime(); Long timeLimit = dmsPlanLube.getTimeLimit(); - dmsBillsLubeInstance.setPlanEndTime(new Date(lubeTime.getTime() + timeLimit*1000l)); + dmsBillsLubeInstance.setPlanEndTime(new Date(lubeTime.getTime() + timeLimit * 1000l)); int i = dmsBillsLubeInstanceMapper.insertDmsBillsLubeInstance(dmsBillsLubeInstance); List dmsBillsLubeInstances = dmsBillsLubeInstanceMapper.selectDmsBillsLubeInstanceList(dmsBillsLubeInstance); DmsBillsLubeInstance dmsBillsLubeInstance1 = dmsBillsLubeInstances.get(0); @@ -99,8 +104,7 @@ public class DmsBillsLubeInstanceServiceImpl implements IDmsBillsLubeInstanceSer * @return 结果 */ @Override - public int updateDmsBillsLubeInstance(DmsBillsLubeInstance dmsBillsLubeInstance) - { + public int updateDmsBillsLubeInstance(DmsBillsLubeInstance dmsBillsLubeInstance) { dmsBillsLubeInstance.setUpdateTime(DateUtils.getNowDate()); return dmsBillsLubeInstanceMapper.updateDmsBillsLubeInstance(dmsBillsLubeInstance); } @@ -112,8 +116,7 @@ public class DmsBillsLubeInstanceServiceImpl implements IDmsBillsLubeInstanceSer * @return 结果 */ @Override - public int deleteDmsBillsLubeInstanceByLubeInstanceIds(Long[] lubeInstanceIds) - { + public int deleteDmsBillsLubeInstanceByLubeInstanceIds(Long[] lubeInstanceIds) { return dmsBillsLubeInstanceMapper.deleteDmsBillsLubeInstanceByLubeInstanceIds(lubeInstanceIds); } @@ -124,15 +127,14 @@ public class DmsBillsLubeInstanceServiceImpl implements IDmsBillsLubeInstanceSer * @return 结果 */ @Override - public int deleteDmsBillsLubeInstanceByLubeInstanceId(Long lubeInstanceId) - { + public int deleteDmsBillsLubeInstanceByLubeInstanceId(Long lubeInstanceId) { return dmsBillsLubeInstanceMapper.deleteDmsBillsLubeInstanceByLubeInstanceId(lubeInstanceId); } @Override public int insertDmsBillsLubeInstancePDA(DmsBillsLubeInstance dmsBillsLubeInstance) { SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHH"); - Long aLong= remoteSysCommonService.selectProcessActivityIdByWfProcessId(SecurityConstants.INNER, 106l); + Long aLong = remoteSysCommonService.selectProcessActivityIdByWfProcessId(SecurityConstants.INNER, 106l); dmsBillsLubeInstance.setBillsLubeCode(sdf.format(DateUtils.getNowDate())); dmsBillsLubeInstance.setLubeStatus("1"); dmsBillsLubeInstance.setIsFlag("1"); @@ -146,4 +148,112 @@ public class DmsBillsLubeInstanceServiceImpl implements IDmsBillsLubeInstanceSer return 0; } + + + /** + * 获取最新一条未完成的润滑工单 + * + * @param dmsBillsLubeInstance + * @return + */ + @Override + public DmsBillsLubeInstance getNewestBillsLubeInstance(DmsBillsLubeInstance dmsBillsLubeInstance) { + dmsBillsLubeInstance.setLubeStatusStr(DmsConstants.DMS_BILLS_LUBE_INSTANCE_STATUS_TO_LUBE + + "," + DmsConstants.DMS_BILLS_LUBE_INSTANCE_STATUS_LUBING); + DmsBillsLubeInstance newestBillsLubeInstance = dmsBillsLubeInstanceMapper.selectNewestDmsBillsLubeInstance(dmsBillsLubeInstance); + if (newestBillsLubeInstance != null) { + DmsBillsLubeDetail queryBillsLubeDetail = new DmsBillsLubeDetail(); + queryBillsLubeDetail.setLubeInstanceId(dmsBillsLubeInstance.getLubeInstanceId()); + List dmsBillsLubeDetails = dmsBillsLubeDetailMapper.selectDmsBillsLubeDetailJoinList(queryBillsLubeDetail); + newestBillsLubeInstance.setDmsBillsLubeDetailList(dmsBillsLubeDetails); + } + + return newestBillsLubeInstance; + } + + + /** + * 开始润滑 + * + * @param dmsBillsLubeDetail 润滑工单明细 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int startLube(DmsBillsLubeDetail dmsBillsLubeDetail) { + DmsBillsLubeInstance dmsBillsLubeInstance = dmsBillsLubeInstanceMapper + .selectDmsBillsLubeInstanceByLubeInstanceId(dmsBillsLubeDetail.getLubeInstanceId()); + String lubeStatus = StringUtils.isEmpty(dmsBillsLubeInstance.getLubeStatus()) ? + DmsConstants.DMS_BILLS_LUBE_INSTANCE_STATUS_TO_LUBE : dmsBillsLubeInstance.getLubeStatus(); + if (lubeStatus.equals(DmsConstants.DMS_BILLS_LUBE_INSTANCE_STATUS_COMPLETE)) {//润滑完成 + throw new ServiceException("已经润滑完成"); + } + + Date currentDate = new Date(); + String userName = SecurityUtils.getUsername(); + + if (lubeStatus.equals(DmsConstants.DMS_BILLS_LUBE_INSTANCE_STATUS_TO_LUBE)) {//待润滑 + dmsBillsLubeInstance.setLubeStatus(DmsConstants.DMS_BILLS_LUBE_INSTANCE_STATUS_LUBING); + dmsBillsLubeInstance.setRealBeginTime(currentDate); + dmsBillsLubeInstance.setUpdateTime(currentDate); + dmsBillsLubeInstance.setUpdateBy(userName); + dmsBillsLubeInstanceMapper.updateDmsBillsLubeInstance(dmsBillsLubeInstance); + + dmsBillsLubeDetail.setBeginTime(currentDate); + dmsBillsLubeDetail.setUpdateBy(userName); + dmsBillsLubeDetail.setUpdateTime(currentDate); + dmsBillsLubeDetail.setMaintStatus(Long.valueOf(DmsConstants.DMS_BILLS_LUBE_INSTANCE_STATUS_LUBING)); + + dmsBillsLubeDetailMapper.updateDmsBillsLubeDetail(dmsBillsLubeDetail); + + } else {//润滑中 + dmsBillsLubeDetail.setUpdateBy(userName); + dmsBillsLubeDetail.setUpdateTime(currentDate); + dmsBillsLubeDetailMapper.updateDmsBillsLubeDetail(dmsBillsLubeDetail); + } + + return 1; + } + + + /** + * 完成润滑 + * + * @param dmsBillsLubeDetail 润滑工单明细 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int completeLube(DmsBillsLubeDetail dmsBillsLubeDetail) { + DmsBillsLubeInstance dmsBillsLubeInstance = dmsBillsLubeInstanceMapper + .selectDmsBillsLubeInstanceByLubeInstanceId(dmsBillsLubeDetail.getLubeInstanceId()); + String lubeStatus = StringUtils.isEmpty(dmsBillsLubeInstance.getLubeStatus()) ? + DmsConstants.DMS_BILLS_LUBE_INSTANCE_STATUS_TO_LUBE : dmsBillsLubeInstance.getLubeStatus(); + if (lubeStatus.equals(DmsConstants.DMS_BILLS_LUBE_INSTANCE_STATUS_COMPLETE)) {//润滑完成 + throw new ServiceException("已经润滑完成"); + } + + if (lubeStatus.equals(DmsConstants.DMS_BILLS_LUBE_INSTANCE_STATUS_TO_LUBE)) {//待润滑 + throw new ServiceException("请先执行开始润滑"); + } + + Date currentDate = new Date(); + String userName = SecurityUtils.getUsername(); + + //todo:判断是否已都保养完成，修改工单状态 +// dmsBillsMaintInstance.setMaintStatus(DmsConstants.DMS_BILLS_MAINT_INSTANCE_STATUS_MAINTING); +// dmsBillsMaintInstance.setRealBeginTime(currentDate); +// dmsBillsMaintInstance.setUpdateTime(currentDate); +// dmsBillsMaintInstance.setUpdateBy(userName); +// dmsBillsMaintInstanceMapper.updateDmsBillsMaintInstance(dmsBillsMaintInstance); + + dmsBillsLubeDetail.setEndTime(currentDate); + dmsBillsLubeDetail.setUpdateBy(userName); + dmsBillsLubeDetail.setUpdateTime(currentDate); + dmsBillsLubeDetail.setMaintStatus(DmsConstants.DMS_BILLS_MAINT_INSTANCE_STATUS_COMPLETE); + + dmsBillsLubeDetailMapper.updateDmsBillsLubeDetail(dmsBillsLubeDetail); + + return 1; + } } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java index 83237666..11f6d133 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java @@ -1,21 +1,27 @@ package com.hw.dms.service.impl; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Date; import java.util.List; +import com.hw.common.core.constant.DmsConstants; import com.hw.common.core.constant.SecurityConstants; +import com.hw.common.core.constant.WfConstants; +import com.hw.common.core.exception.ServiceException; import com.hw.common.core.utils.DateUtils; -import com.hw.dms.domain.DmsMaintInstanceActivity; -import com.hw.dms.domain.DmsPlanMaint; +import com.hw.common.core.utils.uuid.Seq; +import com.hw.common.security.utils.SecurityUtils; +import com.hw.dms.domain.*; +import com.hw.dms.mapper.DmsBillsMaintDetailMapper; import com.hw.dms.mapper.DmsMaintInstanceActivityMapper; import com.hw.dms.mapper.DmsPlanMaintMapper; import com.hw.system.api.RemoteSysCommonService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.hw.dms.mapper.DmsBillsMaintInstanceMapper; -import com.hw.dms.domain.DmsBillsMaintInstance; import com.hw.dms.service.IDmsBillsMaintInstanceService; +import org.springframework.transaction.annotation.Transactional; /** * 保养工单Service业务层处理 @@ -24,14 +30,16 @@ import com.hw.dms.service.IDmsBillsMaintInstanceService; * @date 2024-02-29 */ @Service -public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceService -{ +public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceService { @Autowired private DmsBillsMaintInstanceMapper dmsBillsMaintInstanceMapper; @Autowired private DmsPlanMaintMapper dmsPlanMaintMapper; @Autowired private DmsMaintInstanceActivityMapper dmsMaintInstanceActivityMapper; + @Autowired + private DmsBillsMaintDetailMapper dmsBillsMaintDetailMapper; + @Autowired private RemoteSysCommonService remoteSysCommonService; @@ -42,8 +50,7 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS * @return 保养工单 */ @Override - public DmsBillsMaintInstance selectDmsBillsMaintInstanceByMaintInstanceId(Long maintInstanceId) - { + public DmsBillsMaintInstance selectDmsBillsMaintInstanceByMaintInstanceId(Long maintInstanceId) { return dmsBillsMaintInstanceMapper.selectDmsBillsMaintInstanceByMaintInstanceId(maintInstanceId); } @@ -54,41 +61,37 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS * @return 保养工单 */ @Override - public List selectDmsBillsMaintInstanceList(DmsBillsMaintInstance dmsBillsMaintInstance) - { + public List selectDmsBillsMaintInstanceList(DmsBillsMaintInstance dmsBillsMaintInstance) { return dmsBillsMaintInstanceMapper.selectDmsBillsMaintInstanceList(dmsBillsMaintInstance); } /** * 新增保养工单 * - * @param dmsBillsMaintInstance 保养工单 + * @param dmsPlanMaint 保养计划 * @return 结果 */ @Override - public int insertDmsBillsMaintInstance(DmsBillsMaintInstance dmsBillsMaintInstance) - { - SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmm"); + @Transactional + public int insertDmsBillsMaintInstance(DmsPlanMaint dmsPlanMaint) { + DmsBillsMaintInstance dmsBillsMaintInstance = new DmsBillsMaintInstance(); + dmsBillsMaintInstance.setCreateTime(DateUtils.getNowDate()); - DmsPlanMaint dmsPlanMaint = dmsPlanMaintMapper.selectDmsPlanMaintByPlanMaintId(dmsBillsMaintInstance.getPlanMaintId()); dmsBillsMaintInstance.setPlanBeginTime(dmsPlanMaint.getMaintTime()); - dmsBillsMaintInstance.setBillsMaintCode(sdf.format(DateUtils.getNowDate())); - dmsBillsMaintInstance.setMaintStatus(1l); + dmsBillsMaintInstance.setBillsMaintCode(Seq.getId(Seq.maintInstanceSeqType, Seq.maintInstanceCode)); + dmsBillsMaintInstance.setMaintStatus(DmsConstants.DMS_BILLS_MAINT_INSTANCE_STATUS_TO_MAINT); + dmsBillsMaintInstance.setMaintGroup(dmsPlanMaint.getMaintGroup()); + dmsBillsMaintInstance.setMaintSupervisor(dmsPlanMaint.getMaintSupervisor()); + dmsBillsMaintInstance.setMaintLevel(dmsPlanMaint.getMaintLevel()); + Date lubeTime = dmsPlanMaint.getMaintTime(); Long timeLimit = dmsPlanMaint.getTimeLimit(); dmsBillsMaintInstance.setIsFlag(1l); dmsBillsMaintInstance.setWfProcessId(103l); - dmsBillsMaintInstance.setPlanEndTime(new Date(lubeTime.getTime() + timeLimit*1000l)); + dmsBillsMaintInstance.setPlanEndTime(new Date(lubeTime.getTime() + timeLimit * 1000l)); int i = dmsBillsMaintInstanceMapper.insertDmsBillsMaintInstance(dmsBillsMaintInstance); - DmsMaintInstanceActivity maintInstanceActivity = new DmsMaintInstanceActivity(); - maintInstanceActivity.setMaintInstanceId(dmsBillsMaintInstance.getMaintInstanceId()); - maintInstanceActivity.setProcessActivityId(103l); - maintInstanceActivity.setMaintLevel(dmsPlanMaint.getMaintLevel()); - maintInstanceActivity.setMaintGroup(dmsPlanMaint.getMaintGroup()); - maintInstanceActivity.setMaintSupervisor(dmsPlanMaint.getMaintSupervisor()); - maintInstanceActivity.setProcessStepOrder(1l); - dmsMaintInstanceActivityMapper.insertDmsMaintInstanceActivity(maintInstanceActivity); + batchInsertDmsBillsMaintDetail(dmsPlanMaint, dmsBillsMaintInstance.getMaintInstanceId()); return i; } @@ -99,8 +102,7 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS * @return 结果 */ @Override - public int updateDmsBillsMaintInstance(DmsBillsMaintInstance dmsBillsMaintInstance) - { + public int updateDmsBillsMaintInstance(DmsBillsMaintInstance dmsBillsMaintInstance) { dmsBillsMaintInstance.setUpdateTime(DateUtils.getNowDate()); return dmsBillsMaintInstanceMapper.updateDmsBillsMaintInstance(dmsBillsMaintInstance); } @@ -112,8 +114,7 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS * @return 结果 */ @Override - public int deleteDmsBillsMaintInstanceByMaintInstanceIds(Long[] maintInstanceIds) - { + public int deleteDmsBillsMaintInstanceByMaintInstanceIds(Long[] maintInstanceIds) { return dmsBillsMaintInstanceMapper.deleteDmsBillsMaintInstanceByMaintInstanceIds(maintInstanceIds); } @@ -124,14 +125,13 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS * @return 结果 */ @Override - public int deleteDmsBillsMaintInstanceByMaintInstanceId(Long maintInstanceId) - { + public int deleteDmsBillsMaintInstanceByMaintInstanceId(Long maintInstanceId) { return dmsBillsMaintInstanceMapper.deleteDmsBillsMaintInstanceByMaintInstanceId(maintInstanceId); } @Override public int insertDmsBillsMaintInstancePDA(DmsBillsMaintInstance dmsBillsMaintInstance) { - Long aLong= remoteSysCommonService.selectProcessActivityIdByWfProcessId(SecurityConstants.INNER, 103l); + Long aLong = remoteSysCommonService.selectProcessActivityIdByWfProcessId(SecurityConstants.INNER, 103l); SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHH"); dmsBillsMaintInstance.setWfProcessId(103l); dmsBillsMaintInstance.setBillsMaintCode(sdf.format(DateUtils.getNowDate())); @@ -150,4 +150,132 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS dmsMaintInstanceActivityMapper.insertDmsMaintInstanceActivity(dmsMaintInstanceActivity); return i; } + + + /** + * 获取最新一条未完成的保养工单 + * + * @param dmsBillsMaintInstance + * @return + */ + @Override + public DmsBillsMaintInstance getNewestBillsMaintInstance(DmsBillsMaintInstance dmsBillsMaintInstance) { + dmsBillsMaintInstance.setMaintStatusStr(DmsConstants.DMS_BILLS_MAINT_INSTANCE_STATUS_TO_MAINT + + "," + DmsConstants.DMS_BILLS_MAINT_INSTANCE_STATUS_MAINTING); + DmsBillsMaintInstance newestBillsMaintInstance = dmsBillsMaintInstanceMapper + .selectNewestDmsBillsMaintInstance(dmsBillsMaintInstance); + if (newestBillsMaintInstance != null) { + DmsBillsMaintDetail queryBillsMaintDetail = new DmsBillsMaintDetail(); + queryBillsMaintDetail.setMaintInstanceId(newestBillsMaintInstance.getMaintInstanceId()); + List dmsBillsMaintDetails = dmsBillsMaintDetailMapper.selectDmsBillsMaintDetailJoinList(queryBillsMaintDetail); + newestBillsMaintInstance.setDmsBillsMaintDetailList(dmsBillsMaintDetails); + } + + return newestBillsMaintInstance; + } + + + public void batchInsertDmsBillsMaintDetail(DmsPlanMaint dmsPlanMaint, Long maintInstanceId) { + List planMaintDetails = dmsPlanMaint.getDmsPlanMaintDetailList(); + List billsMaintDetails = new ArrayList<>(); + planMaintDetails.forEach(planMaintDetail -> { + DmsBillsMaintDetail dmsBillsMaintDetail = new DmsBillsMaintDetail(); + dmsBillsMaintDetail.setMaintInstanceId(maintInstanceId); + dmsBillsMaintDetail.setDeviceId(planMaintDetail.getDeviceId()); + dmsBillsMaintDetail.setStationId(planMaintDetail.getMaintStationId()); + dmsBillsMaintDetail.setMaintStandardId(planMaintDetail.getMaintStandardId()); + dmsBillsMaintDetail.setIsFlag(1L); + billsMaintDetails.add(dmsBillsMaintDetail); + }); + + dmsBillsMaintInstanceMapper.batchDmsBillsMaintDetail(billsMaintDetails); + } + + + /** + * 开始保养 + * + * @param dmsBillsMaintDetail 保养工单明细 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int startMaint(DmsBillsMaintDetail dmsBillsMaintDetail) { + DmsBillsMaintInstance dmsBillsMaintInstance = dmsBillsMaintInstanceMapper. + selectDmsBillsMaintInstanceByMaintInstanceId(dmsBillsMaintDetail.getMaintInstanceId()); + Long maintStatus = dmsBillsMaintInstance.getMaintStatus() == null ? + DmsConstants.DMS_BILLS_MAINT_INSTANCE_STATUS_TO_MAINT : dmsBillsMaintInstance.getMaintStatus(); + if (maintStatus.equals(DmsConstants.DMS_BILLS_MAINT_INSTANCE_STATUS_COMPLETE)) {//保养完成 + throw new ServiceException("已经保养完成"); + } + + Date currentDate = new Date(); + String userName = SecurityUtils.getUsername(); + + if (maintStatus.equals(DmsConstants.DMS_BILLS_MAINT_INSTANCE_STATUS_TO_MAINT)) {//待保养 + dmsBillsMaintInstance.setMaintStatus(DmsConstants.DMS_BILLS_MAINT_INSTANCE_STATUS_MAINTING); + dmsBillsMaintInstance.setRealBeginTime(currentDate); + dmsBillsMaintInstance.setUpdateTime(currentDate); + dmsBillsMaintInstance.setUpdateBy(userName); + dmsBillsMaintInstanceMapper.updateDmsBillsMaintInstance(dmsBillsMaintInstance); + + dmsBillsMaintDetail.setBeginTime(currentDate); + dmsBillsMaintDetail.setUpdateBy(userName); + dmsBillsMaintDetail.setUpdateTime(currentDate); + dmsBillsMaintDetail.setMaintStatus(DmsConstants.DMS_BILLS_MAINT_INSTANCE_STATUS_MAINTING); + + dmsBillsMaintDetailMapper.updateDmsBillsMaintDetail(dmsBillsMaintDetail); + + } else {//保养中 + dmsBillsMaintDetail.setUpdateBy(userName); + dmsBillsMaintDetail.setUpdateTime(currentDate); + dmsBillsMaintDetailMapper.updateDmsBillsMaintDetail(dmsBillsMaintDetail); + } + + return 1; + } + + + /** + * 完成保养 + * + * @param dmsBillsMaintDetail 保养工单明细 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int completeMaint(DmsBillsMaintDetail dmsBillsMaintDetail) { + DmsBillsMaintInstance dmsBillsMaintInstance = dmsBillsMaintInstanceMapper. + selectDmsBillsMaintInstanceByMaintInstanceId(dmsBillsMaintDetail.getMaintInstanceId()); + Long maintStatus = dmsBillsMaintInstance.getMaintStatus() == null ? + DmsConstants.DMS_BILLS_MAINT_INSTANCE_STATUS_TO_MAINT : dmsBillsMaintInstance.getMaintStatus(); + if (maintStatus.equals(DmsConstants.DMS_BILLS_MAINT_INSTANCE_STATUS_COMPLETE)) {//保养完成 + throw new ServiceException("已经保养完成"); + } + + if (maintStatus.equals(DmsConstants.DMS_BILLS_MAINT_INSTANCE_STATUS_TO_MAINT)) {//待保养 + throw new ServiceException("请先执行开始保养"); + } + + Date currentDate = new Date(); + String userName = SecurityUtils.getUsername(); + + //todo:判断是否已都保养完成，修改工单状态 +// dmsBillsMaintInstance.setMaintStatus(DmsConstants.DMS_BILLS_MAINT_INSTANCE_STATUS_MAINTING); +// dmsBillsMaintInstance.setRealBeginTime(currentDate); +// dmsBillsMaintInstance.setUpdateTime(currentDate); +// dmsBillsMaintInstance.setUpdateBy(userName); +// dmsBillsMaintInstanceMapper.updateDmsBillsMaintInstance(dmsBillsMaintInstance); + + dmsBillsMaintDetail.setEndTime(currentDate); + dmsBillsMaintDetail.setUpdateBy(userName); + dmsBillsMaintDetail.setUpdateTime(currentDate); + dmsBillsMaintDetail.setMaintStatus(DmsConstants.DMS_BILLS_MAINT_INSTANCE_STATUS_COMPLETE); + + dmsBillsMaintDetailMapper.updateDmsBillsMaintDetail(dmsBillsMaintDetail); + + + return 1; + } + } diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanLubeServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanLubeServiceImpl.java index 878e91ca..8233c685 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanLubeServiceImpl.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsPlanLubeServiceImpl.java @@ -1,14 +1,27 @@ package com.hw.dms.service.impl; +import java.util.Date; 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.core.utils.uuid.Seq; +import com.hw.common.security.utils.SecurityUtils; +import com.hw.dms.domain.DmsPlanMaint; import com.hw.dms.domain.DmsPlanRepair; +import com.hw.job.api.RemoteJobService; +import com.hw.job.api.domain.SysJob; +import com.hw.job.api.util.CronUtils; import com.hw.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.hw.dms.mapper.DmsPlanLubeMapper; import com.hw.dms.domain.DmsPlanLube; import com.hw.dms.service.IDmsPlanLubeService; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; /** * 润滑计划Service业务层处理 @@ -22,6 +35,9 @@ public class DmsPlanLubeServiceImpl implements IDmsPlanLubeService @Autowired private DmsPlanLubeMapper dmsPlanLubeMapper; + @Resource + private RemoteJobService remoteJobService; + /** * 查询润滑计划 * @@ -74,22 +90,35 @@ public class DmsPlanLubeServiceImpl implements IDmsPlanLubeService * @param dmsPlanLube 润滑计划 * @return 结果 */ + @Transactional @Override - public int insertDmsPlanLube(DmsPlanLube dmsPlanLube) - { - dmsPlanLube.setTimeLimit((dmsPlanLube.getTimeLimitDays()*24*60*60) - +(dmsPlanLube.getTimeLimitHours()*60*60)); - LoginUser user = new LoginUser(); + public int insertDmsPlanLube(DmsPlanLube dmsPlanLube) { + String planLubeCode = Seq.getId(Seq.planLubeSeqType, Seq.planLubeCode); + + SysJob job = new SysJob(); + job.setJobName("润滑计划编号" + planLubeCode + "工单任务"); + job.setJobGroup("DEFAULT"); + job.setInvokeTarget("ryTask.getDmsBillsLube(\"" + planLubeCode + "\")"); + job.setCronExpression(dmsPlanLube.getCronExpression()); + job.setMisfirePolicy("1"); + job.setConcurrent("1"); + job.setStatus("1"); + R jobIdR = remoteJobService.add(SecurityConstants.INNER, job); + + String time = dmsPlanLube.getCronExpression(); + //通过cron表达式获取下一次执行时间 + Date nextExecution = CronUtils.getNextExecution(time); + dmsPlanLube.setLubeTime(nextExecution); + dmsPlanLube.setJobId(jobIdR.getData().longValue()); + dmsPlanLube.setPlanLubeCode(planLubeCode); + dmsPlanLube.setTimeLimit((dmsPlanLube.getTimeLimitDays() * 24 * 60 * 60) + + (dmsPlanLube.getTimeLimitHours() * 60 * 60)); dmsPlanLube.setIsFlag("1"); - dmsPlanLube.setCreateBy(user.getUsername()); + dmsPlanLube.setCreateBy(SecurityUtils.getUsername()); dmsPlanLube.setCreateTime(DateUtils.getNowDate()); + int rows = dmsPlanLubeMapper.insertDmsPlanLube(dmsPlanLube); - - - - - return dmsPlanLubeMapper.insertDmsPlanLube(dmsPlanLube); - + return rows; } /** 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 4d27ddb3..98689be5 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 @@ -99,4 +99,19 @@ public class DmsPlanMaintDetailServiceImpl implements IDmsPlanMaintDetailService { return dmsPlanMaintDetailMapper.deleteDmsPlanMaintDetailByPlanMaintDetailId(planMaintDetailId); } + + + + + /** + * 查询保养计划明细列表，Join station and standard + * + * @param dmsPlanMaintDetail 保养计划明细 + * @return 保养计划明细 + */ + @Override + public List selectDmsPlanMaintDetailJoinList(DmsPlanMaintDetail dmsPlanMaintDetail) + { + return dmsPlanMaintDetailMapper.selectDmsPlanMaintDetailJoinList(dmsPlanMaintDetail); + } } 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 f1da72a5..f16cacdd 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 @@ -1,12 +1,23 @@ package com.hw.dms.service.impl; +import java.util.Date; 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.core.utils.uuid.Seq; +import com.hw.common.security.utils.SecurityUtils; import com.hw.dms.domain.DmsPlanRepair; +import com.hw.job.api.RemoteJobService; +import com.hw.job.api.domain.SysJob; +import com.hw.job.api.util.CronUtils; import com.hw.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + import java.util.ArrayList; + import com.hw.common.core.utils.StringUtils; import org.springframework.transaction.annotation.Transactional; import com.hw.dms.domain.DmsPlanMaintDetail; @@ -21,11 +32,13 @@ import com.hw.dms.service.IDmsPlanMaintService; * @date 2024-01-08 */ @Service -public class DmsPlanMaintServiceImpl implements IDmsPlanMaintService -{ +public class DmsPlanMaintServiceImpl implements IDmsPlanMaintService { @Autowired private DmsPlanMaintMapper dmsPlanMaintMapper; + @Autowired + private RemoteJobService remoteJobService; + /** * 查询保养计划信息 * @@ -33,19 +46,18 @@ public class DmsPlanMaintServiceImpl implements IDmsPlanMaintService * @return 保养计划信息 */ @Override - public DmsPlanMaint selectDmsPlanMaintByPlanMaintId(Long planMaintId) - { + public DmsPlanMaint selectDmsPlanMaintByPlanMaintId(Long planMaintId) { DmsPlanMaint dmsPlanMaint = dmsPlanMaintMapper.selectDmsPlanMaintByPlanMaintId(planMaintId); Long timeLimit = dmsPlanMaint.getTimeLimit(); - if (timeLimit !=null){ + if (timeLimit != null) { Long days = timeLimit / (24 * 60 * 60l); Long hours = timeLimit % (24 * 60 * 60l); // System.out.println(days); // System.out.println(hours); dmsPlanMaint.setTimeLimitDays(days); - dmsPlanMaint.setTimeLimitHours(hours/(60*60l)); + dmsPlanMaint.setTimeLimitHours(hours / (60 * 60l)); } return dmsPlanMaint; } @@ -57,14 +69,13 @@ public class DmsPlanMaintServiceImpl implements IDmsPlanMaintService * @return 保养计划信息 */ @Override - public List selectDmsPlanMaintList(DmsPlanMaint dmsPlanMaint) - { + public List selectDmsPlanMaintList(DmsPlanMaint dmsPlanMaint) { List dmsPlanMaints = dmsPlanMaintMapper.selectDmsPlanMaintList(dmsPlanMaint); - for (DmsPlanMaint d:dmsPlanMaints){ + for (DmsPlanMaint d : dmsPlanMaints) { Long timeLimit = d.getTimeLimit(); - d.setTimeLimitDays(timeLimit/(24*60*60L)); - d.setTimeLimitHours((timeLimit%(24*60*60L))/(60*60l)); + d.setTimeLimitDays(timeLimit / (24 * 60 * 60L)); + d.setTimeLimitHours((timeLimit % (24 * 60 * 60L)) / (60 * 60l)); } return dmsPlanMaints; @@ -78,16 +89,33 @@ public class DmsPlanMaintServiceImpl implements IDmsPlanMaintService */ @Transactional @Override - public int insertDmsPlanMaint(DmsPlanMaint dmsPlanMaint) - { - dmsPlanMaint.setTimeLimit((dmsPlanMaint.getTimeLimitDays()*24*60*60) - +(dmsPlanMaint.getTimeLimitHours()*60*60)); + public int insertDmsPlanMaint(DmsPlanMaint dmsPlanMaint) { + String planMaintCode = Seq.getId(Seq.planMaintSeqType, Seq.planMaintCode); + + SysJob job = new SysJob(); + job.setJobName("保养计划编号" + planMaintCode + "工单任务"); + job.setJobGroup("DEFAULT"); + job.setInvokeTarget("ryTask.getDmsBillsMaint(\"" + planMaintCode + "\")"); + job.setCronExpression(dmsPlanMaint.getCronExpression()); + job.setMisfirePolicy("1"); + job.setConcurrent("1"); + job.setStatus("1"); + R jobIdR = remoteJobService.add(SecurityConstants.INNER, job); + + String time = dmsPlanMaint.getCronExpression(); + //通过cron表达式获取下一次执行时间 + Date nextExecution = CronUtils.getNextExecution(time); + dmsPlanMaint.setMaintTime(nextExecution); + dmsPlanMaint.setJobId(jobIdR.getData().longValue()); + dmsPlanMaint.setPlanMaintCode(planMaintCode); + dmsPlanMaint.setTimeLimit((dmsPlanMaint.getTimeLimitDays() * 24 * 60 * 60) + + (dmsPlanMaint.getTimeLimitHours() * 60 * 60)); dmsPlanMaint.setIsFlag(1l); - LoginUser user = new LoginUser(); - dmsPlanMaint.setCreateBy(user.getUsername()); + dmsPlanMaint.setCreateBy(SecurityUtils.getUsername()); dmsPlanMaint.setCreateTime(DateUtils.getNowDate()); int rows = dmsPlanMaintMapper.insertDmsPlanMaint(dmsPlanMaint); - insertDmsPlanMaintDetail(dmsPlanMaint); + + return rows; } @@ -99,8 +127,7 @@ public class DmsPlanMaintServiceImpl implements IDmsPlanMaintService */ @Transactional @Override - public int updateDmsPlanMaint(DmsPlanMaint dmsPlanMaint) - { + public int updateDmsPlanMaint(DmsPlanMaint dmsPlanMaint) { dmsPlanMaint.setIsFlag(1l); LoginUser user = new LoginUser(); dmsPlanMaint.setUpdateBy(user.getUsername()); @@ -118,9 +145,17 @@ public class DmsPlanMaintServiceImpl implements IDmsPlanMaintService */ @Transactional @Override - public int deleteDmsPlanMaintByPlanMaintIds(Long[] planMaintIds) - { - dmsPlanMaintMapper.deleteDmsPlanMaintDetailByPlanMaintIds(planMaintIds); + public int deleteDmsPlanMaintByPlanMaintIds(Long[] planMaintIds) { + int planMaintLength = planMaintIds.length; + Long[] jobIds = new Long[planMaintLength]; + for (int i = 0; i < planMaintIds.length; i++) { + Long planMaintId = planMaintIds[i]; + DmsPlanMaint dmsPlanMaint = dmsPlanMaintMapper.selectDmsPlanMaintByPlanMaintId(planMaintId); + jobIds[i] = dmsPlanMaint.getJobId(); + } + + remoteJobService.remove(SecurityConstants.INNER,jobIds); + return dmsPlanMaintMapper.deleteDmsPlanMaintByPlanMaintIds(planMaintIds); } @@ -132,8 +167,7 @@ public class DmsPlanMaintServiceImpl implements IDmsPlanMaintService */ @Transactional @Override - public int deleteDmsPlanMaintByPlanMaintId(Long planMaintId) - { + public int deleteDmsPlanMaintByPlanMaintId(Long planMaintId) { dmsPlanMaintMapper.deleteDmsPlanMaintDetailByPlanMaintId(planMaintId); return dmsPlanMaintMapper.deleteDmsPlanMaintByPlanMaintId(planMaintId); } @@ -143,25 +177,45 @@ public class DmsPlanMaintServiceImpl implements IDmsPlanMaintService * * @param dmsPlanMaint 保养计划信息对象 */ - public void insertDmsPlanMaintDetail(DmsPlanMaint dmsPlanMaint) - { + public void insertDmsPlanMaintDetail(DmsPlanMaint dmsPlanMaint) { List dmsPlanMaintDetailList = dmsPlanMaint.getDmsPlanMaintDetailList(); Long planMaintId = dmsPlanMaint.getPlanMaintId(); LoginUser user = new LoginUser(); - if (StringUtils.isNotNull(dmsPlanMaintDetailList)) - { + if (StringUtils.isNotNull(dmsPlanMaintDetailList)) { List list = new ArrayList(); - for (DmsPlanMaintDetail dmsPlanMaintDetail : dmsPlanMaintDetailList) - { + for (DmsPlanMaintDetail dmsPlanMaintDetail : dmsPlanMaintDetailList) { dmsPlanMaintDetail.setIsFlag(1l); dmsPlanMaintDetail.setCreateBy(user.getUsername()); dmsPlanMaintDetail.setPlanMaintId(planMaintId); list.add(dmsPlanMaintDetail); } - if (list.size() > 0) - { + if (list.size() > 0) { dmsPlanMaintMapper.batchDmsPlanMaintDetail(list); } } } + + + /** + * 查询保养计划信息 Join detail + * + * @param planMaintCode 保养计划信息Code + * @return 保养计划信息 + */ + @Override + public DmsPlanMaint selectDmsPlanMaintJoinByPlanMaintCode(String planMaintCode) { + DmsPlanMaint dmsPlanMaint = dmsPlanMaintMapper.selectDmsPlanMaintJoinByPlanMaintCode(planMaintCode); + + Long timeLimit = dmsPlanMaint.getTimeLimit(); + if (timeLimit != null) { + Long days = timeLimit / (24 * 60 * 60l); + Long hours = timeLimit % (24 * 60 * 60l); +// System.out.println(days); +// System.out.println(hours); + dmsPlanMaint.setTimeLimitDays(days); + dmsPlanMaint.setTimeLimitHours(hours / (60 * 60l)); + } + return dmsPlanMaint; + } + } diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseMaintStationMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseMaintStationMapper.xml index 188fef00..7bc85221 100644 --- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseMaintStationMapper.xml +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBaseMaintStationMapper.xml @@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -22,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + and lube_instance_id = #{lubeInstanceId} + and device_id = #{deviceId} + and lube_station_id = #{lubeStationId} + and lube_standard_id = #{lubeStandardId} + and operation_description = #{operationDescription} + and maint_status = #{maintStatus} + and is_flag = #{isFlag} + + + + + + + insert into dms_bills_lube_detail + + lube_instance_id, + device_id, + lube_station_id, + lube_standard_id, + operation_description, + maint_status, + is_flag, + remark, + create_by, + create_time, + update_by, + update_time, + begin_time, + end_time, + + + #{lubeInstanceId}, + #{deviceId}, + #{lubeStationId}, + #{lubeStandardId}, + #{operationDescription}, + #{maintStatus}, + #{isFlag}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{beginTime}, + #{endTime}, + + + + + update dms_bills_lube_detail + + lube_instance_id = #{lubeInstanceId}, + device_id = #{deviceId}, + lube_station_id = #{lubeStationId}, + lube_standard_id = #{lubeStandardId}, + operation_description = #{operationDescription}, + maint_status = #{maintStatus}, + is_flag = #{isFlag}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + begin_time = #{beginTime}, + end_time = #{endTime}, + + where bills_lube_detail_id = #{billsLubeDetailId} + + + + delete from dms_bills_lube_detail where bills_lube_detail_id = #{billsLubeDetailId} + + + + delete from dms_bills_lube_detail where bills_lube_detail_id in + + #{billsLubeDetailId} + + + + + + + + + + + + select dbld.bills_lube_detail_id, dbld.lube_instance_id, dbld.device_id, dbld.lube_station_id, dbld.lube_standard_id, + dbld.operation_description, dbld.maint_status, dbld.create_by, dbld.create_time, + dbdl.device_code,dbdl.device_name, + dbdt.type_name, + dbls.protocol_code, + dblsd.lube_protocol,dblsd.operation_description as lube_operation_description + from dms_bills_lube_detail dbld + left join dms_base_device_ledger dbdl on dbld.device_id = dbdl.device_id + left join dms_base_device_type dbdt on dbdl.device_type_id=dbdt.device_type_id + left join dms_base_lube_station dbls on dbld.lube_station_id=dbls.lube_station_id + left join dms_base_lube_standard dblsd on dbld.lube_standard_id=dblsd.lube_standard_id + + + + + + 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 e529c446..536b2d71 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 @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -19,6 +19,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + @@ -27,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + insert into dms_bills_lube_instance @@ -103,9 +107,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from dms_bills_lube_instance where lube_instance_id in + delete from dms_bills_lube_instance where lube_instance_id in #{lubeInstanceId} - \ No newline at end of file + + + + + + + + diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsMaintDetailMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsMaintDetailMapper.xml new file mode 100644 index 00000000..4c58f684 --- /dev/null +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsMaintDetailMapper.xml @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select bills_maint_detail_id, maint_instance_id, device_id, station_id, maint_standard_id, operation_description, maint_status, is_flag, remark, create_by, create_time, update_by, update_time from dms_bills_maint_detail + + + + + + + + insert into dms_bills_maint_detail + + maint_instance_id, + device_id, + station_id, + maint_standard_id, + operation_description, + maint_status, + is_flag, + remark, + create_by, + create_time, + update_by, + update_time, + begin_time, + end_time, + + + #{maintInstanceId}, + #{deviceId}, + #{stationId}, + #{maintStandardId}, + #{operationDescription}, + #{maintStatus}, + #{isFlag}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{beginTime}, + #{endTime}, + + + + + update dms_bills_maint_detail + + maint_instance_id = #{maintInstanceId}, + device_id = #{deviceId}, + station_id = #{stationId}, + maint_standard_id = #{maintStandardId}, + operation_description = #{operationDescription}, + maint_status = #{maintStatus}, + is_flag = #{isFlag}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + begin_time = #{beginTime}, + end_time = #{endTime}, + + where bills_maint_detail_id = #{billsMaintDetailId} + + + + delete from dms_bills_maint_detail where bills_maint_detail_id = #{billsMaintDetailId} + + + + delete from dms_bills_maint_detail where bills_maint_detail_id in + + #{billsMaintDetailId} + + + + + + + + select dbmd.bills_maint_detail_id, dbmd.maint_instance_id, dbmd.device_id, dbmd.station_id, dbmd.maint_standard_id, + dbmd.operation_description, dbmd.maint_status, + dbdl.device_code,dbdl.device_name, + dbdt.type_name, + dbms.maint_station_name, + dbmsd.maint_protocol,dbmsd.operation_description as maint_operation_description + from dms_bills_maint_detail dbmd + left join dms_base_device_ledger dbdl on dbmd.device_id=dbdl.device_id + left join dms_base_device_type dbdt on dbdl.device_type_id=dbdt.device_type_id + left join dms_base_maint_station dbms on dbmd.station_id = dbms.maint_station_id + left join dms_base_maint_standard dbmsd on dbmd.maint_standard_id = dbmsd.maint_standard_id + + + + + 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 c2d8bf4d..26fc7471 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 @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -21,6 +21,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + @@ -29,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + insert into dms_bills_maint_instance @@ -113,9 +118,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from dms_bills_maint_instance where maint_instance_id in + delete from dms_bills_maint_instance where maint_instance_id in #{maintInstanceId} - \ No newline at end of file + + + + + + + + + insert into dms_bills_maint_detail( bills_maint_detail_id, maint_instance_id, device_id, station_id, maint_standard_id, operation_description, maint_status, is_flag, remark, create_by, create_time, update_by, update_time) values + + ( #{item.billsMaintDetailId}, #{item.maintInstanceId}, #{item.deviceId}, #{item.stationId}, #{item.maintStandardId}, #{item.operationDescription}, #{item.maintStatus}, #{item.isFlag}, #{item.remark}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}) + + + + + diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanLubeMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanLubeMapper.xml index ca74084e..f393eee9 100644 --- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanLubeMapper.xml +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanLubeMapper.xml @@ -7,7 +7,6 @@ - @@ -24,15 +23,33 @@ + + + + + + + + + + + + + + + + + + + - select plan_lube_id, plan_lube_code, device_id, lube_level, lube_group, lube_supervisor, lube_time, time_limit, job_id, cycle_period, create_method, is_flag, remark, create_by, create_time, update_by, update_time from dms_plan_lube + select plan_lube_id, plan_lube_code, lube_level, lube_group, lube_supervisor, lube_time, time_limit, job_id, cycle_period, create_method, is_flag, remark, create_by, create_time, update_by, update_time from dms_plan_lube + select a.plan_lube_id, a.plan_lube_code, a.lube_level, a.lube_group, a.lube_supervisor, a.lube_time, a.time_limit, a.job_id, a.cycle_period, a.create_method, a.is_flag, a.remark, a.create_by, a.create_time, a.update_by, a.update_time, + b.plan_lube_detail_id as sub_plan_lube_detail_id, b.plan_lube_id as sub_plan_lube_id, b.device_id as sub_device_id, b.lube_station_id as sub_lube_station_id, b.lube_standard_id as sub_lube_standard_id, b.operation_description as sub_operation_description, b.is_flag as sub_is_flag, b.remark as sub_remark, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time + from dms_plan_lube a + left join dms_plan_lube_detail b on b.plan_lube_id = a.plan_lube_id + where a.plan_lube_code = #{planLubeCode} + 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 43809ad1..8d204713 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 @@ -3,13 +3,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - + @@ -17,36 +17,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + - select plan_maint_detail_id, plan_maint_id, device_id, maint_station_id, maint_protocol, operation_description, is_flag, remark, create_by, create_time, update_by, update_time from dms_plan_maint_detail + select plan_maint_detail_id, plan_maint_id, device_id, maint_station_id, maint_standard_id, operation_description, is_flag, remark, create_by, create_time, update_by, update_time from dms_plan_maint_detail - + - + insert into dms_plan_maint_detail plan_maint_id, device_id, maint_station_id, - maint_protocol, + maint_standard_id, operation_description, is_flag, remark, @@ -59,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{planMaintId}, #{deviceId}, #{maintStationId}, - #{maintProtocol}, + #{maintStandardId}, #{operationDescription}, #{isFlag}, #{remark}, @@ -76,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" plan_maint_id = #{planMaintId}, device_id = #{deviceId}, maint_station_id = #{maintStationId}, - maint_protocol = #{maintProtocol}, + maint_standard_id = #{maintStandardId}, operation_description = #{operationDescription}, is_flag = #{isFlag}, remark = #{remark}, @@ -93,9 +96,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from dms_plan_maint_detail where plan_maint_detail_id in + delete from dms_plan_maint_detail where plan_maint_detail_id in #{planMaintDetailId} - \ No newline at end of file + + + + + + + + + + + + select dpmd.plan_maint_detail_id, dpmd.plan_maint_id, dpmd.device_id, dpmd.maint_station_id, dpmd.maint_standard_id, + dpmd.operation_description, dpmd.is_flag, dpmd.remark, + dbmsd.maint_protocol, + dbms.maint_station_name + from dms_plan_maint_detail dpmd + left join dms_base_maint_standard dbmsd on dpmd.maint_standard_id=dbmsd.maint_standard_id + left join dms_base_maint_station dbms on dpmd.maint_station_id=dbms.maint_station_id + + + + + diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanMaintMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanMaintMapper.xml index 2f371dfe..f846231d 100644 --- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanMaintMapper.xml +++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsPlanMaintMapper.xml @@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -162,4 +162,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ( #{item.planMaintDetailId}, #{item.planMaintId}, #{item.deviceId}, #{item.maintStationId}, #{item.maintProtocol}, #{item.operationDescription}, #{item.isFlag}, #{item.remark}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}) + + + + + + +