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

设备-三个手持接口 维修增加维修措施（也就是处理方式）

Browse Source
master
A0010407 1 year ago
parent bf04c7bdcf
commit ac35ed2bad
5 changed files with 106 additions and 12 deletions
Show Stats Download Patch File Download Diff File

26
op-modules/op-device/src/main/java/com/op/device/controller/DeviceInterfaceController.java
Unescape Escape View File

@ -1,8 +1,7 @@
package com.op.device.controller;
import com.op.common.core.web.domain.AjaxResult;
import com.op.device.domain.EquOperation;
import com.op.device.domain.EquOperationRecord;
import com.op.device.domain.*;
import com.op.device.service.IDeviceInterfaceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -82,4 +81,27 @@ public class DeviceInterfaceController {
return deviceInterfaceService.getDeviceRefreshTime(equOperation);
}
/**
* 查询故障描述列表手持
*/
@GetMapping("/getFaultDescriptionList")
public AjaxResult getFaultDescriptionList(EquFaultDescription equFaultDescription) {
return deviceInterfaceService.selectEquFaultDescriptionList(equFaultDescription);
}
/**
* 查询故障维修措施列表手持
*/
@GetMapping("/getFaultMeasuresList")
public AjaxResult getFaultMeasuresList(EquFaultMeasures equFaultMeasures) {
return deviceInterfaceService.selectEquFaultMeasuresList(equFaultMeasures);
}
/**
* 查询故障原因列表
*/
@GetMapping("/getFaultReasonList")
public AjaxResult getFaultReasonList(EquFaultReason equFaultReason) {
return deviceInterfaceService.selectEquFaultReasonList(equFaultReason);
}
}

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

