fix: 删除sys_town相关调用改为sys_area调用

+package org.thingsboard.server.controller.yunteng;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.thingsboard.server.common.data.yunteng.dto.SysAreaDTO;
+import org.thingsboard.server.dao.yunteng.service.SysAreaService;
+
+import java.util.List;
+
+/**
+ * @author: 徐浩然
+ * @desc: 中国省市区街关联
+ * @date: 2021/12/3-15:56
+ */
+@Api(tags = "中国省市区街关联")
+@RestController
+@RequestMapping("api/yt/area")
+@RequiredArgsConstructor
+public class YtAreaController {
+  private final SysAreaService sysAreaService;
+
+  @PostMapping("areaList")
+  @ApiOperation("查询")
+  public ResponseEntity<List<SysAreaDTO>> areaList(@RequestBody SysAreaDTO sysAreaDTO) {
+    return ResponseEntity.ok(sysAreaService.list(sysAreaDTO));
+  }
+}

-package org.thingsboard.server.controller.yunteng;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.thingsboard.server.dao.yunteng.entities.SysTown;
-import org.thingsboard.server.dao.yunteng.service.SysTownService;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author: 徐浩然
- * @desc: 中国城镇区街
- * @date: 2021/12/3-15:56
- */
-@Api(tags = "中国城镇区街")
-@RestController
-@RequestMapping("api/yt/town")
-@RequiredArgsConstructor
-public class YtTownController {
-  private final SysTownService sysTownService;
-
-  @GetMapping("list")
-  @ApiOperation("查询所有省份")
-  public ResponseEntity<List<SysTown>> getCityList() {
-    return ResponseEntity.ok(sysTownService.getCityList());
-  }
-
-  @GetMapping("childs/{variable}/{value}")
-  @ApiOperation("查询子集")
-  public ResponseEntity<List<SysTown>> childs(
-      @PathVariable("variable") String variable, @PathVariable("value") String value) {
-    return ResponseEntity.ok(sysTownService.findChilds(variable, value));
-  }
-
-  @GetMapping("tree")
-  @ApiOperation("查询城市树形结构")
-  public ResponseEntity<LinkedList<Map<String, Object>>> tree() {
-    return ResponseEntity.ok(sysTownService.tree());
-  }
-}

