Ver Fonte

소스 간결화

pangs há 6 anos atrás
pai
commit
125ef6301b
1 ficheiros alterados com 47 adições e 56 exclusões
  1. 47 56
      bridge/src/com/icontrols/bridge/wallpad/MsgServerHandler.java

+ 47 - 56
bridge/src/com/icontrols/bridge/wallpad/MsgServerHandler.java

@@ -8,11 +8,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.InetSocketAddress;
 import java.net.Socket;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -139,58 +135,53 @@ public class MsgServerHandler extends Thread {
 	    	
 	    	list.forEach(jsonObj -> {
 	    		ServiceDetail service = new Gson().fromJson(jsonObj.toString(), ServiceDetail.class);
-	    	
-	    		Arrays.asList(service.getEvents())
-	    				.stream()
-	    				.filter(supportEventName -> supportEventName.contentEquals(eventName))
-	    				.forEach(suppoortEventName -> 
-	    				{
-			    			StringBuffer sb = new StringBuffer();
-			    			
-			    			if(isContainCompany) rcvMsgStr = sb.append(topStr).append(service.getName()).append(bottomStr).toString();
-			    			
-			    			logger.info("ÃÖÁ¾ - \r\n" + rcvMsgStr);
-			    			
-			    			Runnable task = () -> {
-			    				Socket danziSocket = null;
-			    				
-			    				try {
-			    					danziSocket = new Socket();
-			    					danziSocket.setSoLinger(true, 3000);
-			    					danziSocket.setSendBufferSize(SOCKET_BUFFER_SIZE * 1024);
-			    					danziSocket.setSoTimeout(SOCKET_WAIT_TIME);
-			    					
-			    					InetSocketAddress iSocAddr = new InetSocketAddress(service.getAddress(), service.getPort());
-			    					danziSocket.connect(iSocAddr, SOCKET_WAIT_TIME);
-			    					
-			    					DataOutputStream outStream = new DataOutputStream(danziSocket.getOutputStream());
-			    					String sendMsg = rcvMsgStr + "\r\n";
-			    					byte[] outBF = sendMsg.getBytes("euc-kr");
-			    					
-			    					outStream.write(outBF);
-			    					outStream.flush();
-			    					
-			    					logger.info("***************************************************");
-			    					logger.info("   S E N D    T O " + service.getPort() + "  C O M P L I T E ! ! ! !  ");
-			    					logger.info("***************************************************");
-			    				} catch (Exception e) {
-			    					// TODO Auto-generated catch block
-			    					logger.error("***************************************************");
-			    					logger.error("   F A I L   T O "+ service.getPort() + "   S E N D   E V E N T   ! ! ! !  ");
-			    					logger.error("***************************************************");
-			    					e.printStackTrace();
-			    				} finally {
-			    					try {
-			    						Thread.sleep(100);
-			    						danziSocket.close();
-			    					} catch (Exception e) {
-			    						e.printStackTrace();
-			    					}
-			    				}
-			    			};
-			    			
-			    			new Thread(task).start();
-			    		});
+	    		if(Arrays.asList(service.getEvents()).contains(eventName)) {
+	    			StringBuffer sb = new StringBuffer();
+	    			
+	    			if(isContainCompany) rcvMsgStr = sb.append(topStr).append(service.getName()).append(bottomStr).toString();
+	    			
+	    			logger.info("ÃÖÁ¾ - \r\n" + rcvMsgStr);
+	    			
+	    			Runnable task = () -> {
+	    				Socket danziSocket = null;
+	    				
+	    				try {
+	    					danziSocket = new Socket();
+	    					danziSocket.setSoLinger(true, 3000);
+	    					danziSocket.setSendBufferSize(SOCKET_BUFFER_SIZE * 1024);
+	    					danziSocket.setSoTimeout(SOCKET_WAIT_TIME);
+	    					
+	    					InetSocketAddress iSocAddr = new InetSocketAddress(service.getAddress(), service.getPort());
+	    					danziSocket.connect(iSocAddr, SOCKET_WAIT_TIME);
+	    					
+	    					DataOutputStream outStream = new DataOutputStream(danziSocket.getOutputStream());
+	    					String sendMsg = rcvMsgStr + "\r\n";
+	    					byte[] outBF = sendMsg.getBytes("euc-kr");
+	    					
+	    					outStream.write(outBF);
+	    					outStream.flush();
+	    					
+	    					logger.info("***************************************************");
+	    					logger.info("   S E N D    T O " + service.getPort() + "  C O M P L I T E ! ! ! !  ");
+	    					logger.info("***************************************************");
+	    				} catch (Exception e) {
+	    					// TODO Auto-generated catch block
+	    					logger.error("***************************************************");
+	    					logger.error("   F A I L   T O "+ service.getPort() + "   S E N D   E V E N T   ! ! ! !  ");
+	    					logger.error("***************************************************");
+	    					e.printStackTrace();
+	    				} finally {
+	    					try {
+	    						Thread.sleep(100);
+	    						danziSocket.close();
+	    					} catch (Exception e) {
+	    						e.printStackTrace();
+	    					}
+	    				}
+	    			};
+	    			
+	    			new Thread(task).start();
+	    		}
 	    	});
 		} catch (IOException e) {
 			// TODO Auto-generated catch block