*）修改车库门控制

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/JcsControlServerClient.java

 package com.yeejoin.amos.boot.module.common.api.feign;
 
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
-
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
 /**
  * 
  * <pre>
@@ -29,6 +29,21 @@ public interface JcsControlServerClient {
 	 */
     @GetMapping(value = "/v1/wksendbell/{codestr}/{type}")
     FeignClientResult<String> sendBellAction(@PathVariable("codestr") String areasStr, @PathVariable("type") String type);
+    
+    /**
+     * 
+     * <pre>
+     * 打开/关闭消防警铃(自动关闭时间单位为：秒)
+     * </pre>
+     *
+     * @param areasStr
+     * @param type
+     * @param closttime
+     * @return
+     */
+    @GetMapping(value = "/v1/wksendbell/{codestr}/{type}/{closttime}")
+    FeignClientResult<String> sendBellActionWithTime(@PathVariable("codestr") String areasStr,
+    		@PathVariable("type") String type,@PathVariable("closttime") long closttime);
 
    /**
     * 
@@ -89,5 +104,6 @@ public interface JcsControlServerClient {
     @GetMapping(value = "/v1/controlequip/kndwrite/{ip}/{port}/{num}/{result}")
     FeignClientResult<String> writeStateAction(@PathVariable("ip") String ip,@PathVariable("port") int port, 
     		@PathVariable("num") int whichone, @PathVariable("result") String stateStr);
+    
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java

@@ -628,7 +628,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 		 */
 		List<ControllerDto> controllerDtoList = controllerService.queryAllForList();
 		StringBuilder bellNumSb = new StringBuilder();
-		StringBuilder broadcastNumSb = new StringBuilder();
+//		StringBuilder broadcastNumSb = new StringBuilder();
 		for (ControllerDto controllerDto : controllerDtoList) {
 			// 消防警铃
 			if (controllerDto.getType().equals(ControllerTypeEnum.BELL.getCode())) {
@@ -640,14 +640,14 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 				}
 			}
 			// 广播
-			if (controllerDto.getType().equals(ControllerTypeEnum.BROADCAST.getCode())) {
-				List<String> broadcastList = controllerEquipMap.get(controllerDto.getSequenceNbr());
-				if (!ValidationUtil.isEmpty(broadcastList)) {
-					for (String num : broadcastList) {
-						broadcastNumSb.append(num).append(",");
-					}
-				}
-			}
+//			if (controllerDto.getType().equals(ControllerTypeEnum.BROADCAST.getCode())) {
+//				List<String> broadcastList = controllerEquipMap.get(controllerDto.getSequenceNbr());
+//				if (!ValidationUtil.isEmpty(broadcastList)) {
+//					for (String num : broadcastList) {
+//						broadcastNumSb.append(num).append(",");
+//					}
+//				}
+//			}
 		}
 		/**
 		 * 打开消防警铃
@@ -655,16 +655,21 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 		if (!ValidationUtil.isEmpty(bellNumSb.toString())) {
 			String bellNum = bellNumSb.toString();
 			bellNum = bellNum.substring(0, bellNum.length() - 1);
-			jcsControlServerClient.sendBellAction(bellNum, "1");
+			String[] bellNums = bellNum.split(",");
+			for (int i = 0; i < bellNums.length; i++)
+			{
+				//打开15s后自动关闭
+				jcsControlServerClient.sendBellActionWithTime(bellNums[i], "1", 15);
+			}
 		}
 		/**
 		 * 播放广播
 		 */
-		if (!ValidationUtil.isEmpty(broadcastNumSb.toString())) {
-			String broadcastNum = broadcastNumSb.toString();
-			broadcastNum = broadcastNum.substring(0, broadcastNum.length() - 1);
-			jcsControlServerClient.sendFileAction(broadcastNum, "1490075199246.mp3");
-		}
+//		if (!ValidationUtil.isEmpty(broadcastNumSb.toString())) {
+//			String broadcastNum = broadcastNumSb.toString();
+//			broadcastNum = broadcastNum.substring(0, broadcastNum.length() - 1);
+//			jcsControlServerClient.sendFileAction(broadcastNum, "1490075199246.mp3");
+//		}
 		/**
 		 * 打开北站车库门
 		 */