DMS:完成PDA接口包括:
1、点巡检接口(获取点检或巡检任务、扫描设备验证、提交巡检)
2、故障报修接口(获取故障类别、获取涉及操作、获取维修类型)
3、维修接口(获取故障报修工单列表、获取报修工单明细、修改工单、维修获取明细、扫描验证、开始维修、完成维修)
4、保养工单接口(获取保养工单、开始保养、完成保养)
5、润滑工单接口(获取润滑工单、开始润滑、完成润滑)
master
xins 2 years ago
parent 28576f6ffa
commit 2bad839d2b

@ -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);
}

@ -31,7 +31,7 @@ public class RemoteDmsFallbackFactory implements FallbackFactory<RemoteDmsServic
}
@Override
public R<?> getDmsBillsMaintInstance(String source, String dmsBillsMaintId) {
public R<?> getDmsBillsMaintInstance(String source, String planMaintCode) {
return null;
}
};

@ -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<Integer> 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);
}

@ -21,7 +21,7 @@ public class RemoteJobFallbackFactory implements FallbackFactory<RemoteJobServic
@Override
public R<?> add(String source, SysJob job) {
public R<Integer> add(String source, SysJob job) {
return null;
}
@ -30,6 +30,11 @@ public class RemoteJobFallbackFactory implements FallbackFactory<RemoteJobServic
return null;
}
@Override
public R<?> remove(String source, Long[] jobIds) {
return null;
}
};
}

@ -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";//润滑完成
}

@ -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);
}

@ -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-
* */

@ -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));
}
/**

@ -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));
}
}

@ -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);
}

@ -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<DmsPlanLubeDetail> 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<DmsPlanLubeDetail> list = dmsPlanLubeDetailService.selectDmsPlanLubeDetailList(dmsPlanLubeDetail);
ExcelUtil<DmsPlanLubeDetail> util = new ExcelUtil<DmsPlanLubeDetail>(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));
}
}

@ -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);
}

@ -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<DmsPlanMaintDetail> list = dmsPlanMaintDetailService.selectDmsPlanMaintDetailList(dmsPlanMaintDetail);
List<DmsPlanMaintDetail> list = dmsPlanMaintDetailService.selectDmsPlanMaintDetailJoinList(dmsPlanMaintDetail);
return getDataTable(list);
}

@ -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;

@ -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();
}
}

@ -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<DmsBillsLubeDetail> 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<DmsBillsLubeDetail> getDmsBillsLubeDetailList() {
return dmsBillsLubeDetailList;
}
public void setDmsBillsLubeDetailList(List<DmsBillsLubeDetail> dmsBillsLubeDetailList) {
this.dmsBillsLubeDetailList = dmsBillsLubeDetailList;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

@ -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();
}
}

@ -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<DmsBillsMaintDetail> 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<DmsBillsMaintDetail> getDmsBillsMaintDetailList() {
return dmsBillsMaintDetailList;
}
public void setDmsBillsMaintDetailList(List<DmsBillsMaintDetail> dmsBillsMaintDetailList) {
this.dmsBillsMaintDetailList = dmsBillsMaintDetailList;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

@ -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;
}

@ -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())

@ -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();
}
}

@ -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)

@ -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<DmsBillsLubeDetail> 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_stationlube_standard
*
* @param dmsBillsLubeDetail
* @return
*/
public List<DmsBillsLubeDetail> selectDmsBillsLubeDetailJoinList(DmsBillsLubeDetail dmsBillsLubeDetail);
}

@ -59,4 +59,16 @@ public interface DmsBillsLubeInstanceMapper
*/
public int deleteDmsBillsLubeInstanceByLubeInstanceIds(Long[] lubeInstanceIds);
/**
* ,Join
*
* @param dmsBillsLubeInstance
* @return
*/
public DmsBillsLubeInstance selectNewestDmsBillsLubeInstance(DmsBillsLubeInstance dmsBillsLubeInstance);
}

@ -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<DmsBillsMaintDetail> 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<DmsBillsMaintDetail> selectDmsBillsMaintDetailJoinList(DmsBillsMaintDetail dmsBillsMaintDetail);
}

@ -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<DmsBillsMaintDetail> dmsBillsMaintDetailList);
/**
* Join
*
* @param dmsBillsMaintInstance
* @return
*/
public DmsBillsMaintInstance selectNewestDmsBillsMaintInstance(DmsBillsMaintInstance dmsBillsMaintInstance);
}

@ -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<DmsPlanLubeDetail> 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);
}

@ -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);
}

@ -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 standardstation
*
* @param dmsPlanMaintDetail
* @return
*/
public List<DmsPlanMaintDetail> selectDmsPlanMaintDetailJoinList(DmsPlanMaintDetail dmsPlanMaintDetail);
}

