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

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/publics/BaseTreeNode.java

@@ -27,6 +27,8 @@ public class BaseTreeNode {
 
     private List<BaseTreeNode> children;
 
+    private String companyId;
+
     public BaseTreeNode() {
     }
 
@@ -37,7 +39,12 @@ public class BaseTreeNode {
     public void setId(String id) {
         this.id = id;
     }
-
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+    public String getCompanyId() {
+        return companyId;
+    }
     public String getParentId() {
         return parentId;
     }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/TreeNodeUtil.java

@@ -296,6 +296,60 @@ public class TreeNodeUtil {
             }
         }
     }
+
+    /**
+     * 封装整个树状图数据
+     *
+     * @param listNodes 要处理列表集合节点数据
+     */
+    public static <T extends BaseTreeNode> List<T> assembleTreeTs(List<T> listNodes) {
+        List<T> newTreeNodes = new ArrayList<>();
+        // 循环赋值最上面的节点数据
+        // 赋值最上面节点的值
+        List<T> collect = listNodes.stream()
+                .filter(t -> StringUtils.isEmpty(t.getParentId()) || "null".equals(t.getParentId()) || "0".equals(t.getParentId()) || "-1".equals(t.getParentId()))
+                .collect(Collectors.toList());
+        newTreeNodes.addAll(collect);
+        // 循环处理子节点数据
+        for (T t : newTreeNodes) {
+            //递归
+            assembleTree2(t, listNodes);
+        }
+        return newTreeNodes;
+    }
+
+
+
+    static <T extends BaseTreeNode> void assembleTree2(T node, List<T> listNodes) {
+        if (node != null && !CollectionUtils.isEmpty(listNodes)) {
+            // 循环节点数据，如果是子节点则添加起来
+            listNodes.stream().filter(t -> Objects.equals(t.getParentId(), node.getId())).forEachOrdered(node::addChild);
+            // 循环处理子节点数据,递归
+            if (!CollectionUtils.isEmpty(node.getChildren())) {
+                for (Object t : node.getChildren()) {
+                    //递归
+                    //listNodes.remove(t);
+                    assembleTreeSon((T) t, listNodes);
+                }
+            }
+        }
+    }
+
+    static <T extends BaseTreeNode> void assembleTreeSon(T node, List<T> listNodes) {
+        if (node != null && !CollectionUtils.isEmpty(listNodes)) {
+            // 循环节点数据，如果是子节点则添加起来
+
+            listNodes.stream().filter(t -> t.getParentId().equals(node.getId()) && t.getCompanyId().equals(node.getCompanyId() == null ?node.getParentId():node.getCompanyId() ) ).forEachOrdered(node::addChild);
+            // 循环处理子节点数据,递归
+            if (!CollectionUtils.isEmpty(node.getChildren())) {
+                for (Object t : node.getChildren()) {
+                    //递归
+                    //listNodes.remove(t);
+                    assembleTreeSon((T) t, listNodes);
+                }
+            }
+        }
+    }
     static <T extends BaseTreeNode> void assembleTree_1(T node, List<T> listNodes) {
         if (node != null && !CollectionUtils.isEmpty(listNodes)) {
             // 循环节点数据，如果是子节点则添加起来

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

 package com.yeejoin.amos.boot.module.common.biz.controller;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
+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.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.component.emq.EmqKeeper;
+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 com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -15,7 +38,15 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.common.api.core.framework.PersonIdentify;
-import com.yeejoin.amos.boot.module.common.api.dto.*;
+import com.yeejoin.amos.boot.module.common.api.dto.CheckObjectDto;
+import com.yeejoin.amos.boot.module.common.api.dto.CompanyPerson;
+import com.yeejoin.amos.boot.module.common.api.dto.ESOrgUsrDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto;
+import com.yeejoin.amos.boot.module.common.api.dto.UserDto;
+import com.yeejoin.amos.boot.module.common.api.dto.UserUnitDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
@@ -24,25 +55,9 @@ import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.ESOrgUsrService;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.component.emq.EmqKeeper;
-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 javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 
 /**
  * 部门信息修改
@@ -83,7 +98,8 @@ public class OrgUsrController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/save", method = RequestMethod.POST)
 	@ApiOperation(httpMethod = "POST", value = "新增单位信息", notes = "新增单位信息")
-    public ResponseModel<Object> saveOrgUsr(HttpServletRequest request, @RequestBody OrgUsrDto OrgUsrVo) throws Exception {
+	public ResponseModel<Object> saveOrgUsr(HttpServletRequest request, @RequestBody OrgUsrDto OrgUsrVo)
+			throws Exception {
 		OrgUsrVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
 
 		return ResponseHelper.buildResponse(iOrgUsrService.saveOrgUsr(OrgUsrVo));
@@ -102,30 +118,32 @@ public class OrgUsrController extends BaseController {
 
 		// 删除时，只作逻辑删除
 		// BUG 2741 首先判断是否为公司 如果公司底下有人员不可直接删除 bykongfm
-        //bug 2882 判断是否为部门 如果部门底下有人员不可直接删除 chenzhao 2021-09-27 start
+		// bug 2882 判断是否为部门 如果部门底下有人员不可直接删除 chenzhao 2021-09-27 start
 		OrgUsr tempOrg = iOrgUsrService.getById(id.toString());
-        //当前登录人不能删除自己
+		// 当前登录人不能删除自己
 		AgencyUserModel user = getUserInfo();
 
-        if(tempOrg.getAmosOrgId()!=null&&tempOrg.getAmosOrgId().equals(user.getUserId())){
+		if (tempOrg.getAmosOrgId() != null && tempOrg.getAmosOrgId().equals(user.getUserId())) {
 
 			return ResponseHelper.buildResponse("-1");
 		}
 
 		if (tempOrg.getBizOrgType().equals("COMPANY") || tempOrg.getBizOrgType().equals("DEPARTMENT")) {
-            List<OrgUsr> tempList = iOrgUsrService.list(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getParentId, id).eq(OrgUsr::getIsDelete, false));
-            /*bug3031 删除机场单位后，队伍所属单位字段数据未清空 2021-10-13 start*/
+			List<OrgUsr> tempList = iOrgUsrService
+					.list(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getParentId, id).eq(OrgUsr::getIsDelete, false));
+			/* bug3031 删除机场单位后，队伍所属单位字段数据未清空 2021-10-13 start */
 			List<FireTeam> fireTeams = fireTeamMapper.byTeamId(id);
 			if (tempList.size() > 0 || fireTeams.size() > 0) {
 				return ResponseHelper.buildResponse("-1");
 			}
-            /*bug3031 删除机场单位后，队伍所属单位字段数据未清空 2021-10-13 end*/
+			/* bug3031 删除机场单位后，队伍所属单位字段数据未清空 2021-10-13 end */
 		}
