添加根据所属单位查询其下消防队伍树接口

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FireTeamController.java

@@ -119,7 +119,7 @@ public class FireTeamController extends BaseController {
 
 
     /**
-     * 列表分页查询
+     * 消防队伍树查询
      *
      * @return
      * @throws Exception
@@ -130,9 +130,24 @@ public class FireTeamController extends BaseController {
     public ResponseModel<List<Menu>> listTree() throws Exception {
         Map<String, Object> columnMap = new HashMap<>();
         columnMap.put("is_delete", 0);
-        Collection<FireTeam> list = iFireTeamService.listByMap(columnMap);
-        List<Menu> menus = TreeParser.getTree(null, list, FireTeam.class.getName(), "getSequenceNbr", 2, "getName",
-                "getParent");
+        List<Menu> menus = iFireTeamService.getTeamTree(columnMap);
+        return ResponseHelper.buildResponse(menus);
+    }
+
+    /**
+     * 查询所属单位下消防队伍树
+     *
+     * @return
+     * @throws Exception
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/{companyId}/listTree", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "队伍树", notes = "队伍树")
+    public ResponseModel<List<Menu>> listTreeByCompanyId(@PathVariable(value = "companyId") String companyId) throws Exception {
+        Map<String, Object> columnMap = new HashMap<>();
+        columnMap.put("is_delete", 0);
+        columnMap.put("company", companyId);
+        List<Menu> menus = iFireTeamService.getTeamTree(columnMap);
         return ResponseHelper.buildResponse(menus);
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireTeamServiceImpl.java

@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Maps;
+import com.yeejoin.amos.boot.biz.common.utils.Menu;
+import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
 import com.yeejoin.amos.boot.module.common.api.dto.FireBrigadeResourceDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FireTeamCardDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FireTeamDto;
@@ -18,6 +20,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.annotation.Resource;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -80,4 +83,17 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
     public List<FireTeamDto> queryFireTeamForList(Boolean isDelete) {
         return fireTeamMapper.listFireTeamDto(isDelete);
     }
+
+    /**
+     * 根据列表构造队伍树
+     *
+     * @param columnMap 查询列表条件
+     * @return 队伍树
+     * @throws Exception
+     */
+    public List<Menu> getTeamTree(Map<String, Object> columnMap) throws Exception {
+        Collection<FireTeam> list = this.listByMap(columnMap);
+        return TreeParser.getTree(null, list, FireTeam.class.getName(), "getSequenceNbr", 2, "getName",
+                "getParent");
+    }
 }