chore:测试提交

cjl

2023-07-26 ab8c0e45bc0de2a8aa882051e2fa29d016a6cdd4

 screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java

@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.config.mybatis.MybatisPlusConfig;
import com.moral.api.config.rest.Crc16Utils;
import com.moral.api.entity.HistoryHourly;
import com.moral.api.entity.Sensor;
import com.moral.api.mapper.HistoryHourlyMapper;
@@ -455,7 +456,9 @@
        String time = "2023-07-26 14:00:00.0";
        String mac = "p5dnd7a0391978";
        HistoryHourlyServiceImpl historyHourlyService = new HistoryHourlyServiceImpl();
        historyHourlyService.strList(startTime,mac,value);
        String s = historyHourlyService.strList(startTime,mac,value);
        historyHourlyService.httpResult(s);
        int i = 0;
    }

    private String strList(String startTime,String mn,String msg){
@@ -478,17 +481,40 @@
        }
        stringBuffer.deleteCharAt(stringBuffer.length()-1);
        stringBuffer.append("&&");
        return  qn+stringBuffer.toString();
        String result = "QN=20230726160000001;ST=22;CN=2061;PW=123456;MN=P5DND7A0391978;CP=&&DataTime=20230726160000;a21005-Avg=0.03072,a21005-Flag=N;a21004-Avg=20.6,a21004-Flag=N;a21026-Avg=140.43,a21026-Flag=N;a21028-Avg=0.00778,a21028-Flag=N;a21001-Avg=0.13132,a21001-Flag=N;a01001-Avg=38.68,a01001-Flag=N;a05024-Avg=116.27,a05024-Flag=N;a01002-Avg=57.47,a01002-Flag=N;a01007-Avg=0.864,a01007-Flag=N;a01006-Avg=811.918,a01006-Flag=N;a01008-Avg=156.66,a01008-Flag=N;a34002-Avg=9.18,a34002-Flag=N;a34004-Avg=8.1,a34004-Flag=N;a99054-Avg=0.02283,a99054-Flag=N;a31001-Avg=0,a31001-Flag=N&&";

        //String result = qn+stringBuffer.toString();

        String s = Crc16Utils.padLeftTest(String.valueOf(result.length()),4,null);
        String s1 = Crc16Utils.crc16_2017(result, result.length());
        return  "##"+s+result+s1;
    }

    private void httpResult(String date){
        try {
            System.out.println(date);
            Socket socket = new Socket(InetAddress.getByName("222.92.166.238"),15031);
            Socket socket = new Socket(InetAddress.getByName("127.0.0.1"),5656);
            OutputStream os = socket.getOutputStream();
            //发送数据
            os.write(date.getBytes());
            os.close();


            // 读取服务端返回的数据，使用 Socket 读取流
            InputStream in = socket.getInputStream();
            byte[] buf = new byte[1024];

            int len = in.read(buf);

            String text = new String(buf, 0, len);

            System.out.println(text);

            socket.close();





        }catch (Exception e){
            System.out.println("错误"+e.getMessage());
        }finally {
@@ -506,11 +532,11 @@
            socket.setSoTimeout(20000);
            // 建立连接后获得输出流
            outputStream = socket.getOutputStream();
            outputStream.write(message.getBytes(StandardCharsets.UTF_8));
            outputStream.write(message.getBytes());
            outputStream.flush();

            inputStream = socket.getInputStream();
            bufferedReader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
            bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
            String readLen=bufferedReader.readLine();
            log.debug("响应报文：{}", readLen);
            return readLen;
@@ -518,7 +544,7 @@
            log.error("socket发送异常：{}", e.toString());
        } finally {
            try {
                if(bufferedReader != null){
                    if(bufferedReader != null){
                    bufferedReader.close();
                }
                if (inputStream != null) {