Browse Source

🚀 区域管理接口开发完毕

master
wangxiang 3 years ago
parent
commit
954a81d634
  1. 1
      kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/constant/AppConstants.java
  2. 2
      kicc-common/kicc-common-data/src/main/java/com/cloud/kicc/common/data/entity/TreeEntity.java
  3. 6
      kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/Region.java
  4. 2
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipBoxUserController.java
  5. 2
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipSpecimenController.java
  6. 2
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/EquipTemperatureController.java

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

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

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

@ -1,6 +1,7 @@ @@ -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 { @@ -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();
}

6
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; @@ -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; @@ -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> {
/** 区域编码 */

2
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; @@ -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 {

2
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; @@ -15,7 +15,7 @@ import java.util.Arrays;
@RequiredArgsConstructor
@RestController
@RequestMapping(AppConstants.APP_EQUIP + "/specimen")
@RequestMapping(AppConstants.APP_COMMON + "/specimen")
public class EquipSpecimenController {

2
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; @@ -19,7 +19,7 @@ import java.util.Arrays;
@RequiredArgsConstructor
@RestController
@RequestMapping(AppConstants.APP_EQUIP + "/temperature")
@RequestMapping(AppConstants.APP_COMMON + "/temperature")
public class EquipTemperatureController {

Loading…
Cancel
Save