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

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -793,11 +793,22 @@ public class OrgUsrController extends BaseController {
 	@ApiOperation(httpMethod = "GET", value = "根据机构类型(逗号分割),机构编码获取列表不分页", notes = "根据机构类型(逗号分割),机构编码获取列表不分页")
 	@GetMapping(value = "/{authKey}/listWithAuth")
 	public ResponseModel<List<OrgUsr>> getListWithAuth(@RequestParam(required = false) String orgTypes,
+													   @RequestParam(required = false) String type,
 			@PathVariable String authKey) throws Exception {
 		ReginParams reginParams = getSelectedOrgInfo();
 		ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
 		String bizOrgCode = personIdentity.getBizOrgCode();
-
+		if ("dl".equals(type)){
+			LambdaQueryWrapper<OrgUsr> lambda = new QueryWrapper<OrgUsr>().lambda();
+			lambda.eq(OrgUsr::getBizOrgCode, bizOrgCode);
+			lambda.eq(OrgUsr::getIsDelete, false);
+			OrgUsr orgUsr = orgUsrMapper.selectList(lambda).get(0);
+			if (!org.apache.commons.lang3.ObjectUtils.isEmpty(orgUsr.getBizOrgType()) && "COMPANY".equals(orgUsr.getBizOrgType())) {
+				bizOrgCode = orgUsr.getBizOrgCode();
+			} else {
+				bizOrgCode = getCompanyNameById(orgUsr.getParentId());
+			}
+		}
 
 		//拿到数据字典中存储的 特殊类型 特殊部门
 		QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
@@ -985,4 +996,31 @@ public class OrgUsrController extends BaseController {
 		return ResponseHelper.buildResponse(orgUsr.getBizOrgCode());
 	}
 
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET", value = "查询公司bizOrgCode", notes = "查询公司bizOrgCode")
+	@GetMapping(value = "/getCompany")
+	public ResponseModel<String> getBizByAmos(@RequestParam("bizOrgCode") String bizOrgCode) {
+		LambdaQueryWrapper<OrgUsr> lambda = new QueryWrapper<OrgUsr>().lambda();
+		lambda.eq(OrgUsr::getBizOrgCode, bizOrgCode);
+		lambda.eq(OrgUsr::getIsDelete, false);
+		OrgUsr orgUsr = orgUsrMapper.selectList(lambda).get(0);
+		if (!org.apache.commons.lang3.ObjectUtils.isEmpty(orgUsr.getBizOrgType()) && "COMPANY".equals(orgUsr.getBizOrgType())) {
+			return ResponseHelper.buildResponse(orgUsr.getBizOrgCode());
+		} else {
+			return ResponseHelper.buildResponse(getCompanyNameById(orgUsr.getParentId()));
+		}
+	}
+	private String getCompanyNameById(String id) {
+		LambdaQueryWrapper<OrgUsr> lambda = new QueryWrapper<OrgUsr>().lambda();
+		lambda.eq(OrgUsr::getSequenceNbr, id);
+		lambda.eq(OrgUsr::getIsDelete, false);
+		OrgUsr orgUsr = orgUsrMapper.selectList(lambda).get(0);
+		if (!org.apache.commons.lang3.ObjectUtils.isEmpty(orgUsr.getBizOrgType()) && "COMPANY".equals(orgUsr.getBizOrgType())) {
+			return orgUsr.getBizOrgCode();
+		} else {
+			return getCompanyNameById(orgUsr.getParentId());
+		}
+
+	}
+
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/BuildingController.java

@@ -355,8 +355,8 @@ public class BuildingController extends AbstractBaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation("公司消防建筑树")
     @GetMapping(value = "/companyBuildingTree")
-    public List<BuildingTreeVo> getCompanyBuildingTree() {
-        return buildService.getCompanyBuildingTree(null);
+    public List<BuildingTreeVo> getCompanyBuildingTree(@RequestParam(required = false, value = "type")String type) {
+        return buildService.getCompanyBuildingTree(null, type);
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/fegin/JcsFeign.java

@@ -143,7 +143,7 @@ public interface JcsFeign {
      * @return ResponseModel<OrgUsrDto>
      */
     @GetMapping(value = "/org-usr/{authKey}/listWithAuth")
-    FeignClientResult<List<OrgUsrDto>> getCompanyDeptListWithAuth(@PathVariable(value = "authKey") String authKey, @RequestParam(value = "orgTypes", required = false) String orgTypes);
+    FeignClientResult<List<OrgUsrDto>> getCompanyDeptListWithAuth(@PathVariable(value = "authKey") String authKey, @RequestParam(value = "orgTypes", required = false) String orgTypes, @RequestParam(value = "type", required = false) String type);
 
     /**
      * 获取机场人员
@@ -190,4 +190,7 @@ public interface JcsFeign {
     @GetMapping(value = "/org-person/getUser/{id}")
     FeignClientResult selectById(@PathVariable String id);
 
+
+    @GetMapping(value = "/org-usr/getCompany")
+    FeignClientResult getCompany( @RequestParam("bizOrgCode") String bizOrgCode);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IBuilldService.java

@@ -310,7 +310,7 @@ public interface IBuilldService extends IService<Building> {
      * @return list
      * @param authKey
      */
-    List<BuildingTreeVo> getCompanyBuildingTree(String authKey);
+    List<BuildingTreeVo> getCompanyBuildingTree(String authKey, String type);
 
     /**
      * 获取单位树

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/AreaServiceImpl.java

@@ -238,7 +238,7 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IA
     @Override
     public List<UnitAreaTreeVo> getAreaTreeListVo() {
         // 获取公司list
-        List<OrgUsrDto> orgCompanyLists = jcsRemoteService.getCompanyDeptListWithAuth(authKey, "COMPANY");
+        List<OrgUsrDto> orgCompanyLists = jcsRemoteService.getCompanyDeptListWithAuth(authKey, "COMPANY", null);
         if (orgCompanyLists.isEmpty()) {
             return new ArrayList<>();
         }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingServiceImpl.java

@@ -1329,9 +1329,9 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     }
 
     @Override
-    public List<BuildingTreeVo> getCompanyBuildingTree(String authKey) {
+    public List<BuildingTreeVo> getCompanyBuildingTree(String authKey, String type) {
         //1.组装数据
-        List<BuildingTreeVo> companyBuildingList = buildBuildingAndCompanyListVos(authKey);
+        List<BuildingTreeVo> companyBuildingList = buildBuildingAndCompanyListVos(authKey, type);
         //2.list to tree
         List<BuildingTreeVo> buildingTreeVos = companyBuildingList.stream().filter(a -> companyBuildingList.stream().noneMatch(c -> c.getId().toString().equals(a.getParentId()))).peek(b -> b.setChildren(getCompanyBuildingChildrenTree(b.getId().toString(), companyBuildingList))).collect(Collectors.toList());
         // 任务 7481
@@ -1391,13 +1391,13 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     }
 
 
-    private List<BuildingTreeVo> buildBuildingAndCompanyListVos(String authKey) {
+    private List<BuildingTreeVo> buildBuildingAndCompanyListVos(String authKey, String type) {
         if (StringUtils.isEmpty(authKey)) {
             authKey = this.authKey;
         }
         List<BuildingTreeVo> buildingTreeVos = getBuildingTreeVos(false, null);
         // 1.获取公司list
-        List<OrgUsrDto> orgUsrLists = jcsRemoteService.getCompanyDeptListWithAuth(authKey, "COMPANY");
+        List<OrgUsrDto> orgUsrLists = jcsRemoteService.getCompanyDeptListWithAuth(authKey, "COMPANY", type);
         if(orgUsrLists.isEmpty()){
             return new ArrayList<>();
         }
@@ -1437,7 +1437,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     @Override
     public List<BuildingTreeVo> getBuildingVideoTreeNew() {
         //1.组装数据
-        List<BuildingTreeVo> companyBuildingList = buildBuildingAndCompanyListVos(buildVideoAuthKey);
+        List<BuildingTreeVo> companyBuildingList = buildBuildingAndCompanyListVos(buildVideoAuthKey, null);
 
 
         List<Map<String, Long>> countList = iFormInstanceService.getBuildVideoCount();

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java

@@ -1065,7 +1065,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
     @Override
     public List<FireFightingSystemTreeVo> getSystemTreeByOrgCode(String bizOrgCode) {
         // 获取公司部门list
-        List<OrgUsrDto> orgUsrLists = jcsRemoteService.getCompanyDeptListWithAuth("COMPANY,DEPARTMENT", bizOrgCode);
+        List<OrgUsrDto> orgUsrLists = jcsRemoteService.getCompanyDeptListWithAuth("COMPANY,DEPARTMENT", bizOrgCode, null);
         List<FireFightingSystemTreeVo> fireFightingSystemTreeList = orgUsrLists.stream().map(key -> {
             FireFightingSystemTreeVo vo = new FireFightingSystemTreeVo();
             vo.setId(valueOf(key.getSequenceNbr()));

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/JCSRemoteService.java

@@ -36,8 +36,8 @@ public class JCSRemoteService {
      * @param orgTypes(多个逗号分隔) 为空默认查询公司和部门，COMPANY: 公司树 DEPARTMENT部门树
      * @return List<OrgUsrDto>
      */
-    public List<OrgUsrDto> getCompanyDeptListWithAuth(String authKey, String orgTypes) {
-        FeignClientResult<List<OrgUsrDto>> feignClientResult = jcsFeignClient.getCompanyDeptListWithAuth(authKey, orgTypes);
+    public List<OrgUsrDto> getCompanyDeptListWithAuth(String authKey, String orgTypes,String type) {
+        FeignClientResult<List<OrgUsrDto>> feignClientResult = jcsFeignClient.getCompanyDeptListWithAuth(authKey, orgTypes, type);
         return feignClientResult.getResult();
     }
 
@@ -52,4 +52,9 @@ public class JCSRemoteService {
         FeignClientResult<List<OrgUsrDto>> feignClientResult = jcsFeignClient.getlistCompanyTree( orgType);
         return feignClientResult.getResult();
     }
+
+    public String getCompany(String bizOrgCode) {
+        FeignClientResult<String> feignClientResult = jcsFeignClient.getCompany(bizOrgCode);
+        return feignClientResult.getResult();
+    }
 }

amos-boot-system-fas/src/main/resources/db/mapper/PlanDetailMapper.xml

@@ -103,7 +103,7 @@
       </if>
       AND cpd.is_delete = 0
     </where>
-    ORDER BY cpd.create_date ASC
+    ORDER BY cpd.create_date DESC
     LIMIT #{start}, #{size}
   </select>