@ -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<DmsPlanMaintDetail> dmsPlanMaintDetailList);
/**
*
*
*
* @param planMaintId ID
* @return
*/
public int deleteDmsPlanMaintDetailByPlanMaintId(Long planMaintId);
/**
*
*
* @param planMaintCode Code
* @return
*/
public DmsPlanMaint selectDmsPlanMaintJoinByPlanMaintCode(String planMaintCode);
}

@ -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);
}

@ -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);
}

@ -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<DmsPlanLubeDetail> 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);
}

@ -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<DmsPlanMaintDetail> selectDmsPlanMaintDetailJoinList(DmsPlanMaintDetail dmsPlanMaintDetail);
}

@ -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);
}

@ -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<DmsBillsLubeInstance> selectDmsBillsLubeInstanceList(DmsBillsLubeInstance dmsBillsLubeInstance)
{
public List<DmsBillsLubeInstance> 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<DmsBillsLubeInstance> 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<DmsBillsLubeDetail> 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;
}
}

@ -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<DmsBillsMaintInstance> selectDmsBillsMaintInstanceList(DmsBillsMaintInstance dmsBillsMaintInstance)
{
public List<DmsBillsMaintInstance> 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<DmsBillsMaintDetail> dmsBillsMaintDetails = dmsBillsMaintDetailMapper.selectDmsBillsMaintDetailJoinList(queryBillsMaintDetail);
newestBillsMaintInstance.setDmsBillsMaintDetailList(dmsBillsMaintDetails);
}
return newestBillsMaintInstance;
}
public void batchInsertDmsBillsMaintDetail(DmsPlanMaint dmsPlanMaint, Long maintInstanceId) {
List<DmsPlanMaintDetail> planMaintDetails = dmsPlanMaint.getDmsPlanMaintDetailList();
List<DmsBillsMaintDetail> 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;
}
}

@ -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<Integer> 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;
}
/**

@ -99,4 +99,19 @@ public class DmsPlanMaintDetailServiceImpl implements IDmsPlanMaintDetailService
{
return dmsPlanMaintDetailMapper.deleteDmsPlanMaintDetailByPlanMaintDetailId(planMaintDetailId);
}
/**
* Join station and standard
*
* @param dmsPlanMaintDetail
* @return
*/
@Override
public List<DmsPlanMaintDetail> selectDmsPlanMaintDetailJoinList(DmsPlanMaintDetail dmsPlanMaintDetail)
{
return dmsPlanMaintDetailMapper.selectDmsPlanMaintDetailJoinList(dmsPlanMaintDetail);
}
}

