diff --git a/src/main/java/com/casic/missiles/config/ReadWriterConfig.java b/src/main/java/com/casic/missiles/config/ReadWriterConfig.java index 5e45c58..5b6cd1c 100644 --- a/src/main/java/com/casic/missiles/config/ReadWriterConfig.java +++ b/src/main/java/com/casic/missiles/config/ReadWriterConfig.java @@ -17,6 +17,8 @@ private int antenna; //大读写器读取时长（秒） private int readDuration; + //小读写器读取时长（秒） + private int miniReadDuration; //有线扫码枪监听器接收数据时长（秒） private int receiveDuration; } diff --git a/src/main/java/com/casic/missiles/config/ReadWriterConfig.java b/src/main/java/com/casic/missiles/config/ReadWriterConfig.java index 5e45c58..5b6cd1c 100644 --- a/src/main/java/com/casic/missiles/config/ReadWriterConfig.java +++ b/src/main/java/com/casic/missiles/config/ReadWriterConfig.java @@ -17,6 +17,8 @@ private int antenna; //大读写器读取时长（秒） private int readDuration; + //小读写器读取时长（秒） + private int miniReadDuration; //有线扫码枪监听器接收数据时长（秒） private int receiveDuration; } diff --git a/src/main/java/com/casic/missiles/cotroller/BusinessReadWriterController.java b/src/main/java/com/casic/missiles/cotroller/BusinessReadWriterController.java index d54b93a..1f91771 100644 --- a/src/main/java/com/casic/missiles/cotroller/BusinessReadWriterController.java +++ b/src/main/java/com/casic/missiles/cotroller/BusinessReadWriterController.java @@ -66,6 +66,7 @@ /** * 大读写器和小读写器识别结合的结果TID列表 + * */ @GetMapping("/tIdAndMini/readList") public ReturnDTO> allTidReadList() throws ExecutionException, InterruptedException { diff --git a/src/main/java/com/casic/missiles/config/ReadWriterConfig.java b/src/main/java/com/casic/missiles/config/ReadWriterConfig.java index 5e45c58..5b6cd1c 100644 --- a/src/main/java/com/casic/missiles/config/ReadWriterConfig.java +++ b/src/main/java/com/casic/missiles/config/ReadWriterConfig.java @@ -17,6 +17,8 @@ private int antenna; //大读写器读取时长（秒） private int readDuration; + //小读写器读取时长（秒） + private int miniReadDuration; //有线扫码枪监听器接收数据时长（秒） private int receiveDuration; } diff --git a/src/main/java/com/casic/missiles/cotroller/BusinessReadWriterController.java b/src/main/java/com/casic/missiles/cotroller/BusinessReadWriterController.java index d54b93a..1f91771 100644 --- a/src/main/java/com/casic/missiles/cotroller/BusinessReadWriterController.java +++ b/src/main/java/com/casic/missiles/cotroller/BusinessReadWriterController.java @@ -66,6 +66,7 @@ /** * 大读写器和小读写器识别结合的结果TID列表 + * */ @GetMapping("/tIdAndMini/readList") public ReturnDTO> allTidReadList() throws ExecutionException, InterruptedException { diff --git a/src/main/java/com/casic/missiles/service/impl/BusinessReadWriterServiceImpl.java b/src/main/java/com/casic/missiles/service/impl/BusinessReadWriterServiceImpl.java index 4bc7444..82a3110 100644 --- a/src/main/java/com/casic/missiles/service/impl/BusinessReadWriterServiceImpl.java +++ b/src/main/java/com/casic/missiles/service/impl/BusinessReadWriterServiceImpl.java @@ -233,7 +233,7 @@ return new HashSet<>(); } //连续读取，让事件接收3秒，也可采用单次读取方式（没有连续读取识别效果好） - TimeUnit.SECONDS.sleep(3); + TimeUnit.SECONDS.sleep(readWriterConfig.getMiniReadDuration()); // 停止指令，空闲态 MsgBaseStop msgBaseStop = new MsgBaseStop(); client.sendSynMsg(msgBaseStop); diff --git a/src/main/java/com/casic/missiles/config/ReadWriterConfig.java b/src/main/java/com/casic/missiles/config/ReadWriterConfig.java index 5e45c58..5b6cd1c 100644 --- a/src/main/java/com/casic/missiles/config/ReadWriterConfig.java +++ b/src/main/java/com/casic/missiles/config/ReadWriterConfig.java @@ -17,6 +17,8 @@ private int antenna; //大读写器读取时长（秒） private int readDuration; + //小读写器读取时长（秒） + private int miniReadDuration; //有线扫码枪监听器接收数据时长（秒） private int receiveDuration; } diff --git a/src/main/java/com/casic/missiles/cotroller/BusinessReadWriterController.java b/src/main/java/com/casic/missiles/cotroller/BusinessReadWriterController.java index d54b93a..1f91771 100644 --- a/src/main/java/com/casic/missiles/cotroller/BusinessReadWriterController.java +++ b/src/main/java/com/casic/missiles/cotroller/BusinessReadWriterController.java @@ -66,6 +66,7 @@ /** * 大读写器和小读写器识别结合的结果TID列表 + * */ @GetMapping("/tIdAndMini/readList") public ReturnDTO> allTidReadList() throws ExecutionException, InterruptedException { diff --git a/src/main/java/com/casic/missiles/service/impl/BusinessReadWriterServiceImpl.java b/src/main/java/com/casic/missiles/service/impl/BusinessReadWriterServiceImpl.java index 4bc7444..82a3110 100644 --- a/src/main/java/com/casic/missiles/service/impl/BusinessReadWriterServiceImpl.java +++ b/src/main/java/com/casic/missiles/service/impl/BusinessReadWriterServiceImpl.java @@ -233,7 +233,7 @@ return new HashSet<>(); } //连续读取，让事件接收3秒，也可采用单次读取方式（没有连续读取识别效果好） - TimeUnit.SECONDS.sleep(3); + TimeUnit.SECONDS.sleep(readWriterConfig.getMiniReadDuration()); // 停止指令，空闲态 MsgBaseStop msgBaseStop = new MsgBaseStop(); client.sendSynMsg(msgBaseStop); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml deleted file mode 100644 index f7c3e5d..0000000 --- a/src/main/resources/application.yml +++ /dev/null @@ -1,16 +0,0 @@ -server: - port: 8083 - -logging: - config: classpath:logback-spring.xml - level.root: info - level.com.casic: debug - level.org.springframework.web: info -log: - path: D:\metering\casic-metering-readwriter-1.0-SNAPSHOT - -casic: - readwriter: - antenna: 0x0001 - readDuration: 3 - receiveDuration: 10 \ No newline at end of file diff --git a/src/main/java/com/casic/missiles/config/ReadWriterConfig.java b/src/main/java/com/casic/missiles/config/ReadWriterConfig.java index 5e45c58..5b6cd1c 100644 --- a/src/main/java/com/casic/missiles/config/ReadWriterConfig.java +++ b/src/main/java/com/casic/missiles/config/ReadWriterConfig.java @@ -17,6 +17,8 @@ private int antenna; //大读写器读取时长（秒） private int readDuration; + //小读写器读取时长（秒） + private int miniReadDuration; //有线扫码枪监听器接收数据时长（秒） private int receiveDuration; } diff --git a/src/main/java/com/casic/missiles/cotroller/BusinessReadWriterController.java b/src/main/java/com/casic/missiles/cotroller/BusinessReadWriterController.java index d54b93a..1f91771 100644 --- a/src/main/java/com/casic/missiles/cotroller/BusinessReadWriterController.java +++ b/src/main/java/com/casic/missiles/cotroller/BusinessReadWriterController.java @@ -66,6 +66,7 @@ /** * 大读写器和小读写器识别结合的结果TID列表 + * */ @GetMapping("/tIdAndMini/readList") public ReturnDTO> allTidReadList() throws ExecutionException, InterruptedException { diff --git a/src/main/java/com/casic/missiles/service/impl/BusinessReadWriterServiceImpl.java b/src/main/java/com/casic/missiles/service/impl/BusinessReadWriterServiceImpl.java index 4bc7444..82a3110 100644 --- a/src/main/java/com/casic/missiles/service/impl/BusinessReadWriterServiceImpl.java +++ b/src/main/java/com/casic/missiles/service/impl/BusinessReadWriterServiceImpl.java @@ -233,7 +233,7 @@ return new HashSet<>(); } //连续读取，让事件接收3秒，也可采用单次读取方式（没有连续读取识别效果好） - TimeUnit.SECONDS.sleep(3); + TimeUnit.SECONDS.sleep(readWriterConfig.getMiniReadDuration()); // 停止指令，空闲态 MsgBaseStop msgBaseStop = new MsgBaseStop(); client.sendSynMsg(msgBaseStop); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml deleted file mode 100644 index f7c3e5d..0000000 --- a/src/main/resources/application.yml +++ /dev/null @@ -1,16 +0,0 @@ -server: - port: 8083 - -logging: - config: classpath:logback-spring.xml - level.root: info - level.com.casic: debug - level.org.springframework.web: info -log: - path: D:\metering\casic-metering-readwriter-1.0-SNAPSHOT - -casic: - readwriter: - antenna: 0x0001 - readDuration: 3 - receiveDuration: 10 \ No newline at end of file diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml new file mode 100644 index 0000000..803f3d7 --- /dev/null +++ b/src/main/resources/config/application.yml @@ -0,0 +1,17 @@ +server: + port: 8083 + +logging: + config: classpath:logback-spring.xml + level.root: info + level.com.casic: debug + level.org.springframework.web: info +log: + path: D:\metering\casic-metering-readwriter-1.0-SNAPSHOT\logs + +casic: + readwriter: + antenna: 0x0001 + readDuration: 3 + miniReadDuration: 3 + receiveDuration: 10 \ No newline at end of file