fix: 设备激活查询

server-service/src/main/java/com/makeit/entity/platform/device/PlatDevice.java

 package com.makeit.entity.platform.device;
 package com.makeit.entity.platform.device;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.makeit.common.entity.BaseBusEntity;
 import com.makeit.common.entity.BaseBusEntity;
 import com.makeit.module.iot.enums.DeviceState;
 import com.makeit.module.iot.enums.DeviceState;
@@ -81,6 +82,9 @@ public class PlatDevice extends BaseBusEntity {
     private Long expireTime;
     private Long expireTime;
     @ApiModelProperty(value = "激活时间")
     @ApiModelProperty(value = "激活时间")
     private Long activationTime;
     private Long activationTime;
+    @ApiModelProperty(value = "设备是否激活 1 激活 0 没激活")
+    @TableField(exist = false)
+    private Integer active;
 
 
     @ApiModelProperty(value = "设备类型 0-呼吸心率雷达 1-空间人体雷达 2-跌倒检测雷达")
     @ApiModelProperty(value = "设备类型 0-呼吸心率雷达 1-空间人体雷达 2-跌倒检测雷达")
     private String category;
     private String category;
@@ -92,4 +96,5 @@ public class PlatDevice extends BaseBusEntity {
     private LocalDateTime endDate;
     private LocalDateTime endDate;
 
 
 
 
+
 }
 }

server-service/src/main/resources/mappers/PlatDeviceMapper.xml

@@ -48,7 +48,7 @@
                     and pd.device_license is not null
                     and pd.device_license is not null
                 </when>
                 </when>
                 <when test="param.active !=null and param.active  !='' and param.active == 0">
                 <when test="param.active !=null and param.active  !='' and param.active == 0">
-                    and pd.device_license is  null
+                    and pd.device_license is null
                 </when>
                 </when>
             </choose>
             </choose>
             <if test="param.orgIds != null and param.orgIds.size() > 0 ">
             <if test="param.orgIds != null and param.orgIds.size() > 0 ">