@ -142,6 +142,9 @@ public class EquRepairWorkOrder extends BaseEntity {
/** 设备状态描述 */
private String equipmentStatusDescription;
/** 设备维修措施 */
private String repairMeasures;
// 设备
/** 设备名称 */
@Excel(name = "设备名称")
@ -733,6 +736,14 @@ public class EquRepairWorkOrder extends BaseEntity {
this.equipmentStatusDescription = equipmentStatusDescription;
}
//维修措施
public String getRepairMeasures() {
return repairMeasures;
}
public void setRepairMeasures(String repairMeasures) {
this.repairMeasures = repairMeasures;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

18
op-modules/op-device/src/main/java/com/op/device/service/IDeviceInterfaceService.java
Unescape Escape View File

@ -1,8 +1,7 @@
package com.op.device.service;
import com.op.common.core.web.domain.AjaxResult;
import com.op.device.domain.EquOperation;
import com.op.device.domain.EquOperationRecord;
import com.op.device.domain.*;
/**
* 设备看板接口
@ -46,4 +45,19 @@ public interface IDeviceInterfaceService {
* 初始值：5分钟
*/
public AjaxResult getDeviceRefreshTime(EquOperation equOperation);
/**
* 故障描述
*/
AjaxResult selectEquFaultDescriptionList(EquFaultDescription equFaultDescription);
/**
* 故障维修措施
*/
AjaxResult selectEquFaultMeasuresList(EquFaultMeasures equFaultMeasures);
/**
* 故障维修措施
*/
AjaxResult selectEquFaultReasonList(EquFaultReason equFaultReason);
}

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

@ -3,10 +3,7 @@ package com.op.device.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.web.domain.AjaxResult;
import com.op.device.domain.EquOperation;
import com.op.device.domain.EquOperationRecord;
import com.op.device.domain.EquRepairWorkOrder;
import com.op.device.domain.MesReportWork;
import com.op.device.domain.*;
import com.op.device.mapper.*;
import com.op.device.domain.vo.IEquipmentVO;
import com.op.device.domain.vo.IRepairWorkOrderVO;
@ -26,15 +23,19 @@ import static com.op.common.core.web.domain.AjaxResult.success;
@Service
public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService {
@Autowired
private EquRepairWorkOrderMapper equRepairWorkOrderMapper;
@Autowired
private DeviceInterfaceMapper deviceInterfaceMapper;
@Autowired
private EquOperationRecordMapper equOperationRecordMapper;
@Autowired
private EquOperationMapper equOperationMapper;
private EquFaultMeasuresMapper equFaultMeasuresMapper;
@Autowired
private EquFaultDescriptionMapper equFaultDescriptionMapper;
@Autowired
private EquFaultReasonMapper equFaultReasonMapper;
/**
@ -222,4 +223,43 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService {
int time = Integer.parseInt(refreshTime);
return success(time);
}
/**
* 查询故障维修措施列表
*
* @param equFaultMeasures 故障维修措施
* @return 故障维修措施
*/
@Override
@DS("#header.poolName")
public AjaxResult selectEquFaultMeasuresList(EquFaultMeasures equFaultMeasures) {
List<EquFaultMeasures> list = equFaultMeasuresMapper.selectEquFaultMeasuresList(equFaultMeasures);
return success(list);
}
/**
* 查询故障描述列表
*
* @param equFaultDescription 故障描述
* @return 故障描述
*/
@Override
@DS("#header.poolName")
public AjaxResult selectEquFaultDescriptionList(EquFaultDescription equFaultDescription) {
List<EquFaultDescription> list = equFaultDescriptionMapper.selectEquFaultDescriptionList(equFaultDescription);
return success(list);
}
/**
* 查询故障原因列表
*
* @param equFaultReason 故障原因
* @return 故障原因
*/
@Override
@DS("#header.poolName")
public AjaxResult selectEquFaultReasonList(EquFaultReason equFaultReason) {
List<EquFaultReason> list = equFaultReasonMapper.selectEquFaultReasonList(equFaultReason);
return success(list);
}
}

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

@ -42,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="factoryCode" column="factory_code" />
<result property="faultType" column="fault_type" />
<result property="equipmentStatusDescription" column="equipment_status_description" />
<result property="repairMeasures" column="repair_measures" />
<!--设备-->
<result property="equipmentName" column="equipment_name" />
@ -87,7 +88,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 ,fault_type,equipment_status_description 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,equipment_status_description,repair_measures from equ_repair_work_order
</sql>
<select id="selectEquRepairWorkOrderList" parameterType="EquRepairWorkOrder" resultMap="EquRepairWorkOrderResult">
@ -128,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
erwo.factory_code,
erwo.fault_type,
erwo.equipment_status_description,
erwo.repair_measures,
be.equipment_name,
et.team_name,
et.team_person
@ -208,6 +210,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
erwo.factory_code,
erwo.fault_type,
erwo.equipment_status_description,
erwo.repair_measures,
be.equipment_name,
et.team_name,
et.team_person
@ -257,6 +260,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
erwo.factory_code,
erwo.fault_type,
erwo.equipment_status_description,
erwo.repair_measures,
be.equipment_name,
be.equipment_spec,
be.equipment_type_name,
@ -322,6 +326,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="factoryCode != null">factory_code,</if>
<if test="faultType != null">fault_type,</if>
<if test="equipmentStatusDescription != null">equipment_status_description,</if>
<if test="repairMeasures != null">repair_measures,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="workId != null">#{workId},</if>
@ -360,6 +365,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="factoryCode != null">#{factoryCode},</if>
<if test="faultType != null">#{fault_type},</if>
<if test="equipmentStatusDescription != null">equipment_status_description,</if>
<if test="repairMeasures != null">repair_measures,</if>
</trim>
</insert>
@ -401,6 +407,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="factoryCode != null">factory_code = #{factoryCode},</if>
<if test="faultType != null">fault_type = #{faultType},</if>
<if test="equipmentStatusDescription != null">equipment_status_description = #{equipmentStatusDescription},</if>
<if test="repairMeasures != null">repair_measures = #{repairMeasures},</if>
</trim>
where work_id = #{workId}
and del_flag = '0'

Write Preview
Loading…
Cancel
Save