Browse Source

传感器推送数据TM修改空格

lchao 2 năm trước cách đây
mục cha
commit
f67e991a6f

+ 0 - 59
ruoyi-admin/src/main/java/com/ruoyi/tcp/EchoThread.java

@@ -1,59 +0,0 @@
-package com.ruoyi.tcp;
-
-import com.alibaba.fastjson.JSONObject;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.net.Socket;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class EchoThread{
-    private Socket client;
-    PrintWriter out = null;
-    InputStream in = null;
-
-    public EchoThread(Socket client){
-        this.client = client;
-    }
-
-    public void run() {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        try {
-            out = new PrintWriter(client.getOutputStream(),true);
-            in = client.getInputStream();
-         while(true){
-                String inputLine="";
-                byte[] temp = new byte[1024];
-                int length = in.read(temp);
-                inputLine+=new String(temp,0,length);
-                JSONObject object = JSONObject.parseObject(inputLine);
-                String st = object.get("ST").toString();
-                Integer serial = Integer.parseInt(object.get("SERIAL").toString());
-                if(".".equals(inputLine))
-                {
-                    out.println("bye");
-                    break;
-                }
-                //传感器上报的数据===>inputLine
-                System.out.println("===="+inputLine);
-                //do sth
-
-                //do sth
-                JSONObject res = new JSONObject();
-                res.put("ST",st);
-                res.put("SERIAL",serial);
-                res.put("MARK",1);
-                res.put("TM ", sdf.format(new Date()));
-                out.println(res);
-            }
-            in.close();
-            out.close();
-            client.close();
-        } catch (IOException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-    }
-}

+ 0 - 37
ruoyi-admin/src/main/java/com/ruoyi/tcp/TcpClientHandler.java

@@ -1,37 +0,0 @@
-package com.ruoyi.tcp;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.stereotype.Component;
-import java.net.ServerSocket;
-import java.net.Socket;
-
-@Component
-public class TcpClientHandler  extends Thread implements CommandLineRunner {
-
-    private static final Logger log = LoggerFactory.getLogger(TcpClientHandler.class);
-    private Integer port = 8802;
-
-    @Override
-    public void run(String... args){
-        try{
-            ServerSocket server = new ServerSocket(port);
-            Socket client = null;
-            boolean flag = true;
-            while(flag){
-                log.info("=============> TCP-Server is started with port:{} <=============",port);
-                client = server.accept();
-                new EchoThread(client).run();
-            }
-            client.close();
-            server.close();
-        }catch(Exception ex){
-            // TODO Auto-generated catch block
-            ex.printStackTrace();
-        }
-    }
-
-}
-
-

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/tcp/TcpServer.java

@@ -80,7 +80,7 @@ public class TcpServer  extends Thread implements CommandLineRunner {
         res.put("ST",st);
         res.put("SERIAL",serial);
         res.put("MARK",1);
-        res.put("TM ", sdf.format(new Date()));
+        res.put("TM", sdf.format(new Date()));
         //将缓冲数据写入渠道,返回给客户端
         channel.write(BufferUtil.createUtf8(res.toJSONString()));
     }

+ 5 - 5
ruoyi-admin/src/main/resources/application.yml

@@ -16,11 +16,11 @@ ruoyi:
 # 开发环境配置(视频会议配置)
 server:
   # 服务器的HTTP端口,默认为80
-  port: 81
-#  ssl:
-#    key-store: classpath:keystore.jks
-#    key-store-password: 123456
-#    key-password: 123456
+  port: 41000
+  ssl:
+    key-store: classpath:keystore.jks
+    key-store-password: 123456
+    key-password: 123456
 ## 开发环境配置(短信服务配置)
 #server:
 #  # 服务器的HTTP端口,默认为80