Merge remote-tracking branch 'origin/master'

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

@@ -1,5 +1,6 @@
 package com.op.device.controller;
 
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.op.common.core.web.domain.AjaxResult;
 import com.op.device.domain.*;
 import com.op.device.service.IDeviceInterfaceService;
@@ -27,7 +28,8 @@ public class DeviceInterfaceController {
      * @return
      */
     @GetMapping("/getRepairWorkOrder")
-    public AjaxResult getRepairWorkOrder() {
+    public AjaxResult getRepairWorkOrder(EquOperation equOperation) {
+        DynamicDataSourceContextHolder.push(equOperation.getPoolName());
         return deviceInterfaceService.getRepairWorkOrder();
     }
 
@@ -38,6 +40,7 @@ public class DeviceInterfaceController {
      */
     @GetMapping("/getEquipmentInfo")
     public AjaxResult getEquipmentInfo(EquOperation equOperation) {
+        DynamicDataSourceContextHolder.push(equOperation.getPoolName());
         return deviceInterfaceService.getEquipmentInfo(equOperation);
     }
 
@@ -48,6 +51,7 @@ public class DeviceInterfaceController {
      */
     @GetMapping("/getRepairQuantity")
     public AjaxResult getRepairQuantity(EquOperation equOperation) {
+        DynamicDataSourceContextHolder.push(equOperation.getPoolName());
         return deviceInterfaceService.getRepairQuantity(equOperation);
     }
 
@@ -59,6 +63,7 @@ public class DeviceInterfaceController {
      */
     @GetMapping("/equipmentStability")
     public AjaxResult getEquipmentStabilityList(EquOperation equOperation) {
+        DynamicDataSourceContextHolder.push(equOperation.getPoolName());
         return deviceInterfaceService.getEquipmentStabilityList(equOperation);
     }
 
@@ -70,6 +75,7 @@ public class DeviceInterfaceController {
      */
     @GetMapping("/equipmentIntactRate")
     public AjaxResult getEquipmentIntactRate(EquOperation equOperation) {
+        DynamicDataSourceContextHolder.push(equOperation.getPoolName());
         return deviceInterfaceService.getEquipmentIntactRate(equOperation);
     }
 
@@ -79,6 +85,7 @@ public class DeviceInterfaceController {
      */
     @GetMapping("/getDeviceRefreshTime")
     public AjaxResult getDeviceRefreshTime(EquOperation equOperation) {
+        DynamicDataSourceContextHolder.push(equOperation.getPoolName());
         return deviceInterfaceService.getDeviceRefreshTime(equOperation);
     }
 

op-modules/op-device/src/main/java/com/op/device/domain/EquOperation.java

@@ -190,6 +190,8 @@ public class EquOperation extends BaseEntity {
     //设备看板维修质量 mttr
     private String mttr;
 
+    private String poolName;
+
     public String getCreateTimeStart() {
         return createTimeStart;
     }
@@ -497,6 +499,14 @@ public class EquOperation extends BaseEntity {
         return mttr;
     }
 
+    public void setPoolName(String poolName) {
+        this.poolName = poolName;
+    }
+
+    public String getPoolName() {
+        return poolName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

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

@@ -34,11 +34,12 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService {
      * @return
      */
     @Override
-    @DS("#header.poolName")
+//    @DS("#header.poolName")
     public AjaxResult getRepairWorkOrder() {
         List<IRepairWorkOrderVO> workOrderVOList = deviceInterfaceMapper.selectEquRepairWorkOrderList();
         if(workOrderVOList != null){
             for (IRepairWorkOrderVO orderVO : workOrderVOList) {
+                if(orderVO != null){
                     if(orderVO.getWorkHandle() != null){
                         if (orderVO.getWorkHandle().equals("0")) {
                             orderVO.setWorkHandle("立即");
@@ -48,6 +49,7 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService {
                     }
                 }
             }
+        }
         return success(workOrderVOList);
     }
 
@@ -61,7 +63,7 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService {
      * @return
      */
     @Override
-    @DS("#header.poolName")
+//    @DS("#header.poolName")
     public AjaxResult getEquipmentInfo(EquOperation equOperation) {
         if((equOperation.getStartTime() == null) && (equOperation.getEndTime() == null)){
             //默认时间
@@ -81,7 +83,7 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService {
      * @return
      */
     @Override
-    @DS("#header.poolName")
+//    @DS("#header.poolName")
     public AjaxResult getRepairQuantity(EquOperation equOperation) {
         equOperation.setCreateTime(DateUtils.getNowDate());
         if((equOperation.getStartTime() == null) && (equOperation.getEndTime() == null)){
@@ -101,7 +103,7 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService {
      * 改为：一开始展示默认，可以选择时间
      */
     @Override
-    @DS("#header.poolName")
+//    @DS("#header.poolName")
     public AjaxResult getEquipmentStabilityList(EquOperation equOperation) {
         equOperation.setCreateTime(DateUtils.getNowDate());
         if((equOperation.getStartTime() == null) && (equOperation.getEndTime() == null)){
@@ -119,7 +121,7 @@ public class DeviceInterfaceServiceImpl implements IDeviceInterfaceService {
      * 默认为当日的
      */
     @Override
-    @DS("#header.poolName")
+//    @DS("#header.poolName")
     public AjaxResult getEquipmentIntactRate(EquOperation equOperation) {
         //查询所有设备（设备停用的除外）
         equOperation.setCreateTime(DateUtils.getNowDate());