bug

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

@@ -7,13 +7,13 @@ import java.net.URLConnection;
 import java.util.List;
 import java.util.Map;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSONObject;
-import com.itextpdf.text.pdf.PdfStructTreeController.returnType;
 import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 
@@ -25,6 +25,10 @@ import io.swagger.annotations.ApiOperation;
 @Api(tags="天气api")
 public class WeatherController extends BaseController {
 	
+	@Value("${param.weather.url}")
+    private String weatherUrl;
+
+	
 	@ApiOperation(httpMethod = "GET",value = "天气查询", notes = "天气查询")
 	@GetMapping("/{address}")
 	public CommonResponse getWeather(@PathVariable("address") String address) {
@@ -32,7 +36,7 @@ public class WeatherController extends BaseController {
 		String result = "";
         BufferedReader in = null;
         try {
-            String urlNameString = "http://t.weather.sojson.com/api/weather/city/" + address;
+            String urlNameString = weatherUrl + address;
             URL realUrl = new URL(urlNameString);
             
             // 打开和URL之间的连接

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

@@ -3,6 +3,8 @@ package com.yeejoin.amos.fas.business.dao.repository;
 import com.yeejoin.amos.fas.dao.entity.EquipmentFireEquipment;
 
 import org.springframework.data.jpa.repository.Modifying;
+import java.util.List;
+
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
@@ -19,6 +21,8 @@ public interface IEquipmentFireEquipmentDao extends BaseDao<EquipmentFireEquipme
      */
     @Query(value = "select count(1) from f_equipment_fire_equipment WHERE equipment_id = ?1 and fire_equipment_id = ?2", nativeQuery = true)
     int findByEqmtIdAndFireEqmtId(Long equipmentId, Long fireEquipmentId);
+    
+    List<EquipmentFireEquipment> findAllByEquipmentId(Long equipmentId);
 
     @Query(value = "SELECT count(1) FROM `f_equipment_fire_equipment` WHERE fire_equipment_id in ?1", nativeQuery = true)
 	int countImpEquipByIds(String[] ids);

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

@@ -133,6 +133,11 @@ public class EquipmentServiceImpl implements IEquipmentService {
     			equipment=equipment1.get();
     		}
             if (equipment != null) {
+            	List<EquipmentFireEquipment> eqFireEqs = equipmentFireEquipmentDao.findAllByEquipmentId(equipment.getId());
+            	
+            	if(!eqFireEqs.isEmpty()){
+            		equipmentFireEquipmentDao.deleteAll(eqFireEqs);
+            	}
                 this.iEquipmentDao.deleteById(Long.parseLong(id));
             } else {
                 throw new Exception("找不到指定的对象:" + id);

YeeAmosFireAutoSysStart/src/main/resources/application.properties

 
-spring.application.name = Amos-autosys-sqy
+spring.application.name = Amos-autosys
 
 server.port = 8083
 
@@ -52,3 +52,4 @@ windows.img.path = F:\\
 linux.img.path = /
 
 param.safetyIndexChange.cron = 0 0 2 * * ?
+param.weather.url = http://t.weather.sojson.com/api/weather/city/