修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/EquipFeignClient.java

@@ -139,6 +139,14 @@ public interface EquipFeignClient {
      */
     @RequestMapping(value = "/building/tree", method = RequestMethod.GET)
     ResponseModel<Object> getBuildingTree();
+
+    /**
+     * 获取消防系统列表
+     *
+     * @return
+     */
+    @RequestMapping(value = "/building/treeCompany", method = RequestMethod.GET)
+    ResponseModel<Object> getBuildingTreeCompany();
     /**
      * 获取消防建筑详情
      *

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -44,8 +44,8 @@
         ELSE '' END responseLevelCode
         FROM jc_alert_called a
         where a.is_delete=0
-        <!--AND a.coordinate_x IS NOT NULL
-        AND a.coordinate_y IS NOT NULL-->
+        AND a.coordinate_x IS NOT NULL
+        AND a.coordinate_y IS NOT NULL
     <if test='par.isAid == null '>
             and a.alert_type_code <![CDATA[ <> ]]> 1214
     </if>
@@ -336,8 +336,8 @@
     COUNT(*)
     FROM jc_alert_called a
     where a.is_delete=0  and a.alert_type_code <![CDATA[ <> ]]> 1214
-/*    AND a.coordinate_x IS NOT NULL
-    AND a.coordinate_y IS NOT NULL*/
+    AND a.coordinate_x IS NOT NULL
+    AND a.coordinate_y IS NOT NULL
     <if test='par.status==0'>
         and a.alert_status =0
     </if>

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

@@ -184,7 +184,13 @@ public class FireExpertsController extends BaseController {
         Page<FireExpertsDto> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);
-		/*  修改bug ： 4827 开始*/
+        String bizOrgCode = fireExpertsDto.getBizOrgCode();
+        if (bizOrgCode == null ){
+            ReginParams reginParams = getSelectedOrgInfo();
+            bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
+        }
+
+        /*  修改bug ： 4827 开始*/
         String expertCode =  fireExpertsDto.getExpertCode();
         List<String> expertCodeArr = new ArrayList<String>();
         expertCodeArr.add(expertCode);
@@ -197,7 +203,7 @@ public class FireExpertsController extends BaseController {
         }
         /*  修改bug ： 4827  结束*/
         Page<FireExpertsDto> fireExpertsDtoPage = fireExpertsServiceImpl.queryForFireExpertsPage1(page, false,
-                fireExpertsDto.getName(), expertCodeArr, fireExpertsDto.getBizOrgCode());
+                fireExpertsDto.getName(), expertCodeArr,bizOrgCode);
         List<FireExpertsDto> fireExpertsDtoList = fireExpertsDtoPage.getRecords().stream().map(item -> {
             item.setAge(DateUtils.getAge(item.getBirthdayTime()));
             return item;

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

@@ -154,6 +154,10 @@ public class LinkageUnitController extends BaseController {
                 bizOrgCode = orgUsr.getBizOrgCode();
             }
         }
+        if(StringUtils.isNotEmpty(bizOrgCode)){
+            ReginParams reginParams = getSelectedOrgInfo();
+            bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
+        }
     	Page<LinkageUnitDto> page = new Page<LinkageUnitDto>();
         page.setCurrent(current);
         page.setSize(size);

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

@@ -8,6 +8,8 @@ import java.util.Map;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.equipmanage.common.dto.OrgUsrDto;
+import com.yeejoin.equipmanage.fegin.JcsFeign;
 import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -42,6 +44,7 @@ import com.yeejoin.equipmanage.service.IFormInstanceService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 /**
  * @author ZeHua Li
@@ -60,6 +63,8 @@ public class BuildingController extends AbstractBaseController {
     IFormInstanceService formInstanceService;
     @Value("${window.vedioFormat}")
     String vedioFormat;
+    @Autowired
+    JcsFeign jcsFeign;
     /**
      * @param groupCode
      * @Description 根据groupCode查询allowOperation对应的操作菜单
@@ -117,6 +122,19 @@ public class BuildingController extends AbstractBaseController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation("消防建筑树 查询所在单位下的建筑")
+    @GetMapping(value = "/treeCompany")
+    public List<BuildingTreeVo> getBuildingTreeCompany() {
+        ReginParams reginParams = getSelectedOrgInfo();
+        String bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
+        ResponseModel<OrgUsrDto> company = jcsFeign.getCompanyByBizOrgCodeList(bizOrgCode);
+        if (company.getResult() != null){
+            bizOrgCode = company.getResult().getBizOrgCode();
+        }
+        return buildService.getBuildingTreeNew(bizOrgCode);
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation("消防建筑树带筛选")
     @GetMapping(value = "/treeByName")
     public List<BuildingTreeVo> treeByName(@RequestParam(required = false) String name) {

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

@@ -76,6 +76,8 @@ public interface IBuilldService extends IService<Building> {
      */
     List<BuildingTreeVo> getBuildingTree(String bizOrgCode);
 
+    List<BuildingTreeVo> getBuildingTreeNew(String bizOrgCode);
+
     /**
      * 消防建筑树查询接口(带条件bizOrgCode)
      *

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

@@ -464,6 +464,19 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
         }).collect(Collectors.toList());
     }
 
+    @Override
+    public List<BuildingTreeVo> getBuildingTreeNew(String bizOrgCode) {
+        List<BuildingTreeVo> allListVo = getBuildingTreeVos(true, bizOrgCode);
+        return allListVo.stream().filter(s -> "-1".equals(s.getParentId())).map(s -> {
+            BuildingTreeVo t = new BuildingTreeVo();
+            Bean.copyExistPropertis(s, t);
+            t.setChildren(this.getChildren(t.getInstanceId(), allListVo));
+            t.setDetailPaneApi(address);
+            t.setApiUrl(apiUrl);
+            return t;
+        }).collect(Collectors.toList());
+    }
+
     public List<BuildingTreeVo> getBuildingTree() {
         List<BuildingTreeVo> allListVo = getBuildingTreeVos(true, null);
         return allListVo.stream().filter(s -> "-1".equals(s.getParentId())).map(s -> {

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

@@ -49,6 +49,13 @@ public class EquipmentController extends BaseController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/building/treeCompany")
+    @ApiOperation(value = "获取所在单位下的消防建筑树")
+    public ResponseModel<List<MenuFrom>> getBuildingListCompany() {
+        return ResponseHelper.buildResponse(equipmentService.getBuildingListCompany());
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/fireSystem_waterResource/list")
     @ApiOperation(value = "获取消防系统消防水源列表")
     public ResponseModel<List<MenuFrom>> getFireSystemWaterResourceList() {

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

@@ -77,6 +77,25 @@ public class EquipmentServiceImpl {
         return buildingTreeList.get(0).getChildren();
     }
 
+    public List<MenuFrom> getBuildingListCompany() {
+        StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+        ResponseModel<Object> response = equipFeignClient.getBuildingTreeCompany();
+        stopWatch.stop();
+        System.out.printf("耗时%f秒/n", stopWatch.getTotalTimeSeconds());
+        List<Map<String, Object>> buildingMapList = (List<Map<String, Object>>) response.getResult();
+        List<MenuFrom> buildingTreeList = Lists.newArrayList();
+        buildingMapList.forEach(building -> {
+            MenuFrom menuFrom = new MenuFrom((String) building.get("id"), "全部建筑", (String) building.get("parentId"),
+                    "0");
+            List<Map<String, Object>> children = (List<Map<String, Object>>) building.get("children");
+            menuFrom.setChildren(parseTree(menuFrom, children));
+            menuFrom.setIsLeaf(false);
+            buildingTreeList.add(menuFrom);
+        });
+        return buildingTreeList.get(0).getChildren();
+    }
+
     private List<MenuFrom> parseTree(MenuFrom parent, List<Map<String, Object>> children) {
         List<MenuFrom> menuFromList = Lists.newArrayList();
         if (!ValidationUtil.isEmpty(children)) {