更新

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/IotDeviceController.java

@@ -172,6 +172,19 @@ public class IotDeviceController {
         return success(IotDeviceConvert.INSTANCE.convertList1(devices, deptMap));
     }
 
+    @GetMapping("/deviceAssociateBomListPage")
+    @Operation(summary = "获得设备-bom关联关系列表")
+    @PreAuthorize("@ss.hasPermission('rq:iot-device:query')")
+    public CommonResult<PageResult<IotDeviceRespVO>> deviceAssociateBomListPage(IotDevicePageReqVO pageReqVO) {
+        PageResult<IotDeviceRespVO> devices = iotDeviceService.deviceAssociateBomListPage(pageReqVO);
+        if (CollUtil.isEmpty(devices.getList())) {
+            return success(new PageResult<>(devices.getTotal()));
+        }
+        Map<Long, DeptDO> deptMap = deptService.getDeptMap(
+                convertList(devices.getList(), IotDeviceRespVO::getDeptId));
+        return success(new PageResult<>(IotDeviceConvert.INSTANCE.convertList1(devices.getList(), deptMap), devices.getTotal()));
+    }
+
     /**
      * 组装 设备-bom 关联关系对象
      * @param devices

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/IotDeviceMapper.java

@@ -69,4 +69,5 @@ public interface IotDeviceMapper extends BaseMapperX<IotDeviceDO> {
                                                   @Param("reqVO") IotDevicePageReqVO reqVO, @Param("deptIds") Collection<Long> deptIds);
 
     List<IotDeviceRespVO> deviceAssociateBomList(@Param("deviceIds") Collection<Long> deviceIds);
+    IPage<IotDeviceRespVO> deviceAssociateBomListPage(IPage<IotDeviceRespVO> page, @Param("deviceIds") Collection<Long> deviceIds);
 }

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

@@ -74,6 +74,7 @@ public interface IotDeviceService {
      * @return 设备bom 关联 列表
      */
     List<IotDeviceRespVO> deviceAssociateBomList(List<Long> deviceIds);
+    PageResult<IotDeviceRespVO> deviceAssociateBomListPage(IotDevicePageReqVO pageReqVO);
 
     /**
      * 根据设备id查询设备关联信息

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

@@ -194,6 +194,12 @@ public class IotDeviceServiceImpl implements IotDeviceService {
         return devices;
     }
 
+    @Override
+    public PageResult<IotDeviceRespVO> deviceAssociateBomListPage(IotDevicePageReqVO pageReqVO) {
+        IPage<IotDeviceRespVO> page = iotDeviceMapper.deviceAssociateBomListPage(new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()), pageReqVO.getDeviceIds());
+        return new PageResult<>(page.getRecords(), page.getTotal());
+    }
+
     @Override
     public List<IotDeviceRespVO> getDeviceList(Collection<Long> ids) {
         if (CollUtil.isEmpty(ids)) {

yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/static/IotDeviceMapper.xml

@@ -102,4 +102,59 @@
             AND l.id = latest.max_id
         ) tmp ON tmp.device_id = t2.id
     </select>
+    <select id="deviceAssociateBomListPage"
+            resultType="cn.iocoder.yudao.module.pms.controller.admin.vo.IotDeviceRespVO">
+        SELECT *
+        FROM (
+        SELECT
+        t.id ,
+        t.device_code,
+        t.device_name,
+        t.asset_class,
+        t.brand,
+        t.model,
+        t.dept_id,
+        t.device_status,
+        t.asset_property,
+        t.pic_url,
+        t.remark,
+        t.create_time,
+        t1.id bomNodeId,
+        t1.`name`,
+        t1.`code`
+        FROM
+        rq_iot_device t
+        INNER JOIN rq_iot_bom t1 ON ( t1.device_category_id = t.asset_class AND t1.deleted = 0 )
+        WHERE
+        t.deleted = 0
+        AND t1.deleted = 0
+        AND t1.leaf_flag = 1
+        AND t1.type LIKE '%2%'
+        <if test="deviceIds != null and deviceIds.size &gt; 0">
+            AND t.id IN
+            <foreach collection="deviceIds" index="index" item="key" open="(" separator="," close=")">
+                #{key}
+            </foreach>
+        </if>
+        ) t2
+        LEFT JOIN (
+        SELECT
+        l.device_id,
+        l.total_run_time,
+        l.total_mileage,
+        l.time
+        FROM rq_iot_device_run_log l
+        RIGHT JOIN (
+        SELECT
+        device_id,
+        MAX(time) AS latest_time,
+        MAX(id)	AS max_id
+        FROM rq_iot_device_run_log
+        GROUP BY device_id
+        ) AS latest
+        ON l.device_id = latest.device_id
+        AND l.time = latest.latest_time
+        AND l.id = latest.max_id
+        ) tmp ON tmp.device_id = t2.id
+    </select>
 </mapper>