@@ -58,8 +58,6 @@ public final class ModelConstants {
     public static final String SYS_PLATFORM_DESIGN_TABLE_NAME = "sys_platform_design";
     /** APP定制 */
     public static final String SYS_APP_DESIGN_TABLE_NAME = "sys_app_design";
-    /** 中国城镇区街 */
-    public static final String SYS_TOWN_TABLE_NAME = "sys_town";
     /** 场景联动表 */
     public static final String IOTFS_SCENE_LINKAGE_TABLE_NAME = "iotfs_scene_linkage";
     /** 场景触发器 */
@@ -68,6 +66,8 @@ public final class ModelConstants {
     public static final String IOTFS_DO_CONDITION_TABLE_NAME = "iotfs_do_condition";
     /** 条件动作表 */
     public static final String IOTFS_DO_ACTION_TABLE_NAME = "iotfs_do_action";
+    /** 中国城镇区街 */
+    public static final String SYS_AREA_TABLE_NAME = "sys_area";
   }
 
   public static class TableFields {

@@ -5,24 +5,40 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 
+import java.util.List;
+
 @Data
 @ApiModel(value = "区域信息")
 @RequiredArgsConstructor
-public class SysTownDTO {
+public class AreaInfoDTO {
     @ApiModelProperty(value = "省")
     private String nameProv;
     @ApiModelProperty(value = "省code")
-    private String codeProv;
+    private Long codeProv;
     @ApiModelProperty(value = "市")
     private String nameCity;
     @ApiModelProperty(value = "市code")
-    private String codeCity;
+    private Long codeCity;
     @ApiModelProperty(value = "区")
     private String nameCoun;
     @ApiModelProperty(value = "区code")
-    private String codeCoun;
+    private Long codeCoun;
     @ApiModelProperty(value = "县")
     private String nameTown;
     @ApiModelProperty(value = "县code")
-    private String codeTown;
+    private Long codeTown;
+    @ApiModelProperty(value = "国")
+    private String nameCountry;
+    @ApiModelProperty(value = "国code")
+    private Long codeCountry;
+    @ApiModelProperty(value = "省集合")
+    private List<SysAreaDTO> provs;
+    @ApiModelProperty(value = "市集合")
+    private List<SysAreaDTO> cities;
+    @ApiModelProperty(value = "区集合")
+    private List<SysAreaDTO> couns;
+    @ApiModelProperty(value = "县集合")
+    private List<SysAreaDTO> towns;
+    @ApiModelProperty(value = "国集合")
+    private List<SysAreaDTO> countries;
 }

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.enums.AreaLevelEnum;
+
+/**
+ * @author: 徐浩然
+ * @desc: 中国省市区街关联
+ * @date: 2021/12/16-15:03
+ */
+@Data
+@ApiModel(value = "中国省市区街关联")
+public class SysAreaDTO {
+    @ApiModelProperty(value = "上级Code")
+    private Long parentId;
+
+    @ApiModelProperty(value = "行政级别：AreaLevelEnum")
+    private AreaLevelEnum level;
+
+    @ApiModelProperty(value = "行政名称")
+    private String name;
+
+    @ApiModelProperty(value = "行政编码")
+    private Long code;
+}

@@ -33,8 +33,8 @@ public class SysEnterpriseDTO extends BaseDTO {
   @ApiModelProperty(value = "联系电话")
   private String tel;
   @ApiModelProperty(value = "区域信息")
-  private SysTownDTO sysTown;
-  private String codeTown;
+  private AreaInfoDTO sysTown;
+  private Long codeTown;
   @ApiModelProperty(value = "二维码")
   private String qrCode;
 }

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+import org.thingsboard.server.common.data.yunteng.enums.AreaLevelEnum;
+
+/**
+ * @author: 徐浩然
+ * @desc: 中国省市区街关联
+ * @date: 2021/12/15-17:31
+ */
+@Data
+@TableName(ModelConstants.Table.SYS_AREA_TABLE_NAME)
+public class SysArea{
+  private Long parentId;
+  private AreaLevelEnum level;
+  private String name;
+  private Long code;
+}

-package org.thingsboard.server.dao.yunteng.entities;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
-
-/**
- * @author: 徐浩然
- * @desc: 中国城镇区街
- * @date: 2021/12/3-15:31
- */
-@Data
-@ApiModel(value = "中国城镇区街")
-@TableName(ModelConstants.Table.SYS_TOWN_TABLE_NAME)
-public class SysTown {
-  @ApiModelProperty(value = "省")
-  private String nameProv;
-  @ApiModelProperty(value = "省code")
-  private String codeProv;
-  @ApiModelProperty(value = "市")
-  private String nameCity;
-  @ApiModelProperty(value = "市code")
-  private String codeCity;
-  @ApiModelProperty(value = "区")
-  private String nameCoun;
-  @ApiModelProperty(value = "区code")
-  private String codeCoun;
-  @ApiModelProperty(value = "县")
-  private String nameTown;
-  @ApiModelProperty(value = "县code")
-  private String codeTown;
-}

+package org.thingsboard.server.dao.yunteng.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.yunteng.dto.SysAreaDTO;
+import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
+import org.thingsboard.server.dao.yunteng.entities.SysArea;
+import org.thingsboard.server.dao.yunteng.mapper.SysAreaMapper;
+import org.thingsboard.server.dao.yunteng.service.SysAreaService;
+
+import java.util.List;
+
+/**
+ * @author: 徐浩然
+ * @desc: 中国省市区县
+ * @date: 2021/12/16-11:13
+ */
+@Service
+@RequiredArgsConstructor
+public class SysAreaServiceImpl implements SysAreaService {
+
+  private final SysAreaMapper sysAreaMapper;
+
+  @Override
+  public List<SysAreaDTO> list(SysAreaDTO sysAreaDTO) {
+    return ReflectUtils.sourceToTarget(
+        sysAreaMapper.selectList(
+            new LambdaQueryWrapper<SysArea>()
+                .eq(sysAreaDTO.getLevel() != null, SysArea::getLevel, sysAreaDTO.getLevel())
+                .eq(
+                    sysAreaDTO.getParentId() != null,
+                    SysArea::getParentId,
+                    sysAreaDTO.getParentId())
+                .eq(sysAreaDTO.getCode() != null, SysArea::getCode, sysAreaDTO.getCode())
+                .like(
+                    StringUtils.isNotEmpty(sysAreaDTO.getName()),
+                    SysArea::getName,
+                    sysAreaDTO.getName())),
+        SysAreaDTO.class);
+  }
+
+  @Override
+  public SysAreaDTO getSysAreaInfoByCode(Long code) {
+    if (null == code) return null;
+    SysAreaDTO target = new SysAreaDTO();
+    SysArea source =
+        sysAreaMapper.selectOne(new LambdaQueryWrapper<SysArea>().eq(SysArea::getCode, code));
+    if (null != source) {
+      BeanUtils.copyProperties(source, target);
+    }
+    return target;
+  }
+}

@@ -4,10 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.yunteng.dto.SysAreaDTO;
 import org.thingsboard.server.common.data.yunteng.dto.SysEnterpriseDTO;
+import org.thingsboard.server.common.data.yunteng.dto.AreaInfoDTO;
 import org.thingsboard.server.dao.yunteng.entities.SysEnterprise;
 import org.thingsboard.server.dao.yunteng.mapper.SysEnterpriseMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.SysAreaService;
 import org.thingsboard.server.dao.yunteng.service.SysEnterpriseService;
 
 /**
@@ -21,8 +24,11 @@ import org.thingsboard.server.dao.yunteng.service.SysEnterpriseService;
 public class SysEnterpriseServiceImpl
     extends AbstractBaseService<SysEnterpriseMapper, SysEnterprise>
     implements SysEnterpriseService {
+
+  private final SysAreaService sysAreaService;
+
   @Override
-  public boolean save(SysEnterpriseDTO sysAppDesignDTO,String tenantId) {
+  public boolean save(SysEnterpriseDTO sysAppDesignDTO, String tenantId) {
     SysEnterprise entity = sysAppDesignDTO.getEntity(SysEnterprise.class);
     entity.setTenantId(tenantId);
     return baseMapper.insert(entity) > 0;
@@ -30,19 +36,56 @@ public class SysEnterpriseServiceImpl
 
   @Override
   public SysEnterpriseDTO get(String tenantId) {
-    return baseMapper.get(tenantId);
+    SysEnterpriseDTO sysEnterpriseDTO = baseMapper.get(tenantId);
+    AreaInfoDTO sourceArea = sysEnterpriseDTO.getSysTown();
+    SysAreaDTO town = sysAreaService.getSysAreaInfoByCode(sysEnterpriseDTO.getCodeTown());
+    sourceArea.setNameTown(town.getName());
+    SysAreaDTO county = sysAreaService.getSysAreaInfoByCode(town.getParentId());
+    sourceArea.setNameCoun(county.getName());
+    sourceArea.setCodeCoun(county.getCode());
+    SysAreaDTO city = sysAreaService.getSysAreaInfoByCode(county.getParentId());
+    sourceArea.setNameCoun(city.getName());
+    sourceArea.setCodeCoun(city.getCode());
+    SysAreaDTO province = sysAreaService.getSysAreaInfoByCode(city.getParentId());
+    sourceArea.setNameCoun(province.getName());
+    sourceArea.setCodeCoun(province.getCode());
+    SysAreaDTO country = sysAreaService.getSysAreaInfoByCode(province.getParentId());
+    sourceArea.setNameCoun(country.getName());
+    sourceArea.setCodeCoun(country.getCode());
+
+    //查询同级别县
+    SysAreaDTO var1 = new SysAreaDTO();
+    var1.setParentId(town.getParentId());
+    sourceArea.setTowns(sysAreaService.list(var1));
+    //查询同级别区
+    SysAreaDTO var2 = new SysAreaDTO();
+    var2.setParentId(county.getParentId());
+    sourceArea.setCouns(sysAreaService.list(var2));
+    //查询同级别市
+    SysAreaDTO var3 = new SysAreaDTO();
+    var3.setParentId(city.getParentId());
+    sourceArea.setCities(sysAreaService.list(var3));
+    //查询同级别省
+    SysAreaDTO var4 = new SysAreaDTO();
+    var4.setParentId(province.getParentId());
+    sourceArea.setProvs(sysAreaService.list(var4));
+    //查询同级别省
+    SysAreaDTO var5 = new SysAreaDTO();
+    var5.setParentId(country.getParentId());
+    sourceArea.setCountries(sysAreaService.list(var5));
+    sysEnterpriseDTO.setSysTown(sourceArea);
+    return sysEnterpriseDTO;
   }
 
   @Override
-  public boolean update(SysEnterpriseDTO sysAppDesignDTO,String tenantId) {
+  public boolean update(SysEnterpriseDTO sysAppDesignDTO, String tenantId) {
     if (get(tenantId) != null) {
       return baseMapper.update(
               sysAppDesignDTO.getEntity(SysEnterprise.class),
-              new LambdaQueryWrapper<SysEnterprise>()
-                      .eq(SysEnterprise::getTenantId,tenantId))
-              > 0;
-    }else {
-      return save(sysAppDesignDTO,tenantId);
+              new LambdaQueryWrapper<SysEnterprise>().eq(SysEnterprise::getTenantId, tenantId))
+          > 0;
+    } else {
+      return save(sysAppDesignDTO, tenantId);
     }
   }
 }

-package org.thingsboard.server.dao.yunteng.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.thingsboard.server.dao.yunteng.entities.SysTown;
-import org.thingsboard.server.dao.yunteng.mapper.SysTownMapper;
-import org.thingsboard.server.dao.yunteng.service.SysTownService;
-
-import java.lang.reflect.Field;
-import java.util.*;
-
-/**
- * @author: 徐浩然
- * @desc: 中国城镇区街
- * @date: 2021/12/3-15:37
- */
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class SysTownServiceImpl implements SysTownService {
-
-  private final SysTownMapper sysTownMapper;
-
-  private final String PID = "pid";
-  private final String ID = "id";
-  private final String NAME = "name";
-  private final String CHILD = "child";
-
-  @Override
-  public List<SysTown> findChilds(String variable, String value) {
-    Field[] fields = SysTown.class.getDeclaredFields();
-    Stack<String> list = new Stack<>();
-    for (int i = 0; i < fields.length; i++) {
-      // 查询variable是第几个变量，可以决定groupby什么
-      list.add(fields[i].getName());
-      if (fields[i].getName().equals(variable)) {
-        if (i % 2 == 0) {
-          list.add(fields[++i].getName());
-        }
-        list.add(fields[++i].getName());
-        list.add(fields[++i].getName());
-        break;
-      }
-    }
-    String[] groupBy =
-        list.stream()
-            // 驼峰转下划线
-            .map(this::to_)
-            // 组成需要groupby的字段
-            .toArray(String[]::new);
-    return sysTownMapper.selectList(
-        new QueryWrapper<SysTown>().select(groupBy).eq(to_(variable), value).groupBy(groupBy));
-  }
-
-  private String to_(String s) {
-    return s.replaceAll("[A-Z]", "_$0").toLowerCase();
-  }
-
-  @Override
-  public SysTown findParent(String variable, String value) {
-    return sysTownMapper.selectList(new QueryWrapper<SysTown>().eq(variable, value)).stream()
-        .findFirst()
-        .orElse(null);
-  }
-
-  public List<SysTown> getCityList() {
-    return sysTownMapper.getCityList();
-  }
-
-  @Override
-  public LinkedList<Map<String, Object>> tree() {
-    // 查询有序数据
-    List<SysTown> cityList =
-        sysTownMapper.selectList(
-            new LambdaQueryWrapper<SysTown>()
-                .orderByAsc(
-                    SysTown::getCodeProv,
-                    SysTown::getCodeCity,
-                    SysTown::getCodeCoun,
-                    SysTown::getCodeTown));
-    // 省
-    LinkedList<Map<String, Object>> prov = new LinkedList<>();
-    // 市
-    LinkedList<Map<String, Object>> city = new LinkedList<>();
-    // 区
-    LinkedList<Map<String, Object>> coun = new LinkedList<>();
-    // 县
-    LinkedList<Map<String, Object>> town = new LinkedList<>();
-    for (SysTown sysTown : cityList) {
-      if (coun.size() != 0 && !coun.getLast().get(ID).equals(sysTown.getCodeCoun())) {
-        // 切换区则县链改变
-        town = new LinkedList<>();
-      }
-      // 添加县
-      addTown(town, sysTown);
-
-      if (city.size() != 0 && !city.getLast().get(ID).equals(sysTown.getCodeCity())) {
-        // 切换市则区链改变
-        coun = new LinkedList<>();
-      }
-      // 添加区
-      addCoun(coun, town, sysTown);
-      if (prov.size() != 0 && !prov.getLast().get(ID).equals(sysTown.getCodeProv())) {
-        // 切换省则市链改变
-        city = new LinkedList<>();
-      }
-      // 添加市
-      addCity(city, coun, sysTown);
-      // 添加省
-      addProv(prov, city, sysTown);
-    }
-    return prov;
-  }
-
-  private void addTown(LinkedList<Map<String, Object>> town, SysTown sysTown) {
-    if (town.size() == 0 || !town.getLast().get(ID).equals(sysTown.getCodeTown())) {
-      town.addLast(
-          new HashMap<>() {
-            {
-              put(PID, sysTown.getCodeCoun());
-              put(ID, sysTown.getCodeTown());
-              put(NAME, sysTown.getNameTown());
-              // put(CHILD, null);
-            }
-          });
-    }
-  }
-
-  private void addCoun(
-      LinkedList<Map<String, Object>> coun, LinkedList<Map<String, Object>> town, SysTown sysTown) {
-    if (coun.size() == 0 || !coun.getLast().get(ID).equals(sysTown.getCodeCoun())) {
-      coun.addLast(
-          new HashMap<>() {
-            {
-              put(PID, sysTown.getCodeCity());
-              put(ID, sysTown.getCodeCoun());
-              put(NAME, sysTown.getNameCoun());
-              put(CHILD, town);
-            }
-          });
-    }
-  }
-
-  private void addCity(
-      LinkedList<Map<String, Object>> city, LinkedList<Map<String, Object>> coun, SysTown sysTown) {
-    if (city.size() == 0 || !city.getLast().get(ID).equals(sysTown.getCodeCity())) {
-      city.addLast(
-          new HashMap<>() {
-            {
-              put(PID, sysTown.getCodeProv());
-              put(ID, sysTown.getCodeCity());
-              put(NAME, sysTown.getNameCity());
-              put(CHILD, coun);
-            }
-          });
-    }
-  }
-
-  private void addProv(
-      LinkedList<Map<String, Object>> prov, LinkedList<Map<String, Object>> city, SysTown sysTown) {
-    if (prov.size() == 0 || !prov.getLast().get(ID).equals(sysTown.getCodeProv())) {
-      prov.addLast(
-          new HashMap<>() {
-            {
-              // put(PID, null);
-              put(ID, sysTown.getCodeProv());
-              put(NAME, sysTown.getNameProv());
-              put(CHILD, city);
-            }
-          });
-    }
-  }
-}

@@ -209,7 +209,7 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
 
     device.setAlarmStatus(0);
     /** 默认待激活状态 */
-    device.setDeviceState(DeviceState.INACTIVE.name());
+    device.setDeviceState(DeviceState.INACTIVE);
     baseMapper.insert(device);
     return device.getDTO(DeviceDTO.class);
   }

@@ -2,19 +2,13 @@ package org.thingsboard.server.dao.yunteng.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
-import org.thingsboard.server.dao.yunteng.entities.SysTown;
-
-import java.util.List;
+import org.thingsboard.server.dao.yunteng.entities.SysArea;
 
 /**
  * @author: 徐浩然
  * @desc:
- * @date: 2021/12/3-15:34
+ * @date: 2021/12/16-10:45
  */
 @Mapper
-public interface SysTownMapper extends BaseMapper<SysTown> {
-  /** @return 查询所有省份 */
-  @Select("select name_prov,code_prov from sys_town group by name_prov, code_prov")
-  List<SysTown> getCityList();
+public interface SysAreaMapper extends BaseMapper<SysArea> {
 }

 package org.thingsboard.server.dao.yunteng.service;
-
-import org.thingsboard.server.dao.yunteng.entities.SysTown;
-
-import java.util.LinkedList;
+import org.thingsboard.server.common.data.yunteng.dto.SysAreaDTO;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author: 徐浩然
  * @desc:
- * @date: 2021/12/3-15:36
+ * @date: 2021/12/16-11:13
  */
-public interface SysTownService {
-
-    List<SysTown> findChilds(String variable, String value);
-
-    SysTown findParent(String variable, String value);
-
-    List<SysTown> getCityList();
+public interface SysAreaService {
+    List<SysAreaDTO> list(SysAreaDTO sysAreaDTO);
 
-    LinkedList<Map<String, Object>> tree();
+    SysAreaDTO getSysAreaInfoByCode(Long code);
 }

@@ -14,7 +14,7 @@
         <result property="tel" column="tel"/>
         <result property="codeTown" column="code_town"/>
         <result property="qrCode" column="qr_code"/>
-        <association property="sysTown" javaType="org.thingsboard.server.common.data.yunteng.dto.SysTownDTO">
+        <association property="sysTown" javaType="org.thingsboard.server.common.data.yunteng.dto.AreaInfoDTO">
             <result property="nameProv" column="name_prov"/>
             <result property="codeProv" column="code_prov"/>
             <result property="nameCity" column="name_city"/>