添加对于分页查询时建筑id 的条件帅选

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FireStationMapper.java

@@ -29,9 +29,10 @@ public interface FireStationMapper extends BaseMapper<FireStation> {
 			+ "<if test='par.bizCompanyCode!=null'> and a.biz_company_code like  CONCAT('',#{par.bizCompanyCode},'%') </if>"
 			+ "<if test='par.address!=null'> and a.address like  CONCAT('',#{par.address},'%') </if>"
 			+ "<if test='par.bizOrgCode != null'> and a.biz_org_code like  CONCAT(#{par.bizOrgCode},'%') </if>"
+			+"<if test='nodeIds != null' > AND  where_building_id` in  <foreach collection='nodeIds' item='buildingId' open='(' close=')' separator=','>   #{buildingId}   </foreach></if>"
 			+" order by a.rec_date desc limit  #{pageNum},#{pageSize}"
 			+ "</script>")	
-	List<FireStationDto>getFireStation(@Param("pageNum")int pageNum,@Param("pageSize")int pageSize,@Param("par")FireStationDto par);
+	List<FireStationDto>getFireStation(@Param("pageNum")int pageNum,@Param("pageSize")int pageSize,@Param("par")FireStationDto par,List<String> nodeIds);
 	@Select("<script>"
 			+ "select COUNT(cb_fire_station.sequence_nbr) num from  cb_fire_station  where cb_fire_station.is_delete=0 "
 			+ "<if test='par.name!=null'> and cb_fire_station.name like  CONCAT('%',#{par.name},'%') </if>"	
@@ -39,8 +40,9 @@ public interface FireStationMapper extends BaseMapper<FireStation> {
 			+ "<if test='par.bizCompanyCode!=null'> and cb_fire_station.biz_company_code like  CONCAT('',#{par.bizCompanyCode},'%') </if>"
 			+ "<if test='par.address!=null'> and cb_fire_station.address like  CONCAT('',#{par.address},'%') </if>"
 			+ "<if test='par.bizOrgCode != null'> and biz_org_code  like  CONCAT(#{par.bizOrgCode},'%')  </if>"
+			+"<if test='nodeIds != null' > AND  where_building_id` in  <foreach collection='nodeIds' item='buildingId' open='(' close=')' separator=','>   #{buildingId}   </foreach></if>"
 			+ "</script>")	
-	 Map<String, Long> getFireStationCount(@Param("par")FireStationDto par);
+	 Map<String, Long> getFireStationCount(@Param("par")FireStationDto par,List<String> nodeIds);
 
 
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/KeySiteMapper.java

@@ -21,7 +21,7 @@ public interface KeySiteMapper extends BaseMapper<KeySite> {
  * 分页查询
  */
 
-public IPage<KeySiteDto> getPageList(Page<KeySiteDto> page, String name, Long buildingId, String fireEnduranceRate,
+public IPage<KeySiteDto> getPageList(Page<KeySiteDto> page, String name, List<Long> buildingIds, String fireEnduranceRate,
 			String useNature, String fireFacilitiesInfo, String bizOrgCode);
 /**
  * 获取所有的重点部位数据

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IKeySiteService.java

 package com.yeejoin.amos.boot.module.common.api.service;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import java.util.List;
+import java.util.Map;
+
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
 import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDateDto;
 import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto;
 import com.yeejoin.amos.boot.module.common.api.dto.KeySiteExcleDto;
@@ -11,9 +11,6 @@ import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
 import com.yeejoin.amos.boot.module.common.api.entity.KeySite;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * 重点部位接口类
  *
@@ -83,4 +80,6 @@ public List<Map<String, Object>> keySiteCountAndBuildingTree(String bizOrgCode);
 
 public Map<String, String> getNodeAllParentIds(List<String> ids) ;
 
+public List<Long> getNodeAllnodeIds(Long id) ;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/KeySiteMapper.xml

@@ -44,8 +44,11 @@
 		<if test="name != null and name != ''">
 			AND c.`name` like concat('%',#{name}, '%')
 		</if>
-		<if test="buildingId != null and buildingId != -1">
-			AND c.`building_id`= #{buildingId}
+		<if test="buildingIds != null">
+			AND c.`building_id` in  
+			  <foreach collection="buildingIds" item="buildingId" open="(" close=")" separator=",">
+                #{buildingId}
+            </foreach>
 		</if>
 		<if test="fireEnduranceRate != null and fireEnduranceRate != ''">
 			AND c.`fire_endurance_rate`= #{fireEnduranceRate}

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

@@ -228,32 +228,6 @@ public class KeySiteController extends BaseController {
 	}
    
 
-    /**
-     * 根据sequenceNbr查询
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "find/{sequenceNbr}")
-    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个重点部位", notes = "根据sequenceNbr查询单个重点部位")
-    public ResponseModel<KeySiteDto> selectOne(@PathVariable Long sequenceNbr) {
-        List<String> list = new ArrayList<String>();
-        Map<String, List<AttachmentDto>> files = sourceFileService.getAttachments(sequenceNbr);
-        KeySiteDto dto = keySiteService.getSequenceNbr(sequenceNbr);
-        if (files != null && dto != null) {
-            dto.setAttachments(files);
-            JSONArray array = JSONArray.parseArray(JSONArray.toJSONString(files.get("keySitePhoto")));
-            if (array != null && array.size() > 0) {
-                for (Object i : array) {
-                    JSONObject object = JSONObject.parseObject(JSONObject.toJSONString(i));
-                    list.add(object.getString("url"));
-                }
-            }
-        }
-        dto.setAttachmentsList(list);
-        return ResponseHelper.buildResponse(dto);
-    }
 
     /**
      * 列表分页查询

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireStationServiceImpl.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -54,6 +55,8 @@ public class FireStationServiceImpl extends BaseService<FireStationDto, FireStat
     
     @Autowired
 	EquipFeignClient equipFeignClient;
+    
+    
     /**
      * 分页查询
      */
@@ -78,8 +81,8 @@ public class FireStationServiceImpl extends BaseService<FireStationDto, FireStat
 
     @Override
     public Page<FireStationDto> getFirefighters(int pageNum, int pageSize, FireStationDto par) {
-        List<FireStationDto> list = fireStationMapper.getFireStation((pageNum - 1) * pageSize, pageSize, par);
-        Map<String, Long> num = fireStationMapper.getFireStationCount(par);
+        List<FireStationDto> list = fireStationMapper.getFireStation((pageNum - 1) * pageSize, pageSize, par,getNodeAllnodeIds(par.getWhereBuildingId()));
+        Map<String, Long> num = fireStationMapper.getFireStationCount(par,getNodeAllnodeIds(par.getWhereBuildingId()));
         Page<FireStationDto> pageBean = new Page<>(pageNum, pageSize, num.get("num"));
         return pageBean.setRecords(list);
     }
@@ -291,4 +294,25 @@ public class FireStationServiceImpl extends BaseService<FireStationDto, FireStat
 		}
 		return tegartString;
 	}
+	public List<String> getNodeAllnodeIds(String id) {
+		List<String> resultList = new ArrayList<String>();
+		resultList.add(id);
+		ResponseModel<List<Map<String, Object>>>  response=	equipFeignClient.getBuildingTreeList();
+		List<Map<String, Object>>  responseList =response.getResult();
+		if(response.getResult()==null && response.getResult().size()<1) {
+			return null;
+		}
+		return getNodeAllnodeIds(resultList, responseList,id.toString());
+	}
+	
+	private List<String> getNodeAllnodeIds(List<String> resultList,List<Map<String, Object>> list,String id){
+		for (Map<String, Object> map : list) {
+		 if(map.get("parentId").toString().equals(id) && map.get("parentId")!=null ) {
+			 resultList.add(map.get("id").toString());
+			 return getNodeAllnodeIds(resultList,list,map.get("id").toString());
+		 }
+		}
+		return resultList;
+	}
+	
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/KeySiteServiceImpl.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
-import static org.hamcrest.CoreMatchers.nullValue;
-
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -31,7 +29,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
-import com.itextpdf.text.pdf.PdfStructTreeController.returnType;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
@@ -90,7 +87,8 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 	 */
 	public IPage<KeySiteDto> getPageList(Page<KeySiteDto> page, String name, Long buildingId, String fireEnduranceRate,
 			String useNature, String fireFacilitiesInfo, String bizOrgCode) {
-		return keySiteMapper.getPageList(page, name, buildingId, fireEnduranceRate, useNature, fireFacilitiesInfo,
+		List<Long> ids	=getNodeAllnodeIds(buildingId);
+		return keySiteMapper.getPageList(page, name, ids, fireEnduranceRate, useNature, fireFacilitiesInfo,
 				bizOrgCode);
 	}
 
@@ -464,7 +462,7 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 		Map<String, String> map =new HashMap<String, String>();
 		ResponseModel<List<Map<String, Object>>>  response=	equipFeignClient.getBuildingTreeList();
 		List<Map<String, Object>>  responseList =response.getResult();
-		if(response.getStatus()!=200 && response.getResult().size()<1) {
+		if(response.getResult()==null && response.getResult().size()<1) {
 			return null;
 		}
 		ids.stream().forEach(i->{
@@ -484,4 +482,25 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 		}
 		return tegartString;
 	}
+	
+	public List<Long> getNodeAllnodeIds(Long id) {
+		List<Long> resultList = new ArrayList<Long>();
+		resultList.add(id);
+		ResponseModel<List<Map<String, Object>>>  response=	equipFeignClient.getBuildingTreeList();
+		List<Map<String, Object>>  responseList =response.getResult();
+		if(response.getResult()==null && response.getResult().size()<1) {
+			return null;
+		}
+		return getNodeAllnodeIds(resultList, responseList,id.toString());
+	}
+	
+	private List<Long> getNodeAllnodeIds(List<Long> resultList,List<Map<String, Object>> list,String id){
+		for (Map<String, Object> map : list) {
+		 if(map.get("parentId").toString().equals(id) && map.get("parentId")!=null ) {
+			 resultList.add(Long.parseLong(map.get("id").toString()));
+			 return getNodeAllnodeIds(resultList,list,map.get("id").toString());
+		 }
+		}
+		return resultList;
+	}
 }

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

@@ -45,6 +45,7 @@ import com.yeejoin.equipmanage.common.entity.FormInstance;
 import com.yeejoin.equipmanage.common.entity.SourceFile;
 import com.yeejoin.equipmanage.common.entity.SourceScene;
 import com.yeejoin.equipmanage.common.entity.StockDetail;
+import com.yeejoin.equipmanage.common.entity.Video;
 import com.yeejoin.equipmanage.common.entity.dto.BuildIsRiskDTO;
 import com.yeejoin.equipmanage.common.entity.dto.BuildSearchDTO;
 import com.yeejoin.equipmanage.common.entity.vo.BuildingListVO;
@@ -64,6 +65,7 @@ import com.yeejoin.equipmanage.common.vo.BuildingTreeVo;
 import com.yeejoin.equipmanage.context.SpringContextHolder;
 import com.yeejoin.equipmanage.event.SyncRiskEvent;
 import com.yeejoin.equipmanage.mapper.BuildingMapper;
+import com.yeejoin.equipmanage.mapper.EquipmentSpecificMapper;
 import com.yeejoin.equipmanage.mapper.EquipmentSpecificRelationMapper;
 import com.yeejoin.equipmanage.mapper.FireFightingSystemMapper;
 import com.yeejoin.equipmanage.mapper.FormInstanceMapper;