feat(盘存模块): 释放读写机资源

dev-config/src/main/java/com/tykj/dev/config/ReadMachineLoader.java

-package com.tykj.dev.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-
-/**
- * @author zsp
- * @create 2021/12/13 14:20
- */
-@Configuration
-public class ReadMachineLoader {
-
-    @PostConstruct
-    private void getLoader(){
-        if (System.getProperty("myapplibrary") == null){
-            System.setProperty("myapplibrary","libModuleAPIJni.so");
-            System.loadLibrary("libModuleAPIJni");
-        }
-    }
-}
+//package com.tykj.dev.config;
+//
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.stereotype.Component;
+//
+//import javax.annotation.PostConstruct;
+//
+///**
+// * @author zsp
+// * @create 2021/12/13 14:20
+// */
+//@Configuration
+//public class ReadMachineLoader {
+//
+//    @PostConstruct
+//    private void getLoader(){
+//        if (System.getProperty("myapplibrary") == null){
+//            System.setProperty("myapplibrary","libModuleAPIJni.so");
+//            System.loadLibrary("libModuleAPIJni");
+//        }
+//    }
+//}

dev-readmachine/src/main/java/com/tykj/dev/readmachine/devreadmachine/controller/ReadMachineBillController.java

@@ -70,6 +70,17 @@ public class ReadMachineBillController {
     @Autowired
     private TaskService taskService;
 
+    @Autowired
+    private ReadUtils readUtils;
+
+    static{
+        //增加一个全局变量，只要加载过这个so就不再执行，除非进程重启才会清掉该变量。
+        if(System.getProperty("myapplibrary")==null){
+            System.setProperty("myapplibrary", "libModuleAPIJni.so");
+            System.loadLibrary("libModuleAPIJni");
+        }
+    }
+
     @ApiOperation(value = "保存盘存接口", notes = "保存盘存接口")
     @PostMapping(value = "/addReadMachineBill")
     @Transactional(rollbackFor = Exception.class)
@@ -147,7 +158,7 @@ public class ReadMachineBillController {
      * 读取装备信息
      */
     public  List<DeviceLibrary> startDeviceDetail(){
-        ReadUtils readUtils = new ReadUtils();
+//        ReadUtils readUtils = new ReadUtils();
         //先开启
         readUtils.testinitreader();
         while (localFlag){

dev-rfid/src/main/java/com/tykj/dev/rfid/controller/ReadController.java

-package com.tykj.dev.rfid.controller;
-
-import com.tykj.dev.config.swagger.AutoDocument;
-import com.tykj.dev.rfid.timeTask.ReadUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-/**
- * @author zsp
- * @create 2021/12/2 10:39
- */
-@RestController
-@Api(tags = "读写机模块", description = "读写机模块")
-@AutoDocument
-@RequestMapping("/readMachine")
-@Slf4j
-public class ReadController {
-
-    @PostMapping("/startReadMachine")
-    @ApiOperation(value = "开始扫描读写机")
-    public ResponseEntity startReadMachine(){
-        ReadUtils readUtils = new ReadUtils();
-        //先开启
-        readUtils.testinitreader();
-        //开始盘存
-        readUtils.testinventory1();
-        //关闭
-        readUtils.getJreader().CloseReader();
-        return ResponseEntity.ok("读写成功");
-    }
-}

dev-rfid/src/main/java/com/tykj/dev/rfid/timeTask/ReadUtils.java

@@ -3,11 +3,16 @@ package com.tykj.dev.rfid.timeTask;
 import com.uhf.api.cls.Reader;
 import com.uhf.api.cls.Reader.*;
 import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @Data
+@Slf4j
+@Component
 public class ReadUtils {
 
 	/**
@@ -20,7 +25,10 @@ public class ReadUtils {
 	//公司测试读写机实验室ip
 //	String ReaderAddr="192.168.0.201";
 	//公司正式读写机实验室ip
-	String ReaderAddr="192.168.0.100";
+//	String ReaderAddr="192.168.0.100";
+	@Value("${readMachine.ip}")
+	public String ReaderAddr;
+
 	Reader Jreader;
 	public ReadUtils()
 	{
@@ -183,6 +191,7 @@ public class ReadUtils {
 		 *   返回类型：READER_ERR ,MT_OK_ERR表示正常，其他表示错误
 		 */
 //		READER_ERR er=Jreader.InitReader(ReaderAddr,Reader_Type.MODULE_ONE_ANT);
+		log.info("ReaderAddr:{}",ReaderAddr);
 		READER_ERR er=Jreader.InitReader_Notype(ReaderAddr,AntCount);
 		System.out.println(er.toString());
 		/*

dev-union/src/main/resources/application-dev.properties

@@ -11,3 +11,4 @@ preview.path=http://192.168.102.169:8087/file/
 spring.boot.admin.client.url=http://localhost:8769
 spring.boot.admin.client.instance.serviceBaseUrl=http://localhost:8087w
 block.flag=true
+readMachine.ip=192.168.101.201

dev-union/src/main/resources/application-test.properties

@@ -10,3 +10,4 @@ preview.path=http://192.168.0.80:8088/equip/file/
 spring.boot.admin.client.url=http://localhost:8769
 spring.boot.admin.client.instance.serviceBaseUrl=http://localhost:8087
 block.flag=true
+readMachine.ip=192.168.101.202
\ No newline at end of file