소스 검색

设备台账添加类别查询,运行监控添加是否在线查询

lipenghui 1 개월 전
부모
커밋
71ce2dcf82

+ 2 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/vo/IotDevicePageReqVO.java

@@ -133,4 +133,6 @@ public class IotDevicePageReqVO extends PageParam {
 
     @Schema(description = "车辆id")
     private Long carId;
+    @Schema(description = "是否在线")
+    private Integer ifInline;
 }

+ 6 - 2
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/IotDeviceDO.java

@@ -137,7 +137,9 @@ public class IotDeviceDO extends BaseDO {
      * 动态模板信息
      */
     private String templateJson;
-
+    /**
+     * 设备类别
+     */
     private Long assetClass;
 
     private Long sortColumn;
@@ -146,7 +148,9 @@ public class IotDeviceDO extends BaseDO {
      * 设备分类BOM同步状态 1已同步 0未同步
      */
     private Integer bomSyncStatus;
-
+    /**
+     * 是否在线
+     */
     private Integer ifInline;
 
     private String lastInlineTime;

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

@@ -134,6 +134,7 @@ public interface IotDeviceMapper extends BaseMapperX<IotDeviceDO> {
                 .eqIfPresent(IotDeviceDO::getTemplateJson, reqVO.getTemplateJson())
                 .likeIfPresent(IotDeviceDO::getDeviceCode, reqVO.getDeviceCode())
                 .eqIfPresent(IotDeviceDO::getBomSyncStatus, reqVO.getBomSyncStatus())
+                .eqIfPresent(IotDeviceDO::getIfInline, reqVO.getIfInline())
                 .isNotNull(IotDeviceDO::getIfInline)
                 .orderByAsc(IotDeviceDO::getIfInline).orderByDesc(IotDeviceDO::getLastInlineTime));
     }