Merge remote-tracking branch 'origin/master'

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/controller/admin/yanfan/vo/DevicePageReqVO.java

@@ -0,0 +1,110 @@
+package cn.iocoder.yudao.module.pms.controller.admin.yanfan.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 设备分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class DevicePageReqVO extends PageParam {
+
+    @Schema(description = "设备名称", example = "芋艿")
+    private String deviceName;
+
+    @Schema(description = "产品ID", example = "30992")
+    private Long productId;
+
+    @Schema(description = "产品名称", example = "王五")
+    private String productName;
+
+    @Schema(description = "租户名称", example = "芋艿")
+    private String tenantName;
+
+    @Schema(description = "设备编号")
+    private String serialNumber;
+
+    @Schema(description = "子设备网关编号")
+    private String gwDevCode;
+
+    @Schema(description = "固件版本")
+    private Double firmwareVersion;
+
+    @Schema(description = "设备状态（1-未激活，2-禁用，3-在线，4-离线）", example = "2")
+    private Boolean status;
+
+    @Schema(description = "信号强度（	信号极好4格[-55— 0]，	信号好3格[-70— -55]，	信号一般2格[-85— -70]，	信号差1格[-100— -85]）")
+    private Integer rssi;
+
+    @Schema(description = "是否启用设备影子(0=禁用，1=启用)")
+    private Boolean isShadow;
+
+    @Schema(description = "定位方式(1=ip自动定位，2=设备定位，3=自定义)")
+    private Boolean locationWay;
+
+    @Schema(description = "物模型值")
+    private String thingsModelValue;
+
+    @Schema(description = "设备所在地址")
+    private String networkAddress;
+
+    @Schema(description = "设备入网IP")
+    private String networkIp;
+
+    @Schema(description = "设备经度")
+    private Double longitude;
+
+    @Schema(description = "设备纬度")
+    private Double latitude;
+
+    @Schema(description = "激活时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] activeTime;
+
+    @Schema(description = "设备摘要")
+    private String summary;
+
+    @Schema(description = "图片地址", example = "https://www.iocoder.cn")
+    private String imgUrl;
+
+    @Schema(description = "删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+    @Schema(description = "创建者")
+    private String createBy;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "更新者")
+    private String updateBy;
+
+    @Schema(description = "备注", example = "你猜")
+    private String remark;
+
+    @Schema(description = "是否是模拟设备")
+    private Integer isSimulate;
+
+    @Schema(description = "从机id", example = "31402")
+    private Integer slaveId;
+
+    @Schema(description = "clientId编号", example = "28927")
+    private String clientId;
+
+    @Schema(description = "发布")
+    private String postDev;
+
+    @Schema(description = "订阅")
+    private String getDev;
+
+    @Schema(description = "mqtt是否自定义状态（1为初始化，0为自定义）")
+    private Integer mqttstats;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/yanfan/vo/DeviceRespVO.java

@@ -0,0 +1,139 @@
+package cn.iocoder.yudao.module.pms.controller.admin.yanfan.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 设备 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class DeviceRespVO {
+
+    @Schema(description = "设备ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "25364")
+    @ExcelProperty("设备ID")
+    private Long deviceId;
+
+    @Schema(description = "设备名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @ExcelProperty("设备名称")
+    private String deviceName;
+
+    @Schema(description = "产品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30992")
+    @ExcelProperty("产品ID")
+    private Long productId;
+
+    @Schema(description = "产品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
+    @ExcelProperty("产品名称")
+    private String productName;
+
+    @Schema(description = "租户名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @ExcelProperty("租户名称")
+    private String tenantName;
+
+    @Schema(description = "设备编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("设备编号")
+    private String serialNumber;
+
+    @Schema(description = "子设备网关编号")
+    @ExcelProperty("子设备网关编号")
+    private String gwDevCode;
+
+    @Schema(description = "固件版本", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("固件版本")
+    private Double firmwareVersion;
+
+    @Schema(description = "设备状态（1-未激活，2-禁用，3-在线，4-离线）", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty("设备状态（1-未激活，2-禁用，3-在线，4-离线）")
+    private Boolean status;
+
+    @Schema(description = "信号强度（	信号极好4格[-55— 0]，	信号好3格[-70— -55]，	信号一般2格[-85— -70]，	信号差1格[-100— -85]）")
+    @ExcelProperty("信号强度（	信号极好4格[-55— 0]，	信号好3格[-70— -55]，	信号一般2格[-85— -70]，	信号差1格[-100— -85]）")
+    private Integer rssi;
+
+    @Schema(description = "是否启用设备影子(0=禁用，1=启用)")
+    @ExcelProperty("是否启用设备影子(0=禁用，1=启用)")
+    private Boolean isShadow;
+
+    @Schema(description = "定位方式(1=ip自动定位，2=设备定位，3=自定义)")
+    @ExcelProperty("定位方式(1=ip自动定位，2=设备定位，3=自定义)")
+    private Boolean locationWay;
+
+    @Schema(description = "物模型值")
+    @ExcelProperty("物模型值")
+    private String thingsModelValue;
+
+    @Schema(description = "设备所在地址")
+    @ExcelProperty("设备所在地址")
+    private String networkAddress;
+
+    @Schema(description = "设备入网IP")
+    @ExcelProperty("设备入网IP")
+    private String networkIp;
+
+    @Schema(description = "设备经度")
+    @ExcelProperty("设备经度")
+    private Double longitude;
+
+    @Schema(description = "设备纬度")
+    @ExcelProperty("设备纬度")
+    private Double latitude;
+
+    @Schema(description = "激活时间")
+    @ExcelProperty("激活时间")
+    private LocalDateTime activeTime;
+
+    @Schema(description = "设备摘要")
+    @ExcelProperty("设备摘要")
+    private String summary;
+
+    @Schema(description = "图片地址", example = "https://www.iocoder.cn")
+    @ExcelProperty("图片地址")
+    private String imgUrl;
+
+    @Schema(description = "删除标志（0代表存在 2代表删除）")
+    @ExcelProperty("删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+    @Schema(description = "创建者")
+    @ExcelProperty("创建者")
+    private String createBy;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "更新者")
+    @ExcelProperty("更新者")
+    private String updateBy;
+
+    @Schema(description = "备注", example = "你猜")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "是否是模拟设备")
+    @ExcelProperty("是否是模拟设备")
+    private Integer isSimulate;
+
+    @Schema(description = "从机id", example = "31402")
+    @ExcelProperty("从机id")
+    private Integer slaveId;
+
+    @Schema(description = "clientId编号", example = "28927")
+    @ExcelProperty("clientId编号")
+    private String clientId;
+
+    @Schema(description = "发布")
+    @ExcelProperty("发布")
+    private String postDev;
+
+    @Schema(description = "订阅")
+    @ExcelProperty("订阅")
+    private String getDev;
+
+    @Schema(description = "mqtt是否自定义状态（1为初始化，0为自定义）")
+    @ExcelProperty("mqtt是否自定义状态（1为初始化，0为自定义）")
+    private Integer mqttstats;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/yanfan/vo/DeviceSaveReqVO.java

@@ -0,0 +1,111 @@
+package cn.iocoder.yudao.module.pms.controller.admin.yanfan.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 设备新增/修改 Request VO")
+@Data
+public class DeviceSaveReqVO {
+
+    @Schema(description = "设备ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "25364")
+    private Long deviceId;
+
+    @Schema(description = "设备名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @NotEmpty(message = "设备名称不能为空")
+    private String deviceName;
+
+    @Schema(description = "产品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30992")
+    @NotNull(message = "产品ID不能为空")
+    private Long productId;
+
+    @Schema(description = "产品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
+    @NotEmpty(message = "产品名称不能为空")
+    private String productName;
+
+    @Schema(description = "租户名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @NotEmpty(message = "租户名称不能为空")
+    private String tenantName;
+
+    @Schema(description = "设备编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "设备编号不能为空")
+    private String serialNumber;
+
+    @Schema(description = "子设备网关编号")
+    private String gwDevCode;
+
+    @Schema(description = "固件版本", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "固件版本不能为空")
+    private Double firmwareVersion;
+
+    @Schema(description = "设备状态（1-未激活，2-禁用，3-在线，4-离线）", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotNull(message = "设备状态（1-未激活，2-禁用，3-在线，4-离线）不能为空")
+    private Boolean status;
+
+    @Schema(description = "信号强度（	信号极好4格[-55— 0]，	信号好3格[-70— -55]，	信号一般2格[-85— -70]，	信号差1格[-100— -85]）")
+    private Integer rssi;
+
+    @Schema(description = "是否启用设备影子(0=禁用，1=启用)")
+    private Boolean isShadow;
+
+    @Schema(description = "定位方式(1=ip自动定位，2=设备定位，3=自定义)")
+    private Boolean locationWay;
+
+    @Schema(description = "物模型值")
+    private String thingsModelValue;
+
+    @Schema(description = "设备所在地址")
+    private String networkAddress;
+
+    @Schema(description = "设备入网IP")
+    private String networkIp;
+
+    @Schema(description = "设备经度")
+    private Double longitude;
+
+    @Schema(description = "设备纬度")
+    private Double latitude;
+
+    @Schema(description = "激活时间")
+    private LocalDateTime activeTime;
+
+    @Schema(description = "设备摘要")
+    private String summary;
+
+    @Schema(description = "图片地址", example = "https://www.iocoder.cn")
+    private String imgUrl;
+
+    @Schema(description = "删除标志（0代表存在 2代表删除）")
+    private String delFlag;
+
+    @Schema(description = "创建者")
+    private String createBy;
+
+    @Schema(description = "更新者")
+    private String updateBy;
+
+    @Schema(description = "备注", example = "你猜")
+    private String remark;
+
+    @Schema(description = "是否是模拟设备")
+    private Integer isSimulate;
+
+    @Schema(description = "从机id", example = "31402")
+    private Integer slaveId;
+
+    @Schema(description = "clientId编号", example = "28927")
+    private String clientId;
+
+    @Schema(description = "发布")
+    private String postDev;
+
+    @Schema(description = "订阅")
+    private String getDev;
+
+    @Schema(description = "mqtt是否自定义状态（1为初始化，0为自定义）")
+    private Integer mqttstats;
+
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/yanfan/DeviceDO.java → yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/yanfan/YfDeviceDO.java

@@ -1,10 +1,9 @@
-package cn.iocoder.yudao.module.iot.dal.dataobject.device;
+package cn.iocoder.yudao.module.pms.dal.dataobject.yanfan;
 
 import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
+
 import java.time.LocalDateTime;
+
 import com.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 
@@ -21,7 +20,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class DeviceDO extends BaseDO {
+public class YfDeviceDO extends BaseDO {
 
     /**
      * 设备ID
@@ -145,4 +144,4 @@ public class DeviceDO extends BaseDO {
      */
     private Integer mqttstats;
 
-}
+}

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/dal/mysql/yanfan/DeviceMapper.java

@@ -1,55 +0,0 @@
-package cn.iocoder.yudao.module.iot.dal.mysql.device;
-
-import java.util.*;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.iot.dal.dataobject.device.DeviceDO;
-import org.apache.ibatis.annotations.Mapper;
-import cn.iocoder.yudao.module.iot.controller.admin.device.vo.*;
-
-/**
- * 设备 Mapper
- *
- * @author 李鹏辉
- */
-@Mapper
-public interface DeviceMapper extends BaseMapperX<DeviceDO> {
-
-    default PageResult<DeviceDO> selectPage(DevicePageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<DeviceDO>()
-                .likeIfPresent(DeviceDO::getDeviceName, reqVO.getDeviceName())
-                .eqIfPresent(DeviceDO::getProductId, reqVO.getProductId())
-                .likeIfPresent(DeviceDO::getProductName, reqVO.getProductName())
-                .likeIfPresent(DeviceDO::getTenantName, reqVO.getTenantName())
-                .eqIfPresent(DeviceDO::getSerialNumber, reqVO.getSerialNumber())
-                .eqIfPresent(DeviceDO::getGwDevCode, reqVO.getGwDevCode())
-                .eqIfPresent(DeviceDO::getFirmwareVersion, reqVO.getFirmwareVersion())
-                .eqIfPresent(DeviceDO::getStatus, reqVO.getStatus())
-                .eqIfPresent(DeviceDO::getRssi, reqVO.getRssi())
-                .eqIfPresent(DeviceDO::getIsShadow, reqVO.getIsShadow())
-                .eqIfPresent(DeviceDO::getLocationWay, reqVO.getLocationWay())
-                .eqIfPresent(DeviceDO::getThingsModelValue, reqVO.getThingsModelValue())
-                .eqIfPresent(DeviceDO::getNetworkAddress, reqVO.getNetworkAddress())
-                .eqIfPresent(DeviceDO::getNetworkIp, reqVO.getNetworkIp())
-                .eqIfPresent(DeviceDO::getLongitude, reqVO.getLongitude())
-                .eqIfPresent(DeviceDO::getLatitude, reqVO.getLatitude())
-                .betweenIfPresent(DeviceDO::getActiveTime, reqVO.getActiveTime())
-                .eqIfPresent(DeviceDO::getSummary, reqVO.getSummary())
-                .eqIfPresent(DeviceDO::getImgUrl, reqVO.getImgUrl())
-                .eqIfPresent(DeviceDO::getDelFlag, reqVO.getDelFlag())
-                .eqIfPresent(DeviceDO::getCreateBy, reqVO.getCreateBy())
-                .betweenIfPresent(DeviceDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(DeviceDO::getUpdateBy, reqVO.getUpdateBy())
-                .eqIfPresent(DeviceDO::getRemark, reqVO.getRemark())
-                .eqIfPresent(DeviceDO::getIsSimulate, reqVO.getIsSimulate())
-                .eqIfPresent(DeviceDO::getSlaveId, reqVO.getSlaveId())
-                .eqIfPresent(DeviceDO::getClientId, reqVO.getClientId())
-                .eqIfPresent(DeviceDO::getPostDev, reqVO.getPostDev())
-                .eqIfPresent(DeviceDO::getGetDev, reqVO.getGetDev())
-                .eqIfPresent(DeviceDO::getMqttstats, reqVO.getMqttstats())
-                .orderByDesc(DeviceDO::getId));
-    }
-
-}

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

@@ -0,0 +1,53 @@
+package cn.iocoder.yudao.module.pms.dal.mysql.yanfan;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.pms.controller.admin.yanfan.vo.DevicePageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.yanfan.YfDeviceDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 设备 Mapper
+ *
+ * @author 李鹏辉
+ */
+@Mapper
+public interface YfDeviceMapper extends BaseMapperX<YfDeviceDO> {
+
+    default PageResult<YfDeviceDO> selectPage(DevicePageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<YfDeviceDO>()
+                .likeIfPresent(YfDeviceDO::getDeviceName, reqVO.getDeviceName())
+                .eqIfPresent(YfDeviceDO::getProductId, reqVO.getProductId())
+                .likeIfPresent(YfDeviceDO::getProductName, reqVO.getProductName())
+                .likeIfPresent(YfDeviceDO::getTenantName, reqVO.getTenantName())
+                .eqIfPresent(YfDeviceDO::getSerialNumber, reqVO.getSerialNumber())
+                .eqIfPresent(YfDeviceDO::getGwDevCode, reqVO.getGwDevCode())
+                .eqIfPresent(YfDeviceDO::getFirmwareVersion, reqVO.getFirmwareVersion())
+                .eqIfPresent(YfDeviceDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(YfDeviceDO::getRssi, reqVO.getRssi())
+                .eqIfPresent(YfDeviceDO::getIsShadow, reqVO.getIsShadow())
+                .eqIfPresent(YfDeviceDO::getLocationWay, reqVO.getLocationWay())
+                .eqIfPresent(YfDeviceDO::getThingsModelValue, reqVO.getThingsModelValue())
+                .eqIfPresent(YfDeviceDO::getNetworkAddress, reqVO.getNetworkAddress())
+                .eqIfPresent(YfDeviceDO::getNetworkIp, reqVO.getNetworkIp())
+                .eqIfPresent(YfDeviceDO::getLongitude, reqVO.getLongitude())
+                .eqIfPresent(YfDeviceDO::getLatitude, reqVO.getLatitude())
+                .betweenIfPresent(YfDeviceDO::getActiveTime, reqVO.getActiveTime())
+                .eqIfPresent(YfDeviceDO::getSummary, reqVO.getSummary())
+                .eqIfPresent(YfDeviceDO::getImgUrl, reqVO.getImgUrl())
+                .eqIfPresent(YfDeviceDO::getDelFlag, reqVO.getDelFlag())
+                .eqIfPresent(YfDeviceDO::getCreateBy, reqVO.getCreateBy())
+                .betweenIfPresent(YfDeviceDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(YfDeviceDO::getUpdateBy, reqVO.getUpdateBy())
+                .eqIfPresent(YfDeviceDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(YfDeviceDO::getIsSimulate, reqVO.getIsSimulate())
+                .eqIfPresent(YfDeviceDO::getSlaveId, reqVO.getSlaveId())
+                .eqIfPresent(YfDeviceDO::getClientId, reqVO.getClientId())
+                .eqIfPresent(YfDeviceDO::getPostDev, reqVO.getPostDev())
+                .eqIfPresent(YfDeviceDO::getGetDev, reqVO.getGetDev())
+                .eqIfPresent(YfDeviceDO::getMqttstats, reqVO.getMqttstats())
+                .orderByDesc(YfDeviceDO::getCreateTime));
+    }
+
+}

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/java/cn/iocoder/yudao/module/pms/service/yanfan/DeviceService.java

@@ -1,55 +0,0 @@
-package cn.iocoder.yudao.module.iot.service.device;
-
-import java.util.*;
-import javax.validation.*;
-import cn.iocoder.yudao.module.iot.controller.admin.device.vo.*;
-import cn.iocoder.yudao.module.iot.dal.dataobject.device.DeviceDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-
-/**
- * 设备 Service 接口
- *
- * @author 李鹏辉
- */
-public interface DeviceService {
-
-    /**
-     * 创建设备
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    Long createDevice(@Valid DeviceSaveReqVO createReqVO);
-
-    /**
-     * 更新设备
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updateDevice(@Valid DeviceSaveReqVO updateReqVO);
-
-    /**
-     * 删除设备
-     *
-     * @param id 编号
-     */
-    void deleteDevice(Long id);
-
-    /**
-     * 获得设备
-     *
-     * @param id 编号
-     * @return 设备
-     */
-    DeviceDO getDevice(Long id);
-
-    /**
-     * 获得设备分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 设备分页
-     */
-    PageResult<DeviceDO> getDevicePage(DevicePageReqVO pageReqVO);
-
-}

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

@@ -1,74 +0,0 @@
-package cn.iocoder.yudao.module.iot.service.device;
-
-import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import cn.iocoder.yudao.module.iot.controller.admin.device.vo.*;
-import cn.iocoder.yudao.module.iot.dal.dataobject.device.DeviceDO;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-
-import cn.iocoder.yudao.module.iot.dal.mysql.device.DeviceMapper;
-
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.*;
-
-/**
- * 设备 Service 实现类
- *
- * @author 李鹏辉
- */
-@Service
-@Validated
-public class DeviceServiceImpl implements DeviceService {
-
-    @Resource
-    private DeviceMapper deviceMapper;
-
-    @Override
-    public Long createDevice(DeviceSaveReqVO createReqVO) {
-        // 插入
-        DeviceDO device = BeanUtils.toBean(createReqVO, DeviceDO.class);
-        deviceMapper.insert(device);
-        // 返回
-        return device.getId();
-    }
-
-    @Override
-    public void updateDevice(DeviceSaveReqVO updateReqVO) {
-        // 校验存在
-        validateDeviceExists(updateReqVO.getId());
-        // 更新
-        DeviceDO updateObj = BeanUtils.toBean(updateReqVO, DeviceDO.class);
-        deviceMapper.updateById(updateObj);
-    }
-
-    @Override
-    public void deleteDevice(Long id) {
-        // 校验存在
-        validateDeviceExists(id);
-        // 删除
-        deviceMapper.deleteById(id);
-    }
-
-    private void validateDeviceExists(Long id) {
-        if (deviceMapper.selectById(id) == null) {
-            throw exception(DEVICE_NOT_EXISTS);
-        }
-    }
-
-    @Override
-    public DeviceDO getDevice(Long id) {
-        return deviceMapper.selectById(id);
-    }
-
-    @Override
-    public PageResult<DeviceDO> getDevicePage(DevicePageReqVO pageReqVO) {
-        return deviceMapper.selectPage(pageReqVO);
-    }
-
-}

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

@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.pms.service.yanfan;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.pms.controller.admin.yanfan.vo.DevicePageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.yanfan.YfDeviceDO;
+
+/**
+ * 设备 Service 接口
+ *
+ * @author 李鹏辉
+ */
+public interface YfDeviceService {
+
+    /**
+     * 获得设备
+     *
+     * @param id 编号
+     * @return 设备
+     */
+    YfDeviceDO getDevice(Long id);
+
+    /**
+     * 获得设备分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 设备分页
+     */
+    PageResult<YfDeviceDO> getDevicePage(DevicePageReqVO pageReqVO);
+
+}

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

@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.pms.service.yanfan;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.pms.controller.admin.yanfan.vo.DevicePageReqVO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.yanfan.YfDeviceDO;
+import cn.iocoder.yudao.module.pms.dal.mysql.yanfan.YfDeviceMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+
+/**
+ * 设备 Service 实现类
+ *
+ * @author 李鹏辉
+ */
+@Service
+@Validated
+public class YfDeviceServiceImpl implements YfDeviceService {
+
+    @Resource
+    private YfDeviceMapper deviceMapper;
+
+    @Override
+    public YfDeviceDO getDevice(Long id) {
+        return deviceMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<YfDeviceDO> getDevicePage(DevicePageReqVO pageReqVO) {
+        return deviceMapper.selectPage(pageReqVO);
+    }
+
+}

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>