diff --git a/src/main/java/com/casic/missiles/config/ReadWriterConfig.java b/src/main/java/com/casic/missiles/config/ReadWriterConfig.java index 29f4403..ab39748 100644 --- a/src/main/java/com/casic/missiles/config/ReadWriterConfig.java +++ b/src/main/java/com/casic/missiles/config/ReadWriterConfig.java @@ -25,4 +25,6 @@ private int writePower; //大读写器读取倍数 private int readPower; + //功率 + private int power; } diff --git a/src/main/java/com/casic/missiles/config/ReadWriterConfig.java b/src/main/java/com/casic/missiles/config/ReadWriterConfig.java index 29f4403..ab39748 100644 --- a/src/main/java/com/casic/missiles/config/ReadWriterConfig.java +++ b/src/main/java/com/casic/missiles/config/ReadWriterConfig.java @@ -25,4 +25,6 @@ private int writePower; //大读写器读取倍数 private int readPower; + //功率 + private int power; } diff --git a/src/main/java/com/casic/missiles/cotroller/BusinessReadWriterController.java b/src/main/java/com/casic/missiles/cotroller/BusinessReadWriterController.java index e0ef3be..8617f24 100644 --- a/src/main/java/com/casic/missiles/cotroller/BusinessReadWriterController.java +++ b/src/main/java/com/casic/missiles/cotroller/BusinessReadWriterController.java @@ -67,7 +67,7 @@ } /** - * 有线扫码枪(二维码)和大读写器结合扫描 + * 有线扫码枪(二维码)和大读写器结合扫描(有线扫码枪已去掉,前端已做) */ @CrossOrigin @GetMapping("/gunAndTId/readList") @@ -85,7 +85,7 @@ } /** - * 大读写器和小读写器和有线扫码枪(二维码)识别结合的结果TID列表 + * 大读写器和小读写器和有线扫码枪(二维码)识别结合的结果TID列表(有线扫码枪已去掉,前端已做) */ @CrossOrigin @GetMapping("/tIdAndMiniAndGun/readList") diff --git a/src/main/java/com/casic/missiles/config/ReadWriterConfig.java b/src/main/java/com/casic/missiles/config/ReadWriterConfig.java index 29f4403..ab39748 100644 --- a/src/main/java/com/casic/missiles/config/ReadWriterConfig.java +++ b/src/main/java/com/casic/missiles/config/ReadWriterConfig.java @@ -25,4 +25,6 @@ private int writePower; //大读写器读取倍数 private int readPower; + //功率 + private int power; } diff --git a/src/main/java/com/casic/missiles/cotroller/BusinessReadWriterController.java b/src/main/java/com/casic/missiles/cotroller/BusinessReadWriterController.java index e0ef3be..8617f24 100644 --- a/src/main/java/com/casic/missiles/cotroller/BusinessReadWriterController.java +++ b/src/main/java/com/casic/missiles/cotroller/BusinessReadWriterController.java @@ -67,7 +67,7 @@ } /** - * 有线扫码枪(二维码)和大读写器结合扫描 + * 有线扫码枪(二维码)和大读写器结合扫描(有线扫码枪已去掉,前端已做) */ @CrossOrigin @GetMapping("/gunAndTId/readList") @@ -85,7 +85,7 @@ } /** - * 大读写器和小读写器和有线扫码枪(二维码)识别结合的结果TID列表 + * 大读写器和小读写器和有线扫码枪(二维码)识别结合的结果TID列表(有线扫码枪已去掉,前端已做) */ @CrossOrigin @GetMapping("/tIdAndMiniAndGun/readList") 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 d895095..39e396b 100644 --- a/src/main/java/com/casic/missiles/service/impl/BusinessReadWriterServiceImpl.java +++ b/src/main/java/com/casic/missiles/service/impl/BusinessReadWriterServiceImpl.java @@ -25,10 +25,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.util.HashSet; -import java.util.List; -import java.util.Objects; -import java.util.Set; +import java.util.*; import java.util.concurrent.*; /** @@ -69,6 +66,15 @@ reader.setProtocol(ProtocolVersion.GRP); reader.setReaderProtocol(ProtocolVersion.GRP); reader.setPortSum(4);//只对LRP的有效 + log.info("port:{}", port.substring(port.length() - 1)); + int substring = Integer.parseInt(port.substring(port.length() - 1)); + byte k = (byte) substring; + byte v = (byte) readWriterConfig.getPower(); + HashMap map = new HashMap(); + map.put(k, v); + log.info("k:{}", substring); + log.info("v:{}", readWriterConfig.getPower()); + reader.reader_SetPowerList(map); boolean connect = reader.connect(false, new BaseReader.IConnectListener() { @Override public void callback(boolean b) { @@ -178,12 +184,12 @@ } }); //有线扫码枪(二维码)识别设备id列表 - Set gunSet = queryGunReturnDTO(this.codeGunReadList()); +// Set gunSet = queryGunReturnDTO(this.codeGunReadList()); //大读写器识别tId列表 Set tIdsSet = queryGunReturnDTO(taskResponse.get()); Set resultSet = new HashSet<>(); resultSet.addAll(tIdsSet); - resultSet.addAll(gunSet); +// resultSet.addAll(gunSet); return ReturnUtil.success(resultSet); } @@ -232,17 +238,19 @@ } }); //有线扫码枪(二维码)识别设备id列表 - Set gunSet = queryGunReturnDTO(codeGunReadList()); +// Set gunSet = queryGunReturnDTO(codeGunReadList()); //大读写器识别tId列表 Set tIdsSet = null; - if (CollectionUtils.isEmpty(gunSet)) { - tIdsSet = queryGunReturnDTO(taskResponse.get()); - resultSet.addAll(tIdsSet); - } + tIdsSet = queryGunReturnDTO(taskResponse.get()); + resultSet.addAll(tIdsSet); +// if (CollectionUtils.isEmpty(gunSet)) { +// tIdsSet = queryGunReturnDTO(taskResponse.get()); +// resultSet.addAll(tIdsSet); +// } //小读写器识别tId列表 Set minTIdsSet = queryGunReturnDTO(miniTaskResponse.get()); - resultSet.addAll(gunSet); +// resultSet.addAll(gunSet); resultSet.addAll(minTIdsSet); } catch (Exception e) { log.info("识别出现异常:{}", e.getMessage()); diff --git a/src/main/java/com/casic/missiles/config/ReadWriterConfig.java b/src/main/java/com/casic/missiles/config/ReadWriterConfig.java index 29f4403..ab39748 100644 --- a/src/main/java/com/casic/missiles/config/ReadWriterConfig.java +++ b/src/main/java/com/casic/missiles/config/ReadWriterConfig.java @@ -25,4 +25,6 @@ private int writePower; //大读写器读取倍数 private int readPower; + //功率 + private int power; } diff --git a/src/main/java/com/casic/missiles/cotroller/BusinessReadWriterController.java b/src/main/java/com/casic/missiles/cotroller/BusinessReadWriterController.java index e0ef3be..8617f24 100644 --- a/src/main/java/com/casic/missiles/cotroller/BusinessReadWriterController.java +++ b/src/main/java/com/casic/missiles/cotroller/BusinessReadWriterController.java @@ -67,7 +67,7 @@ } /** - * 有线扫码枪(二维码)和大读写器结合扫描 + * 有线扫码枪(二维码)和大读写器结合扫描(有线扫码枪已去掉,前端已做) */ @CrossOrigin @GetMapping("/gunAndTId/readList") @@ -85,7 +85,7 @@ } /** - * 大读写器和小读写器和有线扫码枪(二维码)识别结合的结果TID列表 + * 大读写器和小读写器和有线扫码枪(二维码)识别结合的结果TID列表(有线扫码枪已去掉,前端已做) */ @CrossOrigin @GetMapping("/tIdAndMiniAndGun/readList") 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 d895095..39e396b 100644 --- a/src/main/java/com/casic/missiles/service/impl/BusinessReadWriterServiceImpl.java +++ b/src/main/java/com/casic/missiles/service/impl/BusinessReadWriterServiceImpl.java @@ -25,10 +25,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.util.HashSet; -import java.util.List; -import java.util.Objects; -import java.util.Set; +import java.util.*; import java.util.concurrent.*; /** @@ -69,6 +66,15 @@ reader.setProtocol(ProtocolVersion.GRP); reader.setReaderProtocol(ProtocolVersion.GRP); reader.setPortSum(4);//只对LRP的有效 + log.info("port:{}", port.substring(port.length() - 1)); + int substring = Integer.parseInt(port.substring(port.length() - 1)); + byte k = (byte) substring; + byte v = (byte) readWriterConfig.getPower(); + HashMap map = new HashMap(); + map.put(k, v); + log.info("k:{}", substring); + log.info("v:{}", readWriterConfig.getPower()); + reader.reader_SetPowerList(map); boolean connect = reader.connect(false, new BaseReader.IConnectListener() { @Override public void callback(boolean b) { @@ -178,12 +184,12 @@ } }); //有线扫码枪(二维码)识别设备id列表 - Set gunSet = queryGunReturnDTO(this.codeGunReadList()); +// Set gunSet = queryGunReturnDTO(this.codeGunReadList()); //大读写器识别tId列表 Set tIdsSet = queryGunReturnDTO(taskResponse.get()); Set resultSet = new HashSet<>(); resultSet.addAll(tIdsSet); - resultSet.addAll(gunSet); +// resultSet.addAll(gunSet); return ReturnUtil.success(resultSet); } @@ -232,17 +238,19 @@ } }); //有线扫码枪(二维码)识别设备id列表 - Set gunSet = queryGunReturnDTO(codeGunReadList()); +// Set gunSet = queryGunReturnDTO(codeGunReadList()); //大读写器识别tId列表 Set tIdsSet = null; - if (CollectionUtils.isEmpty(gunSet)) { - tIdsSet = queryGunReturnDTO(taskResponse.get()); - resultSet.addAll(tIdsSet); - } + tIdsSet = queryGunReturnDTO(taskResponse.get()); + resultSet.addAll(tIdsSet); +// if (CollectionUtils.isEmpty(gunSet)) { +// tIdsSet = queryGunReturnDTO(taskResponse.get()); +// resultSet.addAll(tIdsSet); +// } //小读写器识别tId列表 Set minTIdsSet = queryGunReturnDTO(miniTaskResponse.get()); - resultSet.addAll(gunSet); +// resultSet.addAll(gunSet); resultSet.addAll(minTIdsSet); } catch (Exception e) { log.info("识别出现异常:{}", e.getMessage()); diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index fffa535..ad02893 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -22,4 +22,6 @@ # 大读写器写入功率 writePower: 20 # 大读写器读取功率 - readPower: 5 \ No newline at end of file + readPower: 5 +# 大读写器读取功率 + power: 30 \ No newline at end of file