24282 2 anos atrás
pai
commit
c8fcdd1532

+ 2 - 1
src/main/java/com/fjhx/MyMain.java

@@ -10,6 +10,7 @@ import com.fjhx.utils.MyUtil;
 import java.io.*;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 
 
 public class MyMain {
@@ -60,7 +61,7 @@ public class MyMain {
         }
 
         // 读取配置文件
-        InputStreamReader read = new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8);
+        InputStreamReader read = new InputStreamReader(Files.newInputStream(file.toPath()), StandardCharsets.UTF_8);
         BufferedReader bufferedReader = new BufferedReader(read);
         StringBuilder builder = new StringBuilder();
         String lineTxt;

+ 0 - 377
src/main/java/com/fjhx/entity/test

@@ -1,377 +0,0 @@
-[
-  "B00000000000000000017866",
-  "A0000788DDD90140000A0149",
-  "B00000000000000000013527",
-  "A0003741DDD901400003015A",
-  "B00000000000000000013740",
-  "A0002990DDD90140000C014B",
-  "B00000000000000000017538",
-  "B00000000000000000017598",
-  "B00000000000000000020307",
-  "A0000086DDD90140000B01A2",
-  "B00000000000000000017591",
-  "A0003741DDD90140000301DD",
-  "A0000788DDD90140000A017D",
-  "B00000000000000000018042",
-  "A0002990DDD90140000C0180",
-  "B00000000000000000013600",
-  "B00000000000000000017596",
-  "B00000000000000000014242",
-  "B00000000000000000013098",
-  "B00000000000000000020201",
-  "A00000000000000000010C72",
-  "B00000000000000000013251",
-  "B00000000000000000003300",
-  "B00000000000000000013003",
-  "B00000000000000000017595",
-  "A0000788DDD90140000A0176",
-  "B00000000000000000018014",
-  "B00000000000000000017961",
-  "B00000000000000000015852",
-  "B00000000000000000014338",
-  "A0000086DDD90140000B017A",
-  "A0003741DDD9014000030004",
-  "A0003741DDD901400000019A",
-  "B00000000000000000013226",
-  "B00000000000000000003314",
-  "B00000000000000000014832",
-  "A0000086DDD90140000B002E",
-  "B00000000000000000025713",
-  "A0000788DDD90140000A014F",
-  "A0000086DDD90140000B0134",
-  "B00000000000000000018048",
-  "A0000086DDD90140000B002C",
-  "A0002990DDD90140000C012B",
-  "A0002990DDD90140000C017D",
-  "A0002990DDD90140000C0170",
-  "B00000000000000000018015",
-  "A0000086DDD90140000B0101",
-  "B00000000000000000013102",
-  "B00000000000000000018008",
-  "A0003741DDD901400003019C",
-  "B00000000000000000017937",
-  "A0003741DDD9014000030147",
-  "B00000000000000000018050",
-  "A0002990DDD90140000C018A",
-  "B00000000000000000029125",
-  "A0000086DDD90140000B0165",
-  "B00000000000000000014435",
-  "B00000000000000000010732",
-  "B00000000000000000013681",
-  "A0002990DDD90140000C013A",
-  "A0003741DDD9014000000160",
-  "300000000000000000A00136",
-  "B00000000000000000017935",
-  "A0000086DDD90140000B0133",
-  "A0003741DDD9014000030020",
-  "A0003741DDD90140000E0206",
-  "B00000000000000000013352",
-  "B00000000000000000013576",
-  "B00000000000000000018045",
-  "A0003741DDD9014000030134",
-  "A0000086DDD90140000B0176",
-  "B00000000000000000017982",
-  "B00000000000000000018016",
-  "A0003741DDD9014000030160",
-  "B00000000000000000017530",
-  "A0000086DDD90140000B0031",
-  "B00000000000000000018257",
-  "A0000086DDD90140000B002D",
-  "B00000000000000000018018",
-  "B00000000000000000025490",
-  "B00000000000000000012771",
-  "B00000000000000000027588",
-  "B00000000000000000013406",
-  "B00000000000000000003067",
-  "A0000086DDD90140000B001D",
-  "B00000000000000000017532",
-  "A0000788DDD90140000A014D",
-  "B00000000000000000014717",
-  "A0000086DDD90140000B00BD",
-  "B00000000000000000018021",
-  "B00000000000000000018009",
-  "A0000788DDD90140000A017C",
-  "B00000000000000000017698",
-  "B00000000000000000026605",
-  "A0003741DDD9014000030131",
-  "B00000000000000000013736",
-  "B00000000000000000017599",
-  "A0000788DDD90140000A017A",
-  "B00000000000000000017846",
-  "B00000000000000000026493",
-  "B00000000000000000018006",
-  "B00000000000000000017639",
-  "B00000000000000000017882",
-  "B00000000000000000017594",
-  "B00000000000000000026911",
-  "B00000000000000000017971",
-  "A0000086DDD90140000B001E",
-  "A0002990DDD90140000C0191",
-  "B00000000000000000017963",
-  "B00000000000000000017938",
-  "B00000000000000000026599",
-  "B00000000000000000017535",
-  "B00000000000000000014673",
-  "A0003741DDD90140000301C1",
-  "B00000000000000000017970",
-  "A0000788DDD90140000A0179",
-  "B00000000000000000018020",
-  "A0003741DDD90140000301EC",
-  "A0003741DDD901400003000F",
-  "B00000000000000000017597",
-  "A0000086DDD90140000B00FD",
-  "A0002990DDD90140000C024B",
-  "A0002990DDD90140000C01A5",
-  "B00000000000000000013058",
-  "A0002990DDD90140000C0145",
-  "B00000000000000000012949",
-  "A0000788DDD90140000A00CB",
-  "A0002990DDD90140000C0147",
-  "B00000000000000000017593",
-  "A0000788DDD90140000A0178",
-  "B00000000000000000020153",
-  "A0000086DDD90140000B0131",
-  "A0000086DDD90140000B0196",
-  "A0002990DDD90140000C0125",
-  "A0003741DDD9014000000174",
-  "B00000000000000000020383",
-  "A0003741DDD9014000030155",
-  "A0000086DDD90140000B0127",
-  "300000000000000000A001DC",
-  "B00000000000000000017865",
-  "A0003741DDD901400003015D",
-  "A0002990DDD90140000C0194",
-  "B00000000000000000027591",
-  "A0002990DDD90140000C015A",
-  "B00000000000000000012701",
-  "A0000788DDD90140000A016B",
-  "A0000788DDD90140000A016D",
-  "B00000000000000000012801",
-  "B00000000000000000002657",
-  "B00000000000000000025491",
-  "A0003741DDD90140000301F4",
-  "A0002990DDD90140000C00F6",
-  "A0000086DDD90140000B0139",
-  "A0002990DDD90140000C0234",
-  "B00000000000000000013244",
-  "B00000000000000000018007",
-  "A0000086DDD90140000B0195",
-  "A0000788DDD90140000A0170",
-  "A0000086DDD90140000B0017",
-  "B00000000000000000018026",
-  "B00000000000000000017537",
-  "B00000000000000000012755",
-  "B00000000000000000017854",
-  "B00000000000000000025689",
-  "B00000000000000000017966",
-  "A0000788DDD90140000A0144",
-  "B00000000000000000013627",
-  "B00000000000000000018707",
-  "A0000086DDD90140000B0125",
-  "A0002990DDD90140000C00FD",
-  "A0000086DDD90140000B012C",
-  "A0000086DDD90140000B00C1",
-  "A0003741DDD90140000301C4",
-  "A0000788DDD90140000A0172",
-  "B00000000000000000003308",
-  "A0003741DDD90140000301DC",
-  "A0003741DDD9014000030153",
-  "A0002990DDD90140000C019B",
-  "A0003741DDD901400003001F",
-  "A0002990DDD90140000C01AF",
-  "B00000000000000000013599",
-  "A00000000000000000010C85",
-  "B00000000000000000017531",
-  "B00000000000000000012984",
-  "A0002990DDD90140000C0153",
-  "B00000000000000000017590",
-  "A0003741DDD90140000E004C",
-  "B00000000000000000010005",
-  "B00000000000000000018047",
-  "A0000788DDD90140000A0175",
-  "B00000000000000000018709",
-  "A0000086DDD90140000B003C",
-  "B00000000000000000017976",
-  "A0002990DDD90140000C015E",
-  "B00000000000000000028854",
-  "A0002990DDD90140000C00EB",
-  "A0002990DDD90140000C017E",
-  "B00000000000000000026581",
-  "B00000000000000000018004",
-  "B00000000000000000017885",
-  "A0003741DDD9014000030202",
-  "B00000000000000000026184",
-  "A0003741DDD9014000000187",
-  "A0000086DDD90140000B0130",
-  "B00000000000000000014193",
-  "A0000086DDD90140000B005C",
-  "A0002990DDD90140000C00F4",
-  "B00000000000000000017533",
-  "A0000086DDD90140000B017D",
-  "A0002990DDD90140000C0189",
-  "B00000000000000000013490",
-  "B00000000000000000017769",
-  "B00000000000000000020341",
-  "B00000000000000000018022",
-  "A0000788DDD90140000A0143",
-  "B00000000000000000025236",
-  "A0003741DDD9014000030209",
-  "A0003741DDD901400003011F",
-  "A0000788DDD90140000A014E",
-  "B00000000000000000017883",
-  "B00000000000000000012788",
-  "300000000000000000A0012B",
-  "300000000000000000A000AD",
-  "A0000086DDD90140000B0136",
-  "300000000000000000A0000C",
-  "B00000000000000000018024",
-  "B00000000000000000018090",
-  "A0000086DDD90140000B00FE",
-  "A0000086DDD90140000B013D",
-  "B00000000000000000012781",
-  "A0003741DDD90140000300E7",
-  "B00000000000000000012809",
-  "B00000000000000000013097",
-  "A0002990DDD90140000C0255",
-  "B00000000000000000003324",
-  "A0003741DDD901400003019F",
-  "A0000086DDD90140000B0138",
-  "A0002990DDD90140000C018E",
-  "B00000000000000000012786",
-  "A0000788DDD90140000A0171",
-  "A0003741DDD90140000300A2",
-  "B00000000000000000017853",
-  "B00000000000000000028319",
-  "A0003741DDD901400003019D",
-  "A0000788DDD90140000A018D",
-  "B00000000000000000025515",
-  "A0000788DDD90140000A0187",
-  "A0000788DDD90140000A013E",
-  "B00000000000000000012756",
-  "B00000000000000000007958",
-  "B00000000000000000013463",
-  "A0003741DDD901400000017A",
-  "B00000000000000000018023",
-  "B00000000000000000014184",
-  "B00000000000000000026644",
-  "B00000000000000000014318",
-  "A0003741DDD9014000030154",
-  "A0002990DDD90140000C01AD",
-  "A0000086DDD90140000B0025",
-  "B00000000000000000013445",
-  "A0000086DDD90140000B012D",
-  "A0003741DDD9014000030188",
-  "B00000000000000000025598",
-  "B00000000000000000018695",
-  "A0002990DDD90140000C0169",
-  "B00000000000000000017965",
-  "A0002990DDD90140000C0151",
-  "B00000000000000000014129",
-  "B00000000000000000017930",
-  "B00000000000000000020516",
-  "A0002990DDD90140000C0235",
-  "A0000086DDD90140000B002B",
-  "A0000086DDD90140000B0179",
-  "B00000000000000000013329",
-  "A0000788DDD90140000A0142",
-  "A0000086DDD90140000B00DE",
-  "A0002990DDD90140000C0188",
-  "B00000000000000000017638",
-  "A0003741DDD90140000001C5",
-  "A0002990DDD90140000C0146",
-  "B00000000000000000018017",
-  "B00000000000000000013115",
-  "B00000000000000000018003",
-  "A0002990DDD90140000C017C",
-  "B00000000000000000014835",
-  "B00000000000000000017931",
-  "B00000000000000000013464",
-  "B00000000000000000017884",
-  "A0003741DDD9014000030158",
-  "B00000000000000000019723",
-  "A0003741DDD901400003020A",
-  "300000000000000000A00100",
-  "A0002990DDD90140000C016C",
-  "A0003741DDD901400003014B",
-  "A0000086DDD90140000B0032",
-  "B00000000000000000017979",
-  "B00000000000000000018019",
-  "B00000000000000000002800",
-  "B00000000000000000014448",
-  "A0000086DDD90140000B012E",
-  "A0000788DDD90140000A0140",
-  "B00000000000000000013087",
-  "B00000000000000000010019",
-  "A0003741DDD90140000300E6",
-  "B00000000000000000013410",
-  "A0003741DDD901400003014F",
-  "B00000000000000000003053",
-  "300000000000000000A00101",
-  "A0000788DDD90140000A0145",
-  "A0002990DDD90140000C0127",
-  "B00000000000000000018049",
-  "B00000000000000000014260",
-  "B00000000000000000014124",
-  "B00000000000000000020439",
-  "B00000000000000000018010",
-  "A00000000000000000010ABC",
-  "B00000000000000000017847",
-  "B00000000000000000017624",
-  "A0000086DDD90140000B012A",
-  "B00000000000000000017650",
-  "B00000000000000000018046",
-  "A0000788DDD90140000A00D6",
-  "B00000000000000000013096",
-  "A0000788DDD90140000A016F",
-  "B00000000000000000003273",
-  "B00000000000000000027537",
-  "A0000086DDD90140000B0132",
-  "A0003741DDD9014000030198",
-  "A0000788DDD90140000A016C",
-  "A0000086DDD90140000B001B",
-  "A0003741DDD90140000E00C0",
-  "A0000086DDD90140000B001C",
-  "B00000000000000000013233",
-  "A0003741DDD90140000300DF",
-  "B00000000000000000018025",
-  "300000000000000000A000EC",
-  "A0002990DDD90140000C012F",
-  "B00000000000000000014141",
-  "A0000086DDD90140000B0024",
-  "B00000000000000000013351",
-  "A0000086DDD90140000B0150",
-  "B00000000000000000013620",
-  "B00000000000000000020435",
-  "A0000788DDD90140000A0173",
-  "B00000000000000000018013",
-  "B00000000000000000003323",
-  "B00000000000000000019207",
-  "B00000000000000000013749",
-  "B00000000000000000028678",
-  "B00000000000000000027538",
-  "A0000788DDD90140000A0169",
-  "B00000000000000000012824",
-  "B00000000000000000002159",
-  "A0002990DDD90140000C0172",
-  "A0002990DDD90140000C0184",
-  "A0002990DDD90140000C0168",
-  "B00000000000000000012798",
-  "B00000000000000000007873",
-  "B00000000000000000017534",
-  "A0002990DDD90140000C0124",
-  "A0000788DDD90140000A017B",
-  "A0003741DDD9014000000323",
-  "B00000000000000000025612",
-  "A0000788DDD90140000A018F",
-  "A0002990DDD90140000C01A4",
-  "B00000000000000000025514",
-  "A0003741DDD9014000010116",
-  "A0000788DDD90140000A0141",
-  "B00000000000000000013334",
-  "A0002990DDD90140000C0115",
-  "A0003741DDD90140000E0037",
-  "B00000000000000000018044",
-  "B00000000000000000018005",
-  "B00000000000000000012749",
-  "A0003741DDD90140000E0220"
-]

