增加区域公司

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

@@ -97,6 +97,9 @@ public class ControllerAop {
 		urls.add("^/tzs/flc-unit-info/verifyTelCode/[A-Za-z0-9]+/[A-Za-z0-9]+");
 		urls.add("^/tzs/flc-unit-info/hasExistUser/[A-Za-z0-9_-]+");
 		urls.add("/tzs/reg-unit-info/save");
+        urls.add("/hygf/unit-info/region/tree");
+        urls.add("/hygf/unit-info/management-unit/tree");
+
 		// 获取请求路径
 		for (String uri : urls) {
 			Pattern p = Pattern.compile(uri);

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/UnitInfoDto.java

@@ -93,6 +93,19 @@ public class UnitInfoDto  extends BaseDto {
 
     @ApiModelProperty(value = "管辖单位id")
     private String managementUnitId;
+
+
+    //所属区域公司id
+
+    private Long regionalCompaniesSeq;
+    //所属区域公司名称
+    private String regionalCompaniesName;
+    //所属区域公司code
+    private String regionalCompaniesCode;
+
+
+
+
     /**
      *是否加入黑名单
      * */

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/UnitInfo.java

@@ -181,6 +181,17 @@ public class UnitInfo extends BaseEntity {
 
 
 
+    //所属区域公司id
+    @TableField("regional_companies_seq")
+    private Long regionalCompaniesSeq;
+    //所属区域公司名称
+    @TableField("regional_companies_name")
+    private String regionalCompaniesName;
+    //所属区域公司code
+    @TableField("regional_companies_code")
+    private String regionalCompaniesCode;
+
+
 
     @TableField(exist=false)
     private List<CommonFile> headCardPhotoFrontList;

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/UnitInfoController.java

@@ -17,6 +17,7 @@ import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.Privilege;
+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.ApiParam;
@@ -72,6 +73,10 @@ public class UnitInfoController extends BaseController {
 	@Value("${hygf.sms.tempCode}")
 	private String smsTempCode;
 
+    @Value("${regionalCompanies.company.seq}")
+    private Long regionalCompanies;
+
+
 	@Autowired
 	SendSmsCode sendSmsCode;
 
@@ -231,12 +236,15 @@ public class UnitInfoController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@GetMapping(value = "/management-unit/tree")
 	@ApiOperation(httpMethod = "GET", value = "管辖机构树", notes = "管辖机构树")
-	public ResponseModel<Collection> managementUnitTree(@RequestParam(required = false)String orgCode) {
+	public ResponseModel<Collection<CompanyModel>> managementUnitTree(@RequestParam(required = false)String orgCode) {
 		RequestContext.setAppKey("AMOS_STUDIO");
 		RequestContext.setProduct("AMOS_STUDIO_WEB");
 		RequestContext.setToken(requestContext.getToken());
-		Collection result = unitInfoServiceImpl.getManagementUnitTree(orgCode);
-		return ResponseHelper.buildResponse(result);
+
+        FeignClientResult<Collection<CompanyModel>> feignClientResult=  Privilege.companyClient.querySubAgencyTree(regionalCompanies);
+
+        Collection<CompanyModel>  companyModel = (List<CompanyModel>)feignClientResult.getResult();
+		return ResponseHelper.buildResponse(companyModel);
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-dev.properties

@@ -112,3 +112,6 @@ hygf.user.group.id=1679755750924120066
 unitInfo.station.examine.planId=51776087-a9cf-4a87-9a03-24fd24a8cf45
 
 hygf.sms.tempCodeJXS=SMS_HYGF_0002
+
+
+regionalCompanies.company.seq=1693499571071619074
\ No newline at end of file