diff --git a/src/main/java/com/casic/missiles/config/ReadWriterConfig.java b/src/main/java/com/casic/missiles/config/ReadWriterConfig.java index 5b6cd1c..29f4403 100644 --- a/src/main/java/com/casic/missiles/config/ReadWriterConfig.java +++ b/src/main/java/com/casic/missiles/config/ReadWriterConfig.java @@ -21,4 +21,8 @@ private int miniReadDuration; //有线扫码枪监听器接收数据时长（秒） private int receiveDuration; + //大读写器写入倍数 + private int writePower; + //大读写器读取倍数 + private int readPower; } diff --git a/src/main/java/com/casic/missiles/config/ReadWriterConfig.java b/src/main/java/com/casic/missiles/config/ReadWriterConfig.java index 5b6cd1c..29f4403 100644 --- a/src/main/java/com/casic/missiles/config/ReadWriterConfig.java +++ b/src/main/java/com/casic/missiles/config/ReadWriterConfig.java @@ -21,4 +21,8 @@ private int miniReadDuration; //有线扫码枪监听器接收数据时长（秒） private int receiveDuration; + //大读写器写入倍数 + private int writePower; + //大读写器读取倍数 + private int readPower; } diff --git a/src/main/java/com/casic/missiles/filter/CORSFilter.java b/src/main/java/com/casic/missiles/filter/CORSFilter.java new file mode 100644 index 0000000..3d08228 --- /dev/null +++ b/src/main/java/com/casic/missiles/filter/CORSFilter.java @@ -0,0 +1,45 @@ +package com.casic.missiles.filter; + +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; + +import javax.servlet.*; +import javax.servlet.annotation.WebFilter; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/4/27 11:08 + */ +//@Component +@Order(Ordered.HIGHEST_PRECEDENCE) +@WebFilter(filterName = "CORSFilter", urlPatterns = "/business/readWriter/*") +public class CORSFilter implements Filter { + @Override + public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException { + HttpServletResponse response = (HttpServletResponse) res; + HttpServletRequest request = (HttpServletRequest) req; + response.setHeader("Access-Control-Allow-Origin", "*"); + response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE"); + response.setHeader("Access-Control-Max-Age", "3600"); + response.setHeader("Access-Control-Allow-Credentials", "true"); + response.setHeader("Access-Control-Allow-Headers", "*"); + response.setHeader("Access-Control-Allow-Private-Network", "true"); + if(request.getMethod().equals(HttpMethod.OPTIONS.name())){ + response.setStatus(HttpStatus.NO_CONTENT.value()); + }else{ + chain.doFilter(req, res); + } + } + + @Override + public void init(FilterConfig filterConfig) {} + + @Override + public void destroy() {} +} diff --git a/src/main/java/com/casic/missiles/config/ReadWriterConfig.java b/src/main/java/com/casic/missiles/config/ReadWriterConfig.java index 5b6cd1c..29f4403 100644 --- a/src/main/java/com/casic/missiles/config/ReadWriterConfig.java +++ b/src/main/java/com/casic/missiles/config/ReadWriterConfig.java @@ -21,4 +21,8 @@ private int miniReadDuration; //有线扫码枪监听器接收数据时长（秒） private int receiveDuration; + //大读写器写入倍数 + private int writePower; + //大读写器读取倍数 + private int readPower; } diff --git a/src/main/java/com/casic/missiles/filter/CORSFilter.java b/src/main/java/com/casic/missiles/filter/CORSFilter.java new file mode 100644 index 0000000..3d08228 --- /dev/null +++ b/src/main/java/com/casic/missiles/filter/CORSFilter.java @@ -0,0 +1,45 @@ +package com.casic.missiles.filter; + +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; + +import javax.servlet.*; +import javax.servlet.annotation.WebFilter; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/4/27 11:08 + */ +//@Component +@Order(Ordered.HIGHEST_PRECEDENCE) +@WebFilter(filterName = "CORSFilter", urlPatterns = "/business/readWriter/*") +public class CORSFilter implements Filter { + @Override + public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException { + HttpServletResponse response = (HttpServletResponse) res; + HttpServletRequest request = (HttpServletRequest) req; + response.setHeader("Access-Control-Allow-Origin", "*"); + response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE"); + response.setHeader("Access-Control-Max-Age", "3600"); + response.setHeader("Access-Control-Allow-Credentials", "true"); + response.setHeader("Access-Control-Allow-Headers", "*"); + response.setHeader("Access-Control-Allow-Private-Network", "true"); + if(request.getMethod().equals(HttpMethod.OPTIONS.name())){ + response.setStatus(HttpStatus.NO_CONTENT.value()); + }else{ + chain.doFilter(req, res); + } + } + + @Override + public void init(FilterConfig filterConfig) {} + + @Override + public void destroy() {} +} 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 9193fe7..3f89edf 100644 --- a/src/main/java/com/casic/missiles/service/impl/BusinessReadWriterServiceImpl.java +++ b/src/main/java/com/casic/missiles/service/impl/BusinessReadWriterServiceImpl.java @@ -247,6 +247,8 @@ param.antenna = readWriterConfig.getAntenna(); param.isLoop = true; param.tidParameter = new byte[]{0,8}; + param.writePower = readWriterConfig.getWritePower(); + param.readPower = readWriterConfig.getReadPower(); boolean b = reader.reader_Inventory(param, (byte) 0x01); log.info("大读写器开始盘点：" + b); reader.OnTagDataReceivedHandle = (gateName, tagData) -> { diff --git a/src/main/java/com/casic/missiles/config/ReadWriterConfig.java b/src/main/java/com/casic/missiles/config/ReadWriterConfig.java index 5b6cd1c..29f4403 100644 --- a/src/main/java/com/casic/missiles/config/ReadWriterConfig.java +++ b/src/main/java/com/casic/missiles/config/ReadWriterConfig.java @@ -21,4 +21,8 @@ private int miniReadDuration; //有线扫码枪监听器接收数据时长（秒） private int receiveDuration; + //大读写器写入倍数 + private int writePower; + //大读写器读取倍数 + private int readPower; } diff --git a/src/main/java/com/casic/missiles/filter/CORSFilter.java b/src/main/java/com/casic/missiles/filter/CORSFilter.java new file mode 100644 index 0000000..3d08228 --- /dev/null +++ b/src/main/java/com/casic/missiles/filter/CORSFilter.java @@ -0,0 +1,45 @@ +package com.casic.missiles.filter; + +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; + +import javax.servlet.*; +import javax.servlet.annotation.WebFilter; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/4/27 11:08 + */ +//@Component +@Order(Ordered.HIGHEST_PRECEDENCE) +@WebFilter(filterName = "CORSFilter", urlPatterns = "/business/readWriter/*") +public class CORSFilter implements Filter { + @Override + public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException { + HttpServletResponse response = (HttpServletResponse) res; + HttpServletRequest request = (HttpServletRequest) req; + response.setHeader("Access-Control-Allow-Origin", "*"); + response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE"); + response.setHeader("Access-Control-Max-Age", "3600"); + response.setHeader("Access-Control-Allow-Credentials", "true"); + response.setHeader("Access-Control-Allow-Headers", "*"); + response.setHeader("Access-Control-Allow-Private-Network", "true"); + if(request.getMethod().equals(HttpMethod.OPTIONS.name())){ + response.setStatus(HttpStatus.NO_CONTENT.value()); + }else{ + chain.doFilter(req, res); + } + } + + @Override + public void init(FilterConfig filterConfig) {} + + @Override + public void destroy() {} +} 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 9193fe7..3f89edf 100644 --- a/src/main/java/com/casic/missiles/service/impl/BusinessReadWriterServiceImpl.java +++ b/src/main/java/com/casic/missiles/service/impl/BusinessReadWriterServiceImpl.java @@ -247,6 +247,8 @@ param.antenna = readWriterConfig.getAntenna(); param.isLoop = true; param.tidParameter = new byte[]{0,8}; + param.writePower = readWriterConfig.getWritePower(); + param.readPower = readWriterConfig.getReadPower(); boolean b = reader.reader_Inventory(param, (byte) 0x01); log.info("大读写器开始盘点：" + b); reader.OnTagDataReceivedHandle = (gateName, tagData) -> { diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index a5090db..fffa535 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -18,4 +18,8 @@ # 小读写器读取时长（秒） miniReadDuration: 5 # 有线扫码枪监听器接收数据时长（秒） - receiveDuration: 10 \ No newline at end of file + receiveDuration: 10 +# 大读写器写入功率 + writePower: 20 +# 大读写器读取功率 + readPower: 5 \ No newline at end of file