修改bug

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IFireEquipmentDao.java

@@ -16,4 +16,6 @@ public interface IFireEquipmentDao extends BaseDao<FireEquipment, Long> {
 	
 	Optional<FireEquipment> findById(Long id);
 
+	@Query(value = "SELECT count(1) FROM `f_fire_station_equipment` WHERE fire_equipment_id in ?1", nativeQuery = true)
+	int countAssociatedEquipStationByIds(String[] ids);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IFireStationDao.java

@@ -10,5 +10,4 @@ import com.yeejoin.amos.fas.dao.entity.FireStation;
 public interface IFireStationDao extends BaseDao<FireStation, Long> {
 
 	Optional<FireStation> findById(Long id);
-
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IWaterResourceDao.java

@@ -4,6 +4,7 @@ import com.yeejoin.amos.fas.dao.entity.WaterResource;
 
 import java.util.Optional;
 
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 @Repository("iWaterResourceDao")
@@ -11,4 +12,6 @@ public interface IWaterResourceDao extends BaseDao<WaterResource, Long> {
 
 	Optional<WaterResource> findById(Long id);
 
+	@Query(value = "SELECT count(1) FROM `f_water_resource_equipment` WHERE fire_equipment_id in ?1", nativeQuery = true)
+	int countAssociatedEquipWaterByIds(String[] ids);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/FireEquipServiceImpl.java

@@ -189,7 +189,8 @@ public class FireEquipServiceImpl implements IFireEquipService {
         return returnEntity;
     }
 
-
-
-
+    @Override
+    public int countAssociatedEquipStationByIds(String[] ids) {
+        return iFireEquipmentDao.countAssociatedEquipStationByIds(ids);
+    }
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/WaterResourceServiceImpl.java

@@ -120,8 +120,8 @@ public class WaterResourceServiceImpl implements IWaterResourceService {
 		}
 
 
-
-
-
-
+	@Override
+	public int countAssociatedEquipWaterByIds(String[] ids) {
+		return iWaterResourceDao.countAssociatedEquipWaterByIds(ids);
+	}
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IFireEquipService.java

@@ -18,15 +18,10 @@ public interface IFireEquipService {
 
 	List<String> findFireEquipArea();
 
-
-
-
 	FireEquipment save(FireEquipment fireEquipment);
 
-
 	FireEquipment queryOne(Long id);
 
-
 	/**
 	 * 删除单个风险点
 	 * @return
@@ -34,8 +29,6 @@ public interface IFireEquipService {
 	 */
 	String [] delete(String []idArray) throws Exception;
 
-
-
 	Page queryForFireEquipmentHistory(String fireEquipmentName,
 												  String equipmentName,
 												  String startTime,
@@ -44,9 +37,13 @@ public interface IFireEquipService {
 
 	Page queryForEquipmentList(String name, String code,String equipClassify,CommonPageable commonPageable);
 
-
-
-
 	//查询设备明细
 	Object queryForDetail(String type, Long id) throws Exception;
+
+	/**
+	 *  查询关联数量
+	 * @param ids
+	 * @return
+	 */
+	int countAssociatedEquipStationByIds(String[] ids);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IWaterResourceService.java

@@ -54,4 +54,6 @@ public interface IWaterResourceService {
 
 
 	Object queryForList();
+
+    int countAssociatedEquipWaterByIds(String[] ids);
 }

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_impAndfire_equip.xml

@@ -68,7 +68,9 @@
 			fe.room,
 			fe.risk_source_id,
 			fe.is_indoor,
-			fe.model,fe.manufacturer
+			fe.model,
+			fe.manufacturer,
+			fe.floor3d
 		FROM
 			f_fire_equipment fe
 		LEFT JOIN f_risk_source rs ON rs.id = fe.risk_source_id