Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/api/dto/NewRegionModel.java

+package com.yeejoin.amos.boot.module.cylinder.flc.api.dto;
+
+import lombok.Data;
+import java.util.Collection;
+
+/**
+ * @author LiuLin
+ * @date 2024年06月01日 13:44
+ */
+@Data
+public class NewRegionModel {
+
+    private Long parentId;
+
+    private Integer regionCode;
+
+    private Integer parentRegionCode;
+
+    private String regionName;
+
+    private String level;
+
+    private String levelName;
+
+    private String longitude;
+
+    private String latitude;
+
+    private String agencyCode;
+
+    private Collection<NewRegionModel> children;
+
+    private Long sequenceNbr;
+
+    private String label;
+
+    private Integer value;
+}

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/biz/controller/TzsAuthController.java

@@ -5,10 +5,12 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.cylinder.api.entity.TzsCitInfo;
 import com.yeejoin.amos.boot.module.cylinder.api.service.TzsAuthService;
 import com.yeejoin.amos.boot.module.cylinder.biz.service.impl.TzsCitInfoServiceImpl;
+import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.NewRegionModel;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -16,17 +18,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 特种设备权限controller
@@ -80,30 +79,42 @@ public class TzsAuthController extends BaseController {
     }
 
     /**
-     * 获取用户组织机构树
+     * 获取三级组织机构树
+     *
+     * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/getUserReginTree")
-    @ApiOperation(httpMethod = "GET", value = "获取用户组织机构树", notes = "获取用户组织机构树")
-    public ResponseModel<Collection<RegionModel>> getUserReginTree() {
-        List<RegionModel> result = tzsAuthService.getUserReginTree();
-        return ResponseHelper.buildResponse(result);
+    @GetMapping(value = "/getThreeUserReginTree")
+    @ApiOperation(httpMethod = "GET", value = "获取组织机构树", notes = "获取组织机构树")
+    public ResponseModel<Collection<NewRegionModel>> getRegionTree(@RequestParam(value = "parentId",required = false) Long parentId) {
+        return ResponseHelper.buildResponse(thirdLevelRegion(Systemctl.regionClient.queryForTree(null).getResult()));
     }
 
     /**
-     * 获取用户组织机构树-到省市区级别三级
-     *
-     * @author LiuLin
-     * @date 2025-05-31
+     * 去区域树中level多余空格以及保留三级
+     * @param result
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/getThreeUserReginTree")
-    @ApiOperation(httpMethod = "GET", value = "获取三级用户组织机构树", notes = "获取三级用户组织机构树")
-    public ResponseModel<Collection<RegionModel>> getThreeUserReginTree() {
-        List<RegionModel> result = tzsAuthService.getThreeUserReginTree();
-        return ResponseHelper.buildResponse(result);
+    public List<NewRegionModel> thirdLevelRegion(Collection<RegionModel> result) {
+        List<NewRegionModel> newRegionList = new ArrayList<>();
+
+        for (RegionModel regionModel : result) {
+            if (!"4".equals(regionModel.getLevel())) {
+                NewRegionModel newRegion = new NewRegionModel();
+                newRegion.setRegionCode(regionModel.getRegionCode());
+                newRegion.setRegionName(regionModel.getRegionName().trim());
+                newRegion.setLabel(regionModel.getRegionName().trim());
+                newRegion.setValue(regionModel.getRegionCode());
+                newRegion.setLevel(regionModel.getLevel().trim());
+                if (!ValidationUtil.isEmpty(regionModel.getChildren())) {
+                    newRegion.setChildren(thirdLevelRegion(regionModel.getChildren()));
+                }
+                newRegionList.add(newRegion);
+            }
+        }
+        return newRegionList;
     }
 
+
     /**
      * 获取用户监管机构
      */