+ 1 - 1
src/main/java/com/fjhx/service/impl/ServiceImpl.java

@@ -45,7 +45,7 @@ public class ServiceImpl implements Service {
                 String instructions = data.getString("instructions");
                 // ip配置集合
                 List<ConnectConfig> connectConfigList = MyMain.config.getInstructionsMap().get(instructions);
-                distinctRead(forwardUserId, forwardSessionId, connectConfigList, data);
+                distinctRead(forwardUserId, forwardSessionId, new ArrayList<>(connectConfigList), data);
                 break;
             case CLOSE:
                 close(forwardSessionId);

+ 3 - 0
src/main/java/com/fjhx/service/impl/TcpOperation.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.ConcurrentHashSet;
 import com.alibaba.fastjson.JSONObject;
 import com.fjhx.entity.ConnectConfig;
 import com.fjhx.service.Operation;
+import com.fjhx.utils.MyUtil;
 import com.fjhx.utils.ThreadPoolManager;
 import com.rfid.callBack.CallBack;
 import com.rfid.uhf.controller.impl.ReaderR2000;
@@ -59,6 +60,8 @@ public class TcpOperation implements Operation {
                     return;
                 }
                 rfidSet.add(rfid);
+
+                MyUtil.errorLog("扫描到rfid标签:sessionId" + sessionId + ",rfid:" + rfid);
                 sendRfidDate(userId, sessionId, rfid, data);
             }
 

