出厂日期

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java

@@ -1,9 +1,6 @@
 package com.fuyuanshen.equipment.domain;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fuyuanshen.common.tenant.core.TenantEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -32,6 +29,13 @@ public class Device extends TenantEntity {
     @TableField(exist = false)
     private Long assignId;
 
+    /**
+     * 设备分组
+     * group_id
+     */
+    @Schema(name = "设备分组")
+    private Long groupId;
+
     /**
      * device_type
      */
@@ -143,4 +147,11 @@ public class Device extends TenantEntity {
      */
     private String subTopic;
 
+    /**
+     * 出厂日期
+     * production_date
+     */
+    @Schema(name = "出厂日期")
+    private Date productionDate;
+
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java

@@ -66,8 +66,22 @@ public class DeviceQueryCriteria extends BaseEntity {
     /* app绑定用户id */
     private Long bindingUserId;
 
-
+    /**
-    /* 是否为管理员 */
+     * 是否为管理员
+     */
+    @Schema(name = "是否为管理员")
     private Boolean isAdmin = false;
 
+    /**
+     * 设备所属分组
+     */
+    @Schema(name = "设备所属分组")
+    private Long groupId;
+
+    /**
+     * 设备地区
+     */
+    @Schema(name = "设备地区")
+    private String area;
+
 }