Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

维修 故障类型 故障树

Browse Source
orign^2
A0010407 1 year ago
parent b00e31ec4d
commit 65e7fdb995
9 changed files with 131 additions and 29 deletions
Show Stats Download Patch File Download Diff File

8
op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java
Unescape Escape View File

@ -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);
}
/**
* 开始保养任务

10
op-modules/op-device/src/main/java/com/op/device/controller/EquRepairWorkOrderController.java
Unescape Escape View File

@ -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<EquTeamUser> list = equRepairWorkOrderService.getMaintenancePersonList(equTeamUser);
return getDataTable(list);
}
//传故障类型
@GetMapping(value = "/queryEquFaultTypeTree")
public AjaxResult queryEquFaultTypeTree(EquRepairWorkOrder equRepairWorkOrder) {
return devicePDAService.queryEquFaultTypeTree(equRepairWorkOrder);
}
}

46
op-modules/op-device/src/main/java/com/op/device/domain/EquFaultTypeTree.java
Unescape Escape View File

@ -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<EquFaultTypeTree> 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<EquFaultTypeTree> getChildren() {
return children;
}
public void setChildren(List<EquFaultTypeTree> children) {
this.children = children;
}
}

10
op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java
Unescape Escape View File

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

5
op-modules/op-device/src/main/java/com/op/device/mapper/EquFaultTypeMapper.java
Unescape Escape View File

@ -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<EquFaultType> selectFirstLevelList(EquRepairWorkOrder equRepairWorkOrder);
//故障报修第二级
List<EquFaultType> selectSecondLevelList(String dictValue);
}

2
op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java
Unescape Escape View File

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

56
op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java
Unescape Escape View File

@ -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<EquFaultType> firstLevel = equFaultTypeMapper.selectFirstLevelList(equRepairWorkOrder);
// // 一级list
// List<EquFaultTypeTree> firstTree = new ArrayList<>();
// // 判空
// if (!CollectionUtils.isEmpty(firstLevel)) {
// for(EquFaultType equFaultType : firstLevel){
//
// }
// }
//
// return treeAll;
// }
@Override
@DS("#header.poolName")
public AjaxResult queryEquFaultTypeTree(EquRepairWorkOrder equRepairWorkOrder) {
// 查询一级数据
List<EquFaultType> firstLevel = equFaultTypeMapper.selectFirstLevelList(equRepairWorkOrder);
// 一级list
List<EquFaultTypeTree> firstTree = new ArrayList<>();
// 判空
if (!CollectionUtils.isEmpty(firstLevel)) {
for(EquFaultType equFaultType : firstLevel){
EquFaultTypeTree equFaultTypeParentTree = new EquFaultTypeTree();
equFaultTypeParentTree.setValue(equFaultType.getDictValue());
equFaultTypeParentTree.setLabel(equFaultType.getDictLabel());
//二级
List <EquFaultType> secondLevel = equFaultTypeMapper.selectSecondLevelList(equFaultType.getDictValue());
// 二级list
List<EquFaultTypeTree> 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);
}
/**
* 查询设备管理列表

14
op-modules/op-device/src/main/resources/mapper/device/EquFaultTypeMapper.xml
Unescape Escape View File

@ -131,13 +131,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
<select id="selectFirstLevelList" resultMap="EquFaultTypeResult">
<select id="selectFirstLevelList" resultType="com.op.device.domain.EquFaultType">
SELECT
dict_label AS dictLabel
dict_label AS dictLabel,
dict_value AS dictValue
FROM sys_dict_data
WHERE dict_type = 'device_fault_type'
</select>
<select id="selectSecondLevelList" resultType="com.op.device.domain.EquFaultType">
SELECT
fault_code AS faultCode,
fault_subclass AS faultSubclass
FROM equ_fault_type
WHERE fault_type = #{dictValue}
and del_flag = '0'
</select>
</mapper>

9
op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml
Unescape Escape View File

@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by" />
<result property="delFlag" column="del_flag" />
<result property="factoryCode" column="factory_code" />
<result property="faultType" column="fault_type" />
<!--设备-->
<result property="equipmentName" column="equipment_name" />
<result property="equipmentSpec" column="equipment_spec" />
@ -84,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<sql id="selectEquRepairWorkOrderVo">
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
</sql>
<select id="selectEquRepairWorkOrderList" parameterType="EquRepairWorkOrder" resultMap="EquRepairWorkOrderResult">
@ -123,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
erwo.update_by,
erwo.del_flag,
erwo.factory_code,
erwo.fault_type,
be.equipment_name,
et.team_name,
et.team_person
@ -201,6 +203,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
erwo.update_by,
erwo.del_flag,
erwo.factory_code,
erwo.fault_type,
be.equipment_name,
et.team_name,
et.team_person
@ -248,6 +251,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
erwo.update_time,
erwo.update_by,
erwo.factory_code,
erwo.fault_type,
be.equipment_name,
be.equipment_spec,
be.equipment_type_name,
@ -311,6 +315,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">update_by,</if>
<if test="delFlag != null">del_flag,</if>
<if test="factoryCode != null">factory_code,</if>
<if test="faultType != null">fault_type,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="workId != null">#{workId},</if>
@ -347,6 +352,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">#{updateBy},</if>
<if test="delFlag != null">#{delFlag},</if>
<if test="factoryCode != null">#{factoryCode},</if>
<if test="faultType != null">#{fault_type},</if>
</trim>
</insert>
@ -386,6 +392,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
<if test="factoryCode != null">factory_code = #{factoryCode},</if>
<if test="faultType != null">fault_type = #{faultType},</if>
</trim>
where work_id = #{workId}
and del_flag = '0'

Write Preview
Loading…
Cancel
Save