巡检工单调整优化

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/inspect/order/IotInspectOrderController.java

@@ -17,9 +17,7 @@ import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.module.pms.controller.admin.inspect.order.vo.*;
 import cn.iocoder.yudao.module.pms.controller.admin.stat.DeptUtil;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDevicePageReqVO;
-import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDeviceRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDeviceSimple;
-import cn.iocoder.yudao.module.pms.controller.admin.vo.IotReportDeviceRespVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.IotDeviceDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectOrderDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectOrderDetailDO;
@@ -219,25 +217,24 @@ public class IotInspectOrderController {
     @PreAuthorize("@ss.hasPermission('rq:iot-inspect-order:query')")
     public CommonResult<PageResult<IotInspectOrderRespVO>> getIotInspectOrderPage(@Valid IotInspectOrderPageReqVO pageReqVO) {
         PageResult<IotInspectOrderDO> pageResult = iotInspectOrderService.getIotInspectOrderPage(pageReqVO);
-        List<IotInspectOrderRespVO> collect = pageResult.getList().stream().map(e -> {
-            IotInspectOrderRespVO iotInspectOrderRespVO = new IotInspectOrderRespVO();
-            BeanUtils.copyProperties(e, iotInspectOrderRespVO);
-            List<IotInspectOrderDetailDO> details = iotInspectOrderDetailMapper.selectList("order_id", e.getId());
-            long deviceCount = details.stream().map(IotInspectOrderDetailDO::getDeviceId).distinct().count();
-            long exceptionCount = details.stream().filter(f -> Objects.nonNull(f.getIfNormal()) && !f.getIfNormal()).map(IotInspectOrderDetailDO::getDeviceId).distinct().count();
-            Map<Long, List<IotInspectOrderDetailDO>> collect1 = details.stream().collect(Collectors.groupingBy(IotInspectOrderDetailDO::getDeviceId));
-            AtomicInteger needDevice = new AtomicInteger();
-            collect1.forEach((k, v) -> {
-                if (v.stream().anyMatch(gg -> Objects.isNull(gg.getIfNormal()))){
-                    needDevice.getAndIncrement();
-                }
-            });
-            iotInspectOrderRespVO.setDeviceCount(deviceCount);
-            iotInspectOrderRespVO.setExceptionCount(exceptionCount);
-            iotInspectOrderRespVO.setNeedDevice(needDevice.get());
-            return iotInspectOrderRespVO;
-        }).collect(Collectors.toList());
-        return success(new PageResult<>(collect, pageResult.getTotal()));
+//        List<IotInspectOrderRespVO> collect = pageResult.getList().stream().map(e -> {
+            //            BeanUtils.copyProperties(e, iotInspectOrderRespVO);
+//            List<IotInspectOrderDetailDO> details = iotInspectOrderDetailMapper.selectList("order_id", e.getId());
+//            long deviceCount = details.stream().map(IotInspectOrderDetailDO::getDeviceId).distinct().count();
+//            long exceptionCount = details.stream().filter(f -> Objects.nonNull(f.getIfNormal()) && !f.getIfNormal()).map(IotInspectOrderDetailDO::getDeviceId).distinct().count();
+//            Map<Long, List<IotInspectOrderDetailDO>> collect1 = details.stream().collect(Collectors.groupingBy(IotInspectOrderDetailDO::getDeviceId));
+//            AtomicInteger needDevice = new AtomicInteger();
+//            collect1.forEach((k, v) -> {
+//                if (v.stream().anyMatch(gg -> Objects.isNull(gg.getIfNormal()))){
+//                    needDevice.getAndIncrement();
+//                }
+//            });
+//            iotInspectOrderRespVO.setDeviceCount(deviceCount);
+//            iotInspectOrderRespVO.setExceptionCount(exceptionCount);
+//            iotInspectOrderRespVO.setNeedDevice(needDevice.get());
+//            return new IotInspectOrderRespVO();
+//        }).collect(Collectors.toList());
+        return success(BeanUtils.toBean(pageResult, IotInspectOrderRespVO.class));
     }
 
     @GetMapping("/page/app")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/inspect/IotInspectOrderDO.java

@@ -66,11 +66,11 @@ public class IotInspectOrderDO extends BaseDO {
     /**
      * 总数
      */
-    private Integer totalCount;
+    private Integer deviceCount;
     /**
      * 应检设备数
      */
-    private Integer needCount;
+    private Integer needDevice;
     /**
      * 异常设备数
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/inspect/IotInspectOrderServiceImpl.java

@@ -130,9 +130,9 @@ public class IotInspectOrderServiceImpl implements IotInspectOrderService {
                 needDevice.getAndIncrement();
             }
         });
-        order.setTotalCount(Math.toIntExact(deviceCount));
+        order.setDeviceCount(Math.toIntExact(deviceCount));
         order.setExceptionCount(Math.toIntExact(exceptionCount));
-        order.setNeedCount(needDevice.get());
+        order.setNeedDevice(needDevice.get());
         iotInspectOrderMapper.updateById(order);
         //--------------------------------------------------------------------------------------------------------
         CompletableFuture.runAsync(()->{
@@ -359,8 +359,8 @@ public class IotInspectOrderServiceImpl implements IotInspectOrderService {
             iotInspectOrderDO.setChargeName(Objects.nonNull(user)?user.getNickname():"");
             iotInspectOrderDO.setDeptId(user.getDeptId());
             Set<Long> collect = results.stream().map(IotInspectOrderDetailDO::getDeviceId).collect(Collectors.toSet());
-            iotInspectOrderDO.setTotalCount(collect.size());
-            iotInspectOrderDO.setNeedCount(collect.size());
+            iotInspectOrderDO.setDeviceCount(collect.size());
+            iotInspectOrderDO.setNeedDevice(collect.size());
             iotInspectOrderDO.setExceptionCount(0);
             TenantUtils.execute(1L, () -> iotInspectOrderMapper.insert(iotInspectOrderDO));
             results.forEach(result-> result.setOrderId(iotInspectOrderDO.getId()));