【fix】修改获取区域树

registration-center/src/main/java/com/huimv/center/controller/BizBaseAreaController.java

@@ -2,10 +2,7 @@ package com.huimv.center.controller;
 
 import com.huimv.center.service.BizBaseAreaService;
 import com.huimv.eartag2.common.utils.Result;
-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.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.Map;
@@ -62,7 +59,7 @@ public class BizBaseAreaController {
      * 【查询】 树形查询区域信息
      * @return
      */
-    @PostMapping("/tree/list")
+    @GetMapping("/tree/list")
     public Result treeList(){
         return bizBaseAreaService.treeList();
     }

registration-center/src/main/java/com/huimv/center/mapper/xml/BizBaseAreaMapper.xml

@@ -5,14 +5,14 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.huimv.center.pojo.BizBaseArea">
         <id column="id" property="id" />
-        <result column="name" property="name" />
-        <result column="code" property="code" />
+        <result column="area_name" property="areaName" />
+        <result column="area_code" property="areaCode" />
         <result column="parent_code" property="parentCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,name,code,parent_code
+        id,area_name,area_code,parent_code
     </sql>
 
 </mapper>

registration-center/src/main/java/com/huimv/center/pojo/BizBaseArea.java

@@ -17,9 +17,9 @@ public class BizBaseArea implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    private String name;
+    private String areaName;
 
-    private String code;
+    private String areaCode;
 
     private String parentCode;
 }

registration-center/src/main/java/com/huimv/center/service/impl/BizBaseAreaServiceImpl.java