@ -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<DmsPlanMaint> selectDmsPlanMaintList(DmsPlanMaint dmsPlanMaint)
{
public List<DmsPlanMaint> selectDmsPlanMaintList(DmsPlanMaint dmsPlanMaint) {
List<DmsPlanMaint> 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<Integer> 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<DmsPlanMaintDetail> dmsPlanMaintDetailList = dmsPlanMaint.getDmsPlanMaintDetailList();
Long planMaintId = dmsPlanMaint.getPlanMaintId();
LoginUser user = new LoginUser();
if (StringUtils.isNotNull(dmsPlanMaintDetailList))
{
if (StringUtils.isNotNull(dmsPlanMaintDetailList)) {
List<DmsPlanMaintDetail> list = new ArrayList<DmsPlanMaintDetail>();
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;
}
}

@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="maintStationId" column="maint_station_id" />
<result property="deviceTypeId" column="device_type_id" />
<result property="maintStationCode" column="maint_station_code" />
<result property="maintStationName" column="maint_station_name" />
<result property="protocolCode" column="protocol_code" />
<result property="isFlag" column="is_flag" />
<result property="remark" column="remark" />
@ -22,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="selectDmsBaseMaintStationList" parameterType="DmsBaseMaintStation" resultMap="DmsBaseMaintStationResult">
select a.maint_station_id, a.device_type_id, a.maint_station_code, a.protocol_code, a.is_flag, a.remark, a.create_by, a.create_time, a.update_by, a.update_time
select a.maint_station_id, a.device_type_id, a.maint_station_code, a.maint_station_name, a.protocol_code, a.is_flag, a.remark, a.create_by, a.create_time, a.update_by, a.update_time
from dms_base_maint_station a
left join dms_base_device_type b on a.device_type_id = b.device_type_id
<where>

@ -0,0 +1,155 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hw.dms.mapper.DmsBillsLubeDetailMapper">
<resultMap type="DmsBillsLubeDetail" id="DmsBillsLubeDetailResult">
<result property="billsLubeDetailId" column="bills_lube_detail_id" />
<result property="lubeInstanceId" column="lube_instance_id" />
<result property="deviceId" column="device_id" />
<result property="lubeStationId" column="lube_station_id" />
<result property="lubeStandardId" column="lube_standard_id" />
<result property="operationDescription" column="operation_description" />
<result property="maintStatus" column="maint_status" />
<result property="isFlag" column="is_flag" />
<result property="remark" column="remark" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="beginTime" column="begin_time" />
<result property="endTime" column="end_time" />
<result property="deviceCode" column="device_code" />
<result property="deviceName" column="device_name" />
<result property="typeName" column="type_name" />
<result property="lubeStationName" column="lube_station_name" />
<result property="lubeProtocol" column="lube_protocol" />
</resultMap>
<sql id="selectDmsBillsLubeDetailVo">
select bills_lube_detail_id, 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 from dms_bills_lube_detail
</sql>
<select id="selectDmsBillsLubeDetailList" parameterType="DmsBillsLubeDetail" resultMap="DmsBillsLubeDetailResult">
<include refid="selectDmsBillsLubeDetailVo"/>
<where>
<if test="lubeInstanceId != null "> and lube_instance_id = #{lubeInstanceId}</if>
<if test="deviceId != null "> and device_id = #{deviceId}</if>
<if test="lubeStationId != null "> and lube_station_id = #{lubeStationId}</if>
<if test="lubeStandardId != null "> and lube_standard_id = #{lubeStandardId}</if>
<if test="operationDescription != null and operationDescription != ''"> and operation_description = #{operationDescription}</if>
<if test="maintStatus != null "> and maint_status = #{maintStatus}</if>
<if test="isFlag != null "> and is_flag = #{isFlag}</if>
</where>
</select>
<select id="selectDmsBillsLubeDetailByBillsLubeDetailId" parameterType="Long" resultMap="DmsBillsLubeDetailResult">
<include refid="selectDmsBillsLubeDetailVo"/>
where bills_lube_detail_id = #{billsLubeDetailId}
</select>
<insert id="insertDmsBillsLubeDetail" parameterType="DmsBillsLubeDetail" useGeneratedKeys="true" keyProperty="billsLubeDetailId">
insert into dms_bills_lube_detail
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="lubeInstanceId != null">lube_instance_id,</if>
<if test="deviceId != null">device_id,</if>
<if test="lubeStationId != null">lube_station_id,</if>
<if test="lubeStandardId != null">lube_standard_id,</if>
<if test="operationDescription != null">operation_description,</if>
<if test="maintStatus != null">maint_status,</if>
<if test="isFlag != null">is_flag,</if>
<if test="remark != null">remark,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="beginTime != null">begin_time,</if>
<if test="endTime != null">end_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="lubeInstanceId != null">#{lubeInstanceId},</if>
<if test="deviceId != null">#{deviceId},</if>
<if test="lubeStationId != null">#{lubeStationId},</if>
<if test="lubeStandardId != null">#{lubeStandardId},</if>
<if test="operationDescription != null">#{operationDescription},</if>
<if test="maintStatus != null">#{maintStatus},</if>
<if test="isFlag != null">#{isFlag},</if>
<if test="remark != null">#{remark},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="beginTime != null">#{beginTime},</if>
<if test="endTime != null">#{endTime},</if>
</trim>
</insert>
<update id="updateDmsBillsLubeDetail" parameterType="DmsBillsLubeDetail">
update dms_bills_lube_detail
<trim prefix="SET" suffixOverrides=",">
<if test="lubeInstanceId != null">lube_instance_id = #{lubeInstanceId},</if>
<if test="deviceId != null">device_id = #{deviceId},</if>
<if test="lubeStationId != null">lube_station_id = #{lubeStationId},</if>
<if test="lubeStandardId != null">lube_standard_id = #{lubeStandardId},</if>
<if test="operationDescription != null">operation_description = #{operationDescription},</if>
<if test="maintStatus != null">maint_status = #{maintStatus},</if>
<if test="isFlag != null">is_flag = #{isFlag},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="beginTime != null">begin_time = #{beginTime},</if>
<if test="endTime != null">end_time = #{endTime},</if>
</trim>
where bills_lube_detail_id = #{billsLubeDetailId}
</update>
<delete id="deleteDmsBillsLubeDetailByBillsLubeDetailId" parameterType="Long">
delete from dms_bills_lube_detail where bills_lube_detail_id = #{billsLubeDetailId}
</delete>
<delete id="deleteDmsBillsLubeDetailByBillsLubeDetailIds" parameterType="String">
delete from dms_bills_lube_detail where bills_lube_detail_id in
<foreach item="billsLubeDetailId" collection="array" open="(" separator="," close=")">
#{billsLubeDetailId}
</foreach>
</delete>
<sql id="selectDmsBillsLubeDetailJoinVo">
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
</sql>
<select id="selectDmsBillsLubeDetailJoinList" parameterType="DmsBillsLubeDetail" resultMap="DmsBillsLubeDetailResult">
<include refid="selectDmsBillsLubeDetailJoinVo"/>
<where>
<if test="lubeInstanceId != null "> and dbld.lube_instance_id = #{lubeInstanceId}</if>
<if test="deviceId != null "> and dbld.device_id = #{deviceId}</if>
<if test="lubeStationId != null "> and dbld.lube_station_id = #{lubeStationId}</if>
<if test="lubeStandardId != null "> and dbld.lube_standard_id = #{lubeStandardId}</if>
<if test="operationDescription != null and operationDescription != ''"> and dbld.operation_description = #{operationDescription}</if>
<if test="maintStatus != null "> and dbld.maint_status = #{maintStatus}</if>
</where>
</select>
</mapper>

@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hw.dms.mapper.DmsBillsLubeInstanceMapper">
<resultMap type="DmsBillsLubeInstance" id="DmsBillsLubeInstanceResult">
<result property="lubeInstanceId" column="lube_instance_id" />
<result property="planLubeId" column="plan_lube_id" />
@ -19,6 +19,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="lubeGroup" column="lube_group" />
<result property="lubeSupervisor" column="lube_supervisor" />
<result property="lubeLevel" column="lube_level" />
</resultMap>
<sql id="selectDmsBillsLubeInstanceVo">
@ -27,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectDmsBillsLubeInstanceList" parameterType="DmsBillsLubeInstance" resultMap="DmsBillsLubeInstanceResult">
<include refid="selectDmsBillsLubeInstanceVo"/>
<where>
<where>
<if test="planLubeId != null "> and plan_lube_id = #{planLubeId}</if>
<if test="billsLubeCode != null and billsLubeCode != ''"> and bills_lube_code = #{billsLubeCode}</if>
<if test="planBeginTime != null "> and plan_begin_time = #{planBeginTime}</if>
@ -38,12 +42,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isFlag != null and isFlag != ''"> and is_flag = #{isFlag}</if>
</where>
</select>
<select id="selectDmsBillsLubeInstanceByLubeInstanceId" parameterType="Long" resultMap="DmsBillsLubeInstanceResult">
<include refid="selectDmsBillsLubeInstanceVo"/>
where lube_instance_id = #{lubeInstanceId}
</select>
<insert id="insertDmsBillsLubeInstance" parameterType="DmsBillsLubeInstance" useGeneratedKeys="true" keyProperty="lubeInstanceId">
insert into dms_bills_lube_instance
<trim prefix="(" suffix=")" suffixOverrides=",">
@ -103,9 +107,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteDmsBillsLubeInstanceByLubeInstanceIds" parameterType="String">
delete from dms_bills_lube_instance where lube_instance_id in
delete from dms_bills_lube_instance where lube_instance_id in
<foreach item="lubeInstanceId" collection="array" open="(" separator="," close=")">
#{lubeInstanceId}
</foreach>
</delete>
</mapper>
<select id="selectNewestDmsBillsLubeInstance" parameterType="DmsBillsLubeInstance" resultMap="DmsBillsLubeInstanceResult">
select dbli.lube_instance_id, dbli.plan_lube_id, dbli.bills_lube_code, dbli.plan_begin_time, dbli.real_begin_time, dbli.plan_end_time,
dbli.real_end_time, dbli.lube_status,
dbli.lube_group,dbli.lube_supervisor,dbli.lube_level
from dms_bills_lube_instance dbli
<where>
<if test="lubeStatusStr != null and lubeStatusStr != ''"> and dbli.lube_status in (${lubeStatusStr})</if>
</where>
order by dbli.create_time desc limit 1
</select>
</mapper>

@ -0,0 +1,152 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hw.dms.mapper.DmsBillsMaintDetailMapper">
<resultMap type="DmsBillsMaintDetail" id="DmsBillsMaintDetailResult">
<result property="billsMaintDetailId" column="bills_maint_detail_id" />
<result property="maintInstanceId" column="maint_instance_id" />
<result property="deviceId" column="device_id" />
<result property="stationId" column="station_id" />
<result property="maintStandardId" column="maint_standard_id" />
<result property="operationDescription" column="operation_description" />
<result property="maintStatus" column="maint_status" />
<result property="isFlag" column="is_flag" />
<result property="remark" column="remark" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="beginTime" column="begin_time" />
<result property="endTime" column="end_time" />
<result property="deviceCode" column="device_code" />
<result property="deviceName" column="device_name" />
<result property="typeName" column="type_name" />
<result property="maintStationName" column="maint_station_name" />
<result property="maintProtocol" column="maint_protocol" />
<result property="maintOperationDescription" column="maint_operation_description" />
</resultMap>
<sql id="selectDmsBillsMaintDetailVo">
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
</sql>
<select id="selectDmsBillsMaintDetailList" parameterType="DmsBillsMaintDetail" resultMap="DmsBillsMaintDetailResult">
<include refid="selectDmsBillsMaintDetailVo"/>
<where>
<if test="maintInstanceId != null "> and maint_instance_id = #{maintInstanceId}</if>
<if test="deviceId != null "> and device_id = #{deviceId}</if>
<if test="stationId != null "> and station_id = #{stationId}</if>
<if test="maintStandardId != null "> and maint_standard_id = #{maintStandardId}</if>
<if test="operationDescription != null and operationDescription != ''"> and operation_description = #{operationDescription}</if>
<if test="maintStatus != null "> and maint_status = #{maintStatus}</if>
<if test="isFlag != null "> and is_flag = #{isFlag}</if>
</where>
</select>
<select id="selectDmsBillsMaintDetailByBillsMaintDetailId" parameterType="Long" resultMap="DmsBillsMaintDetailResult">
<include refid="selectDmsBillsMaintDetailVo"/>
where bills_maint_detail_id = #{billsMaintDetailId}
</select>
<insert id="insertDmsBillsMaintDetail" parameterType="DmsBillsMaintDetail" useGeneratedKeys="true" keyProperty="billsMaintDetailId">
insert into dms_bills_maint_detail
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="maintInstanceId != null">maint_instance_id,</if>
<if test="deviceId != null">device_id,</if>
<if test="stationId != null">station_id,</if>
<if test="maintStandardId != null">maint_standard_id,</if>
<if test="operationDescription != null">operation_description,</if>
<if test="maintStatus != null">maint_status,</if>
<if test="isFlag != null">is_flag,</if>
<if test="remark != null">remark,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="beginTime != null">begin_time,</if>
<if test="endTime != null">end_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="maintInstanceId != null">#{maintInstanceId},</if>
<if test="deviceId != null">#{deviceId},</if>
<if test="stationId != null">#{stationId},</if>
<if test="maintStandardId != null">#{maintStandardId},</if>
<if test="operationDescription != null">#{operationDescription},</if>
<if test="maintStatus != null">#{maintStatus},</if>
<if test="isFlag != null">#{isFlag},</if>
<if test="remark != null">#{remark},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="beginTime != null">#{beginTime},</if>
<if test="endTime != null">#{endTime},</if>
</trim>
</insert>
<update id="updateDmsBillsMaintDetail" parameterType="DmsBillsMaintDetail">
update dms_bills_maint_detail
<trim prefix="SET" suffixOverrides=",">
<if test="maintInstanceId != null">maint_instance_id = #{maintInstanceId},</if>
<if test="deviceId != null">device_id = #{deviceId},</if>
<if test="stationId != null">station_id = #{stationId},</if>
<if test="maintStandardId != null">maint_standard_id = #{maintStandardId},</if>
<if test="operationDescription != null">operation_description = #{operationDescription},</if>
<if test="maintStatus != null">maint_status = #{maintStatus},</if>
<if test="isFlag != null">is_flag = #{isFlag},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="beginTime != null">begin_time = #{beginTime},</if>
<if test="endTime != null">end_time = #{endTime},</if>
</trim>
where bills_maint_detail_id = #{billsMaintDetailId}
</update>
<delete id="deleteDmsBillsMaintDetailByBillsMaintDetailId" parameterType="Long">
delete from dms_bills_maint_detail where bills_maint_detail_id = #{billsMaintDetailId}
</delete>
<delete id="deleteDmsBillsMaintDetailByBillsMaintDetailIds" parameterType="String">
delete from dms_bills_maint_detail where bills_maint_detail_id in
<foreach item="billsMaintDetailId" collection="array" open="(" separator="," close=")">
#{billsMaintDetailId}
</foreach>
</delete>
<sql id="selectDmsBillsMaintDetailJoinVo">
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
</sql>
<select id="selectDmsBillsMaintDetailJoinList" parameterType="DmsBillsMaintDetail" resultMap="DmsBillsMaintDetailResult">
<include refid="selectDmsBillsMaintDetailJoinVo"/>
<where>
<if test="maintInstanceId != null "> and dbmd.maint_instance_id = #{maintInstanceId}</if>
<if test="deviceId != null "> and dbmd.device_id = #{deviceId}</if>
<if test="stationId != null "> and dbmd.station_id = #{stationId}</if>
<if test="maintStandardId != null "> and dbmd.maint_standard_id = #{maintStandardId}</if>
<if test="maintStatus != null "> and dbmd.maint_status = #{maintStatus}</if>
</where>
</select>
</mapper>

@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hw.dms.mapper.DmsBillsMaintInstanceMapper">
<resultMap type="DmsBillsMaintInstance" id="DmsBillsMaintInstanceResult">
<result property="maintInstanceId" column="maint_instance_id" />
<result property="planMaintId" column="plan_maint_id" />
@ -21,6 +21,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="maintLevel" column="maint_level" />
<result property="maintGroup" column="maint_group" />
<result property="maintSupervisor" column="maint_supervisor" />
</resultMap>
<sql id="selectDmsBillsMaintInstanceVo">
@ -29,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectDmsBillsMaintInstanceList" parameterType="DmsBillsMaintInstance" resultMap="DmsBillsMaintInstanceResult">
<include refid="selectDmsBillsMaintInstanceVo"/>
<where>
<where>
<if test="planMaintId != null "> and plan_maint_id = #{planMaintId}</if>
<if test="wfProcessId != null "> and wf_process_id = #{wfProcessId}</if>
<if test="billsMaintCode != null and billsMaintCode != ''"> and bills_maint_code = #{billsMaintCode}</if>
@ -42,12 +47,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isFlag != null "> and is_flag = #{isFlag}</if>
</where>
</select>
<select id="selectDmsBillsMaintInstanceByMaintInstanceId" parameterType="Long" resultMap="DmsBillsMaintInstanceResult">
<include refid="selectDmsBillsMaintInstanceVo"/>
where maint_instance_id = #{maintInstanceId}
</select>
<insert id="insertDmsBillsMaintInstance" parameterType="DmsBillsMaintInstance" useGeneratedKeys="true" keyProperty="maintInstanceId">
insert into dms_bills_maint_instance
<trim prefix="(" suffix=")" suffixOverrides=",">
@ -113,9 +118,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteDmsBillsMaintInstanceByMaintInstanceIds" parameterType="String">
delete from dms_bills_maint_instance where maint_instance_id in
delete from dms_bills_maint_instance where maint_instance_id in
<foreach item="maintInstanceId" collection="array" open="(" separator="," close=")">
#{maintInstanceId}
</foreach>
</delete>
</mapper>
<insert id="batchDmsBillsMaintDetail">
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
<foreach item="item" index="index" collection="list" separator=",">
( #{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})
</foreach>
</insert>
<select id="selectNewestDmsBillsMaintInstance" parameterType="DmsBillsMaintInstance" resultMap="DmsBillsMaintInstanceResult">
select dbmi.maint_instance_id, dbmi.plan_maint_id, dbmi.wf_process_id, dbmi.bills_maint_code, dbmi.plan_begin_time, dbmi.real_begin_time,
dbmi.plan_end_time, dbmi.real_end_time, dbmi.maint_status, dbmi.maint_comp_rate, dbmi.create_by, dbmi.create_time,
dbmi.maint_level,dbmi.maint_group,dbmi.maint_supervisor
from dms_bills_maint_instance dbmi
<where>
<if test="maintStatusStr != null and maintStatusStr != ''"> and dbmi.maint_status in (${maintStatusStr})</if>
</where>
order by dbmi.create_time desc limit 1
</select>
</mapper>

@ -7,7 +7,6 @@
<resultMap type="DmsPlanLube" id="DmsPlanLubeResult">
<result property="planLubeId" column="plan_lube_id" />
<result property="planLubeCode" column="plan_lube_code" />
<result property="deviceId" column="device_id" />
<result property="lubeLevel" column="lube_level" />
<result property="lubeGroup" column="lube_group" />
<result property="lubeSupervisor" column="lube_supervisor" />
@ -24,15 +23,33 @@
<result property="updateTime" column="update_time" />
</resultMap>
<resultMap id="DmsPlanLubeDmsPlanLubeDetailResult" type="DmsPlanLube" extends="DmsPlanLubeResult">
<collection property="dmsPlanLubeDetailList" notNullColumn="sub_plan_lube_detail_id" javaType="java.util.List" resultMap="DmsPlanLubeDetailResult" />
</resultMap>
<resultMap type="DmsPlanLubeDetail" id="DmsPlanLubeDetailResult">
<result property="planLubeDetailId" column="sub_plan_lube_detail_id" />
<result property="planLubeId" column="sub_plan_lube_id" />
<result property="deviceId" column="sub_device_id" />
<result property="lubeStationId" column="sub_lube_station_id" />
<result property="lubeStandardId" column="sub_lube_standard_id" />
<result property="operationDescription" column="sub_operation_description" />
<result property="isFlag" column="sub_is_flag" />
<result property="remark" column="sub_remark" />
<result property="createBy" column="sub_create_by" />
<result property="createTime" column="sub_create_time" />
<result property="updateBy" column="sub_update_by" />
<result property="updateTime" column="sub_update_time" />
</resultMap>
<sql id="selectDmsPlanLubeVo">
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
</sql>
<select id="selectDmsPlanLubeList" parameterType="DmsPlanLube" resultMap="DmsPlanLubeResult">
<include refid="selectDmsPlanLubeVo"/>
<where>
<if test="planLubeCode != null and planLubeCode != ''"> and plan_lube_code = #{planLubeCode}</if>
<if test="deviceId != null "> and device_id = #{deviceId}</if>
<if test="lubeLevel != null and lubeLevel != ''"> and lube_level = #{lubeLevel}</if>
<if test="lubeGroup != null and lubeGroup != ''"> and lube_group = #{lubeGroup}</if>
<if test="lubeSupervisor != null and lubeSupervisor != ''"> and lube_supervisor = #{lubeSupervisor}</if>
@ -54,7 +71,6 @@
insert into dms_plan_lube
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="planLubeCode != null">plan_lube_code,</if>
<if test="deviceId != null">device_id,</if>
<if test="lubeLevel != null">lube_level,</if>
<if test="lubeGroup != null">lube_group,</if>
<if test="lubeSupervisor != null">lube_supervisor,</if>
@ -72,7 +88,6 @@
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="planLubeCode != null">#{planLubeCode},</if>
<if test="deviceId != null">#{deviceId},</if>
<if test="lubeLevel != null">#{lubeLevel},</if>
<if test="lubeGroup != null">#{lubeGroup},</if>
<if test="lubeSupervisor != null">#{lubeSupervisor},</if>
@ -94,7 +109,6 @@
update dms_plan_lube
<trim prefix="SET" suffixOverrides=",">
<if test="planLubeCode != null">plan_lube_code = #{planLubeCode},</if>
<if test="deviceId != null">device_id = #{deviceId},</if>
<if test="lubeLevel != null">lube_level = #{lubeLevel},</if>
<if test="lubeGroup != null">lube_group = #{lubeGroup},</if>
<if test="lubeSupervisor != null">lube_supervisor = #{lubeSupervisor},</if>
@ -123,4 +137,17 @@
#{planLubeId}
</foreach>
</delete>
<select id="selectDmsPlanLubeJoinByPlanLubeCode" parameterType="String" resultMap="DmsPlanLubeDmsPlanLubeDetailResult">
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}
</select>
</mapper>

@ -3,13 +3,13 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hw.dms.mapper.DmsPlanMaintDetailMapper">
<resultMap type="DmsPlanMaintDetail" id="DmsPlanMaintDetailResult">
<result property="planMaintDetailId" column="plan_maint_detail_id" />
<result property="planMaintId" column="plan_maint_id" />
<result property="deviceId" column="device_id" />
<result property="maintStationId" column="maint_station_id" />
<result property="maintProtocol" column="maint_protocol" />
<result property="maintStandardId" column="maint_standard_id" />
<result property="operationDescription" column="operation_description" />
<result property="isFlag" column="is_flag" />
<result property="remark" column="remark" />
@ -17,36 +17,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="maintProtocol" column="maint_protocol" />
<result property="maintStationName" column="maint_station_name" />
</resultMap>
<sql id="selectDmsPlanMaintDetailVo">
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
</sql>
<select id="selectDmsPlanMaintDetailList" parameterType="DmsPlanMaintDetail" resultMap="DmsPlanMaintDetailResult">
<include refid="selectDmsPlanMaintDetailVo"/>
<where>
<where>
<if test="planMaintId != null "> and plan_maint_id = #{planMaintId}</if>
<if test="deviceId != null "> and device_id = #{deviceId}</if>
<if test="maintStationId != null "> and maint_station_id = #{maintStationId}</if>
<if test="maintProtocol != null and maintProtocol != ''"> and maint_protocol = #{maintProtocol}</if>
<if test="maintStandardId != null and maintStandardId != ''"> and maint_standard_id = #{maintStandardId}</if>
<if test="operationDescription != null and operationDescription != ''"> and operation_description = #{operationDescription}</if>
<if test="isFlag != null "> and is_flag = #{isFlag}</if>
</where>
</select>
<select id="selectDmsPlanMaintDetailByPlanMaintDetailId" parameterType="Long" resultMap="DmsPlanMaintDetailResult">
<include refid="selectDmsPlanMaintDetailVo"/>
where plan_maint_detail_id = #{planMaintDetailId}
</select>
<insert id="insertDmsPlanMaintDetail" parameterType="DmsPlanMaintDetail" useGeneratedKeys="true" keyProperty="planMaintDetailId">
insert into dms_plan_maint_detail
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="planMaintId != null">plan_maint_id,</if>
<if test="deviceId != null">device_id,</if>
<if test="maintStationId != null">maint_station_id,</if>
<if test="maintProtocol != null">maint_protocol,</if>
<if test="maintStandardId != null">maint_standard_id,</if>
<if test="operationDescription != null">operation_description,</if>
<if test="isFlag != null">is_flag,</if>
<if test="remark != null">remark,</if>
@ -59,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="planMaintId != null">#{planMaintId},</if>
<if test="deviceId != null">#{deviceId},</if>
<if test="maintStationId != null">#{maintStationId},</if>
<if test="maintProtocol != null">#{maintProtocol},</if>
<if test="maintStandardId != null">#{maintStandardId},</if>
<if test="operationDescription != null">#{operationDescription},</if>
<if test="isFlag != null">#{isFlag},</if>
<if test="remark != null">#{remark},</if>
@ -76,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="planMaintId != null">plan_maint_id = #{planMaintId},</if>
<if test="deviceId != null">device_id = #{deviceId},</if>
<if test="maintStationId != null">maint_station_id = #{maintStationId},</if>
<if test="maintProtocol != null">maint_protocol = #{maintProtocol},</if>
<if test="maintStandardId != null">maint_standard_id = #{maintStandardId},</if>
<if test="operationDescription != null">operation_description = #{operationDescription},</if>
<if test="isFlag != null">is_flag = #{isFlag},</if>
<if test="remark != null">remark = #{remark},</if>
@ -93,9 +96,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteDmsPlanMaintDetailByPlanMaintDetailIds" parameterType="String">
delete from dms_plan_maint_detail where plan_maint_detail_id in
delete from dms_plan_maint_detail where plan_maint_detail_id in
<foreach item="planMaintDetailId" collection="array" open="(" separator="," close=")">
#{planMaintDetailId}
</foreach>
</delete>
</mapper>
<sql id="selectDmsPlanMaintDetailJoinVo">
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
</sql>
<select id="selectDmsPlanMaintDetailJoinList" parameterType="DmsPlanMaintDetail" resultMap="DmsPlanMaintDetailResult">
<include refid="selectDmsPlanMaintDetailJoinVo"/>
<where>
<if test="planMaintId != null "> and plan_maint_id = #{planMaintId}</if>
<if test="deviceId != null "> and device_id = #{deviceId}</if>
<if test="maintStationId != null "> and maint_station_id = #{maintStationId}</if>
<if test="maintStandardId != null and maintStandardId != ''"> and maint_standard_id = #{maintStandardId}</if>
<if test="operationDescription != null and operationDescription != ''"> and operation_description = #{operationDescription}</if>
<if test="isFlag != null "> and is_flag = #{isFlag}</if>
</where>
</select>
</mapper>

@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="planMaintId" column="sub_plan_maint_id" />
<result property="deviceId" column="sub_device_id" />
<result property="maintStationId" column="sub_maint_station_id" />
<result property="maintStandardId" column="maint_standard_id" />
<result property="maintStandardId" column="sub_maint_standard_id" />
<result property="operationDescription" column="sub_operation_description" />
<result property="isFlag" column="sub_is_flag" />
<result property="remark" column="sub_remark" />
@ -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})
</foreach>
</insert>
<select id="selectDmsPlanMaintJoinByPlanMaintCode" parameterType="String" resultMap="DmsPlanMaintDmsPlanMaintDetailResult">
select a.plan_maint_id, a.plan_maint_code, a.maint_level, a.maint_group, a.maint_supervisor, a.maint_time,a.time_limit,a.job_id, a.cycle_period, a.maint_status, a.create_method, a.is_flag, a.remark, a.create_by, a.create_time, a.update_by, a.update_time,
b.plan_maint_detail_id as sub_plan_maint_detail_id, b.plan_maint_id as sub_plan_maint_id, b.device_id as sub_device_id, b.maint_station_id as sub_maint_station_id, b.maint_standard_id as sub_maint_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_maint a
left join dms_plan_maint_detail b on b.plan_maint_id = a.plan_maint_id
where a.plan_maint_code = #{planMaintCode}
</select>
</mapper>

Loading…
Cancel
Save