-        //bug 2882 判断是否为部门 如果部门底下有人员不可直接删除 chenzhao 2021-09-27 end
+		// bug 2882 判断是否为部门 如果部门底下有人员不可直接删除 chenzhao 2021-09-27 end
 //        iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", id).set("is_delete", CommonConstant.IS_DELETE_01));
-        /*bug 2812 一次删除多条数据  传入类型修改为string 问题解决 2021-09-09 陈召 开始*/
-        iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", String.valueOf(id)).set("is_delete", CommonConstant.IS_DELETE_01));
-        /*bug 2812 一次删除多条数据  传入类型修改为string 问题解决 2021-09-09 陈召 结束*/
+		/* bug 2812 一次删除多条数据 传入类型修改为string 问题解决 2021-09-09 陈召 开始 */
+		iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", String.valueOf(id)).set("is_delete",
+				CommonConstant.IS_DELETE_01));
+		/* bug 2812 一次删除多条数据 传入类型修改为string 问题解决 2021-09-09 陈召 结束 */
 		try {
 			eSOrgUsrService.deleteById(id);
 			emqKeeper.getMqttClient().publish(airportDeleteTopic, JSON.toJSONString(id).getBytes(), 2, false);
@@ -136,7 +154,6 @@ public class OrgUsrController extends BaseController {
 		return ResponseHelper.buildResponse("0");
 	}
 
-
 	/**
 	 * 更新单位数据
 	 *
@@ -145,13 +162,13 @@ public class OrgUsrController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/{id}", method = RequestMethod.PUT)
 	@ApiOperation(httpMethod = "PUT", value = "更新单位数据", notes = "更新单位数据")
-    public ResponseModel<?> updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgUsrDto OrgUsrVo, @PathVariable Long id) throws Exception {
+	public ResponseModel<?> updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgUsrDto OrgUsrVo,
+			@PathVariable Long id) throws Exception {
 		OrgUsrVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
 //        iOrgUsrService.updateByIdOrgUsr(OrgUsrVo, id);
 		return ResponseHelper.buildResponse(iOrgUsrService.updateByIdOrgUsr(OrgUsrVo, id));
 	}
 
-
 	/**
 	 * 根据id查询单位
 	 *
@@ -165,7 +182,6 @@ public class OrgUsrController extends BaseController {
 		return ResponseHelper.buildResponse(iOrgUsrService.selectCompanyById(id));
 	}
 
-
 	/**
 	 * 根据bizOrgType分页查询
 	 *
@@ -175,11 +191,12 @@ public class OrgUsrController extends BaseController {
 	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/selectByBizOrgType/{bizOrgType}", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "根据bizOrgType分页查询", notes = "根据bizOrgType分页查询")
-    public ResponseModel<IPage<OrgUsr>> bizOrgTypeListPage(String pageNum, String pageSize, @PathVariable String bizOrgType) throws Exception {
-        return ResponseHelper.buildResponse(iOrgUsrService.page(iOrgUsrService.bizOrgTypeListPage(pageNum, pageSize, bizOrgType)));
+	public ResponseModel<IPage<OrgUsr>> bizOrgTypeListPage(String pageNum, String pageSize,
+			@PathVariable String bizOrgType) throws Exception {
+		return ResponseHelper
+				.buildResponse(iOrgUsrService.page(iOrgUsrService.bizOrgTypeListPage(pageNum, pageSize, bizOrgType)));
 	}
 
-
 	/**
 	 * 获取单位部门树
 	 *
@@ -190,7 +207,8 @@ public class OrgUsrController extends BaseController {
 	@RequestMapping(value = "/companyTree", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "获取单位部门树(key为物理主键)", notes = "获取单位部门树(key为物理主键)\"")
 	public ResponseModel<List<OrgMenuDto>> selectCompanyTree() throws Exception {
-        List<OrgMenuDto> menus = iOrgUsrService.getTree(null, iOrgUsrService.selectCompanyDepartmentMsg(), OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
+		List<OrgMenuDto> menus = iOrgUsrService.getTree(null, iOrgUsrService.selectCompanyDepartmentMsg(),
+				OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
 		return ResponseHelper.buildResponse(menus);
 	}
 
@@ -268,6 +286,7 @@ public class OrgUsrController extends BaseController {
 		page = iOrgUsrService.page(pageBean, orgUsrQueryWrapper);
 		return page;
 	}
+
 	/**
 	 * 列表分页查询
 	 *
@@ -278,7 +297,7 @@ public class OrgUsrController extends BaseController {
 	@ApiOperation(httpMethod = "GET", value = "新列表分页查询---只查询当前登录人本单位下的对应数据信息", notes = "新列表分页查询---只查询当前登录人本单位下的对应数据信息")
 	public IPage<OrgUsr> newlistPage(String pageNum, String pageSize, OrgUsr orgUsr) {
 		ReginParams reginParams = getSelectedOrgInfo();
-    	String   companyIdString= reginParams.getPersonIdentity().getCompanyId();
+		String companyIdString = reginParams.getPersonIdentity().getCompanyId();
 		orgUsr.setParentId(companyIdString);
 		Page<OrgUsr> pageBean;
 		QueryWrapper<OrgUsr> orgUsrQueryWrapper = new QueryWrapper<>();
@@ -326,7 +345,8 @@ public class OrgUsrController extends BaseController {
 	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/saveDepartment", method = RequestMethod.POST)
 	@ApiOperation(httpMethod = "POST", value = "导入部门信息", notes = "导入部门信息")
-    public ResponseModel<?> saveDepartment(HttpServletRequest request, @RequestBody List<OrgDepartmentDto> OrgDepartmentVo, @PathVariable Long id) throws Exception {
+	public ResponseModel<?> saveDepartment(HttpServletRequest request,
+			@RequestBody List<OrgDepartmentDto> OrgDepartmentVo, @PathVariable Long id) throws Exception {
 		iOrgUsrService.saveDepartment(OrgDepartmentVo, id);
 		return ResponseHelper.buildResponse(null);
 	}
@@ -339,7 +359,8 @@ public class OrgUsrController extends BaseController {
 	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/saveCompany", method = RequestMethod.POST)
 	@ApiOperation(httpMethod = "POST", value = "导入单位信息", notes = "导入单位信息")
-    public ResponseModel<?> saveCompany(HttpServletRequest request, @RequestBody List<OrgUsrDto> OrgUsrVo) throws Exception {
+	public ResponseModel<?> saveCompany(HttpServletRequest request, @RequestBody List<OrgUsrDto> OrgUsrVo)
+			throws Exception {
 		iOrgUsrService.saveCompany(OrgUsrVo);
 		return ResponseHelper.buildResponse(null);
 	}
@@ -353,7 +374,8 @@ public class OrgUsrController extends BaseController {
 	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/{ids}/users", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "根据id获取单位人员列表", notes = "根据id获取单位人员列表")
-    public ResponseModel<List<Map<String, Object>>> selectUsersByOrgCode(HttpServletRequest request, @PathVariable List<Long> ids) throws Exception {
+	public ResponseModel<List<Map<String, Object>>> selectUsersByOrgCode(HttpServletRequest request,
+			@PathVariable List<Long> ids) throws Exception {
 		return ResponseHelper.buildResponse(iOrgUsrService.returnCompanyPersonMsg(ids));
 	}
 
@@ -377,7 +399,6 @@ public class OrgUsrController extends BaseController {
 		return ResponseHelper.buildResponse(iOrgUsrService.getParentId(amosUserId));
 	}
 
-
 	/**
 	 * 根据id获取单位人员列表
 	 *
@@ -404,7 +425,6 @@ public class OrgUsrController extends BaseController {
 		return ResponseHelper.buildResponse(iOrgUsrService.selectCompanyUsers(orgUnitId));
 	}
 
-
 	/**
 	 * 根据名称模糊匹配
 	 *
@@ -418,7 +438,6 @@ public class OrgUsrController extends BaseController {
 		return ResponseHelper.buildResponse(eSOrgUsrService.queryByKeys(name));
 	}
 
-
 	/**
 	 * 获取单位部门树
 	 *
@@ -489,7 +508,6 @@ public class OrgUsrController extends BaseController {
 		return ResponseHelper.buildResponse(menus);
 	}
 
-
 	/**
 	 * 获取用户单位归属
 	 *
@@ -530,7 +548,7 @@ public class OrgUsrController extends BaseController {
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = {"/getLoginUserDetails/{userId}", "/getLoginUserDetails"}, method = RequestMethod.GET)
+	@RequestMapping(value = { "/getLoginUserDetails/{userId}", "/getLoginUserDetails" }, method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "获取登陆人绑定的人员关系", notes = "获取登陆人绑定的人员关系")
 	public ResponseModel<List<Map<String, Object>>> getLoginUserDetails(@PathVariable(required = false) String userId) {
 		AgencyUserModel user = getUserInfo();
@@ -638,7 +656,8 @@ public class OrgUsrController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET", value = "根据机场单位id获取各单位下部门数量", notes = "根据机场单位id获取各单位下部门数量")
 	@GetMapping(value = "/amos/companyIds")
-    public ResponseModel<Map<String, Integer>> getDeptCountByCompanyIds(@RequestParam List<String> companyIdList) throws Exception {
+	public ResponseModel<Map<String, Integer>> getDeptCountByCompanyIds(@RequestParam List<String> companyIdList)
+			throws Exception {
 		return ResponseHelper.buildResponse(iOrgUsrService.getDeptCountByCompanyIds(companyIdList));
 	}
 
@@ -669,6 +688,25 @@ public class OrgUsrController extends BaseController {
 	}
 
 	/**
+	 * 根据机场单位id获取单位人员列表
+	 *
+	 * @param
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET", value = "当前角色为单位防火监督检查负责人 --下的-- 根据机场单位id获取单位人员列表", notes = "当前角色为单位防火监督检查负责人 --下的--根据机场单位id获取单位人员列表")
+	@GetMapping(value = "/{companyId}/person/newList")
+	public ResponseModel<List<OrgUsr>> getNewPersonListByCompanyId(@PathVariable String companyId) {
+		ReginParams reginParams = getSelectedOrgInfo();
+		String roleNameString = reginParams.getRole().getRoleName();
+		String currentCompanyId = getCompanyId(reginParams);
+		if (companyId.equals(currentCompanyId) && roleNameString.contains("Person_charge_unit_fire_protection_supervision_inspection")) {//单位防火监督检查负责人 
+			return ResponseHelper.buildResponse(iOrgUsrService.getPersonListByCompanyId(companyId));
+		}
+		return null;
+	}
+
+	/**
 	 * 根据id获取单位人员列表
 	 *
 	 * @param amosUserId
@@ -681,7 +719,6 @@ public class OrgUsrController extends BaseController {
 		return ResponseHelper.buildResponse(iOrgUsrService.getOrgUserByAmosUserId(amosUserId));
 	}
 
-
 	/**
 	 * 根据机构类型和登陆人bizOrgCode获取列表不分页
 	 *
@@ -699,13 +736,11 @@ public class OrgUsrController extends BaseController {
 		return ResponseHelper.buildResponse(iOrgUsrService.getListByBizOrgTypeCode(orgTypes, bizOrgCode));
 	}
 
-
 	@PersonIdentify
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET", value = "根据机构类型(逗号分割),机构编码获取列表不分页", notes = "根据机构类型(逗号分割),机构编码获取列表不分页")
 	@GetMapping(value = "/{authKey}/listWithAuth")
-    public ResponseModel<List<OrgUsr>> getListWithAuth(
-            @RequestParam(required = false) String orgTypes,
+	public ResponseModel<List<OrgUsr>> getListWithAuth(@RequestParam(required = false) String orgTypes,
 			@PathVariable String authKey) {
 		ReginParams reginParams = getSelectedOrgInfo();
 		ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
@@ -719,8 +754,7 @@ public class OrgUsrController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/{authKey}/treeWithAuth", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "根据权限查询公司部门树", notes = "根据权限查询公司部门树")
-    public ResponseModel<List<OrgMenuDto>> getCompanyTreeWithAuth(
-            @RequestParam(required = false) String orgType,
+	public ResponseModel<List<OrgMenuDto>> getCompanyTreeWithAuth(@RequestParam(required = false) String orgType,
 			@PathVariable String authKey) {
 		// 获取登陆人角色
 		ReginParams reginParams = getSelectedOrgInfo();
@@ -764,7 +798,6 @@ public class OrgUsrController extends BaseController {
 		return ResponseHelper.buildResponse(iOrgUsrService.getCompanyByBizOrgCodeList(bizOrgCode));
 	}
 
-    
 	/**
 	 * 查询多个组织机构下面的所有人员列表信息
 	 *
@@ -778,7 +811,6 @@ public class OrgUsrController extends BaseController {
 		return ResponseHelper.buildResponse(iOrgUsrService.getCompanyByUserId(userId));
 	}
 
-    
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET", value = "查询当前人员的身份证号码", notes = "查询当前人员的身份证号码")
 	@GetMapping(value = "find/getIdNumberByAmosId")
@@ -786,7 +818,6 @@ public class OrgUsrController extends BaseController {
 		return ResponseHelper.buildResponse(iOrgUsrService.getIdNumberByAmosId(amosId));
 	}
 
-
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET", value = "根据平台Id查询人员", notes = "根据平台Id查询人员")
 	@GetMapping(value = "find/getByAmosId")
@@ -794,7 +825,6 @@ public class OrgUsrController extends BaseController {
 		return ResponseHelper.buildResponse(iOrgUsrService.getByAmosId(amosIds));
 	}
 
-
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET", value = "根据bizOrgCode查询公司部门 非树", notes = "根据bizOrgCode查询公司部门 非树")
 	@GetMapping(value = "find/getByOrgCode")
@@ -802,8 +832,4 @@ public class OrgUsrController extends BaseController {
 		return ResponseHelper.buildResponse(iOrgUsrService.getByOrgCode(bizOrgCode));
 	}
 
-
-
-
-
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/MaintenanceResourceDataMapper.java

@@ -32,6 +32,8 @@ public interface MaintenanceResourceDataMapper extends BaseMapper<MaintenanceRes
      */
     public List<MaintenanceResourceData> selectMaintenanceResourceDataList(MaintenanceResourceData maintenanceResourceData);
 
+    public List<MaintenanceResourceData> selectMaintenanceResourceDataListByclassifyId();
+
     /**
      * 新增消防设施资源数据
      *

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/MaintenanceResourceMapper.java

@@ -59,6 +59,8 @@ public interface MaintenanceResourceMapper extends BaseMapper<MaintenanceResourc
      */
     public int deleteMaintenanceResourceById(Long id);
 
+
+
     /**
      * 批量删除维保设施资源树
      *
@@ -71,6 +73,8 @@ public interface MaintenanceResourceMapper extends BaseMapper<MaintenanceResourc
 
     List<MaintenanceResourceDto> selectAll();
 
+    List<MaintenanceResourceDto> selectAllType();
+
     List<MaintenanceResourceDataVo> findByIds(@Param("list") List<Long> ids);
 
     List<MaintenanceResourceDto> findTreeById(Long id);

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

@@ -120,11 +120,27 @@ public class MaintenanceResourceServiceImpl extends ServiceImpl<MaintenanceResou
 
     @Override
     public List<MaintenanceResourceDto> getMaintenanceResourceTree(String appKey, String product, String token) {
-        List<MaintenanceResourceDto> list = this.selectAll();
+        //从维保设施资源表中获取所有资源
+        List<MaintenanceResourceData> maintenanceResourceData = maintenanceResourceDataMapper.selectMaintenanceResourceDataListByclassifyId();
+        //获取第三层分类节点
+        List<MaintenanceResourceDto> maintenanceResourceDtos = this.baseMapper.selectAllType();
+        List<MaintenanceResourceDto> list = new ArrayList<>();
+        maintenanceResourceData.stream().forEach(e-> {
+            MaintenanceResourceDto e1 = new MaintenanceResourceDto();
+            e1.setId(e.getClassifyId().toString());
+            e1.setName(e.getClassifyName());
+            e1.setCompanyId(e.getMaintenanceCompanyId().toString());
+            e1.setType(MaintenanceResourceEnum.CLASSIFY.getValue());
+            e1.setParentId(e.getFireFightSysId().toString());
+            e1.setCode(e.getClassifyCode());
+            list.add(e1);
+        });
+     //   List<MaintenanceResourceDto> list = this.selectAll();
         if (!CollectionUtils.isEmpty(list)) {
+     //获取维保单位和业主单位
             List<MaintenanceResourceDto> companyTree = getCompanyList(appKey, product, token);
             if (!CollectionUtils.isEmpty(companyTree)) {
-                List<MaintenanceResourceDto> result =   new ArrayList<>();
+   /*             List<MaintenanceResourceDto> result =   new ArrayList<>();
                 result.addAll(list);
                 for (int i = 0; i < list.size(); i++) {
                     for (int j = 0; j < companyTree.size(); j++) {
@@ -132,9 +148,8 @@ public class MaintenanceResourceServiceImpl extends ServiceImpl<MaintenanceResou
                             result.remove(list.get(i));
                         }
                     }
-                }
-
-                result.addAll(companyTree);
+                }*/
+    /*            result.addAll(companyTree);
                 result.forEach(e->{if (e.getContractId() == null){
                     e.setContractId(QRCodeUtil.generateQRCode());
                 }
@@ -145,9 +160,11 @@ public class MaintenanceResourceServiceImpl extends ServiceImpl<MaintenanceResou
                     entry.getValue().ifPresent(v -> {
                         dataList.add(v);
                     });
-                });
-
-                return TreeNodeUtil.assembleTree(dataList);
+                });*/
+                list.addAll(companyTree);
+                list.addAll(maintenanceResourceDtos);
+                //避免造成其他代码bug,替换新的组装树
+                return TreeNodeUtil.assembleTreeTs(list);
             }
             return TreeNodeUtil.assembleTree(list);
         } else {

amos-boot-system-equip/src/main/resources/mapper/MaintenanceResourceDataMapper.xml

@@ -32,6 +32,36 @@
         select id, maintenance_company_id, maintenance_company_code, maintenance_company_name, owner_unit_id, owner_unit_code, owner_unit_name, fire_fight_sys_id, fire_fight_sys_code, fire_fight_sys_name, classify_id, classify_code, classify_name, classify_type, fire_facility_id, fire_facility_code, fire_facility_name, fire_facility_type, maintenance_expiration_time, maintenance_time, maintenance_cycle, create_date from mt_maintenance_resource_data
     </sql>
 
+    <select id="selectMaintenanceResourceDataListByclassifyId" parameterType="com.yeejoin.equipmanage.common.entity.MaintenanceResourceData"
+            resultMap="MaintenanceResourceDataResult">
+        SELECT
+            id,
+            maintenance_company_id,
+            maintenance_company_code,
+            maintenance_company_name,
+            owner_unit_id,
+            owner_unit_code,
+            owner_unit_name,
+            fire_fight_sys_id,
+            fire_fight_sys_code,
+            fire_fight_sys_name,
+            classify_id,
+            classify_code,
+            classify_name,
+            classify_type,
+            fire_facility_id,
+            fire_facility_code,
+            fire_facility_name,
+            fire_facility_type,
+            maintenance_expiration_time,
+            maintenance_time,
+            maintenance_cycle,
+            create_date
+        FROM
+            mt_maintenance_resource_data
+        GROUP BY classify_id
+    </select>
+
     <select id="selectMaintenanceResourceDataList"
             parameterType="com.yeejoin.equipmanage.common.entity.MaintenanceResourceData"
             resultMap="MaintenanceResourceDataResult">

amos-boot-system-equip/src/main/resources/mapper/MaintenanceResourceMapper.xml

@@ -124,6 +124,23 @@
         `mt_maintenance_resource` m
         ]]>
     </select>
+
+    <select id="selectAllType" resultType="com.yeejoin.equipmanage.common.dto.MaintenanceResourceDto">
+        <![CDATA[
+        SELECT
+            maintenance_company_id as companyId,
+            fire_fight_sys_id AS id,
+            fire_fight_sys_name name ,
+            owner_unit_id as parentId,
+            IFNULL(classify_type,3)
+        FROM
+            `mt_maintenance_resource_data`
+        GROUP BY
+            owner_unit_id,
+            maintenance_company_id,
+            fire_fight_sys_id
+        ]]>
+    </select>
     <select id="findTreeById" resultType="com.yeejoin.equipmanage.common.dto.MaintenanceResourceDto">
         <![CDATA[
         SELECT