@@ -10,11 +10,10 @@ import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.common.utils.ResultCode;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -32,8 +31,8 @@ public class BizBaseAreaServiceImpl implements BizBaseAreaService {
     @Override
     public Result add(String name, String code, String parentCode) {
         BizBaseArea bizBaseArea = new BizBaseArea();
-        bizBaseArea.setName(name);
-        bizBaseArea.setCode(code);
+        bizBaseArea.setAreaName(name);
+        bizBaseArea.setAreaCode(code);
         bizBaseArea.setParentCode(parentCode);
         return ResultUtil.result( bizBaseAreaMapper.insert(bizBaseArea));
     }
@@ -47,8 +46,8 @@ public class BizBaseAreaServiceImpl implements BizBaseAreaService {
     public Result update(Integer id, String name, String code, String parentCode) {
         BizBaseArea bizBaseArea = bizBaseAreaMapper.selectById(id);
         bizBaseArea.setParentCode(parentCode);
-        bizBaseArea.setCode(code);
-        bizBaseArea.setName(name);
+        bizBaseArea.setAreaCode(code);
+        bizBaseArea.setAreaName(name);
         return ResultUtil.result(bizBaseAreaMapper.updateById(bizBaseArea));
     }
 
@@ -72,30 +71,32 @@ public class BizBaseAreaServiceImpl implements BizBaseAreaService {
      * @return
      */
     private List<BaseAreaVo> parseBizBaseArea(List<BizBaseArea> bizBaseAreas){
+        System.out.println("----------------"+bizBaseAreas);
         //构建需要展示的树形节点结构
         Map<String, BaseAreaVo> cityNodeMap = bizBaseAreas.stream().map(biZBaseAreasDo -> {
             BaseAreaVo baseAreaVo = new BaseAreaVo();
             baseAreaVo.setChildBaseAreaVo(new ArrayList<>());
-            baseAreaVo.setCode(biZBaseAreasDo.getCode());
-            baseAreaVo.setName(biZBaseAreasDo.getName());
+            baseAreaVo.setCode(biZBaseAreasDo.getAreaCode());
+            baseAreaVo.setName(biZBaseAreasDo.getAreaName());
             baseAreaVo.setParentCode(biZBaseAreasDo.getParentCode());
             return baseAreaVo;
-        }).collect(Collectors.toMap(BaseAreaVo::getCode, b -> b));
-
+        }).collect(Collectors.toMap(BaseAreaVo::getCode, b -> b,(k1,k2)->k1));
+        System.out.println("----------------"+cityNodeMap);
         //创建数组存父亲节点
         ArrayList<BaseAreaVo> roots = new ArrayList<>();
-
         //构建树形
         cityNodeMap.values().forEach(city->{
             String parentCode = city.getParentCode();
-            if (StringUtils.isBlank(parentCode)){
+            if (cityNodeMap.get(parentCode) == null){
                 //父节点为空，说明当前节点就已经是父节点了 将该节点存起来
                 roots.add(city);
                 return;
+            }else {
+                //父节点 不为空，说明有父节点，拿到该节点的父节点的孩子节点（就是我自己),将该节点存起来
+                cityNodeMap.get(parentCode).getChildBaseAreaVo().add(city);
             }
-            //父节点 不为空，说明有父节点，拿到该节点的父节点的孩子节点（就是我自己),将该节点存起来
-            cityNodeMap.get(parentCode).getChildBaseAreaVo().add(city);
         });
+        System.out.println(roots);
         return roots;
     }
 }

registration-center/src/main/java/com/huimv/center/service/impl/BizFarmServiceImpl.java

@@ -66,7 +66,7 @@ public class BizFarmServiceImpl extends ServiceImpl<BizFarmMapper, BizFarm> impl
         //根据区域名称查询区域编码
         BizBaseArea bizBaseArea = bizBaseAreaService.queryAreaCodeByAreaName(areaName);
         if (Objects.nonNull(bizBaseArea)){
-            farm.setFarmCode(bizBaseArea.getCode());
+            farm.setFarmCode(bizBaseArea.getAreaCode());
         }
         farm.setFarmName(farmName);
         return ResultUtil.result(BizFarmMapper.insert(farm));

registration-center/src/main/java/com/huimv/center/vo/BaseAreaVo.java

@@ -1,6 +1,7 @@
 package com.huimv.center.vo;
 
 import lombok.Data;
+import org.springframework.stereotype.Component;
 
 import java.io.Serializable;
 import java.util.List;
@@ -10,6 +11,7 @@ import java.util.List;
  * @author 静静
  */
 @Data
+@Component
 public class BaseAreaVo implements Serializable {
 
     private static final long serialVersionUID=1L;

registration-center/src/test/java/com/huimv/center/service/BizFarmServiceTest.java

@@ -30,7 +30,8 @@ public class BizFarmServiceTest {
         String linkman = "张经理b";
         String phone = "13312345678b";
         String remark = "备注b";
-        Result result = farmService.save(farmName,farmCode,linkman,phone,remark);
+        String areaName = "曙光";
+        Result result = farmService.save(farmName,farmCode,linkman,phone,remark,areaName);
         System.out.println("result>>"+result);
     }
 

registration-center/target/classes/com/huimv/center/mapper/xml/BizFarmMapper.xml

@@ -11,11 +11,13 @@
         <result column="phone" property="phone" />
         <result column="remark" property="remark" />
         <result column="add_time" property="addTime" />
+        <result column="area_name" property="areaName" />
+        <result column="area_code" property="areaCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, farm_name, farm_code, linkman, phone, remark
+        id, farm_name, farm_code, linkman, phone, remark，area_name，area_code
     </sql>
 
 </mapper>

registration-center/target/maven-archiver/pom.properties

@@ -1,3 +0,0 @@
-artifactId=registration-center
-groupId=org.example
-version=1.0-SNAPSHOT

registration-center/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,63 +0,0 @@
-com/huimv/center/listener/DeviceListener.class
-com/huimv/center/utils/Constant.class
-com/huimv/center/service/impl/BizDeviceRegisterServiceImpl.class
-com/huimv/center/pojo/BizDeviceUnregistered.class
-com/huimv/center/service/BizDeviceRegisteredFlowService.class
-com/huimv/center/utils/RegexUtil.class
-com/huimv/center/pojo/BizRawData.class
-com/huimv/center/pojo/BizDeviceRegisteredFlow.class
-com/huimv/center/utils/Constant$MenuType.class
-com/huimv/center/controller/BizRawDataController.class
-com/huimv/center/server/RegisterServerHandler.class
-com/huimv/center/controller/BizDeviceUnregisteredFlowController.class
-com/huimv/center/mapper/BizDeviceRegisteredFlowMapper.class
-com/huimv/center/utils/Const.class
-com/huimv/center/service/impl/BizDeviceRegisteredFlowServiceImpl.class
-com/huimv/center/controller/BizDeviceRegisterController.class
-com/huimv/center/mapper/BizDeviceUnregisteredFlowMapper.class
-com/huimv/center/utils/Constant$CloudService.class
-com/huimv/center/service/impl/BizDeviceUnregisteredServiceImpl.class
-com/huimv/center/controller/BizFarmController.class
-com/huimv/center/service/impl/BizFarmServiceImpl.class
-com/huimv/center/server/RegisterServerHandler2.class
-com/huimv/center/mapper/BizDeviceUnregisteredMapper.class
-com/huimv/center/service/BizDeviceUnregisteredService.class
-com/huimv/center/controller/BizDeviceUnregisteredController.class
-com/huimv/center/config/MybatisPlusConfig.class
-com/huimv/center/controller/BizDeviceAnswerFlowController.class
-com/huimv/center/server/RegisterServer.class
-com/huimv/center/controller/BizTransferHistoryController.class
-com/huimv/center/service/BizTransferHistoryService.class
-com/huimv/center/service/BizRawDataService.class
-com/huimv/center/pojo/BizFarm.class
-com/huimv/center/pojo/BizDeviceRegister.class
-com/huimv/center/service/impl/BizDeviceUnregisteredFlowServiceImpl.class
-com/huimv/center/utils/DateUtil.class
-com/huimv/center/utils/IDUtil.class
-com/huimv/center/service/BizDeviceAnswerFlowService.class
-com/huimv/center/config/TopicRabbitMQConfig.class
-com/huimv/center/mapper/BizRawDataMapper.class
-com/huimv/center/producer/Producer.class
-com/huimv/center/pojo/BizTransferHistory.class
-com/huimv/center/server/RegisterServer2$1.class
-com/huimv/center/server/RegisterServer2.class
-com/huimv/center/HuimvRegistrationCenterApplication.class
-com/huimv/center/pojo/BizDeviceAnswerFlow.class
-com/huimv/center/service/impl/BizTransferHistoryServiceImpl.class
-com/huimv/center/mapper/BizDeviceRegisterMapper.class
-com/huimv/center/pojo/BizDeviceUnregisteredFlow.class
-com/huimv/center/mapper/BizFarmMapper.class
-com/huimv/center/mapper/BizDeviceAnswerFlowMapper.class
-com/huimv/center/mapper/BizTransferHistoryMapper.class
-com/huimv/center/controller/BizDeviceRegisteredFlowController.class
-com/huimv/center/server/RegisterServer$1.class
-com/huimv/center/service/BizDeviceRegisterService.class
-com/huimv/center/service/impl/BizDeviceAnswerFlowServiceImpl.class
-com/huimv/center/result/RRException.class
-com/huimv/center/service/impl/BizRawDataServiceImpl.class
-com/huimv/center/utils/SQLFilter.class
-com/huimv/center/utils/ResultUtil.class
-com/huimv/center/service/BizDeviceUnregisteredFlowService.class
-com/huimv/center/utils/Query.class
-com/huimv/center/utils/Constant$ScheduleStatus.class
-com/huimv/center/service/BizFarmService.class

registration-center/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,58 +0,0 @@
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/controller/BizDeviceRegisterController.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/HuimvRegistrationCenterApplication.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/utils/Query.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/utils/ResultUtil.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/utils/Constant.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/pojo/BizDeviceUnregistered.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/service/impl/BizDeviceRegisteredFlowServiceImpl.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/service/BizRawDataService.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/result/RRException.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/pojo/BizDeviceAnswerFlow.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/pojo/BizRawData.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/mapper/BizDeviceUnregisteredFlowMapper.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/mapper/BizDeviceRegisteredFlowMapper.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/utils/Const.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/pojo/BizTransferHistory.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/service/BizTransferHistoryService.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/listener/DeviceListener.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/server/RegisterServer.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/pojo/BizDeviceUnregisteredFlow.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/mapper/BizDeviceUnregisteredMapper.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/utils/RegexUtil.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/service/impl/BizDeviceUnregisteredServiceImpl.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/controller/BizDeviceUnregisteredFlowController.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/config/MybatisPlusConfig.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/server/RegisterServerHandler.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/mapper/BizDeviceRegisterMapper.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/service/impl/BizDeviceRegisterServiceImpl.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/config/TopicRabbitMQConfig.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/pojo/BizDeviceRegisteredFlow.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/service/BizDeviceAnswerFlowService.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/server/RegisterServerHandler2.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/service/BizFarmService.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/service/BizDeviceUnregisteredService.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/controller/BizTransferHistoryController.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/controller/BizDeviceAnswerFlowController.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/service/BizDeviceRegisteredFlowService.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/mapper/BizTransferHistoryMapper.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/mapper/BizRawDataMapper.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/pojo/BizFarm.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/service/BizDeviceUnregisteredFlowService.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/controller/BizDeviceRegisteredFlowController.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/pojo/BizDeviceRegister.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/utils/SQLFilter.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/utils/IDUtil.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/controller/BizDeviceUnregisteredController.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/controller/BizRawDataController.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/service/impl/BizDeviceAnswerFlowServiceImpl.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/service/impl/BizTransferHistoryServiceImpl.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/service/impl/BizFarmServiceImpl.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/mapper/BizFarmMapper.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/utils/DateUtil.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/service/impl/BizDeviceUnregisteredFlowServiceImpl.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/service/impl/BizRawDataServiceImpl.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/service/BizDeviceRegisterService.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/controller/BizFarmController.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/producer/Producer.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/mapper/BizDeviceAnswerFlowMapper.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/main/java/com/huimv/center/server/RegisterServer2.java

registration-center/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

@@ -1,9 +0,0 @@
-com/huimv/center/MybatisGenerator$1.class
-com/huimv/center/CodeGenerator.class
-com/huimv/center/service/BizRawDataServiceTest.class
-com/huimv/center/service/BizDeviceRegisterTest.class
-com/huimv/center/service/BizDeviceRegisteredFlowServiceTest.class
-com/huimv/center/service/BizFarmServiceTest.class
-com/huimv/center/MybatisGenerator$2.class
-com/huimv/center/MybatisGenerator.class
-com/huimv/center/service/BizDeviceAnswerFlowServiceTest.class

registration-center/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

@@ -1,7 +0,0 @@
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/test/java/com/huimv/center/service/BizRawDataServiceTest.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/test/java/com/huimv/center/service/BizDeviceRegisterTest.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/test/java/com/huimv/center/service/BizDeviceAnswerFlowServiceTest.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/test/java/com/huimv/center/service/BizDeviceRegisteredFlowServiceTest.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/test/java/com/huimv/center/MybatisGenerator.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/test/java/com/huimv/center/CodeGenerator.java
-/Users/a1/Desktop/hmcode/registration.center/registration-center/src/test/java/com/huimv/center/service/BizFarmServiceTest.java