TRX 1 éve
szülő
commit
5e40dba7bd

+ 2 - 1
FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/DeviceInfoModel.java

@@ -5,6 +5,7 @@ import com.zhongshu.card.client.model.base.SuperModel;
 import com.zhongshu.card.client.model.org.OrganizationMiniModel;
 import com.zhongshu.card.client.model.org.OrganizationSimpleModel;
 import com.zhongshu.card.client.model.school.AreaModel;
+import com.zhongshu.card.client.model.school.AreaSimpleModel;
 import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.client.type.OnLineState;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -105,7 +106,7 @@ public class DeviceInfoModel extends SuperModel {
     }
 
     @Schema(description = "区域信息")
-    private AreaModel area;
+    private AreaSimpleModel area;
 
     @Schema(description = "")
     private String areaId;

+ 6 - 5
FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/DevicePermissModel.java

@@ -5,8 +5,9 @@ import com.zhongshu.card.client.model.base.SuperModel;
 import com.zhongshu.card.client.model.org.DepartmentModel;
 import com.zhongshu.card.client.model.org.OrganizationUserModel;
 import com.zhongshu.card.client.model.org.UserCountModel;
+import com.zhongshu.card.client.model.org.UserCountSimpleModel;
 import com.zhongshu.card.client.model.org.role.RoleModel;
-import com.zhongshu.card.client.model.school.AreaModel;
+import com.zhongshu.card.client.model.school.AreaSimpleModel;
 import com.zhongshu.card.client.model.school.DictInfoSimpleModel;
 import com.zhongshu.card.client.type.UserState;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -50,9 +51,9 @@ public class DevicePermissModel extends SuperModel {
     }
 
     @Schema(description = "区域信息")
-    private AreaModel area;
+    private AreaSimpleModel area;
 
-    public AreaModel getArea() {
+    public AreaSimpleModel getArea() {
         if (ObjectUtils.isNotEmpty(deviceInfo)) {
             return deviceInfo.getArea();
         }
@@ -63,9 +64,9 @@ public class DevicePermissModel extends SuperModel {
     private String areaPaths = "";
 
     @Schema(description = "可使用的用户信息")
-    private UserCountModel userAccount;
+    private UserCountSimpleModel userAccount;
 
-    public UserCountModel getUserAccount() {
+    public UserCountSimpleModel getUserAccount() {
         if (organizationUser != null) {
             return organizationUser.getUser();
         }

+ 1 - 1
FullCardClient/src/main/java/com/zhongshu/card/client/model/org/OrganizationUserModel.java

@@ -42,7 +42,7 @@ public class OrganizationUserModel extends SuperModel {
     }
 
     @Schema(description = "用户信息")
-    private UserCountModel user;
+    private UserCountSimpleModel user;
 
     @Schema(description = "性别")
     private Sex sex;

+ 28 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/school/AreaSimpleModel.java

@@ -0,0 +1,28 @@
+package com.zhongshu.card.client.model.school;
+
+import com.zhongshu.card.client.model.base.SuperModel;
+import com.zhongshu.card.client.type.DataState;
+import com.zhongshu.card.client.utils.ITree;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author TRX
+ * @date 2024/6/3
+ */
+@Data
+public class AreaSimpleModel implements Serializable {
+
+    @Schema(description = "数据ID")
+    private String id;
+
+    @Schema(description = "区域名称")
+    private String name;
+
+    @Schema(description = "区域编码")
+    private String code = "";
+}

+ 2 - 1
FullCardClient/src/main/java/com/zhongshu/card/client/service/school/AreaService.java

@@ -4,6 +4,7 @@ import com.zhongshu.card.client.model.base.IDsParam;
 import com.zhongshu.card.client.model.school.AreaModel;
 import com.zhongshu.card.client.model.school.AreaParam;
 import com.github.microservice.net.ResultContent;
+import com.zhongshu.card.client.model.school.AreaSimpleModel;
 import com.zhongshu.card.client.utils.ITree;
 
 import java.util.List;
@@ -19,7 +20,7 @@ public interface AreaService {
     public ResultContent<List<ITree>> getAreaTree(String oid);
 
     // 加载当前区域的所有上级区域(包括自己)
-    List<AreaModel> getParents(String id);
+    List<AreaSimpleModel> getParents(String id);
 
     // 删除
     ResultContent deleteArea(String id);