diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquFaultDescriptionController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquFaultDescriptionController.java new file mode 100644 index 00000000..c65ae462 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquFaultDescriptionController.java @@ -0,0 +1,97 @@ +package com.op.device.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +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.op.common.log.annotation.Log; +import com.op.common.log.enums.BusinessType; +import com.op.common.security.annotation.RequiresPermissions; +import com.op.device.domain.EquFaultDescription; +import com.op.device.service.IEquFaultDescriptionService; +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.common.core.web.page.TableDataInfo; + +/** + * 故障描述Controller + * + * @author Open Platform + * @date 2023-12-15 + */ +@RestController +@RequestMapping("/faultDescription") +public class EquFaultDescriptionController extends BaseController { + @Autowired + private IEquFaultDescriptionService equFaultDescriptionService; + + /** + * 查询故障描述列表 + */ + @RequiresPermissions("device:faultDescription:list") + @GetMapping("/list") + public TableDataInfo list(EquFaultDescription equFaultDescription) { + startPage(); + List list = equFaultDescriptionService.selectEquFaultDescriptionList(equFaultDescription); + return getDataTable(list); + } + + /** + * 导出故障描述列表 + */ + @RequiresPermissions("device:faultDescription:export") + @Log(title = "故障描述", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, EquFaultDescription equFaultDescription) { + List list = equFaultDescriptionService.selectEquFaultDescriptionList(equFaultDescription); + ExcelUtil util = new ExcelUtil(EquFaultDescription.class); + util.exportExcel(response, list, "故障描述数据"); + } + + /** + * 获取故障描述详细信息 + */ + @RequiresPermissions("device:faultDescription:query") + @GetMapping(value = "/{faultId}") + public AjaxResult getInfo(@PathVariable("faultId") String faultId) { + return success(equFaultDescriptionService.selectEquFaultDescriptionByFaultId(faultId)); + } + + /** + * 新增故障描述 + */ + @RequiresPermissions("device:faultDescription:add") + @Log(title = "故障描述", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody EquFaultDescription equFaultDescription) { + return equFaultDescriptionService.insertEquFaultDescription(equFaultDescription); + } + + /** + * 修改故障描述 + */ + @RequiresPermissions("device:faultDescription:edit") + @Log(title = "故障描述", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody EquFaultDescription equFaultDescription) { + return equFaultDescriptionService.updateEquFaultDescription(equFaultDescription); + } + + /** + * 删除故障描述 + */ + @RequiresPermissions("device:faultDescription:remove") + @Log(title = "故障描述", businessType = BusinessType.DELETE) + @DeleteMapping("/{faultIds}") + public AjaxResult remove(@PathVariable String[] faultIds) { + return toAjax(equFaultDescriptionService.deleteEquFaultDescriptionByFaultIds(faultIds)); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquFaultMeasuresController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquFaultMeasuresController.java new file mode 100644 index 00000000..4449e7f1 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquFaultMeasuresController.java @@ -0,0 +1,97 @@ +package com.op.device.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +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.op.common.log.annotation.Log; +import com.op.common.log.enums.BusinessType; +import com.op.common.security.annotation.RequiresPermissions; +import com.op.device.domain.EquFaultMeasures; +import com.op.device.service.IEquFaultMeasuresService; +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.common.core.web.page.TableDataInfo; + +/** + * 故障维修措施Controller + * + * @author Open Platform + * @date 2023-12-15 + */ +@RestController +@RequestMapping("/faultMeasures") +public class EquFaultMeasuresController extends BaseController { + @Autowired + private IEquFaultMeasuresService equFaultMeasuresService; + + /** + * 查询故障维修措施列表 + */ + @RequiresPermissions("device:faultMeasures:list") + @GetMapping("/list") + public TableDataInfo list(EquFaultMeasures equFaultMeasures) { + startPage(); + List list = equFaultMeasuresService.selectEquFaultMeasuresList(equFaultMeasures); + return getDataTable(list); + } + + /** + * 导出故障维修措施列表 + */ + @RequiresPermissions("device:faultMeasures:export") + @Log(title = "故障维修措施", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, EquFaultMeasures equFaultMeasures) { + List list = equFaultMeasuresService.selectEquFaultMeasuresList(equFaultMeasures); + ExcelUtil util = new ExcelUtil(EquFaultMeasures.class); + util.exportExcel(response, list, "故障维修措施数据"); + } + + /** + * 获取故障维修措施详细信息 + */ + @RequiresPermissions("device:faultMeasures:query") + @GetMapping(value = "/{faultId}") + public AjaxResult getInfo(@PathVariable("faultId") String faultId) { + return success(equFaultMeasuresService.selectEquFaultMeasuresByFaultId(faultId)); + } + + /** + * 新增故障维修措施 + */ + @RequiresPermissions("device:faultMeasures:add") + @Log(title = "故障维修措施", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody EquFaultMeasures equFaultMeasures) { + return equFaultMeasuresService.insertEquFaultMeasures(equFaultMeasures); + } + + /** + * 修改故障维修措施 + */ + @RequiresPermissions("device:faultMeasures:edit") + @Log(title = "故障维修措施", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody EquFaultMeasures equFaultMeasures) { + return equFaultMeasuresService.updateEquFaultMeasures(equFaultMeasures); + } + + /** + * 删除故障维修措施 + */ + @RequiresPermissions("device:faultMeasures:remove") + @Log(title = "故障维修措施", businessType = BusinessType.DELETE) + @DeleteMapping("/{faultIds}") + public AjaxResult remove(@PathVariable String[] faultIds) { + return toAjax(equFaultMeasuresService.deleteEquFaultMeasuresByFaultIds(faultIds)); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquFaultReasonController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquFaultReasonController.java new file mode 100644 index 00000000..0618de64 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquFaultReasonController.java @@ -0,0 +1,97 @@ +package com.op.device.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +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.op.common.log.annotation.Log; +import com.op.common.log.enums.BusinessType; +import com.op.common.security.annotation.RequiresPermissions; +import com.op.device.domain.EquFaultReason; +import com.op.device.service.IEquFaultReasonService; +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.common.core.web.page.TableDataInfo; + +/** + * 故障原因Controller + * + * @author Open Platform + * @date 2023-12-15 + */ +@RestController +@RequestMapping("/faultReason") +public class EquFaultReasonController extends BaseController { + @Autowired + private IEquFaultReasonService equFaultReasonService; + + /** + * 查询故障原因列表 + */ + @RequiresPermissions("device:faultReason:list") + @GetMapping("/list") + public TableDataInfo list(EquFaultReason equFaultReason) { + startPage(); + List list = equFaultReasonService.selectEquFaultReasonList(equFaultReason); + return getDataTable(list); + } + + /** + * 导出故障原因列表 + */ + @RequiresPermissions("device:faultReason:export") + @Log(title = "故障原因", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, EquFaultReason equFaultReason) { + List list = equFaultReasonService.selectEquFaultReasonList(equFaultReason); + ExcelUtil util = new ExcelUtil(EquFaultReason.class); + util.exportExcel(response, list, "故障原因数据"); + } + + /** + * 获取故障原因详细信息 + */ + @RequiresPermissions("device:faultReason:query") + @GetMapping(value = "/{faultId}") + public AjaxResult getInfo(@PathVariable("faultId") String faultId) { + return success(equFaultReasonService.selectEquFaultReasonByFaultId(faultId)); + } + + /** + * 新增故障原因 + */ + @RequiresPermissions("device:faultReason:add") + @Log(title = "故障原因", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody EquFaultReason equFaultReason) { + return equFaultReasonService.insertEquFaultReason(equFaultReason); + } + + /** + * 修改故障原因 + */ + @RequiresPermissions("device:faultReason:edit") + @Log(title = "故障原因", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody EquFaultReason equFaultReason) { + return equFaultReasonService.updateEquFaultReason(equFaultReason); + } + + /** + * 删除故障原因 + */ + @RequiresPermissions("device:faultReason:remove") + @Log(title = "故障原因", businessType = BusinessType.DELETE) + @DeleteMapping("/{faultIds}") + public AjaxResult remove(@PathVariable String[] faultIds) { + return toAjax(equFaultReasonService.deleteEquFaultReasonByFaultIds(faultIds)); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java index 9d787425..d9fc5dae 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java @@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse; import com.op.device.domain.EquEquipment; import com.op.device.domain.EquTeamUser; +import com.op.device.domain.Equipment; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -137,4 +138,13 @@ public class EquRepairOrderController extends BaseController { return getDataTable(list); } + /** + * 查询组线 + */ + @GetMapping("/getGroupLineList") + public TableDataInfo getGroupLineList() { + List list = equRepairOrderService.selectGroupLineList(); + return getDataTable(list); + } + } diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairWorkOrderController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairWorkOrderController.java index 5f687dd5..ff6b00af 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairWorkOrderController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairWorkOrderController.java @@ -3,6 +3,7 @@ package com.op.device.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.op.device.domain.EquEquipment; import com.op.device.domain.EquTeamUser; import com.op.device.service.IDevicePDAService; import com.op.device.service.IEquOutsourceWorkService; diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultDescription.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultDescription.java new file mode 100644 index 00000000..042bf483 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultDescription.java @@ -0,0 +1,214 @@ +package com.op.device.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + +import java.util.Date; +import java.util.List; + +/** + * 故障描述对象 equ_fault_description + * + * @author Open Platform + * @date 2023-12-15 + */ +public class EquFaultDescription extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 故障描述主键 */ + private String faultId; + + /** 故障描述编码 */ + @Excel(name = "故障描述编码") + private String faultCode; + + /** 故障描述类型 */ + @Excel(name = "故障描述类型") + private String faultType; + + /** 故障描述子类 */ + @Excel(name = "故障描述子类") + private String faultSubclass; + + /** 备注 */ + @Excel(name = "备注") + private String faultRemark; + + /** 工厂编码 */ + @Excel(name = "工厂编码") + private String factoryCode; + + /** 备用字段1 */ + @Excel(name = "备用字段1") + private String attr1; + + /** 备用字段2 */ + @Excel(name = "备用字段2") + private String attr2; + + /** 备用字段3 */ + @Excel(name = "备用字段3") + private String attr3; + + /** 删除标志 */ + private String delFlag; + + // 创建日期范围list + private List createTimeArray; + + // 更新日期范围list + private List updateTimeArray; + + // 更新日期开始 + private String updateTimeStart; + + // 更新日期结束 + private String updateTimeEnd; + + // 创建日期开始 + private String createTimeStart; + + // 创建日期结束 + private String createTimeEnd; + + public void setFaultId(String faultId) { + this.faultId = faultId; + } + + public String getFaultId() { + return faultId; + } + public void setFaultCode(String faultCode) { + this.faultCode = faultCode; + } + + public String getFaultCode() { + return faultCode; + } + public void setFaultType(String faultType) { + this.faultType = faultType; + } + + public String getFaultType() { + return faultType; + } + public void setFaultSubclass(String faultSubclass) { + this.faultSubclass = faultSubclass; + } + + public String getFaultSubclass() { + return faultSubclass; + } + public void setFaultRemark(String faultRemark) { + this.faultRemark = faultRemark; + } + + public String getFaultRemark() { + return faultRemark; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + 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(String attr3) { + this.attr3 = attr3; + } + + public String getAttr3() { + return attr3; + } + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + + public List getCreateTimeArray() { + return createTimeArray; + } + + public void setCreateTimeArray(List createTimeArray) { + this.createTimeArray = createTimeArray; + } + + public List getUpdateTimeArray() { + return updateTimeArray; + } + + public void setUpdateTimeArray(List updateTimeArray) { + this.updateTimeArray = updateTimeArray; + } + + public String getUpdateTimeStart() { + return updateTimeStart; + } + + public void setUpdateTimeStart(String updateTimeStart) { + this.updateTimeStart = updateTimeStart; + } + + public String getUpdateTimeEnd() { + return updateTimeEnd; + } + + public void setUpdateTimeEnd(String updateTimeEnd) { + this.updateTimeEnd = updateTimeEnd; + } + + public String getCreateTimeStart() { + return createTimeStart; + } + + public void setCreateTimeStart(String createTimeStart) { + this.createTimeStart = createTimeStart; + } + + public String getCreateTimeEnd() { + return createTimeEnd; + } + + public void setCreateTimeEnd(String createTimeEnd) { + this.createTimeEnd = createTimeEnd; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("faultId", getFaultId()) + .append("faultCode", getFaultCode()) + .append("faultType", getFaultType()) + .append("faultSubclass", getFaultSubclass()) + .append("faultRemark", getFaultRemark()) + .append("factoryCode", getFactoryCode()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultMeasures.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultMeasures.java new file mode 100644 index 00000000..ed3f1293 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultMeasures.java @@ -0,0 +1,214 @@ +package com.op.device.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + +import java.util.Date; +import java.util.List; + +/** + * 故障维修措施对象 equ_fault_measures + * + * @author Open Platform + * @date 2023-12-15 + */ +public class EquFaultMeasures extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 故障维修措施主键 */ + private String faultId; + + /** 故障维修措施编码 */ + @Excel(name = "故障维修措施编码") + private String faultCode; + + /** 故障维修措施类型 */ + @Excel(name = "故障维修措施类型") + private String faultType; + + /** 故障维修措施子类 */ + @Excel(name = "故障维修措施子类") + private String faultSubclass; + + /** 备注 */ + @Excel(name = "备注") + private String faultRemark; + + /** 工厂编码 */ + @Excel(name = "工厂编码") + private String factoryCode; + + /** 备用字段1 */ + @Excel(name = "备用字段1") + private String attr1; + + /** 备用字段2 */ + @Excel(name = "备用字段2") + private String attr2; + + /** 备用字段3 */ + @Excel(name = "备用字段3") + private String attr3; + + /** 删除标志 */ + private String delFlag; + + // 创建日期范围list + private List createTimeArray; + + // 更新日期范围list + private List updateTimeArray; + + // 更新日期开始 + private String updateTimeStart; + + // 更新日期结束 + private String updateTimeEnd; + + // 创建日期开始 + private String createTimeStart; + + // 创建日期结束 + private String createTimeEnd; + + public void setFaultId(String faultId) { + this.faultId = faultId; + } + + public String getFaultId() { + return faultId; + } + public void setFaultCode(String faultCode) { + this.faultCode = faultCode; + } + + public String getFaultCode() { + return faultCode; + } + public void setFaultType(String faultType) { + this.faultType = faultType; + } + + public String getFaultType() { + return faultType; + } + public void setFaultSubclass(String faultSubclass) { + this.faultSubclass = faultSubclass; + } + + public String getFaultSubclass() { + return faultSubclass; + } + public void setFaultRemark(String faultRemark) { + this.faultRemark = faultRemark; + } + + public String getFaultRemark() { + return faultRemark; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + 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(String attr3) { + this.attr3 = attr3; + } + + public String getAttr3() { + return attr3; + } + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + + public List getCreateTimeArray() { + return createTimeArray; + } + + public void setCreateTimeArray(List createTimeArray) { + this.createTimeArray = createTimeArray; + } + + public List getUpdateTimeArray() { + return updateTimeArray; + } + + public void setUpdateTimeArray(List updateTimeArray) { + this.updateTimeArray = updateTimeArray; + } + + public String getUpdateTimeStart() { + return updateTimeStart; + } + + public void setUpdateTimeStart(String updateTimeStart) { + this.updateTimeStart = updateTimeStart; + } + + public String getUpdateTimeEnd() { + return updateTimeEnd; + } + + public void setUpdateTimeEnd(String updateTimeEnd) { + this.updateTimeEnd = updateTimeEnd; + } + + public String getCreateTimeStart() { + return createTimeStart; + } + + public void setCreateTimeStart(String createTimeStart) { + this.createTimeStart = createTimeStart; + } + + public String getCreateTimeEnd() { + return createTimeEnd; + } + + public void setCreateTimeEnd(String createTimeEnd) { + this.createTimeEnd = createTimeEnd; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("faultId", getFaultId()) + .append("faultCode", getFaultCode()) + .append("faultType", getFaultType()) + .append("faultSubclass", getFaultSubclass()) + .append("faultRemark", getFaultRemark()) + .append("factoryCode", getFactoryCode()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultReason.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultReason.java new file mode 100644 index 00000000..f9437ead --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultReason.java @@ -0,0 +1,214 @@ +package com.op.device.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + +import java.util.Date; +import java.util.List; + +/** + * 故障原因对象 equ_fault_reason + * + * @author Open Platform + * @date 2023-12-15 + */ +public class EquFaultReason extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 故障原因主键 */ + private String faultId; + + /** 故障原因编码 */ + @Excel(name = "故障原因编码") + private String faultCode; + + /** 故障原因类型 */ + @Excel(name = "故障原因类型") + private String faultType; + + /** 故障原因子类 */ + @Excel(name = "故障原因子类") + private String faultSubclass; + + /** 备注 */ + @Excel(name = "备注") + private String faultRemark; + + /** 工厂编码 */ + @Excel(name = "工厂编码") + private String factoryCode; + + /** 备用字段1 */ + @Excel(name = "备用字段1") + private String attr1; + + /** 备用字段2 */ + @Excel(name = "备用字段2") + private String attr2; + + /** 备用字段3 */ + @Excel(name = "备用字段3") + private String attr3; + + /** 删除标志 */ + private String delFlag; + + // 创建日期范围list + private List createTimeArray; + + // 更新日期范围list + private List updateTimeArray; + + // 更新日期开始 + private String updateTimeStart; + + // 更新日期结束 + private String updateTimeEnd; + + // 创建日期开始 + private String createTimeStart; + + // 创建日期结束 + private String createTimeEnd; + + public void setFaultId(String faultId) { + this.faultId = faultId; + } + + public String getFaultId() { + return faultId; + } + public void setFaultCode(String faultCode) { + this.faultCode = faultCode; + } + + public String getFaultCode() { + return faultCode; + } + public void setFaultType(String faultType) { + this.faultType = faultType; + } + + public String getFaultType() { + return faultType; + } + public void setFaultSubclass(String faultSubclass) { + this.faultSubclass = faultSubclass; + } + + public String getFaultSubclass() { + return faultSubclass; + } + public void setFaultRemark(String faultRemark) { + this.faultRemark = faultRemark; + } + + public String getFaultRemark() { + return faultRemark; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + 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(String attr3) { + this.attr3 = attr3; + } + + public String getAttr3() { + return attr3; + } + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + + public List getCreateTimeArray() { + return createTimeArray; + } + + public void setCreateTimeArray(List createTimeArray) { + this.createTimeArray = createTimeArray; + } + + public List getUpdateTimeArray() { + return updateTimeArray; + } + + public void setUpdateTimeArray(List updateTimeArray) { + this.updateTimeArray = updateTimeArray; + } + + public String getUpdateTimeStart() { + return updateTimeStart; + } + + public void setUpdateTimeStart(String updateTimeStart) { + this.updateTimeStart = updateTimeStart; + } + + public String getUpdateTimeEnd() { + return updateTimeEnd; + } + + public void setUpdateTimeEnd(String updateTimeEnd) { + this.updateTimeEnd = updateTimeEnd; + } + + public String getCreateTimeStart() { + return createTimeStart; + } + + public void setCreateTimeStart(String createTimeStart) { + this.createTimeStart = createTimeStart; + } + + public String getCreateTimeEnd() { + return createTimeEnd; + } + + public void setCreateTimeEnd(String createTimeEnd) { + this.createTimeEnd = createTimeEnd; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("faultId", getFaultId()) + .append("faultCode", getFaultCode()) + .append("faultType", getFaultType()) + .append("faultSubclass", getFaultSubclass()) + .append("faultRemark", getFaultRemark()) + .append("factoryCode", getFactoryCode()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultType.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultType.java index c389e4dc..8c980ec8 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultType.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultType.java @@ -10,7 +10,7 @@ import java.util.List; /** * 故障类型维护对象 equ_fault_type - * + * * @author wws * @date 2023-10-12 */ @@ -216,20 +216,20 @@ public class EquFaultType extends BaseEntity { @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("faultId", getFaultId()) - .append("faultCode", getFaultCode()) - .append("faultType", getFaultType()) - .append("faultSubclass", getFaultSubclass()) - .append("faultRemark", getFaultRemark()) - .append("factoryCode", getFactoryCode()) - .append("attr1", getAttr1()) - .append("attr2", getAttr2()) - .append("attr3", getAttr3()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); + .append("faultId", getFaultId()) + .append("faultCode", getFaultCode()) + .append("faultType", getFaultType()) + .append("faultSubclass", getFaultSubclass()) + .append("faultRemark", getFaultRemark()) + .append("factoryCode", getFactoryCode()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); } } diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquEquipmentMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquEquipmentMapper.java index 0363c83a..e258c0d1 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquEquipmentMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquEquipmentMapper.java @@ -66,7 +66,7 @@ public interface EquEquipmentMapper { List getEquipmentTypeList(EquEquipment equEquipment); // 查询设备组线 - List selectEqupmentGroupLine(); + List selectEquipmentGroupLine(); // 查询设备信息 List selectEquipmentList(EquEquipment equEquipment); diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultDescriptionMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultDescriptionMapper.java new file mode 100644 index 00000000..6b9ecfdf --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultDescriptionMapper.java @@ -0,0 +1,66 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.EquFaultDescription; +import com.op.device.domain.EquFaultType; + +/** + * 故障描述Mapper接口 + * + * @author Open Platform + * @date 2023-12-15 + */ +public interface EquFaultDescriptionMapper { + /** + * 查询故障描述 + * + * @param faultId 故障描述主键 + * @return 故障描述 + */ + public EquFaultDescription selectEquFaultDescriptionByFaultId(String faultId); + + /** + * 查询故障描述列表 + * + * @param equFaultDescription 故障描述 + * @return 故障描述集合 + */ + public List selectEquFaultDescriptionList(EquFaultDescription equFaultDescription); + + /** + * 新增故障描述 + * + * @param equFaultDescription 故障描述 + * @return 结果 + */ + public int insertEquFaultDescription(EquFaultDescription equFaultDescription); + + /** + * 修改故障描述 + * + * @param equFaultDescription 故障描述 + * @return 结果 + */ + public int updateEquFaultDescription(EquFaultDescription equFaultDescription); + + /** + * 删除故障描述 + * + * @param faultId 故障描述主键 + * @return 结果 + */ + public int deleteEquFaultDescriptionByFaultId(String faultId); + + /** + * 批量删除故障描述 + * + * @param faultIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEquFaultDescriptionByFaultIds(String[] faultIds); + + int selectSerialNumber(); + + List selectFaultDescriptionList(EquFaultDescription equFaultDescription); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultMeasuresMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultMeasuresMapper.java new file mode 100644 index 00000000..f508785c --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultMeasuresMapper.java @@ -0,0 +1,66 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.EquFaultMeasures; +import com.op.device.domain.EquFaultType; + +/** + * 故障维修措施Mapper接口 + * + * @author Open Platform + * @date 2023-12-15 + */ +public interface EquFaultMeasuresMapper { + /** + * 查询故障维修措施 + * + * @param faultId 故障维修措施主键 + * @return 故障维修措施 + */ + public EquFaultMeasures selectEquFaultMeasuresByFaultId(String faultId); + + /** + * 查询故障维修措施列表 + * + * @param equFaultMeasures 故障维修措施 + * @return 故障维修措施集合 + */ + public List selectEquFaultMeasuresList(EquFaultMeasures equFaultMeasures); + + /** + * 新增故障维修措施 + * + * @param equFaultMeasures 故障维修措施 + * @return 结果 + */ + public int insertEquFaultMeasures(EquFaultMeasures equFaultMeasures); + + /** + * 修改故障维修措施 + * + * @param equFaultMeasures 故障维修措施 + * @return 结果 + */ + public int updateEquFaultMeasures(EquFaultMeasures equFaultMeasures); + + /** + * 删除故障维修措施 + * + * @param faultId 故障维修措施主键 + * @return 结果 + */ + public int deleteEquFaultMeasuresByFaultId(String faultId); + + /** + * 批量删除故障维修措施 + * + * @param faultIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEquFaultMeasuresByFaultIds(String[] faultIds); + + List selectFaultMeasuresList(EquFaultMeasures equFaultMeasures); + + int selectSerialNumber(); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultReasonMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultReasonMapper.java new file mode 100644 index 00000000..0b91828c --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultReasonMapper.java @@ -0,0 +1,66 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.EquFaultReason; +import com.op.device.domain.EquFaultType; + +/** + * 故障原因Mapper接口 + * + * @author Open Platform + * @date 2023-12-15 + */ +public interface EquFaultReasonMapper { + /** + * 查询故障原因 + * + * @param faultId 故障原因主键 + * @return 故障原因 + */ + public EquFaultReason selectEquFaultReasonByFaultId(String faultId); + + /** + * 查询故障原因列表 + * + * @param equFaultReason 故障原因 + * @return 故障原因集合 + */ + public List selectEquFaultReasonList(EquFaultReason equFaultReason); + + /** + * 新增故障原因 + * + * @param equFaultReason 故障原因 + * @return 结果 + */ + public int insertEquFaultReason(EquFaultReason equFaultReason); + + /** + * 修改故障原因 + * + * @param equFaultReason 故障原因 + * @return 结果 + */ + public int updateEquFaultReason(EquFaultReason equFaultReason); + + /** + * 删除故障原因 + * + * @param faultId 故障原因主键 + * @return 结果 + */ + public int deleteEquFaultReasonByFaultId(String faultId); + + /** + * 批量删除故障原因 + * + * @param faultIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEquFaultReasonByFaultIds(String[] faultIds); + + List selectFaultReasonList(EquFaultType checkQuery); + + int selectSerialNumber(); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultTypeMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultTypeMapper.java index bfd7ebee..c084ab13 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultTypeMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultTypeMapper.java @@ -8,14 +8,14 @@ import com.op.device.domain.EquRepairWorkOrder; /** * 故障类型维护Mapper接口 - * + * * @author wws * @date 2023-10-12 */ public interface EquFaultTypeMapper { /** * 查询故障类型维护 - * + * * @param faultId 故障类型维护主键 * @return 故障类型维护 */ @@ -23,7 +23,7 @@ public interface EquFaultTypeMapper { /** * 查询故障类型维护列表 - * + * * @param equFaultType 故障类型维护 * @return 故障类型维护集合 */ @@ -31,7 +31,7 @@ public interface EquFaultTypeMapper { /** * 新增故障类型维护 - * + * * @param equFaultType 故障类型维护 * @return 结果 */ @@ -39,7 +39,7 @@ public interface EquFaultTypeMapper { /** * 修改故障类型维护 - * + * * @param equFaultType 故障类型维护 * @return 结果 */ @@ -47,7 +47,7 @@ public interface EquFaultTypeMapper { /** * 删除故障类型维护-逻辑 - * + * * @param faultId 故障类型维护主键 * @return 结果 */ @@ -55,7 +55,7 @@ public interface EquFaultTypeMapper { /** * 批量删除故障类型维护-逻辑 - * + * * @param faultIds 需要删除的数据主键集合 * @return 结果 */ @@ -65,9 +65,9 @@ public interface EquFaultTypeMapper { * 获取流水号 * @return */ - int selectSerialNumber(); + int selectSerialNumber(); - //故障报修第一级 + //故障报修第一级 @DS("master") List selectFirstLevelList(EquRepairWorkOrder equRepairWorkOrder); diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultDescriptionService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultDescriptionService.java new file mode 100644 index 00000000..5609eb63 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultDescriptionService.java @@ -0,0 +1,62 @@ +package com.op.device.service; + +import java.util.List; + +import com.op.common.core.web.domain.AjaxResult; +import com.op.device.domain.EquFaultDescription; + +/** + * 故障描述Service接口 + * + * @author Open Platform + * @date 2023-12-15 + */ +public interface IEquFaultDescriptionService { + /** + * 查询故障描述 + * + * @param faultId 故障描述主键 + * @return 故障描述 + */ + public EquFaultDescription selectEquFaultDescriptionByFaultId(String faultId); + + /** + * 查询故障描述列表 + * + * @param equFaultDescription 故障描述 + * @return 故障描述集合 + */ + public List selectEquFaultDescriptionList(EquFaultDescription equFaultDescription); + + /** + * 新增故障描述 + * + * @param equFaultDescription 故障描述 + * @return 结果 + */ + public AjaxResult insertEquFaultDescription(EquFaultDescription equFaultDescription); + + /** + * 修改故障描述 + * + * @param equFaultDescription 故障描述 + * @return 结果 + */ + public AjaxResult updateEquFaultDescription(EquFaultDescription equFaultDescription); + + /** + * 批量删除故障描述 + * + * @param faultIds 需要删除的故障描述主键集合 + * @return 结果 + */ + public int deleteEquFaultDescriptionByFaultIds(String[] faultIds); + + /** + * 删除故障描述信息 + * + * @param faultId 故障描述主键 + * @return 结果 + */ + public int deleteEquFaultDescriptionByFaultId(String faultId); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultMeasuresService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultMeasuresService.java new file mode 100644 index 00000000..9537be07 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultMeasuresService.java @@ -0,0 +1,62 @@ +package com.op.device.service; + +import java.util.List; + +import com.op.common.core.web.domain.AjaxResult; +import com.op.device.domain.EquFaultMeasures; + +/** + * 故障维修措施Service接口 + * + * @author Open Platform + * @date 2023-12-15 + */ +public interface IEquFaultMeasuresService { + /** + * 查询故障维修措施 + * + * @param faultId 故障维修措施主键 + * @return 故障维修措施 + */ + public EquFaultMeasures selectEquFaultMeasuresByFaultId(String faultId); + + /** + * 查询故障维修措施列表 + * + * @param equFaultMeasures 故障维修措施 + * @return 故障维修措施集合 + */ + public List selectEquFaultMeasuresList(EquFaultMeasures equFaultMeasures); + + /** + * 新增故障维修措施 + * + * @param equFaultMeasures 故障维修措施 + * @return 结果 + */ + public AjaxResult insertEquFaultMeasures(EquFaultMeasures equFaultMeasures); + + /** + * 修改故障维修措施 + * + * @param equFaultMeasures 故障维修措施 + * @return 结果 + */ + public AjaxResult updateEquFaultMeasures(EquFaultMeasures equFaultMeasures); + + /** + * 批量删除故障维修措施 + * + * @param faultIds 需要删除的故障维修措施主键集合 + * @return 结果 + */ + public int deleteEquFaultMeasuresByFaultIds(String[] faultIds); + + /** + * 删除故障维修措施信息 + * + * @param faultId 故障维修措施主键 + * @return 结果 + */ + public int deleteEquFaultMeasuresByFaultId(String faultId); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultReasonService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultReasonService.java new file mode 100644 index 00000000..c48f085d --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultReasonService.java @@ -0,0 +1,62 @@ +package com.op.device.service; + +import java.util.List; + +import com.op.common.core.web.domain.AjaxResult; +import com.op.device.domain.EquFaultReason; + +/** + * 故障原因Service接口 + * + * @author Open Platform + * @date 2023-12-15 + */ +public interface IEquFaultReasonService { + /** + * 查询故障原因 + * + * @param faultId 故障原因主键 + * @return 故障原因 + */ + public EquFaultReason selectEquFaultReasonByFaultId(String faultId); + + /** + * 查询故障原因列表 + * + * @param equFaultReason 故障原因 + * @return 故障原因集合 + */ + public List selectEquFaultReasonList(EquFaultReason equFaultReason); + + /** + * 新增故障原因 + * + * @param equFaultReason 故障原因 + * @return 结果 + */ + public AjaxResult insertEquFaultReason(EquFaultReason equFaultReason); + + /** + * 修改故障原因 + * + * @param equFaultReason 故障原因 + * @return 结果 + */ + public AjaxResult updateEquFaultReason(EquFaultReason equFaultReason); + + /** + * 批量删除故障原因 + * + * @param faultIds 需要删除的故障原因主键集合 + * @return 结果 + */ + public int deleteEquFaultReasonByFaultIds(String[] faultIds); + + /** + * 删除故障原因信息 + * + * @param faultId 故障原因主键 + * @return 结果 + */ + public int deleteEquFaultReasonByFaultId(String faultId); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultTypeService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultTypeService.java index fef90657..a55b6697 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultTypeService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquFaultTypeService.java @@ -7,14 +7,14 @@ import com.op.device.domain.EquFaultType; /** * 故障类型维护Service接口 - * + * * @author wws * @date 2023-10-12 */ public interface IEquFaultTypeService { /** * 查询故障类型维护 - * + * * @param faultId 故障类型维护主键 * @return 故障类型维护 */ @@ -22,7 +22,7 @@ public interface IEquFaultTypeService { /** * 查询故障类型维护列表 - * + * * @param equFaultType 故障类型维护 * @return 故障类型维护集合 */ @@ -30,7 +30,7 @@ public interface IEquFaultTypeService { /** * 新增故障类型维护 - * + * * @param equFaultType 故障类型维护 * @return 结果 */ @@ -38,7 +38,7 @@ public interface IEquFaultTypeService { /** * 修改故障类型维护 - * + * * @param equFaultType 故障类型维护 * @return 结果 */ @@ -46,7 +46,7 @@ public interface IEquFaultTypeService { /** * 批量删除故障类型维护 - * + * * @param faultIds 需要删除的故障类型维护主键集合 * @return 结果 */ @@ -54,7 +54,7 @@ public interface IEquFaultTypeService { /** * 删除故障类型维护信息 - * + * * @param faultId 故障类型维护主键 * @return 结果 */ diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java index 097698ab..b11aac6e 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java @@ -77,4 +77,7 @@ public interface IEquRepairOrderService { //查询报修人员列表 List getRepairPersonList(EquTeamUser equTeamUser); + + //查询组线 + public List selectGroupLineList(); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairWorkOrderService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairWorkOrderService.java index 71ff46df..db342700 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairWorkOrderService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairWorkOrderService.java @@ -2,6 +2,7 @@ package com.op.device.service; import java.util.List; +import com.op.device.domain.EquEquipment; import com.op.device.domain.EquRepairWorkOrder; import com.op.device.domain.EquTeamUser; diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultDescriptionServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultDescriptionServiceImpl.java new file mode 100644 index 00000000..38107214 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultDescriptionServiceImpl.java @@ -0,0 +1,169 @@ +package com.op.device.service.impl; + +import java.text.SimpleDateFormat; +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.context.SecurityContextHolder; +import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.uuid.IdUtils; +import com.op.common.core.web.domain.AjaxResult; +import com.op.device.domain.EquFaultType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.device.mapper.EquFaultDescriptionMapper; +import com.op.device.domain.EquFaultDescription; +import com.op.device.service.IEquFaultDescriptionService; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; + +import static com.op.common.core.web.domain.AjaxResult.error; +import static com.op.common.core.web.domain.AjaxResult.success; + +/** + * 故障描述Service业务层处理 + * + * @author Open Platform + * @date 2023-12-15 + */ +@Service +public class EquFaultDescriptionServiceImpl implements IEquFaultDescriptionService { + @Autowired + private EquFaultDescriptionMapper equFaultDescriptionMapper; + + /** + * 查询故障描述 + * + * @param faultId 故障描述主键 + * @return 故障描述 + */ + @Override + @DS("#header.poolName") + public EquFaultDescription selectEquFaultDescriptionByFaultId(String faultId) { + return equFaultDescriptionMapper.selectEquFaultDescriptionByFaultId(faultId); + } + + /** + * 查询故障描述列表 + * + * @param equFaultDescription 故障描述 + * @return 故障描述 + */ + @Override + @DS("#header.poolName") + public List selectEquFaultDescriptionList(EquFaultDescription equFaultDescription) { + // 创建时间不为空 + if (equFaultDescription.getCreateTimeArray() != null) { + // 设置创建日期开始和结束值 + if (equFaultDescription.getCreateTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + equFaultDescription.setCreateTimeStart(formatter.format(equFaultDescription.getCreateTimeArray().get(0))); + equFaultDescription.setCreateTimeEnd(formatter.format(equFaultDescription.getCreateTimeArray().get(1))); + } + } + // 更新时间不为空 + if (equFaultDescription.getUpdateTimeArray() != null) { + // 设置更新日期开始和结束 + if (equFaultDescription.getUpdateTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + equFaultDescription.setUpdateTimeStart(formatter.format(equFaultDescription.getUpdateTimeArray().get(0))); + equFaultDescription.setUpdateTimeEnd(formatter.format(equFaultDescription.getUpdateTimeArray().get(1))); + } + } + return equFaultDescriptionMapper.selectEquFaultDescriptionList(equFaultDescription); + } + + /** + * 新增故障描述 + * + * @param equFaultDescription 故障描述 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public AjaxResult insertEquFaultDescription(EquFaultDescription equFaultDescription) { + // 校验 + EquFaultDescription checkQuery = new EquFaultDescription(); + checkQuery.setFaultType(equFaultDescription.getFaultType()); + checkQuery.setFaultSubclass(equFaultDescription.getFaultSubclass()); + List check = equFaultDescriptionMapper.selectEquFaultDescriptionList(checkQuery); + if (check.size() > 0) { + return error(500, "故障描述已存在！不可添加！"); + } + + //获取当前所选工厂 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + String str = request.getHeader(key.substring(8)); + int index = str.indexOf("_"); + String factory = str.substring(index + 1); + + // 获取检查项流水号 + String serialNum = String.format("%04d", equFaultDescriptionMapper.selectSerialNumber()); + + // 处理故障信息 + equFaultDescription.setFaultId(IdUtils.fastSimpleUUID());// id + equFaultDescription.setFaultCode("DES" + serialNum);// 故障编码 + equFaultDescription.setFactoryCode(factory);// 工厂 + equFaultDescription.setCreateBy(SecurityContextHolder.getUserName()); + equFaultDescription.setCreateTime(DateUtils.getNowDate()); + equFaultDescription.setUpdateBy(SecurityContextHolder.getUserName()); + equFaultDescription.setUpdateTime(DateUtils.getNowDate()); + equFaultDescriptionMapper.insertEquFaultDescription(equFaultDescription); + return success("新增故障描述成功！"); + } + + /** + * 修改故障描述 + * + * @param equFaultDescription 故障描述 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public AjaxResult updateEquFaultDescription(EquFaultDescription equFaultDescription) { + // 校验 + EquFaultDescription checkQuery = new EquFaultDescription(); + checkQuery.setFaultType(equFaultDescription.getFaultType()); + checkQuery.setFaultSubclass(equFaultDescription.getFaultSubclass()); + List check = equFaultDescriptionMapper.selectEquFaultDescriptionList(checkQuery); + if (check.size() > 0) { + for (EquFaultDescription equFaultDescription1 : check) { + if (!equFaultDescription1.getFaultCode().equals(equFaultDescription.getFaultCode())){ + return error(500, "故障子类已存在！修改失败！"); + } + } + } + equFaultDescription.setUpdateBy(SecurityContextHolder.getUserName()); + equFaultDescription.setUpdateTime(DateUtils.getNowDate()); + // 插入数据库 + equFaultDescriptionMapper.updateEquFaultDescription(equFaultDescription); + return success("修改成功！"); + } + + /** + * 批量删除故障描述 + * + * @param faultIds 需要删除的故障描述主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquFaultDescriptionByFaultIds(String[] faultIds) { + return equFaultDescriptionMapper.deleteEquFaultDescriptionByFaultIds(faultIds); + } + + /** + * 删除故障描述信息 + * + * @param faultId 故障描述主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquFaultDescriptionByFaultId(String faultId) { + return equFaultDescriptionMapper.deleteEquFaultDescriptionByFaultId(faultId); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultMeasuresServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultMeasuresServiceImpl.java new file mode 100644 index 00000000..e807b246 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultMeasuresServiceImpl.java @@ -0,0 +1,170 @@ +package com.op.device.service.impl; + +import java.text.SimpleDateFormat; +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.context.SecurityContextHolder; +import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.uuid.IdUtils; +import com.op.common.core.web.domain.AjaxResult; +import com.op.device.domain.EquFaultDescription; +import com.op.device.domain.EquFaultType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.device.mapper.EquFaultMeasuresMapper; +import com.op.device.domain.EquFaultMeasures; +import com.op.device.service.IEquFaultMeasuresService; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; + +import static com.op.common.core.web.domain.AjaxResult.error; +import static com.op.common.core.web.domain.AjaxResult.success; + +/** + * 故障维修措施Service业务层处理 + * + * @author Open Platform + * @date 2023-12-15 + */ +@Service +public class EquFaultMeasuresServiceImpl implements IEquFaultMeasuresService { + @Autowired + private EquFaultMeasuresMapper equFaultMeasuresMapper; + + /** + * 查询故障维修措施 + * + * @param faultId 故障维修措施主键 + * @return 故障维修措施 + */ + @Override + @DS("#header.poolName") + public EquFaultMeasures selectEquFaultMeasuresByFaultId(String faultId) { + return equFaultMeasuresMapper.selectEquFaultMeasuresByFaultId(faultId); + } + + /** + * 查询故障维修措施列表 + * + * @param equFaultMeasures 故障维修措施 + * @return 故障维修措施 + */ + @Override + @DS("#header.poolName") + public List selectEquFaultMeasuresList(EquFaultMeasures equFaultMeasures) { + // 创建时间不为空 + if (equFaultMeasures.getCreateTimeArray() != null) { + // 设置创建日期开始和结束值 + if (equFaultMeasures.getCreateTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + equFaultMeasures.setCreateTimeStart(formatter.format(equFaultMeasures.getCreateTimeArray().get(0))); + equFaultMeasures.setCreateTimeEnd(formatter.format(equFaultMeasures.getCreateTimeArray().get(1))); + } + } + // 更新时间不为空 + if (equFaultMeasures.getUpdateTimeArray() != null) { + // 设置更新日期开始和结束 + if (equFaultMeasures.getUpdateTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + equFaultMeasures.setUpdateTimeStart(formatter.format(equFaultMeasures.getUpdateTimeArray().get(0))); + equFaultMeasures.setUpdateTimeEnd(formatter.format(equFaultMeasures.getUpdateTimeArray().get(1))); + } + } + return equFaultMeasuresMapper.selectEquFaultMeasuresList(equFaultMeasures); + } + + /** + * 新增故障维修措施 + * + * @param equFaultMeasures 故障维修措施 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public AjaxResult insertEquFaultMeasures(EquFaultMeasures equFaultMeasures) { + // 校验 + EquFaultMeasures checkQuery = new EquFaultMeasures(); + checkQuery.setFaultType(equFaultMeasures.getFaultType()); + checkQuery.setFaultSubclass(equFaultMeasures.getFaultSubclass()); + List check = equFaultMeasuresMapper.selectEquFaultMeasuresList(checkQuery); + if (check.size() > 0) { + return error(500, "故障子类已存在！不可添加！"); + } + + //获取当前所选工厂 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + String str = request.getHeader(key.substring(8)); + int index = str.indexOf("_"); + String factory = str.substring(index + 1); + + // 获取检查项流水号 + String serialNum = String.format("%04d", equFaultMeasuresMapper.selectSerialNumber()); + + // 处理故障信息 + equFaultMeasures.setFaultId(IdUtils.fastSimpleUUID());// id + equFaultMeasures.setFaultCode("MEA" + serialNum);// 故障编码 + equFaultMeasures.setFactoryCode(factory);// 工厂 + equFaultMeasures.setCreateBy(SecurityContextHolder.getUserName()); + equFaultMeasures.setCreateTime(DateUtils.getNowDate()); + equFaultMeasures.setUpdateBy(SecurityContextHolder.getUserName()); + equFaultMeasures.setUpdateTime(DateUtils.getNowDate()); + equFaultMeasuresMapper.insertEquFaultMeasures(equFaultMeasures); + return success("新增故障维修措施成功"); + } + + /** + * 修改故障维修措施 + * + * @param equFaultMeasures 故障维修措施 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public AjaxResult updateEquFaultMeasures(EquFaultMeasures equFaultMeasures) { + // 校验 + EquFaultMeasures checkQuery = new EquFaultMeasures(); + checkQuery.setFaultType(equFaultMeasures.getFaultType()); + checkQuery.setFaultSubclass(equFaultMeasures.getFaultSubclass()); + List check = equFaultMeasuresMapper.selectEquFaultMeasuresList(checkQuery); + if (check.size() > 0) { + for (EquFaultMeasures equFaultMeasures1 : check) { + if (!equFaultMeasures1.getFaultCode().equals(equFaultMeasures.getFaultCode())){ + return error(500, "故障子类已存在！修改失败！"); + } + } + } + equFaultMeasures.setUpdateBy(SecurityContextHolder.getUserName()); + equFaultMeasures.setUpdateTime(DateUtils.getNowDate()); + // 插入数据库 + equFaultMeasuresMapper.updateEquFaultMeasures(equFaultMeasures); + return success("修改成功！"); + } + + /** + * 批量删除故障维修措施 + * + * @param faultIds 需要删除的故障维修措施主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquFaultMeasuresByFaultIds(String[] faultIds) { + return equFaultMeasuresMapper.deleteEquFaultMeasuresByFaultIds(faultIds); + } + + /** + * 删除故障维修措施信息 + * + * @param faultId 故障维修措施主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquFaultMeasuresByFaultId(String faultId) { + return equFaultMeasuresMapper.deleteEquFaultMeasuresByFaultId(faultId); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultReasonServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultReasonServiceImpl.java new file mode 100644 index 00000000..bfb17939 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquFaultReasonServiceImpl.java @@ -0,0 +1,170 @@ +package com.op.device.service.impl; + +import java.text.SimpleDateFormat; +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.context.SecurityContextHolder; +import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.uuid.IdUtils; +import com.op.common.core.web.domain.AjaxResult; +import com.op.device.domain.EquFaultMeasures; +import com.op.device.domain.EquFaultType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.device.mapper.EquFaultReasonMapper; +import com.op.device.domain.EquFaultReason; +import com.op.device.service.IEquFaultReasonService; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; + +import static com.op.common.core.web.domain.AjaxResult.error; +import static com.op.common.core.web.domain.AjaxResult.success; + +/** + * 故障原因Service业务层处理 + * + * @author Open Platform + * @date 2023-12-15 + */ +@Service +public class EquFaultReasonServiceImpl implements IEquFaultReasonService { + @Autowired + private EquFaultReasonMapper equFaultReasonMapper; + + /** + * 查询故障原因 + * + * @param faultId 故障原因主键 + * @return 故障原因 + */ + @Override + @DS("#header.poolName") + public EquFaultReason selectEquFaultReasonByFaultId(String faultId) { + return equFaultReasonMapper.selectEquFaultReasonByFaultId(faultId); + } + + /** + * 查询故障原因列表 + * + * @param equFaultReason 故障原因 + * @return 故障原因 + */ + @Override + @DS("#header.poolName") + public List selectEquFaultReasonList(EquFaultReason equFaultReason) { + // 创建时间不为空 + if (equFaultReason.getCreateTimeArray() != null) { + // 设置创建日期开始和结束值 + if (equFaultReason.getCreateTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + equFaultReason.setCreateTimeStart(formatter.format(equFaultReason.getCreateTimeArray().get(0))); + equFaultReason.setCreateTimeEnd(formatter.format(equFaultReason.getCreateTimeArray().get(1))); + } + } + // 更新时间不为空 + if (equFaultReason.getUpdateTimeArray() != null) { + // 设置更新日期开始和结束 + if (equFaultReason.getUpdateTimeArray().size() == 2) { + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + equFaultReason.setUpdateTimeStart(formatter.format(equFaultReason.getUpdateTimeArray().get(0))); + equFaultReason.setUpdateTimeEnd(formatter.format(equFaultReason.getUpdateTimeArray().get(1))); + } + } + return equFaultReasonMapper.selectEquFaultReasonList(equFaultReason); + } + + /** + * 新增故障原因 + * + * @param equFaultReason 故障原因 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public AjaxResult insertEquFaultReason(EquFaultReason equFaultReason) { + // 校验 + EquFaultReason checkQuery = new EquFaultReason(); + checkQuery.setFaultType(equFaultReason.getFaultType()); + checkQuery.setFaultSubclass(equFaultReason.getFaultSubclass()); + List check = equFaultReasonMapper.selectEquFaultReasonList(checkQuery); + if (check.size() > 0) { + return error(500, "故障子类已存在！不可添加！"); + } + + //获取当前所选工厂 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + String str = request.getHeader(key.substring(8)); + int index = str.indexOf("_"); + String factory = str.substring(index + 1); + + // 获取检查项流水号 + String serialNum = String.format("%04d", equFaultReasonMapper.selectSerialNumber()); + + // 处理故障信息 + equFaultReason.setFaultId(IdUtils.fastSimpleUUID());// id + equFaultReason.setFaultCode("REA" + serialNum);// 故障编码 + equFaultReason.setFactoryCode(factory);// 工厂 + equFaultReason.setCreateBy(SecurityContextHolder.getUserName()); + equFaultReason.setCreateTime(DateUtils.getNowDate()); + equFaultReason.setUpdateBy(SecurityContextHolder.getUserName()); + equFaultReason.setUpdateTime(DateUtils.getNowDate()); + equFaultReasonMapper.insertEquFaultReason(equFaultReason); + return success("新增故障原因成功！"); + } + + /** + * 修改故障原因 + * + * @param equFaultReason 故障原因 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public AjaxResult updateEquFaultReason(EquFaultReason equFaultReason) { + // 校验 + EquFaultReason checkQuery = new EquFaultReason(); + checkQuery.setFaultType(equFaultReason.getFaultType()); + checkQuery.setFaultSubclass(equFaultReason.getFaultSubclass()); + List check = equFaultReasonMapper.selectEquFaultReasonList(checkQuery); + if (check.size() > 0) { + for (EquFaultReason equFaultReason1 : check) { + if (!equFaultReason1.getFaultCode().equals(equFaultReason.getFaultCode())){ + return error(500, "故障子类已存在！修改失败！"); + } + } + } + equFaultReason.setUpdateBy(SecurityContextHolder.getUserName()); + equFaultReason.setUpdateTime(DateUtils.getNowDate()); + // 插入数据库 + equFaultReasonMapper.updateEquFaultReason(equFaultReason); + return success("修改成功！"); + } + + /** + * 批量删除故障原因 + * + * @param faultIds 需要删除的故障原因主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquFaultReasonByFaultIds(String[] faultIds) { + return equFaultReasonMapper.deleteEquFaultReasonByFaultIds(faultIds); + } + + /** + * 删除故障原因信息 + * + * @param faultId 故障原因主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteEquFaultReasonByFaultId(String faultId) { + return equFaultReasonMapper.deleteEquFaultReasonByFaultId(faultId); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java index 610eb572..ab2285f3 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquPlanServiceImpl.java @@ -370,7 +370,7 @@ public class EquPlanServiceImpl implements IEquPlanService { @Override @DS("#header.poolName") public AjaxResult getGroupLine() { - return success(equEquipmentMapper.selectEqupmentGroupLine()); + return success(equEquipmentMapper.selectEquipmentGroupLine()); } /** diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java index dfb15f3b..4ca7100c 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java @@ -432,4 +432,11 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService { public List getRepairPersonList(EquTeamUser equTeamUser) { return equRepairOrderMapper.getRepairPersonList(equTeamUser); } + + //获取组线列表 + @Override + @DS("#header.poolName") + public List selectGroupLineList() { + return equEquipmentMapper.selectEquipmentGroupLine(); + } } diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquEquipmentMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquEquipmentMapper.xml index fa2fe8c4..b5dbaed9 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquEquipmentMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquEquipmentMapper.xml @@ -252,15 +252,15 @@ group by equipment_type_code,equipment_type_name - select equipment_code, equipment_name - from base_equipment - where del_flag = '0' - and equipment_category = '1' + from base_equipment + where del_flag = '0' + and equipment_category = '1' + + + and fault_code like concat('%', #{faultCode}, '%') + and fault_type like concat('%', #{faultType}, '%') + and fault_subclass like concat('%', #{faultSubclass}, '%') + and fault_remark = #{faultRemark} + and factory_code = #{factoryCode} + and attr1 = #{attr1} + and attr2 = #{attr2} + and attr3 = #{attr3} + and del_flag = #{delFlag} + and CONVERT(date,create_time) >= #{createTimeStart} + and #{createTimeEnd} >= CONVERT(date,create_time) + and create_by like concat('%', #{createBy}, '%') + and CONVERT(date,update_time) >= #{updateTimeStart} + and #{updateTimeEnd} >= CONVERT(date,update_time) + and update_by like concat('%', #{updateBy}, '%') + and del_flag = '0' + + + + + + + insert into equ_fault_description + + fault_id, + fault_code, + fault_type, + fault_subclass, + fault_remark, + factory_code, + attr1, + attr2, + attr3, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{faultId}, + #{faultCode}, + #{faultType}, + #{faultSubclass}, + #{faultRemark}, + #{factoryCode}, + #{attr1}, + #{attr2}, + #{attr3}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update equ_fault_description + + fault_code = #{faultCode}, + fault_type = #{faultType}, + fault_subclass = #{faultSubclass}, + fault_remark = #{faultRemark}, + factory_code = #{factoryCode}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where fault_id = #{faultId} + + + + delete from equ_fault_description where fault_id = #{faultId} + + + + delete from equ_fault_description where fault_id in + + #{faultId} + + + + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquFaultMeasuresMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquFaultMeasuresMapper.xml new file mode 100644 index 00000000..eaafe629 --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/EquFaultMeasuresMapper.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + select fault_id, fault_code, fault_type, fault_subclass, fault_remark, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_fault_measures + + + + + + + + insert into equ_fault_measures + + fault_id, + fault_code, + fault_type, + fault_subclass, + fault_remark, + factory_code, + attr1, + attr2, + attr3, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{faultId}, + #{faultCode}, + #{faultType}, + #{faultSubclass}, + #{faultRemark}, + #{factoryCode}, + #{attr1}, + #{attr2}, + #{attr3}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update equ_fault_measures + + fault_code = #{faultCode}, + fault_type = #{faultType}, + fault_subclass = #{faultSubclass}, + fault_remark = #{faultRemark}, + factory_code = #{factoryCode}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where fault_id = #{faultId} + + + + delete from equ_fault_measures where fault_id = #{faultId} + + + + delete from equ_fault_measures where fault_id in + + #{faultId} + + + + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquFaultReasonMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquFaultReasonMapper.xml new file mode 100644 index 00000000..10b95ba1 --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/EquFaultReasonMapper.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + select fault_id, fault_code, fault_type, fault_subclass, fault_remark, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_fault_reason + + + + + + + + insert into equ_fault_reason + + fault_id, + fault_code, + fault_type, + fault_subclass, + fault_remark, + factory_code, + attr1, + attr2, + attr3, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{faultId}, + #{faultCode}, + #{faultType}, + #{faultSubclass}, + #{faultRemark}, + #{factoryCode}, + #{attr1}, + #{attr2}, + #{attr3}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update equ_fault_reason + + fault_code = #{faultCode}, + fault_type = #{faultType}, + fault_subclass = #{faultSubclass}, + fault_remark = #{faultRemark}, + factory_code = #{factoryCode}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where fault_id = #{faultId} + + + + delete from equ_fault_reason where fault_id = #{faultId} + + + + delete from equ_fault_reason where fault_id in + + #{faultId} + + + + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml index c10ad203..b9268d5f 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml @@ -1,9 +1,9 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - SELECT COUNT(fault_id)+1 AS serialNum FROM equ_fault_type WHERE CONVERT(date, GETDATE()) = CONVERT(date,create_time) - + insert into equ_fault_type fault_id, @@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_time, update_by, update_time, - + #{faultId}, #{faultCode}, @@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createTime}, #{updateBy}, #{updateTime}, - + diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java index 30f9c1ff..164e6814 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java @@ -239,7 +239,7 @@ public class BaseEquipmentController extends BaseController { } /** - * 查询组线/辅助设备 + * 查询组线下的辅助设备 */ @GetMapping("/getAuxiliaryEquipmentList") public TableDataInfo getAuxiliaryEquipmentList(EquBindAuxiliaryEquipment equBindAuxiliaryEquipment) { diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java index 2c786021..df533481 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java @@ -81,6 +81,6 @@ public interface IBaseEquipmentService { //查询人员列表 List getPersonList(BaseTeamUser baseTeamUser); - //查询组线/辅助设备 + //查询组线下的辅助设备 List selectAuxiliaryEquipmentList(EquBindAuxiliaryEquipment equBindAuxiliaryEquipment); }