+ 3 - 0
src/main/java/com/fjhx/service/impl/UdpOperation.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.fjhx.constant.UdpConstant;
 import com.fjhx.entity.ConnectConfig;
 import com.fjhx.service.Operation;
+import com.fjhx.utils.MyUtil;
 import com.fjhx.utils.ThreadPoolManager;
 import com.fjhx.utils.Utility;
 import lombok.SneakyThrows;
@@ -84,6 +85,8 @@ public class UdpOperation implements Operation {
                     return;
                 }
                 rfidSet.add(rfid);
+
+                MyUtil.errorLog("扫描到rfid标签:sessionId" + sessionId + ",rfid:" + rfid);
                 sendRfidDate(userId, sessionId, rfid, data);
             }
 

+ 4 - 4
src/main/resources/META-INF/MANIFEST.MF

@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Main-Class: com.fjhx.MyMain
-Class-Path: common-udp-1.0.jar common-sdk-1.0.jar lombok-1.18.24.jar com
- mon-network-1.0.jar jna-1.0.jar fastjson-1.2.80.jar Java-WebSocket-1.5.
- 3.jar RXTXcomm-1.0.jar common-1.0.jar slf4j-simple-1.7.25.jar hutool-al
- l-5.8.8.jar slf4j-api-1.7.25.jar common-serialport-1.0.jar
+Class-Path: slf4j-api-1.7.25.jar slf4j-simple-1.7.25.jar common-serialpo
+ rt-1.0.jar Java-WebSocket-1.5.3.jar RXTXcomm-1.0.jar common-1.0.jar com
+ mon-network-1.0.jar fastjson-1.2.80.jar jna-1.0.jar lombok-1.18.24.jar 
+ common-udp-1.0.jar hutool-all-5.8.8.jar common-sdk-1.0.jar