1

op-modules/op-device/src/main/java/com/op/device/controller/DevicePDAController.java

@@ -31,6 +31,7 @@ public class DevicePDAController extends BaseController {
 
     /**
      * 获取今日巡检任务工单list
+     *
      * @param pdadto
      * @return
      */
@@ -41,6 +42,7 @@ public class DevicePDAController extends BaseController {
 
     /**
      * 获取巡检记录
+     *
      * @param pdadto
      * @return
      */
@@ -51,6 +53,7 @@ public class DevicePDAController extends BaseController {
 
     /**
      * 获取任务详情
+     *
      * @param equOrder
      * @return
      */
@@ -60,7 +63,8 @@ public class DevicePDAController extends BaseController {
     }
 
     /**
-     * 填写巡检记录工单
+     * 填写巡检、点检、保养记录
+     *
      * @param equOrder
      * @return
      */
@@ -70,8 +74,10 @@ public class DevicePDAController extends BaseController {
     }
 
     //报修
+
     /**
      * 新增手持报修记录
+     *
      * @param equRepairOrder
      * @return
      */
@@ -81,6 +87,7 @@ public class DevicePDAController extends BaseController {
     }
 
     //维修
+
     /**
      * 获取维修记录（待处理）
      *
@@ -143,6 +150,7 @@ public class DevicePDAController extends BaseController {
 
     /**
      * 填写维修记录
+     *
      * @param equRepairWorkOrder
      * @return
      */
@@ -159,6 +167,7 @@ public class DevicePDAController extends BaseController {
 
     /**
      * 开始保养任务
+     *
      * @param pdadto
      * @return
      */

op-modules/op-device/src/main/java/com/op/device/domain/vo/IEquipmentVO.java

@@ -8,14 +8,22 @@ public class IEquipmentVO {
     private String equipmentCode;
     // 所在部门
     private String department;
-    // 状态
-    private String status;
     // 设备故障率
     private Double failureRate;
     // 设备有效利用率
     private Double utilizationRatio;
     // 设备维修质量
     private Double rapairQuantity;
+    // 设备状态
+    private String equipmentStatus;
+
+    public String getEquipmentStatus() {
+        return equipmentStatus;
+    }
+
+    public void setEquipmentStatus(String equipmentStatus) {
+        this.equipmentStatus = equipmentStatus;
+    }
 
     public Double getRapairQuantity() {
         return rapairQuantity;
@@ -49,14 +57,6 @@ public class IEquipmentVO {
         this.department = department;
     }
 
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
     public Double getFailureRate() {
         return failureRate;
     }

op-modules/op-device/src/main/java/com/op/device/service/IDevicePDAService.java

@@ -16,12 +16,14 @@ public interface IDevicePDAService {
 
     /**
      * 获取今日巡检任务工单list
+     *
      * @return
      */
     AjaxResult getTodayTask(PDADTO pdadto);
 
     /**
      * 获取巡检记录
+     *
      * @param pdadto
      * @return
      */
@@ -29,37 +31,45 @@ public interface IDevicePDAService {
 
     /**
      * 获取任务详情
+     *
      * @param equOrder
      * @return
      */
     AjaxResult getInspectionOrderInfo(EquOrder equOrder);
 
     /**
-     * 填写巡检记录工单
+     * 填写巡检、点检、保养记录
+     *
      * @param equOrder
      * @return
      */
     AjaxResult updateInspectionRecord(EquOrder equOrder);
 
     //报修
+
     /**
      * 手持新增报修记录
+     *
      * @param equRepairOrder
      * @return
      */
     public AjaxResult addRepairRecord(EquRepairOrder equRepairOrder);
 
     //维修
+
     /**
      * 手持查询维修记录 （待处理和已经维修完成）
+     *
      * @param equRepairWorkOrder
      * @return
      */
     public AjaxResult getMaintenanceRecords(EquRepairWorkOrder equRepairWorkOrder);
 
     //班组
+
     /**
      * 维修班组
+     *
      * @param equTeamUser
      * @return
      */
@@ -67,6 +77,7 @@ public interface IDevicePDAService {
 
     /**
      * 手持是否停机
+     *
      * @param equRepairWorkOrder
      * @return
      */
@@ -74,6 +85,7 @@ public interface IDevicePDAService {
 
     /**
      * 查询设备详细信息
+     *
      * @param equipmentId
      * @return
      */
@@ -81,6 +93,7 @@ public interface IDevicePDAService {
 
     /**
      * 查询维修工单
+     *
      * @param workId
      * @return
      */
@@ -88,6 +101,7 @@ public interface IDevicePDAService {
 
     /**
      * 填写维修工单
+     *
      * @param equRepairWorkOrder
      * @return
      */
@@ -101,6 +115,7 @@ public interface IDevicePDAService {
 
     /**
      * 开始保养任务
+     *
      * @param pdadto
      * @return
      */

op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceInterfaceServiceImpl.java

@@ -58,14 +58,15 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService {
         // 获取所有设备信息
         List<IEquipmentVO> equipmentVOList = deviceInterfaceMapper.selectEquipmentList();
         for (IEquipmentVO equipmentVO : equipmentVOList) {
-            // TODO 设备状态待修改
+            // 设备状态
-            if (equipmentVO.getStatus().equals("1")) {
+            if (equipmentVO.getEquipmentStatus().equals("1")) {
-                equipmentVO.setStatus("正常");
+                equipmentVO.setEquipmentStatus("正常");
             } else {
-                equipmentVO.setStatus("停用");
+                equipmentVO.setEquipmentStatus("停用");
             }
             // TODO 设备故障停机率
-            equipmentVO.setFailureRate(0.90);
+
+            equipmentVO.setFailureRate(0.10);
             // TODO 设备有效利用率
             equipmentVO.setUtilizationRatio(0.80);
         }

op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java

@@ -165,7 +165,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
     }
 
     /**
-     *  填写巡检记录工单
+     * 填写巡检、点检、保养记录
      *
      * @param equOrder
      * @return
@@ -344,6 +344,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
     }
 
     //////////////////////报修
+
     /**
      * 新增报修记录
      *
@@ -435,6 +436,8 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
 
     /**
      * 开始保养任务
+     * TODO 修改设备状态
+     *
      * @param pdadto
      * @return
      */
@@ -490,6 +493,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
             return error();
         }
     }
+
     /**
      * 获取维修人员
      *
@@ -535,8 +539,6 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
     }
 
     /**
-     *
-     *
      * @param equipmentId
      * @return
      */

op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml

@@ -24,7 +24,7 @@
         select be.equipment_code   AS "equipmentCode",
                be.equipment_name   AS "equipmentName",
                be.department       AS "department",
-               be.status         AS "status"
+               be.equipment_status AS "equipmentStatus"
         from base_equipment be
         where del_flag = '0'
     </select>