diff --git a/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/constant/AppConstants.java b/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/constant/AppConstants.java index 44489d55..c24c6df8 100644 --- a/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/constant/AppConstants.java +++ b/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"; } diff --git a/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/entity/TreeEntity.java b/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/entity/TreeEntity.java index 7eb29cc1..eba7f88f 100644 --- a/kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/entity/TreeEntity.java +++ b/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 extends CommonEntity { @ApiModelProperty("子级集合") @TableField(exist = false) + @JsonInclude(JsonInclude.Include.NON_EMPTY) protected List children = new ArrayList(); } diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Region.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Region.java index 4d371158..061a42b0 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Region.java +++ b/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; + /** *

* 区域管理 @@ -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 { /** 区域编码 */ diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipBoxUserController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipBoxUserController.java index 8aeb8568..e1f6e524 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipBoxUserController.java +++ b/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 { diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipSpecimenController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipSpecimenController.java index d6e522f1..79dcd169 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipSpecimenController.java +++ b/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 { diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipTemperatureController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipTemperatureController.java index e95ddc8d..d766fa96 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipTemperatureController.java +++ b/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 {