From 82a550628ea9180ee9e68b891dbb08146faa6df8 Mon Sep 17 00:00:00 2001
From: xia <taume@126.com>
Date: Wed, 2 Nov 2022 09:24:53 +0800
Subject: [PATCH] =?UTF-8?q?RFID=E6=89=8B=E6=8C=81=E6=9C=BA=20=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../archives/controller/RFIDController.java   | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/archives/src/main/java/com/storeroom/modules/archives/controller/RFIDController.java b/archives/src/main/java/com/storeroom/modules/archives/controller/RFIDController.java
index 0fde49b..cdb3ce6 100644
--- a/archives/src/main/java/com/storeroom/modules/archives/controller/RFIDController.java
+++ b/archives/src/main/java/com/storeroom/modules/archives/controller/RFIDController.java
@@ -56,12 +56,12 @@ public class RFIDController {
     private final ArrangeService arrangeService;
 
     @ApiOperation("读取epc和Tid号")
-    @GetMapping("/ReadEpc")
-    public ApiResponse<Object> ReadEpc(String ip,String op, String sDevID) throws IOException {
+    @AnonymousGetMapping("/ReadEpc")
+    public ApiResponse<Object> ReadEpc(String ip, String sDevID) throws IOException {
         String result = "";
         try {
             HttpClient client = HttpClients.createDefault();
-            String url = "http://" + ip + "/RFIDInterface.aspx?op=" + op + "&sDevID=" + sDevID;
+            String url = "http://" + ip + "/api/RFIDInterface/RFID_ReadEpc?sDevID=" + sDevID;
             HttpGet httpGet = new HttpGet(url);
             httpGet.setHeader("Content-Type", "application/x-www-form-urlencoded");
             System.out.println("调用URL: " + httpGet.getURI());
@@ -92,13 +92,12 @@ public class RFIDController {
     }
 
     @ApiOperation("写epc")
-    @GetMapping("/WriteEPC")
-    public ApiResponse<Object> WriteEPC(String ip,String op, String sDevID, String EAS, String Type, String Code, String Tid) throws IOException {
+    @AnonymousGetMapping("/WriteEPC")
+    public ApiResponse<Object> WriteEPC(String ip, String sDevID, String EAS, String Type, String Code, String Tid) throws IOException {
         String result = "";
         try {
             HttpClient client = HttpClients.createDefault();
-            String url = "http://" + ip + "/RFIDInterface.aspx?op=" + op
-                    + "&sDevID=" + sDevID
+            String url = "http://" + ip + "/api/RFIDInterface/RFID_WriteEPC?sDevID=" + sDevID
                     + "&EAS=" + EAS
                     + "&Type=" + Type
                     + "&Code=" + Code
@@ -138,7 +137,7 @@ public class RFIDController {
     }
 
     @ApiOperation("根据mac地址获取设备id")
-    @GetMapping("/getDeviceIdByMac")
+    @AnonymousGetMapping("/getDeviceIdByMac")
     public ApiResponse<Object> ReadEpc(String mac) {
         DeviceSpecParamDto deviceSpecParamDto = deviceSpecParamService.findMacAddress(mac);
         if (null == deviceSpecParamDto)
@@ -147,12 +146,12 @@ public class RFIDController {
     }
 
     @ApiOperation("读写器状态检测")
-    @GetMapping("/CheckStatus")
-    public ApiResponse<Object> CheckStatus(String ip,String op, String sDevID) throws IOException {
+    @AnonymousGetMapping("/CheckStatus")
+    public ApiResponse<Object> CheckStatus(String ip, String sDevID) throws IOException {
         String result = "";
         try {
             HttpClient client = HttpClients.createDefault();
-            String url = "http://" + ip + "/RFIDInterface.aspx?op=" + op + "&sDevID=" + sDevID;
+            String url = "http://" + ip + "/api/RFIDInterface/RFID_CheckStatus?sDevID=" + sDevID;
             HttpGet httpGet = new HttpGet(url);
             httpGet.setHeader("Content-Type", "application/x-www-form-urlencoded");
             System.out.println("调用URL: " + httpGet.getURI());