bug

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

 package com.yeejoin.amos.fas.business.dao.repository;
 
 import com.yeejoin.amos.fas.dao.entity.FireStationFireEquipment;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
 @Repository("iFireStationEquipmentDao")
 public interface IFireStationEquipmentDao extends BaseDao<FireStationFireEquipment, Long> {
 
+	@Transactional
+    @Modifying
+    @Query(value = "delete  FROM `f_fire_station_equipment` WHERE fire_station_id = ?1", nativeQuery = true)
+	void deleteByStationId(Long id);
+
 
 }

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

@@ -3,7 +3,10 @@ package com.yeejoin.amos.fas.business.dao.repository;
 import java.util.List;
 import java.util.Optional;
 
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.yeejoin.amos.fas.dao.entity.WaterResourceEquipment;
 
@@ -16,4 +19,9 @@ public interface IWaterResourceEquipmentDao extends BaseDao<WaterResourceEquipme
 	
 	int countByWaterResourceIdAndFireEquipmentId(Long waterResourceId,Long fireEquipmentId);
 
+	@Transactional
+    @Modifying
+    @Query(value = "delete  FROM `f_water_resource_equipment` WHERE water_resource_id = ?1", nativeQuery = true)
+	void deleteByWaterSourceId(Long id);
+
 }

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.fas.business.service.impl;
 import com.yeejoin.amos.fas.business.constants.FasConstant;
 import com.yeejoin.amos.fas.business.dao.mapper.FireStationEquipmentMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.FireStationMapper;
+import com.yeejoin.amos.fas.business.dao.repository.IEquipmentFireEquipmentDao;
 import com.yeejoin.amos.fas.business.dao.repository.IFireEquipmentDao;
 import com.yeejoin.amos.fas.business.dao.repository.IFireStationDao;
 import com.yeejoin.amos.fas.business.dao.repository.IFireStationEquipmentDao;
@@ -17,6 +18,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -41,7 +43,7 @@ public class FireStationServiceImpl implements IFireStationService {
 
 	@Autowired
 	IFireEquipmentDao iFireEquipmentDao;
-
+	
 	@Value("${windows.img.path}")
 	private String winImgPath;
 
@@ -133,6 +135,7 @@ public class FireStationServiceImpl implements IFireStationService {
 		return result;
 	}
 
+	@Transactional
 	public String[] delete(String[] idArray) throws Exception {
 		for (String id : idArray) {
 			Optional<FireStation> fireStation1 = iFireStationDao.findById(Long.parseLong(id));
@@ -140,6 +143,7 @@ public class FireStationServiceImpl implements IFireStationService {
 			if(fireStation1.isPresent()){
 				fireStation=fireStation1.get();
 			}
+			iFireStationEquipmentDao.deleteByStationId(Long.valueOf(id));
 			if (fireStation != null) {
 				this.iFireStationDao.deleteById(Long.parseLong(id));
 			} else {

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

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -46,6 +47,7 @@ public class WaterResourceServiceImpl implements IWaterResourceService {
 		return waterResourceMapper.queryOne(id);
 	}
 
+	@Transactional
 	public String [] delete(String []idArray) throws Exception
 	{
 		for(String id:idArray)
@@ -55,6 +57,7 @@ public class WaterResourceServiceImpl implements IWaterResourceService {
 			if(waterResource1.isPresent()){
 				waterResource=waterResource1.get();
 			}
+			iWaterResourceEquipmentDao.deleteByWaterSourceId(Long.valueOf(id));
 			if(waterResource != null)
 			{
 				this.iWaterResourceDao.deleteById(Long.parseLong(id));