diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvCheckRecordController.java b/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvCheckRecordController.java new file mode 100644 index 0000000..b5286bc --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvCheckRecordController.java @@ -0,0 +1,176 @@ +package com.ktg.mes.dv.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.ktg.common.constant.UserConstants; +import com.ktg.mes.dv.domain.DvCheckRecordLine; +import com.ktg.mes.dv.domain.DvCheckSubject; +import com.ktg.mes.dv.service.IDvCheckRecordLineService; +import com.ktg.mes.dv.service.IDvCheckSubjectService; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; +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.ktg.common.annotation.Log; +import com.ktg.common.core.controller.BaseController; +import com.ktg.common.core.domain.AjaxResult; +import com.ktg.common.enums.BusinessType; +import com.ktg.mes.dv.domain.DvCheckRecord; +import com.ktg.mes.dv.service.IDvCheckRecordService; +import com.ktg.common.utils.poi.ExcelUtil; +import com.ktg.common.core.page.TableDataInfo; + +/** + * 设备点检记录Controller + * + * @author yinjinlu + * @date 2024-12-26 + */ +@RestController +@RequestMapping("/mes/dv/checkrecord") +public class DvCheckRecordController extends BaseController +{ + @Autowired + private IDvCheckRecordService dvCheckRecordService; + + @Autowired + private IDvCheckSubjectService dvCheckSubjectService; + + @Autowired + private IDvCheckRecordLineService dvCheckRecordLineService; + + /** + * 查询设备点检记录列表 + */ + @PreAuthorize("@ss.hasPermi('mes:dv:checkrecord:list')") + @GetMapping("/list") + public TableDataInfo list(DvCheckRecord dvCheckRecord) + { + startPage(); + List list = dvCheckRecordService.selectDvCheckRecordList(dvCheckRecord); + return getDataTable(list); + } + + /** + * 导出设备点检记录列表 + */ + @PreAuthorize("@ss.hasPermi('mes:dv:checkrecord:export')") + @Log(title = "设备点检记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, DvCheckRecord dvCheckRecord) + { + List list = dvCheckRecordService.selectDvCheckRecordList(dvCheckRecord); + ExcelUtil util = new ExcelUtil(DvCheckRecord.class); + util.exportExcel(response, list, "设备点检记录数据"); + } + + /** + * 获取设备点检记录详细信息 + */ + @PreAuthorize("@ss.hasPermi('mes:dv:checkrecord:query')") + @GetMapping(value = "/{recordId}") + public AjaxResult getInfo(@PathVariable("recordId") Long recordId) + { + return AjaxResult.success(dvCheckRecordService.selectDvCheckRecordByRecordId(recordId)); + } + + /** + * 新增设备点检记录 + */ + @PreAuthorize("@ss.hasPermi('mes:dv:checkrecord:add')") + @Log(title = "设备点检记录", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DvCheckRecord dvCheckRecord) + { + dvCheckRecordService.insertDvCheckRecord(dvCheckRecord); + + if(dvCheckRecord.getPlanId()!= null){ + //根据选择的点检计划自动生成对应的行信息 + DvCheckSubject param = new DvCheckSubject(); + param.setPlanId(dvCheckRecord.getPlanId()); + List subjectList = dvCheckSubjectService.selectDvCheckSubjectList(param); + if(!CollectionUtils.isEmpty(subjectList)){ + for(DvCheckSubject subject : subjectList){ + DvCheckRecordLine line = new DvCheckRecordLine(); + line.setRecordId(dvCheckRecord.getRecordId()); + line.setSubjectId(subject.getSubjectId()); + line.setSubjectName(subject.getSubjectName()); + line.setSubjectType(subject.getSubjectType()); + line.setSubjectContent(subject.getSubjectContent()); + line.setSubjectStandard(subject.getSubjectStandard()); + line.setCheckStatus(UserConstants.YES); + } + } + } + + return AjaxResult.success(dvCheckRecord.getRecordId()); + } + + /** + * 修改设备点检记录 + */ + @PreAuthorize("@ss.hasPermi('mes:dv:checkrecord:edit')") + @Log(title = "设备点检记录", businessType = BusinessType.UPDATE) + @Transactional + @PutMapping + public AjaxResult edit(@RequestBody DvCheckRecord dvCheckRecord) + { + if(UserConstants.ORDER_STATUS_FINISHED.equals(dvCheckRecord.getStatus())){ + DvCheckRecordLine param = new DvCheckRecordLine(); + param.setRecordId(dvCheckRecord.getRecordId()); + List lineList = dvCheckRecordLineService.selectDvCheckRecordLineList(param); + if(CollectionUtils.isEmpty(lineList)){ + return AjaxResult.error("请添加设备点检项目结果信息"); + } + } + + DvCheckRecord oldRecord = dvCheckRecordService.selectDvCheckRecordByRecordId(dvCheckRecord.getRecordId()); + if(oldRecord.getPlanId() != null && dvCheckRecord.getPlanId() != null && !dvCheckRecord.getPlanId().equals(oldRecord.getPlanId())){ + dvCheckRecordLineService.deleteDvCheckRecordLineByRecordId(dvCheckRecord.getRecordId()); + //根据选择的点检计划自动生成对应的行信息 + DvCheckSubject param = new DvCheckSubject(); + param.setPlanId(dvCheckRecord.getPlanId()); + List subjectList = dvCheckSubjectService.selectDvCheckSubjectList(param); + if(!CollectionUtils.isEmpty(subjectList)){ + for(DvCheckSubject subject : subjectList){ + DvCheckRecordLine line = new DvCheckRecordLine(); + line.setRecordId(dvCheckRecord.getRecordId()); + line.setSubjectId(subject.getSubjectId()); + line.setSubjectName(subject.getSubjectName()); + line.setSubjectType(subject.getSubjectType()); + line.setSubjectContent(subject.getSubjectContent()); + line.setSubjectStandard(subject.getSubjectStandard()); + line.setCheckStatus(UserConstants.YES); + } + } + } + + return toAjax(dvCheckRecordService.updateDvCheckRecord(dvCheckRecord)); + } + + /** + * 删除设备点检记录 + */ + @PreAuthorize("@ss.hasPermi('mes:dv:checkrecord:remove')") + @Log(title = "设备点检记录", businessType = BusinessType.DELETE) + @Transactional + @DeleteMapping("/{recordIds}") + public AjaxResult remove(@PathVariable Long[] recordIds) + { + + for(Long recordId : recordIds){ + dvCheckRecordLineService.deleteDvCheckRecordLineByRecordId(recordId); + } + + return toAjax(dvCheckRecordService.deleteDvCheckRecordByRecordIds(recordIds)); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvCheckRecordLineController.java b/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvCheckRecordLineController.java new file mode 100644 index 0000000..2bede2a --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvCheckRecordLineController.java @@ -0,0 +1,107 @@ +package com.ktg.mes.dv.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +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.ktg.common.annotation.Log; +import com.ktg.common.core.controller.BaseController; +import com.ktg.common.core.domain.AjaxResult; +import com.ktg.common.enums.BusinessType; +import com.ktg.mes.dv.domain.DvCheckRecordLine; +import com.ktg.mes.dv.service.IDvCheckRecordLineService; +import com.ktg.common.utils.poi.ExcelUtil; +import com.ktg.common.core.page.TableDataInfo; + +/** + * 设备点检记录行Controller + * + * @author yinjinlu + * @date 2024-12-26 + */ +@RestController +@RequestMapping("/mes/dv/checkrecordline") +public class DvCheckRecordLineController extends BaseController +{ + @Autowired + private IDvCheckRecordLineService dvCheckRecordLineService; + + /** + * 查询设备点检记录行列表 + */ + @PreAuthorize("@ss.hasPermi('mes:dv:checkrecord:list')") + @GetMapping("/list") + public TableDataInfo list(DvCheckRecordLine dvCheckRecordLine) + { + startPage(); + List list = dvCheckRecordLineService.selectDvCheckRecordLineList(dvCheckRecordLine); + return getDataTable(list); + } + + /** + * 导出设备点检记录行列表 + */ + @PreAuthorize("@ss.hasPermi('mes:dv:checkrecord:export')") + @Log(title = "设备点检记录行", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, DvCheckRecordLine dvCheckRecordLine) + { + List list = dvCheckRecordLineService.selectDvCheckRecordLineList(dvCheckRecordLine); + ExcelUtil util = new ExcelUtil(DvCheckRecordLine.class); + util.exportExcel(response, list, "设备点检记录行数据"); + } + + /** + * 获取设备点检记录行详细信息 + */ + @PreAuthorize("@ss.hasPermi('mes:dv:checkrecord:query')") + @GetMapping(value = "/{lineId}") + public AjaxResult getInfo(@PathVariable("lineId") Long lineId) + { + return AjaxResult.success(dvCheckRecordLineService.selectDvCheckRecordLineByLineId(lineId)); + } + + /** + * 新增设备点检记录行 + */ + @PreAuthorize("@ss.hasPermi('mes:dv:checkrecord:add')") + @Log(title = "设备点检记录行", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DvCheckRecordLine dvCheckRecordLine) + { + return toAjax(dvCheckRecordLineService.insertDvCheckRecordLine(dvCheckRecordLine)); + } + + /** + * 修改设备点检记录行 + */ + @PreAuthorize("@ss.hasPermi('mes:dv:checkrecord:edit')") + @Log(title = "设备点检记录行", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DvCheckRecordLine dvCheckRecordLine) + { + return toAjax(dvCheckRecordLineService.updateDvCheckRecordLine(dvCheckRecordLine)); + } + + /** + * 删除设备点检记录行 + */ + @PreAuthorize("@ss.hasPermi('mes:dv:checkrecord:remove')") + @Log(title = "设备点检记录行", businessType = BusinessType.DELETE) + @DeleteMapping("/{lineIds}") + public AjaxResult remove(@PathVariable Long[] lineIds) + { + return toAjax(dvCheckRecordLineService.deleteDvCheckRecordLineByLineIds(lineIds)); + } + + + +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/domain/DvCheckRecord.java b/ktg-mes/src/main/java/com/ktg/mes/dv/domain/DvCheckRecord.java new file mode 100644 index 0000000..512d5c4 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/domain/DvCheckRecord.java @@ -0,0 +1,282 @@ +package com.ktg.mes.dv.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ktg.common.annotation.Excel; +import com.ktg.common.core.domain.BaseEntity; + +/** + * 设备点检记录对象 dv_check_record + * + * @author yinjinlu + * @date 2024-12-26 + */ +public class DvCheckRecord extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 计划ID */ + private Long recordId; + + /** 计划ID */ + @Excel(name = "计划ID") + private Long planId; + + /** 计划编码 */ + @Excel(name = "计划编码") + private String planCode; + + /** 计划名称 */ + @Excel(name = "计划名称") + private String planName; + + /** 计划类型 */ + @Excel(name = "计划类型") + private String planType; + + /** 设备ID */ + @Excel(name = "设备ID") + private Long machineryId; + + /** 设备编码 */ + @Excel(name = "设备编码") + private String machineryCode; + + /** 设备名称 */ + @Excel(name = "设备名称") + private String machineryName; + + /** 品牌 */ + @Excel(name = "品牌") + private String machineryBrand; + + /** 规格型号 */ + @Excel(name = "规格型号") + private String machinerySpec; + + /** 点检时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8") + @Excel(name = "点检时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date checkTime; + + private Long userId; + + private String userName; + + private String nickName; + + /** 状态 */ + @Excel(name = "状态") + private String status; + + /** 预留字段1 */ + private String attr1; + + /** 预留字段2 */ + private String attr2; + + /** 预留字段3 */ + private Long attr3; + + /** 预留字段4 */ + private Long attr4; + + public void setRecordId(Long recordId) + { + this.recordId = recordId; + } + + public Long getRecordId() + { + return recordId; + } + public void setPlanId(Long planId) + { + this.planId = planId; + } + + public Long getPlanId() + { + return planId; + } + public void setPlanCode(String planCode) + { + this.planCode = planCode; + } + + public String getPlanCode() + { + return planCode; + } + public void setPlanName(String planName) + { + this.planName = planName; + } + + public String getPlanName() + { + return planName; + } + public void setPlanType(String planType) + { + this.planType = planType; + } + + public String getPlanType() + { + return planType; + } + public void setMachineryId(Long machineryId) + { + this.machineryId = machineryId; + } + + public Long getMachineryId() + { + return machineryId; + } + public void setMachineryCode(String machineryCode) + { + this.machineryCode = machineryCode; + } + + public String getMachineryCode() + { + return machineryCode; + } + public void setMachineryName(String machineryName) + { + this.machineryName = machineryName; + } + + public String getMachineryName() + { + return machineryName; + } + public void setMachineryBrand(String machineryBrand) + { + this.machineryBrand = machineryBrand; + } + + public String getMachineryBrand() + { + return machineryBrand; + } + public void setMachinerySpec(String machinerySpec) + { + this.machinerySpec = machinerySpec; + } + + public String getMachinerySpec() + { + return machinerySpec; + } + public void setCheckTime(Date checkTime) + { + this.checkTime = checkTime; + } + + public Date getCheckTime() + { + return checkTime; + } + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getNickName() { + return nickName; + } + + public void setNickName(String nickName) { + this.nickName = nickName; + } + + public void setAttr1(String attr1) + { + this.attr1 = attr1; + } + + public String getAttr1() + { + return attr1; + } + public void setAttr2(String attr2) + { + this.attr2 = attr2; + } + + public String getAttr2() + { + return attr2; + } + public void setAttr3(Long attr3) + { + this.attr3 = attr3; + } + + public Long getAttr3() + { + return attr3; + } + public void setAttr4(Long attr4) + { + this.attr4 = attr4; + } + + public Long getAttr4() + { + return attr4; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("recordId", getRecordId()) + .append("planId", getPlanId()) + .append("planCode", getPlanCode()) + .append("planName", getPlanName()) + .append("planType", getPlanType()) + .append("machineryId", getMachineryId()) + .append("machineryCode", getMachineryCode()) + .append("machineryName", getMachineryName()) + .append("machineryBrand", getMachineryBrand()) + .append("machinerySpec", getMachinerySpec()) + .append("checkTime", getCheckTime()) + .append("status", getStatus()) + .append("remark", getRemark()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("attr4", getAttr4()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/domain/DvCheckRecordLine.java b/ktg-mes/src/main/java/com/ktg/mes/dv/domain/DvCheckRecordLine.java new file mode 100644 index 0000000..186fe82 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/domain/DvCheckRecordLine.java @@ -0,0 +1,219 @@ +package com.ktg.mes.dv.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ktg.common.annotation.Excel; +import com.ktg.common.core.domain.BaseEntity; + +/** + * 设备点检记录行对象 dv_check_record_line + * + * @author yinjinlu + * @date 2024-12-26 + */ +public class DvCheckRecordLine extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 计划ID */ + private Long lineId; + + /** 计划ID */ + @Excel(name = "计划ID") + private Long recordId; + + /** 项目ID */ + @Excel(name = "项目ID") + private Long subjectId; + + /** 项目编码 */ + @Excel(name = "项目编码") + private String subjectCode; + + /** 项目名称 */ + @Excel(name = "项目名称") + private String subjectName; + + /** 项目类型 */ + @Excel(name = "项目类型") + private String subjectType; + + /** 项目内容 */ + @Excel(name = "项目内容") + private String subjectContent; + + /** 标准 */ + @Excel(name = "标准") + private String subjectStandard; + + /** 点检结果 */ + @Excel(name = "点检结果") + private String checkStatus; + + /** 异常描述 */ + @Excel(name = "异常描述") + private String checkResult; + + /** 预留字段1 */ + private String attr1; + + /** 预留字段2 */ + private String attr2; + + /** 预留字段3 */ + private Long attr3; + + /** 预留字段4 */ + private Long attr4; + + public void setLineId(Long lineId) + { + this.lineId = lineId; + } + + public Long getLineId() + { + return lineId; + } + public void setRecordId(Long recordId) + { + this.recordId = recordId; + } + + public Long getRecordId() + { + return recordId; + } + public void setSubjectId(Long subjectId) + { + this.subjectId = subjectId; + } + + public Long getSubjectId() + { + return subjectId; + } + public void setSubjectCode(String subjectCode) + { + this.subjectCode = subjectCode; + } + + public String getSubjectCode() + { + return subjectCode; + } + public void setSubjectName(String subjectName) + { + this.subjectName = subjectName; + } + + public String getSubjectName() + { + return subjectName; + } + public void setSubjectType(String subjectType) + { + this.subjectType = subjectType; + } + + public String getSubjectType() + { + return subjectType; + } + public void setSubjectContent(String subjectContent) + { + this.subjectContent = subjectContent; + } + + public String getSubjectContent() + { + return subjectContent; + } + public void setSubjectStandard(String subjectStandard) + { + this.subjectStandard = subjectStandard; + } + + public String getSubjectStandard() + { + return subjectStandard; + } + public void setCheckStatus(String checkStatus) + { + this.checkStatus = checkStatus; + } + + public String getCheckStatus() + { + return checkStatus; + } + public void setCheckResult(String checkResult) + { + this.checkResult = checkResult; + } + + public String getCheckResult() + { + return checkResult; + } + public void setAttr1(String attr1) + { + this.attr1 = attr1; + } + + public String getAttr1() + { + return attr1; + } + public void setAttr2(String attr2) + { + this.attr2 = attr2; + } + + public String getAttr2() + { + return attr2; + } + public void setAttr3(Long attr3) + { + this.attr3 = attr3; + } + + public Long getAttr3() + { + return attr3; + } + public void setAttr4(Long attr4) + { + this.attr4 = attr4; + } + + public Long getAttr4() + { + return attr4; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("lineId", getLineId()) + .append("recordId", getRecordId()) + .append("subjectId", getSubjectId()) + .append("subjectCode", getSubjectCode()) + .append("subjectName", getSubjectName()) + .append("subjectType", getSubjectType()) + .append("subjectContent", getSubjectContent()) + .append("subjectStandard", getSubjectStandard()) + .append("checkStatus", getCheckStatus()) + .append("checkResult", getCheckResult()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("attr4", getAttr4()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvCheckRecordLineMapper.java b/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvCheckRecordLineMapper.java new file mode 100644 index 0000000..a847f1c --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvCheckRecordLineMapper.java @@ -0,0 +1,69 @@ +package com.ktg.mes.dv.mapper; + +import java.util.List; +import com.ktg.mes.dv.domain.DvCheckRecordLine; + +/** + * 设备点检记录行Mapper接口 + * + * @author yinjinlu + * @date 2024-12-26 + */ +public interface DvCheckRecordLineMapper +{ + /** + * 查询设备点检记录行 + * + * @param lineId 设备点检记录行主键 + * @return 设备点检记录行 + */ + public DvCheckRecordLine selectDvCheckRecordLineByLineId(Long lineId); + + /** + * 查询设备点检记录行列表 + * + * @param dvCheckRecordLine 设备点检记录行 + * @return 设备点检记录行集合 + */ + public List selectDvCheckRecordLineList(DvCheckRecordLine dvCheckRecordLine); + + /** + * 新增设备点检记录行 + * + * @param dvCheckRecordLine 设备点检记录行 + * @return 结果 + */ + public int insertDvCheckRecordLine(DvCheckRecordLine dvCheckRecordLine); + + /** + * 修改设备点检记录行 + * + * @param dvCheckRecordLine 设备点检记录行 + * @return 结果 + */ + public int updateDvCheckRecordLine(DvCheckRecordLine dvCheckRecordLine); + + /** + * 删除设备点检记录行 + * + * @param lineId 设备点检记录行主键 + * @return 结果 + */ + public int deleteDvCheckRecordLineByLineId(Long lineId); + + /** + * 批量删除设备点检记录行 + * + * @param lineIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDvCheckRecordLineByLineIds(Long[] lineIds); + + /** + * 根据记录ID删除设备点检记录行信息 + * + * @param recordId 记录ID + * @return 结果 + */ + public int deleteDvCheckRecordLineByRecordId(Long recordId); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvCheckRecordMapper.java b/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvCheckRecordMapper.java new file mode 100644 index 0000000..21df09e --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvCheckRecordMapper.java @@ -0,0 +1,61 @@ +package com.ktg.mes.dv.mapper; + +import java.util.List; +import com.ktg.mes.dv.domain.DvCheckRecord; + +/** + * 设备点检记录Mapper接口 + * + * @author yinjinlu + * @date 2024-12-26 + */ +public interface DvCheckRecordMapper +{ + /** + * 查询设备点检记录 + * + * @param recordId 设备点检记录主键 + * @return 设备点检记录 + */ + public DvCheckRecord selectDvCheckRecordByRecordId(Long recordId); + + /** + * 查询设备点检记录列表 + * + * @param dvCheckRecord 设备点检记录 + * @return 设备点检记录集合 + */ + public List selectDvCheckRecordList(DvCheckRecord dvCheckRecord); + + /** + * 新增设备点检记录 + * + * @param dvCheckRecord 设备点检记录 + * @return 结果 + */ + public int insertDvCheckRecord(DvCheckRecord dvCheckRecord); + + /** + * 修改设备点检记录 + * + * @param dvCheckRecord 设备点检记录 + * @return 结果 + */ + public int updateDvCheckRecord(DvCheckRecord dvCheckRecord); + + /** + * 删除设备点检记录 + * + * @param recordId 设备点检记录主键 + * @return 结果 + */ + public int deleteDvCheckRecordByRecordId(Long recordId); + + /** + * 批量删除设备点检记录 + * + * @param recordIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDvCheckRecordByRecordIds(Long[] recordIds); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvCheckRecordLineService.java b/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvCheckRecordLineService.java new file mode 100644 index 0000000..6e9023e --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvCheckRecordLineService.java @@ -0,0 +1,69 @@ +package com.ktg.mes.dv.service; + +import java.util.List; +import com.ktg.mes.dv.domain.DvCheckRecordLine; + +/** + * 设备点检记录行Service接口 + * + * @author yinjinlu + * @date 2024-12-26 + */ +public interface IDvCheckRecordLineService +{ + /** + * 查询设备点检记录行 + * + * @param lineId 设备点检记录行主键 + * @return 设备点检记录行 + */ + public DvCheckRecordLine selectDvCheckRecordLineByLineId(Long lineId); + + /** + * 查询设备点检记录行列表 + * + * @param dvCheckRecordLine 设备点检记录行 + * @return 设备点检记录行集合 + */ + public List selectDvCheckRecordLineList(DvCheckRecordLine dvCheckRecordLine); + + /** + * 新增设备点检记录行 + * + * @param dvCheckRecordLine 设备点检记录行 + * @return 结果 + */ + public int insertDvCheckRecordLine(DvCheckRecordLine dvCheckRecordLine); + + /** + * 修改设备点检记录行 + * + * @param dvCheckRecordLine 设备点检记录行 + * @return 结果 + */ + public int updateDvCheckRecordLine(DvCheckRecordLine dvCheckRecordLine); + + /** + * 批量删除设备点检记录行 + * + * @param lineIds 需要删除的设备点检记录行主键集合 + * @return 结果 + */ + public int deleteDvCheckRecordLineByLineIds(Long[] lineIds); + + /** + * 删除设备点检记录行信息 + * + * @param lineId 设备点检记录行主键 + * @return 结果 + */ + public int deleteDvCheckRecordLineByLineId(Long lineId); + + /** + * 根据记录ID删除设备点检记录行信息 + * + * @param recordId 记录ID + * @return 结果 + */ + public int deleteDvCheckRecordLineByRecordId(Long recordId); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvCheckRecordService.java b/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvCheckRecordService.java new file mode 100644 index 0000000..e13e6cb --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvCheckRecordService.java @@ -0,0 +1,61 @@ +package com.ktg.mes.dv.service; + +import java.util.List; +import com.ktg.mes.dv.domain.DvCheckRecord; + +/** + * 设备点检记录Service接口 + * + * @author yinjinlu + * @date 2024-12-26 + */ +public interface IDvCheckRecordService +{ + /** + * 查询设备点检记录 + * + * @param recordId 设备点检记录主键 + * @return 设备点检记录 + */ + public DvCheckRecord selectDvCheckRecordByRecordId(Long recordId); + + /** + * 查询设备点检记录列表 + * + * @param dvCheckRecord 设备点检记录 + * @return 设备点检记录集合 + */ + public List selectDvCheckRecordList(DvCheckRecord dvCheckRecord); + + /** + * 新增设备点检记录 + * + * @param dvCheckRecord 设备点检记录 + * @return 结果 + */ + public int insertDvCheckRecord(DvCheckRecord dvCheckRecord); + + /** + * 修改设备点检记录 + * + * @param dvCheckRecord 设备点检记录 + * @return 结果 + */ + public int updateDvCheckRecord(DvCheckRecord dvCheckRecord); + + /** + * 批量删除设备点检记录 + * + * @param recordIds 需要删除的设备点检记录主键集合 + * @return 结果 + */ + public int deleteDvCheckRecordByRecordIds(Long[] recordIds); + + /** + * 删除设备点检记录信息 + * + * @param recordId 设备点检记录主键 + * @return 结果 + */ + public int deleteDvCheckRecordByRecordId(Long recordId); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckRecordLineServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckRecordLineServiceImpl.java new file mode 100644 index 0000000..c122bc8 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckRecordLineServiceImpl.java @@ -0,0 +1,101 @@ +package com.ktg.mes.dv.service.impl; + +import java.util.List; +import com.ktg.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ktg.mes.dv.mapper.DvCheckRecordLineMapper; +import com.ktg.mes.dv.domain.DvCheckRecordLine; +import com.ktg.mes.dv.service.IDvCheckRecordLineService; + +/** + * 设备点检记录行Service业务层处理 + * + * @author yinjinlu + * @date 2024-12-26 + */ +@Service +public class DvCheckRecordLineServiceImpl implements IDvCheckRecordLineService +{ + @Autowired + private DvCheckRecordLineMapper dvCheckRecordLineMapper; + + /** + * 查询设备点检记录行 + * + * @param lineId 设备点检记录行主键 + * @return 设备点检记录行 + */ + @Override + public DvCheckRecordLine selectDvCheckRecordLineByLineId(Long lineId) + { + return dvCheckRecordLineMapper.selectDvCheckRecordLineByLineId(lineId); + } + + /** + * 查询设备点检记录行列表 + * + * @param dvCheckRecordLine 设备点检记录行 + * @return 设备点检记录行 + */ + @Override + public List selectDvCheckRecordLineList(DvCheckRecordLine dvCheckRecordLine) + { + return dvCheckRecordLineMapper.selectDvCheckRecordLineList(dvCheckRecordLine); + } + + /** + * 新增设备点检记录行 + * + * @param dvCheckRecordLine 设备点检记录行 + * @return 结果 + */ + @Override + public int insertDvCheckRecordLine(DvCheckRecordLine dvCheckRecordLine) + { + dvCheckRecordLine.setCreateTime(DateUtils.getNowDate()); + return dvCheckRecordLineMapper.insertDvCheckRecordLine(dvCheckRecordLine); + } + + /** + * 修改设备点检记录行 + * + * @param dvCheckRecordLine 设备点检记录行 + * @return 结果 + */ + @Override + public int updateDvCheckRecordLine(DvCheckRecordLine dvCheckRecordLine) + { + dvCheckRecordLine.setUpdateTime(DateUtils.getNowDate()); + return dvCheckRecordLineMapper.updateDvCheckRecordLine(dvCheckRecordLine); + } + + /** + * 批量删除设备点检记录行 + * + * @param lineIds 需要删除的设备点检记录行主键 + * @return 结果 + */ + @Override + public int deleteDvCheckRecordLineByLineIds(Long[] lineIds) + { + return dvCheckRecordLineMapper.deleteDvCheckRecordLineByLineIds(lineIds); + } + + /** + * 删除设备点检记录行信息 + * + * @param lineId 设备点检记录行主键 + * @return 结果 + */ + @Override + public int deleteDvCheckRecordLineByLineId(Long lineId) + { + return dvCheckRecordLineMapper.deleteDvCheckRecordLineByLineId(lineId); + } + + @Override + public int deleteDvCheckRecordLineByRecordId(Long recordId) { + return dvCheckRecordLineMapper.deleteDvCheckRecordLineByRecordId(recordId); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckRecordServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckRecordServiceImpl.java new file mode 100644 index 0000000..f9dc62e --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckRecordServiceImpl.java @@ -0,0 +1,96 @@ +package com.ktg.mes.dv.service.impl; + +import java.util.List; +import com.ktg.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ktg.mes.dv.mapper.DvCheckRecordMapper; +import com.ktg.mes.dv.domain.DvCheckRecord; +import com.ktg.mes.dv.service.IDvCheckRecordService; + +/** + * 设备点检记录Service业务层处理 + * + * @author yinjinlu + * @date 2024-12-26 + */ +@Service +public class DvCheckRecordServiceImpl implements IDvCheckRecordService +{ + @Autowired + private DvCheckRecordMapper dvCheckRecordMapper; + + /** + * 查询设备点检记录 + * + * @param recordId 设备点检记录主键 + * @return 设备点检记录 + */ + @Override + public DvCheckRecord selectDvCheckRecordByRecordId(Long recordId) + { + return dvCheckRecordMapper.selectDvCheckRecordByRecordId(recordId); + } + + /** + * 查询设备点检记录列表 + * + * @param dvCheckRecord 设备点检记录 + * @return 设备点检记录 + */ + @Override + public List selectDvCheckRecordList(DvCheckRecord dvCheckRecord) + { + return dvCheckRecordMapper.selectDvCheckRecordList(dvCheckRecord); + } + + /** + * 新增设备点检记录 + * + * @param dvCheckRecord 设备点检记录 + * @return 结果 + */ + @Override + public int insertDvCheckRecord(DvCheckRecord dvCheckRecord) + { + dvCheckRecord.setCreateTime(DateUtils.getNowDate()); + return dvCheckRecordMapper.insertDvCheckRecord(dvCheckRecord); + } + + /** + * 修改设备点检记录 + * + * @param dvCheckRecord 设备点检记录 + * @return 结果 + */ + @Override + public int updateDvCheckRecord(DvCheckRecord dvCheckRecord) + { + dvCheckRecord.setUpdateTime(DateUtils.getNowDate()); + return dvCheckRecordMapper.updateDvCheckRecord(dvCheckRecord); + } + + /** + * 批量删除设备点检记录 + * + * @param recordIds 需要删除的设备点检记录主键 + * @return 结果 + */ + @Override + public int deleteDvCheckRecordByRecordIds(Long[] recordIds) + { + return dvCheckRecordMapper.deleteDvCheckRecordByRecordIds(recordIds); + } + + /** + * 删除设备点检记录信息 + * + * @param recordId 设备点检记录主键 + * @return 结果 + */ + @Override + public int deleteDvCheckRecordByRecordId(Long recordId) + { + return dvCheckRecordMapper.deleteDvCheckRecordByRecordId(recordId); + } +} diff --git a/ktg-mes/src/main/resources/mapper/dv/DvCheckRecordLineMapper.xml b/ktg-mes/src/main/resources/mapper/dv/DvCheckRecordLineMapper.xml new file mode 100644 index 0000000..2d61105 --- /dev/null +++ b/ktg-mes/src/main/resources/mapper/dv/DvCheckRecordLineMapper.xml @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + select line_id, record_id, subject_id, subject_code, subject_name, subject_type, subject_content, subject_standard, check_status, check_result, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from dv_check_record_line + + + + + + + + insert into dv_check_record_line + + record_id, + subject_id, + subject_code, + subject_name, + subject_type, + subject_content, + subject_standard, + check_status, + check_result, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + + + #{recordId}, + #{subjectId}, + #{subjectCode}, + #{subjectName}, + #{subjectType}, + #{subjectContent}, + #{subjectStandard}, + #{checkStatus}, + #{checkResult}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update dv_check_record_line + + record_id = #{recordId}, + subject_id = #{subjectId}, + subject_code = #{subjectCode}, + subject_name = #{subjectName}, + subject_type = #{subjectType}, + subject_content = #{subjectContent}, + subject_standard = #{subjectStandard}, + check_status = #{checkStatus}, + check_result = #{checkResult}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where line_id = #{lineId} + + + + delete from dv_check_record_line where line_id = #{lineId} + + + + delete from dv_check_record_line where line_id in + + #{lineId} + + + + + delete from dv_check_record_line where record_id = #{recordId} + + + \ No newline at end of file diff --git a/ktg-mes/src/main/resources/mapper/dv/DvCheckRecordMapper.xml b/ktg-mes/src/main/resources/mapper/dv/DvCheckRecordMapper.xml new file mode 100644 index 0000000..32a6c69 --- /dev/null +++ b/ktg-mes/src/main/resources/mapper/dv/DvCheckRecordMapper.xml @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select record_id, plan_id, plan_code, plan_name, plan_type, machinery_id, machinery_code, machinery_name, machinery_brand, machinery_spec, check_time, user_id, user_name, nick_name, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from dv_check_record + + + + + + + + insert into dv_check_record + + plan_id, + plan_code, + plan_name, + plan_type, + machinery_id, + machinery_code, + machinery_name, + machinery_brand, + machinery_spec, + check_time, + user_id, + user_name, + nick_name, + status, + remark, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + + + #{planId}, + #{planCode}, + #{planName}, + #{planType}, + #{machineryId}, + #{machineryCode}, + #{machineryName}, + #{machineryBrand}, + #{machinerySpec}, + #{checkTime}, + #{userId}, + #{userName}, + #{nickName}, + #{status}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update dv_check_record + + plan_id = #{planId}, + plan_code = #{planCode}, + plan_name = #{planName}, + plan_type = #{planType}, + machinery_id = #{machineryId}, + machinery_code = #{machineryCode}, + machinery_name = #{machineryName}, + machinery_brand = #{machineryBrand}, + machinery_spec = #{machinerySpec}, + check_time = #{checkTime}, + user_id = #{userId}, + user_name = #{userName}, + nick_name = #{nickName}, + status = #{status}, + remark = #{remark}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where record_id = #{recordId} + + + + delete from dv_check_record where record_id = #{recordId} + + + + delete from dv_check_record where record_id in + + #{recordId} + + + \ No newline at end of file