删除省市区代码字段，改为区域字段regionCode

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/feign/FeignService.java

+package com.yeejoin.amos.boot.biz.common.feign;
+
+import com.yeejoin.amos.component.feign.utils.FeignUtil;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Feign service
+ *
+ * @author tb
+ */
+@Service
+public class FeignService {
+
+    private final Logger logger = LogManager.getLogger(FeignService.class);
+
+    /**
+     * 根据dictCode从平台获取数据字典
+     *
+     * @param dictCode
+     * @return
+     */
+    public Object listDictionaryByDictCode(String dictCode) throws Exception {
+        logger.info("===========>listDictionaryByDictCode方法请求参数：{}", dictCode);
+        List<DictionarieValueModel> dictionaryModel;
+
+        dictionaryModel = FeignUtil.remoteCall(() -> Systemctl.dictionarieClient.dictValues(dictCode));
+        return dictionaryModel;
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/ElevatorDto.java

@@ -28,25 +28,19 @@ public class ElevatorDto extends BaseEntity {
     private Integer rescueCode;
 
     @ApiModelProperty(value = "设备注册代码")
-    private String registorCode;
+    private String registerCode;
 
     @ApiModelProperty(value = "所属省")
     private String province;
 
-    @ApiModelProperty(value = "所属省代码")
-    private String provinceCode;
-
     @ApiModelProperty(value = "所属地市")
     private String city;
 
-    @ApiModelProperty(value = "所属地市代码")
-    private String cityCode;
-
     @ApiModelProperty(value = "所属区县")
     private String district;
 
-    @ApiModelProperty(value = "所属区县代码")
-    private String districtCode;
+    @ApiModelProperty(value = "所属区域代码")
+    private String regionCode;
 
     @ApiModelProperty(value = "安装地址")
     private String address;

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/MaintenanceUnitDto.java

@@ -36,20 +36,14 @@ public class MaintenanceUnitDto extends BaseEntity {
     @ApiModelProperty(value = "省份")
     private String province;
 
-    @ApiModelProperty(value = "省份代码")
-    private String provinceCode;
-
     @ApiModelProperty(value = "地市")
     private String city;
 
-    @ApiModelProperty(value = "地市代码")
-    private String cityCode;
-
     @ApiModelProperty(value = "区县")
     private String district;
 
-    @ApiModelProperty(value = "区县代码")
-    private String districtCode;
+    @ApiModelProperty(value = "区域代码")
+    private String regionCode;
 
     @ApiModelProperty(value = "地址(详细地址，包括道路、门牌号码)")
     private String address;

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/RescueStationDto.java

@@ -33,20 +33,14 @@ public class RescueStationDto extends BaseEntity {
     @ApiModelProperty(value = "省份")
     private String province;
 
-    @ApiModelProperty(value = "省份代码")
-    private String provinceCode;
-
     @ApiModelProperty(value = "地市")
     private String city;
 
-    @ApiModelProperty(value = "地市代码")
-    private String cityCode;
-
     @ApiModelProperty(value = "区县")
     private String district;
 
-    @ApiModelProperty(value = "区县代码")
-    private String districtCode;
+    @ApiModelProperty(value = "区域代码")
+    private String regionCode;
 
     @ApiModelProperty(value = "地址(详细地址，包括道路、门牌号码)")
     private String address;

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/UseUnitDto.java

@@ -42,20 +42,14 @@ public class UseUnitDto extends BaseEntity {
     @ApiModelProperty(value = "省份")
     private String province;
 
-    @ApiModelProperty(value = "省份代码")
-    private String provinceCode;
-
     @ApiModelProperty(value = "地市")
     private String city;
 
-    @ApiModelProperty(value = "地市代码")
-    private String cityCode;
-
     @ApiModelProperty(value = "区县")
     private String district;
 
-    @ApiModelProperty(value = "区县代码")
-    private String districtCode;
+    @ApiModelProperty(value = "区域代码")
+    private String regionCode;
 
     @ApiModelProperty(value = "地址")
     private String address;

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/Elevator.java

@@ -29,25 +29,19 @@ public class Elevator extends BaseEntity {
     private Integer rescueCode;
 
     @ApiModelProperty(value = "设备注册代码")
-    private String registorCode;
+    private String registerCode;
 
     @ApiModelProperty(value = "所属省")
     private String province;
 
-    @ApiModelProperty(value = "所属省代码")
-    private String provinceCode;
-
     @ApiModelProperty(value = "所属地市")
     private String city;
 
-    @ApiModelProperty(value = "所属地市代码")
-    private String cityCode;
-
     @ApiModelProperty(value = "所属区县")
     private String district;
 
-    @ApiModelProperty(value = "所属区县代码")
-    private String districtCode;
+    @ApiModelProperty(value = "所属区域代码")
+    private String regionCode;
 
     @ApiModelProperty(value = "安装地址")
     private String address;

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/MaintenanceUnit.java

@@ -37,20 +37,14 @@ public class MaintenanceUnit extends BaseEntity {
     @ApiModelProperty(value = "省份")
     private String province;
 
-    @ApiModelProperty(value = "省份代码")
-    private String provinceCode;
-
     @ApiModelProperty(value = "地市")
     private String city;
 
-    @ApiModelProperty(value = "地市代码")
-    private String cityCode;
-
     @ApiModelProperty(value = "区县")
     private String district;
 
-    @ApiModelProperty(value = "区县代码")
-    private String districtCode;
+    @ApiModelProperty(value = "区域代码")
+    private String regionCode;
 
     @ApiModelProperty(value = "地址(详细地址，包括道路、门牌号码)")
     private String address;

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/RescueStation.java

@@ -34,20 +34,14 @@ public class RescueStation extends BaseEntity {
     @ApiModelProperty(value = "省份")
     private String province;
 
-    @ApiModelProperty(value = "省份代码")
-    private String provinceCode;
-
     @ApiModelProperty(value = "地市")
     private String city;
 
-    @ApiModelProperty(value = "地市代码")
-    private String cityCode;
-
     @ApiModelProperty(value = "区县")
     private String district;
 
-    @ApiModelProperty(value = "区县代码")
-    private String districtCode;
+    @ApiModelProperty(value = "区域代码")
+    private String regionCode;
 
     @ApiModelProperty(value = "地址(详细地址，包括道路、门牌号码)")
     private String address;

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/UseUnit.java

@@ -43,20 +43,14 @@ public class UseUnit extends BaseEntity {
     @ApiModelProperty(value = "省份")
     private String province;
 
-    @ApiModelProperty(value = "省份代码")
-    private String provinceCode;
-
     @ApiModelProperty(value = "地市")
     private String city;
 
-    @ApiModelProperty(value = "地市代码")
-    private String cityCode;
-
     @ApiModelProperty(value = "区县")
     private String district;
 
-    @ApiModelProperty(value = "区县代码")
-    private String districtCode;
+    @ApiModelProperty(value = "区域代码")
+    private String regionCode;
 
     @ApiModelProperty(value = "地址")
     private String address;

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/vo/ElevatorVo.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.util.Date;
 
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -17,7 +18,7 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @TableName("tcb_elevator")
 @ApiModel(value = "ElevatorVo", description = "ElevatorVo")
-public class ElevatorVo {
+public class ElevatorVo extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
@@ -26,25 +27,19 @@ public class ElevatorVo {
     private Integer rescueCode;
 
     @ApiModelProperty(value = "设备注册代码")
-    private String registorCode;
+    private String registerCode;
 
     @ApiModelProperty(value = "所属省")
     private String province;
 
-    @ApiModelProperty(value = "所属省代码")
-    private String provinceCode;
-
     @ApiModelProperty(value = "所属地市")
     private String city;
 
-    @ApiModelProperty(value = "所属地市代码")
-    private String cityCode;
-
     @ApiModelProperty(value = "所属区县")
     private String district;
 
-    @ApiModelProperty(value = "所属区县代码")
-    private String districtCode;
+    @ApiModelProperty(value = "所属区域代码")
+    private String regionCode;
 
     @ApiModelProperty(value = "安装地址")
     private String address;

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/vo/MaintenanceUnitVo.java

@@ -22,7 +22,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 @Accessors(chain = true)
 @TableName("cb_maintenance_unit")
 @ApiModel(value="MaintenanceUnitVo", description="")
-public class MaintenanceUnitVo{
+public class MaintenanceUnitVo extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
@@ -36,20 +36,14 @@ public class MaintenanceUnitVo{
     @ApiModelProperty(value = "省份")
     private String province;
 
-    @ApiModelProperty(value = "省份代码")
-    private String provinceCode;
-
     @ApiModelProperty(value = "地市")
     private String city;
 
-    @ApiModelProperty(value = "地市代码")
-    private String cityCode;
-
     @ApiModelProperty(value = "区县")
     private String district;
 
-    @ApiModelProperty(value = "区县代码")
-    private String districtCode;
+    @ApiModelProperty(value = "区域代码")
+    private String regionCode;
 
     @ApiModelProperty(value = "地址(详细地址，包括道路、门牌号码)")
     private String address;

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/vo/RescueStationVo.java

@@ -22,7 +22,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 @Accessors(chain = true)
 @TableName("tcb_rescue_station")
 @ApiModel(value="RescueStationVo", description="")
-public class RescueStationVo{
+public class RescueStationVo extends BaseEntity{
 
     private static final long serialVersionUID = 1L;
 
@@ -33,20 +33,14 @@ public class RescueStationVo{
     @ApiModelProperty(value = "省份")
     private String province;
 
-    @ApiModelProperty(value = "省份代码")
-    private String provinceCode;
-
     @ApiModelProperty(value = "地市")
     private String city;
 
-    @ApiModelProperty(value = "地市代码")
-    private String cityCode;
-
     @ApiModelProperty(value = "区县")
     private String district;
 
-    @ApiModelProperty(value = "区县代码")
-    private String districtCode;
+    @ApiModelProperty(value = "区域代码")
+    private String regionCode;
 
     @ApiModelProperty(value = "地址(详细地址，包括道路、门牌号码)")
     private String address;

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/vo/UseUnitVo.java

@@ -22,7 +22,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 @Accessors(chain = true)
 @TableName("tcb_use_unit")
 @ApiModel(value="UseUnitVo", description="")
-public class UseUnitVo{
+public class UseUnitVo extends BaseEntity{
 
     private static final long serialVersionUID = 1L;
 
@@ -42,20 +42,14 @@ public class UseUnitVo{
     @ApiModelProperty(value = "省份")
     private String province;
 
-    @ApiModelProperty(value = "省份代码")
-    private String provinceCode;
-
     @ApiModelProperty(value = "地市")
     private String city;
 
-    @ApiModelProperty(value = "地市代码")
-    private String cityCode;
-
     @ApiModelProperty(value = "区县")
     private String district;
 
-    @ApiModelProperty(value = "区县代码")
-    private String districtCode;
+    @ApiModelProperty(value = "区域代码")
+    private String regionCode;
 
     @ApiModelProperty(value = "地址")
     private String address;