Merge remote-tracking branch 'origin/master'

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

@@ -21,7 +21,6 @@ public class DeviceInterfaceController {
     @Autowired
     private IDeviceInterfaceService deviceInterfaceService;
 
-
     /**
      * 获取维修工单
      * @return
@@ -81,29 +80,6 @@ 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);
-    }
     /**
      * 首页-组线设备月故障数
      * @return

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

@@ -10,7 +10,6 @@ import com.op.device.service.IDevicePDAService;
 import com.op.device.service.IEquRepairOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.List;
 
 /**
@@ -175,4 +174,28 @@ public class DevicePDAController extends BaseController {
     public AjaxResult startMaintenanceTask(PDADTO pdadto) {
         return devicePDAService.startMaintenanceTask(pdadto);
     }
+
+    /**
+     * 查询故障描述列表手持
+     */
+    @GetMapping("/getFaultDescriptionList")
+    public AjaxResult getFaultDescriptionList(EquFaultDescription equFaultDescription) {
+        return devicePDAService.selectEquFaultDescriptionList(equFaultDescription);
+    }
+
+    /**
+     * 查询故障维修措施列表手持
+     */
+    @GetMapping("/getFaultMeasuresList")
+    public AjaxResult getFaultMeasuresList(EquFaultMeasures equFaultMeasures) {
+        return devicePDAService.selectEquFaultMeasuresList(equFaultMeasures);
+    }
+
+    /**
+     * 查询故障原因列表
+     */
+    @GetMapping("/getFaultReasonList")
+    public AjaxResult getFaultReasonList(EquFaultReason equFaultReason) {
+        return devicePDAService.selectEquFaultReasonList(equFaultReason);
+    }
 }

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

@@ -46,22 +46,6 @@ public interface IDeviceInterfaceService {
      */
     public AjaxResult getDeviceRefreshTime(EquOperation equOperation);
 
-    /**
-     * 故障描述
-     */
-    AjaxResult selectEquFaultDescriptionList(EquFaultDescription equFaultDescription);
-
-    /**
-     * 故障维修措施
-     */
-    AjaxResult selectEquFaultMeasuresList(EquFaultMeasures equFaultMeasures);
-
-    /**
-     * 故障维修措施
-     */
-    AjaxResult selectEquFaultReasonList(EquFaultReason equFaultReason);
-    public AjaxResult getDeviceRefreshTime(EquOperationRecord equOperationRecord);
-
     /**
      * 首页-组线设备月故障数
      * @return

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

@@ -123,4 +123,19 @@ public interface IDevicePDAService {
 
     //查询设备列表
     List<EquEquipment> selectEquEquipmentList(EquEquipment equEquipment);
+
+    /**
+     * 故障描述
+     */
+    AjaxResult selectEquFaultDescriptionList(EquFaultDescription equFaultDescription);
+
+    /**
+     * 故障维修措施
+     */
+    AjaxResult selectEquFaultMeasuresList(EquFaultMeasures equFaultMeasures);
+
+    /**
+     * 故障维修措施
+     */
+    AjaxResult selectEquFaultReasonList(EquFaultReason equFaultReason);
 }

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

@@ -33,16 +33,6 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService {
     @Autowired
     private EquOperationRecordMapper equOperationRecordMapper;
 
-    @Autowired
-    private EquFaultMeasuresMapper equFaultMeasuresMapper;
-
-    @Autowired
-    private EquFaultDescriptionMapper equFaultDescriptionMapper;
-
-    @Autowired
-    private EquFaultReasonMapper equFaultReasonMapper;
-
-
     /**
      * 获取待维修的维修工单
      *
@@ -229,55 +219,6 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService {
         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);
-    }
-
-    /**
-     * 看板刷新时间
-     */
-    @Override
-    @DS("master")
-    public AjaxResult getDeviceRefreshTime(EquOperationRecord equOperationRecord) {
-        String refreshTime = deviceInterfaceMapper.getDeviceRefreshTime(equOperationRecord);
-        int time = Integer.parseInt(refreshTime);
-        return success(time);
-    }
 
     /**
      * 首页-组线设备月故障数

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

@@ -72,6 +72,15 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
     @Autowired
     private EquOperationRecordMapper equOperationRecordMapper;
 
+    @Autowired
+    private EquFaultMeasuresMapper equFaultMeasuresMapper;
+
+    @Autowired
+    private EquFaultDescriptionMapper equFaultDescriptionMapper;
+
+    @Autowired
+    private EquFaultReasonMapper equFaultReasonMapper;
+
 
     /**
      * 获取今日任务工单list-状态不为已完成
@@ -913,4 +922,43 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
         equOperationRecordMapper.insertEquOperationRecord(newRecord);
     }
 
+    /**
+     * 查询故障维修措施列表
+     *
+     * @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);
+    }
+
 }

op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java

@@ -297,9 +297,7 @@ public class OpenServiceImpl implements OpenService {
         String createBy = SecurityUtils.getUsername();
         Date nowDate= DateUtils.getNowDate();
         //获取当前所选工厂
-        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        String factoryCode = qcCheckTaskProduce.getFactoryCode();
-        String key = "#header.poolName";
-        String factoryCode = request.getHeader(key.substring(8)).replace("ds_","");
 
         qcCheckTaskProduce.setCheckNo(bpDD+liushuiStr);