Merge remote-tracking branch 'origin/master'

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/iotmainworkorder/IotMainWorkOrderServiceImpl.java

@@ -139,6 +139,7 @@ public class IotMainWorkOrderServiceImpl implements IotMainWorkOrderService {
 
     @Override
     public PageResult<IotDeviceRespVO> deviceMainDistances(IotMainWorkOrderPageReqVO pageReqVO) {
+        // 20250624 只查询保养计划中的设备 不查询保养工单表
         // 所有保养计划 + 保养工单 明细中待保养的最近距离 里程/时间/自然日
         // 查询所有保养工单明细中所有设备的累计运行里程 累计运行时间 如果保养项有设置 里程/时间规则 可以计算保养距离
         IotMainWorkOrderBomPageReqVO bomReqVO = new IotMainWorkOrderBomPageReqVO();
@@ -147,12 +148,12 @@ public class IotMainWorkOrderServiceImpl implements IotMainWorkOrderService {
         reqVO.setResult(1);
         reqVO.setType(1);
         List<Long> workOrderIds = new ArrayList<>();
-        List<IotMainWorkOrderDO> workOrders = iotMainWorkOrderMapper.selectList(reqVO);
-        if (CollUtil.isNotEmpty(workOrders)) {
+        // List<IotMainWorkOrderDO> workOrders = iotMainWorkOrderMapper.selectList(reqVO);
+        /* if (CollUtil.isNotEmpty(workOrders)) {
             workOrders.forEach(order -> {
                 workOrderIds.add(order.getId());
             });
-        }
+        } */
         List<IotMainWorkOrderBomDO> workOrderBomS = new ArrayList<>();
         if (CollUtil.isNotEmpty(workOrderIds)) {
             bomReqVO.setWorkOrderIds(workOrderIds);
@@ -341,9 +342,8 @@ public class IotMainWorkOrderServiceImpl implements IotMainWorkOrderService {
                 ids = deptService.getChildDeptIdListFromCache(pageReqVO.getDeptId());
                 ids.add(pageReqVO.getDeptId());
             }
-            // 筛选出已计算出保养距离的设备id
-            /* IPage<IotDeviceRespVO> page = iotDeviceMapper.deviceDistances(
-                    new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()), pageReqVO, sortedDeviceIds, orderDeviceIds, mainBomDeviceIds, ids); */
+            // 不查询保养订单表 暂时传一个不会出现的设备id
+            orderDeviceIds.add(Long.MIN_VALUE);
             List<IotDeviceRespVO> alarmDevices = iotDeviceMapper.deviceAlarmDistances(sortedDeviceIds, orderDeviceIds, mainBomDeviceIds);
             // 处理当前分页数据 拼接上已经排序的 筛选出的设备保养项 最小保养距离
             List<Long> alarmDeviceIds = new ArrayList<>();
@@ -376,7 +376,6 @@ public class IotMainWorkOrderServiceImpl implements IotMainWorkOrderService {
             }
             throw exception;
         }
-        // return PageResult.empty();
     }
 
     /**