修改bug

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/FireSourceController.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.fas.business.controller;
 import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
 import com.yeejoin.amos.fas.business.service.intfc.IFireCarService;
 import com.yeejoin.amos.fas.business.service.intfc.IFireEquipService;
+import com.yeejoin.amos.fas.business.service.intfc.IWaterResourceService;
 import com.yeejoin.amos.fas.business.util.CommonPageParamUtil;
 import com.yeejoin.amos.fas.business.vo.FireCarDetailVo;
 import com.yeejoin.amos.fas.business.vo.ReginParams;
@@ -32,12 +33,14 @@ public class FireSourceController extends BaseController {
     private IFireCarService fireCarService;
     @Autowired
     private IFireEquipService iFireEquipService;
+    @Autowired
+    private IWaterResourceService iWaterResourceService;
 
     @ApiOperation(httpMethod = "POST", value = "添加消防装备", notes = "添加消防装备")
     @RequestMapping(value = "", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse create(@RequestBody FireEquipment fireEquipment) throws Exception {
-		ReginParams reginParams =getSelectedOrgInfo();
-		String compCode=getOrgCode(reginParams);
+        ReginParams reginParams = getSelectedOrgInfo();
+        String compCode = getOrgCode(reginParams);
         fireEquipment.setCreateBy(getUserId());
         fireEquipment.setCreateDate(new Date());
         fireEquipment.setOrgCode(compCode);
@@ -62,13 +65,18 @@ public class FireSourceController extends BaseController {
     @RequestMapping(value = "/{ids}", produces = "application/json;charset=UTF-8", method = RequestMethod.DELETE)
     public CommonResponse delete(@PathVariable String ids) throws Exception {
         String[] idArray = ids.split(",");
+        if (iWaterResourceService.countAssociatedEquipWaterByIds(idArray) > 0) {
+            return CommonResponseUtil.failure("该设备已被灭火栓或消防水池绑定，请先删除绑定关系");
+        }
+        if (iFireEquipService.countAssociatedEquipStationByIds(idArray) > 0) {
+            return CommonResponseUtil.failure("该设备已被消防泡沫间或消防小室绑定，请先删除绑定关系");
+        }
         return CommonResponseUtil.success(iFireEquipService.delete(idArray));
     }
 
     /**
      * 消防车查询
      *
-	 * @param id
      * @return
      */
     @ApiOperation(httpMethod = "POST", value = "查询消防车", notes = "查询消防车")
@@ -77,7 +85,7 @@ public class FireSourceController extends BaseController {
             @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
             @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable) {
         CommonPageInfoParam param = CommonPageParamUtil.fillCommonPageInfoParam(queryRequests, commonPageable);
-		Page<HashMap<String, Object>> carList = fireCarService.queryFireCar(getToken(),getProduct(),getAppKey(), param);
+        Page<HashMap<String, Object>> carList = fireCarService.queryFireCar(getToken(), getProduct(), getAppKey(), param);
         return CommonResponseUtil.success(carList);
     }
 
@@ -90,14 +98,13 @@ public class FireSourceController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "查询消防车", notes = "查询消防车")
     @RequestMapping(value = "/fire-car/det/{id}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse queryFireCar(@ApiParam(value = "查询条件", required = true) @PathVariable Long id) {
-		FireCarDetailVo car = fireCarService.findFireCarById(getToken(),getProduct(),getAppKey(),id);
+        FireCarDetailVo car = fireCarService.findFireCarById(getToken(), getProduct(), getAppKey(), id);
         return CommonResponseUtil.success(car);
     }
 
     /**
      * 消防装备查询-查询消防装备及视频监控
      *
-	 * @param id
      * @return
      */
     @ApiOperation(httpMethod = "POST", value = "消防装备查询", notes = "消防装备查询")
@@ -113,7 +120,6 @@ public class FireSourceController extends BaseController {
     /**
      * 配套设备查询
      *
-	 * @param id
      * @return
      */
     @ApiOperation(httpMethod = "POST", value = "配套设备查询", notes = "配套设备查询")
@@ -129,7 +135,6 @@ public class FireSourceController extends BaseController {
     /**
      * 生产区域查询查询
      *
-	 * @param id
      * @return
      */
     @ApiOperation(httpMethod = "GET", value = "生产区域查询", notes = "生产区域查询")
@@ -139,7 +144,7 @@ public class FireSourceController extends BaseController {
         return CommonResponseUtil.success(car);
     }
 
-//	@Authorization(ingore = true)
+    //	@Authorization(ingore = true)
     @ApiOperation(httpMethod = "GET", value = "查询消防设备历史数据", notes = "查询消防设备历史数据")
     @RequestMapping(value = "/data/history", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse queryForFireEquipmentHistory(
@@ -175,7 +180,4 @@ public class FireSourceController extends BaseController {
 
         return CommonResponseUtil.success(iFireEquipService.queryForDetail(type, id));
     }
-
-
-
 }

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