🚀 区域管理接口开发完毕

kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/constant/AppConstants.java

@@ -16,5 +16,4 @@ public interface AppConstants {
 
     String APP_COMMON = "/common";
 
-    String APP_EQUIP = "/equip";
 }

kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/entity/TreeEntity.java

@@ -1,6 +1,7 @@
 package com.cloud.kicc.common.data.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -37,6 +38,7 @@ public class TreeEntity<T> extends CommonEntity {
 
     @ApiModelProperty("子级集合")
     @TableField(exist = false)
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
     protected List<T> children = new ArrayList();
 
 }

kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Region.java

@@ -3,10 +3,14 @@ package com.cloud.kicc.system.api.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.cloud.kicc.common.data.entity.TreeEntity;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  *<p>
  * 区域管理
@@ -19,7 +23,7 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName(value="sys_region", excludeProperty = { "remarks", "delFlag" })
+@TableName(value="sys_region", excludeProperty = { "delFlag" })
 public class Region extends TreeEntity<Region> {
 
     /** 区域编码 */

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipBoxUserController.java

@@ -21,7 +21,7 @@ import java.util.Arrays;
  */
 @RestController
 @RequiredArgsConstructor
-@RequestMapping(AppConstants.APP_EQUIP + "/box/user")
+@RequestMapping(AppConstants.APP_COMMON + "/box/user")
 public class EquipBoxUserController {
 
 

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipSpecimenController.java

@@ -15,7 +15,7 @@ import java.util.Arrays;
 
 @RequiredArgsConstructor
 @RestController
-@RequestMapping(AppConstants.APP_EQUIP + "/specimen")
+@RequestMapping(AppConstants.APP_COMMON + "/specimen")
 public class EquipSpecimenController {
 
 

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipTemperatureController.java

@@ -19,7 +19,7 @@ import java.util.Arrays;
 
 @RequiredArgsConstructor
 @RestController
-@RequestMapping(AppConstants.APP_EQUIP + "/temperature")
+@RequestMapping(AppConstants.APP_COMMON + "/temperature")
 public class EquipTemperatureController {