1.定时任务：保证网关数据链路活跃状态

2.个推改为群推

adc-da-main/src/main/java/com/adc/da/AdcDaApplication.java

@@ -15,7 +15,7 @@ import org.springframework.context.annotation.Bean;
 
 import com.codahale.metrics.CsvReporter;
 import org.springframework.context.annotation.ComponentScan;
-
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @MapperScan("com.adc.da.**.dao")
 @ComponentScan("com.adc")
@@ -23,6 +23,7 @@ import org.springframework.context.annotation.ComponentScan;
 @SpringBootApplication(exclude = {
 		DataSourceAutoConfiguration.class
 })
+@EnableScheduling
 public class AdcDaApplication {
 
 	public static void main(String[] args) {

adc-da-main/src/main/java/com/adc/da/znks/util/AppPushUtils.java

@@ -23,7 +23,7 @@ public class AppPushUtils {
     private static String appKey = "XRxH4VbaVZAkl7uK44pd97";
     private static String masterSecret = "xhUi7HRWsv8uj28GJdjhR2";
     private static String url = "http://sdk.open.api.igexin.com/apiex.htm";
-    public static void push(String title, String msg, String clientId) throws IOException {
+    public static void push(String title, String msg, String[] clientId) throws IOException {
 
         // 配置返回每个用户返回用户状态，可选
         System.setProperty("gexin_pushList_needDetails", "true");
@@ -40,10 +40,12 @@ public class AppPushUtils {
         message.setOfflineExpireTime(24 * 1000 * 3600);
         // 配置推送目标
         List<Target> targets = new ArrayList<>(1);
+        for(String client : clientId){
             Target target1 = new Target();
             target1.setAppId(appId);
-        target1.setClientId(clientId);
+            target1.setClientId(client);
             targets.add(target1);
+        }
         // taskId用于在推送时去查找对应的message
         String taskId = push.getContentId(message);
         IPushResult ret = push.pushMessageToList(taskId, targets);
@@ -76,7 +78,7 @@ public class AppPushUtils {
         return template;
     }
 
-    public static void pushTc(String title, String msg, String clientId) throws IOException {
+    public static void pushTc(String title, String msg, String[] clientId) throws IOException {
 
         // 配置返回每个用户返回用户状态，可选
         System.setProperty("gexin_pushList_needDetails", "true");
@@ -93,10 +95,12 @@ public class AppPushUtils {
         message.setOfflineExpireTime(24 * 1000 * 3600);
         // 配置推送目标
         List<Target> targets = new ArrayList<>(1);
+        for(String client : clientId){
             Target target1 = new Target();
             target1.setAppId(appId);
-        target1.setClientId(clientId);
+            target1.setClientId(client);
             targets.add(target1);
+        }
         // taskId用于在推送时去查找对应的message
         String taskId = push.getContentId(message);
         IPushResult ret = push.pushMessageToList(taskId, targets);
@@ -115,11 +119,11 @@ public class AppPushUtils {
     }
 
     public static void main(String[] args) {
-        try {
-            push("提示", "测试推送", "c3d2cb373109db849b7ecfb22a4fd93d");
+        /*try {
+           // push("提示", "测试推送", "c3d2cb373109db849b7ecfb22a4fd93d");
         } catch (IOException e) {
             e.printStackTrace();
-        }
+        }*/
     }
 
 }

adc-da-main/src/main/java/com/adc/da/znks/util/netty/ActiveGateWay.java

+package com.adc.da.znks.util.netty;
+
+import com.adc.da.znks.util.SystemValue;
+import io.netty.channel.Channel;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @ClassName ActiveGateWay
+ * @Descroption TODO
+ * @Author 王夏晖
+ * @Date 2018/9/17 0017 19:50
+ **/
+@Component
+public class ActiveGateWay {
+    @Scheduled(cron = "0 0/1 * * * ?")
+    public void timerToNow(){
+        Map<String,Object> channelMap = SystemValue.channelMap;
+        for (Map.Entry<String,Object> entry : channelMap.entrySet()) {
+            byte[] request = new byte[23];
+            request[0] = 0x4d;
+            request[1] = 0x41;
+            request[2] = 0x43;
+            request[3] = 0x5F;
+            request[4] = 0x52;
+            request[5] = 0x45;
+            request[6] = 0x51;
+            request[7] = 0x55;
+            request[8] = 0x45;
+            request[9] = 0x53;
+            request[10] = 0x54;
+            Channel channel = (Channel)entry.getValue();
+            channel.writeAndFlush(request);
+        }
+    }
+}

adc-da-main/src/main/java/com/adc/da/znks/util/netty/ServerHandler.java

@@ -108,28 +108,20 @@ public class ServerHandler extends ChannelInboundHandlerAdapter {
 				System.out.println(lockType);
 				serverHandler.lockRecordService.insertLockRecord(lockRecord);
 				if(list != null){
-					if("80".equals(instruct)){ // 远程开锁触发请求，发送透传
+					String[] client = new String[list.size()];
 					for(int i=0;i<list.size();i++){
 						clientId = list.get(i).get("client_id")!=null?list.get(i).get("client_id").toString():"";
 						if(!"".equals(clientId)){
-								AppPushUtils.pushTc(title,message,clientId);
-								AppPushUtils.push(title,message,clientId);
+							client[i] = clientId;
 						}else{
 							logger.info("clientId为空");
 						}
-
 					}
-
-					}else{
-						for(int i=0;i<list.size();i++){
-							clientId = list.get(i).get("client_id")!=null?list.get(i).get("client_id").toString():"";
-							if(!"".equals(clientId)){
-								AppPushUtils.push(title,message,clientId);
+					if("80".equals(instruct)){ // 远程开锁触发请求，发送透传
+						AppPushUtils.pushTc(title,message,client);
+						AppPushUtils.push(title,message,client);
 					}else{
-								logger.info("clientId为空");
-							}
-						}
-
+						AppPushUtils.push(title,message,client);
 					}
 				}else{
 					logger.info("clientId未获取，消息发送失败");