From 65e7fdb99591eb041a6dc4d1294021d8a5d69db4 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Tue, 5 Dec 2023 17:46:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=20=E6=95=85=E9=9A=9C?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20=E6=95=85=E9=9A=9C=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DevicePDAController.java | 8 +-- .../EquRepairWorkOrderController.java | 10 ++++ .../op/device/domain/EquFaultTypeTree.java | 46 +++++++++++++++ .../op/device/domain/EquRepairWorkOrder.java | 10 ++++ .../op/device/mapper/EquFaultTypeMapper.java | 5 ++ .../op/device/service/IDevicePDAService.java | 2 +- .../service/impl/DevicePDAServiceImpl.java | 56 ++++++++++++------- .../mapper/device/EquFaultTypeMapper.xml | 14 ++++- .../device/EquRepairWorkOrderMapper.xml | 9 ++- 9 files changed, 131 insertions(+), 29 deletions(-) create mode 100644 op-modules/op-device/src/main/java/com/op/device/domain/EquFaultTypeTree.java diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java b/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java index 2a89399a..f223e665 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java @@ -160,10 +160,10 @@ public class DevicePDAController extends BaseController { } //传故障类型 -// @GetMapping(value = "/queryEquFaultTypeTree") -// public AjaxResult queryEquFaultTypeTree(EquRepairWorkOrder equRepairWorkOrder) { -// return devicePDAService.queryEquFaultTypeTree(equRepairWorkOrder); -// } + @GetMapping(value = "/queryEquFaultTypeTree") + public AjaxResult queryEquFaultTypeTree(EquRepairWorkOrder equRepairWorkOrder) { + return devicePDAService.queryEquFaultTypeTree(equRepairWorkOrder); + } /** * 开始保养任务 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 f047e7ff..5f687dd5 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 @@ -4,6 +4,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.op.device.domain.EquTeamUser; +import com.op.device.service.IDevicePDAService; import com.op.device.service.IEquOutsourceWorkService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -39,6 +40,9 @@ public class EquRepairWorkOrderController extends BaseController { @Autowired private IEquOutsourceWorkService equOutsourceWorkService; + @Autowired + private IDevicePDAService devicePDAService; + /** * 查询维修工单列表 */ @@ -127,4 +131,10 @@ public class EquRepairWorkOrderController extends BaseController { List list = equRepairWorkOrderService.getMaintenancePersonList(equTeamUser); return getDataTable(list); } + + //传故障类型 + @GetMapping(value = "/queryEquFaultTypeTree") + public AjaxResult queryEquFaultTypeTree(EquRepairWorkOrder equRepairWorkOrder) { + return devicePDAService.queryEquFaultTypeTree(equRepairWorkOrder); + } } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultTypeTree.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultTypeTree.java new file mode 100644 index 00000000..b5a1221a --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquFaultTypeTree.java @@ -0,0 +1,46 @@ +package com.op.device.domain; + +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.Date; +import java.util.List; + +/** + * 故障类型树 + * + */ + +public class EquFaultTypeTree extends BaseEntity { + private String value; + + private String label; + + private List children; + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public List getChildren() { + return children; + } + + public void setChildren(List children) { + this.children = children; + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java index e55546bf..e0d7c617 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java @@ -219,6 +219,8 @@ public class EquRepairWorkOrder extends BaseEntity { private String workOutsourcingUnit; /** 联系方式 */ private String outSourceConnection; + /** 故障类型 */ + private String faultType; //手持 //用户id @@ -712,6 +714,14 @@ public class EquRepairWorkOrder extends BaseEntity { this.standardList = standardList; } + //故障类型 + public String getFaultType() { + return faultType; + } + public void setFaultType(String faultType) { + this.faultType = faultType; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) 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 914b2e93..bfd7ebee 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 @@ -2,6 +2,7 @@ package com.op.device.mapper; import java.util.List; +import com.baomidou.dynamic.datasource.annotation.DS; import com.op.device.domain.EquFaultType; import com.op.device.domain.EquRepairWorkOrder; @@ -67,5 +68,9 @@ public interface EquFaultTypeMapper { int selectSerialNumber(); //故障报修第一级 + @DS("master") List selectFirstLevelList(EquRepairWorkOrder equRepairWorkOrder); + + //故障报修第二级 + List selectSecondLevelList(String dictValue); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java b/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java index cadf7322..43003f4f 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java @@ -108,7 +108,7 @@ public interface IDevicePDAService { public AjaxResult updateMaintenanceRecords(EquRepairWorkOrder equRepairWorkOrder); //获取设备故障类型 -// public AjaxResult queryEquFaultTypeTree(EquRepairWorkOrder equRepairWorkOrder); + public AjaxResult queryEquFaultTypeTree(EquRepairWorkOrder equRepairWorkOrder); //待处理 AjaxResult getMaintenancePendRecords(EquRepairWorkOrder equRepairWorkOrder); diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java index 73282be1..8f1e2f3e 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java @@ -667,7 +667,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService { @Override @DS("#header.poolName") public AjaxResult updateMaintenanceRecords(EquRepairWorkOrder equRepairWorkOrder) { -// try { + try { //判断是否停机 EquRepairWorkOrder list = equRepairWorkOrderMapper.selectEquRepairWorkOrderByWorkId(equRepairWorkOrder.getWorkId()); if (list.getWorkDownMachine().equals("1")) { @@ -803,9 +803,9 @@ public class DevicePDAServiceImpl implements IDevicePDAService { equRepairWorkOrderMapper.updateEquipmentStatus(equEquipment); return success("提交成功，维修完成！"); -// } catch (Exception e) { -// return error("提交失败！"); -// } + } catch (Exception e) { + return error("提交失败！"); + } } /** @@ -814,22 +814,38 @@ public class DevicePDAServiceImpl implements IDevicePDAService { * @param equRepairWorkOrder * @return */ -// @Override -// @DS("#header.poolName") -// public AjaxResult queryEquFaultTypeTree(EquRepairWorkOrder equRepairWorkOrder) { -// // 查询一级数据 -// List firstLevel = equFaultTypeMapper.selectFirstLevelList(equRepairWorkOrder); -// // 一级list -// List firstTree = new ArrayList<>(); -// // 判空 -// if (!CollectionUtils.isEmpty(firstLevel)) { -// for(EquFaultType equFaultType : firstLevel){ -// -// } -// } -// -// return treeAll; -// } + @Override + @DS("#header.poolName") + public AjaxResult queryEquFaultTypeTree(EquRepairWorkOrder equRepairWorkOrder) { + // 查询一级数据 + List firstLevel = equFaultTypeMapper.selectFirstLevelList(equRepairWorkOrder); + // 一级list + List firstTree = new ArrayList<>(); + // 判空 + if (!CollectionUtils.isEmpty(firstLevel)) { + for(EquFaultType equFaultType : firstLevel){ + EquFaultTypeTree equFaultTypeParentTree = new EquFaultTypeTree(); + equFaultTypeParentTree.setValue(equFaultType.getDictValue()); + equFaultTypeParentTree.setLabel(equFaultType.getDictLabel()); + //二级 + List secondLevel = equFaultTypeMapper.selectSecondLevelList(equFaultType.getDictValue()); + // 二级list + List secondTree = new ArrayList<>(); + // 判空 + if (!CollectionUtils.isEmpty(secondLevel)) { + for(EquFaultType second : secondLevel) { + EquFaultTypeTree equFaultTypeChildTree = new EquFaultTypeTree(); + equFaultTypeChildTree.setValue(second.getFaultCode()); + equFaultTypeChildTree.setLabel(second.getFaultSubclass()); + secondTree.add(equFaultTypeChildTree); + } + } + equFaultTypeParentTree.setChildren(secondTree); + firstTree.add(equFaultTypeParentTree); + } + } + return success(firstTree); + } /** * 查询设备管理列表 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 be0a6e48..c10ad203 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 @@ -131,13 +131,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - SELECT - dict_label AS dictLabel + dict_label AS dictLabel, dict_value AS dictValue FROM sys_dict_data WHERE dict_type = 'device_fault_type' + + \ No newline at end of file diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml index 062a6694..e62d3348 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml @@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -84,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select work_id, order_id, order_code, work_code,work_handle, work_plan_time, work_plan_down_time, order_relevance, work_person, work_team, work_outsource, work_down_machine, equipment_code, work_reason, work_fault_desc, work_start_time,work_end_time,work_cost_time, work_cost, work_status,out_work_id, out_work_code, attr1, attr2, attr3, create_by, create_time, update_time, update_by, del_flag, factory_code from equ_repair_work_order + select work_id, order_id, order_code, work_code,work_handle, work_plan_time, work_plan_down_time, order_relevance, work_person, work_team, work_outsource, work_down_machine, equipment_code, work_reason, work_fault_desc, work_start_time,work_end_time,work_cost_time, work_cost, work_status,out_work_id, out_work_code, attr1, attr2, attr3, create_by, create_time, update_time, update_by, del_flag, factory_code ,fault_type from equ_repair_work_order