fix(读写机): 修改ip

dev-readmachine/src/main/java/com/tykj/dev/readmachine/devreadmachine/service/impl/DeviceLibraryPositionServiceImpl.java → dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceLibraryPositionServiceImpl.java

-package com.tykj.dev.readmachine.devreadmachine.service.impl;
+package com.tykj.dev.device.library.service.impl;
 
-import com.github.wenhao.jpa.PredicateBuilder;
-import com.github.wenhao.jpa.Specifications;
 import com.tykj.dev.device.library.repository.DeviceLibraryPositionDao;
 import com.tykj.dev.device.library.service.DeviceLibraryPositionService;
 import com.tykj.dev.device.library.subject.domin.DeviceLibraryPosition;
@@ -10,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @author zsp
@@ -44,4 +43,14 @@ public class DeviceLibraryPositionServiceImpl implements DeviceLibraryPositionSe
         return deviceLibraryPositionDao.findAllByStorageLocationId(StorageLocationId);
 
     }
+
+    @Override
+    public DeviceLibraryPosition findById(Integer id) {
+        DeviceLibraryPosition deviceLibraryPosition = new DeviceLibraryPosition();
+        Optional<DeviceLibraryPosition> positionDaoById = deviceLibraryPositionDao.findById(id);
+        if(positionDaoById.isPresent()){
+            deviceLibraryPosition = positionDaoById.get();
+        }
+        return deviceLibraryPosition;
+    }
 }

dev-readmachine/src/main/java/com/tykj/dev/readmachine/devreadmachine/Entity/ReadMachineIp.java

@@ -45,6 +45,9 @@ public class ReadMachineIp {
     @ApiModelProperty(value = "删除标志位")
     private Integer deleteTag = 0;
 
+    @ApiModelProperty(value = "老的ip")
+    private String oldIp;
+
 
 
 }

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

@@ -74,15 +74,15 @@ public class ReadMachineBillController {
     @Autowired
     private TaskService taskService;
 
-    static{
-        //增加一个全局变量，只要加载过这个so就不再执行，除非进程重启才会清掉该变量。
-        if(System.getProperty("myapplibrary")==null){
-            log.info("myapplibrary:{}",System.getProperty("myapplibrary"));
-            System.setProperty("myapplibrary", "libModuleAPIJni.so");
-//            System.loadLibrary("libModuleAPIJni");
-            System.load("/usr/lib/libModuleAPIJni.so");
-        }
-    }
+//    static{
+//        //增加一个全局变量，只要加载过这个so就不再执行，除非进程重启才会清掉该变量。
+//        if(System.getProperty("myapplibrary")==null){
+//            log.info("myapplibrary:{}",System.getProperty("myapplibrary"));
+//            System.setProperty("myapplibrary", "libModuleAPIJni.so");
+////            System.loadLibrary("libModuleAPIJni");
+//            System.load("/usr/lib/libModuleAPIJni.so");
+//        }
+//    }
 
     @ApiOperation(value = "保存盘存接口", notes = "保存盘存接口")
     @PostMapping(value = "/addReadMachineBill")
@@ -155,12 +155,10 @@ public class ReadMachineBillController {
         readMachineBillService.deleteReadMachineBillForDraft(saveDefatVos);
         return ResponseEntity.ok("任务已取消");
     }
-
-
     /**
      * 读取装备信息
      */
-    public  List<DeviceLibrary> startDeviceDetail(){
+    public List<DeviceLibrary> startDeviceDetail(){
         ReadUtils readUtils = new ReadUtils();
         //先获取ip1
         //TODO 后续考虑做成ip的选择,目前先写死

dev-readmachine/src/main/java/com/tykj/dev/readmachine/devreadmachine/service/impl/ReadMachineIpServiceImpl.java

@@ -7,6 +7,8 @@ import com.tykj.dev.readmachine.devreadmachine.util.ReadUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.io.UnsupportedEncodingException;
 import java.util.List;
 import java.util.Optional;
 
@@ -29,7 +31,13 @@ public class ReadMachineIpServiceImpl implements ReadMachineIpService {
     @Override
     public ReadMachineIp updateIp(ReadMachineIp machineIp) {
         ReadUtils readUtils = new ReadUtils();
-        readUtils.testsetip(machineIp.getIp(),machineIp.getMask(), machineIp.getGateway());
+        readUtils.testinitreader(machineIp.getOldIp());
+        try {
+            readUtils.testsetip(machineIp.getIp(),machineIp.getMask(), machineIp.getGateway());
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+            System.out.println("e = " + e);
+        }
         log.info("读写机ip修改成功");
         return readMachineIpDao.save(machineIp);
     }

dev-readmachine/src/main/java/com/tykj/dev/readmachine/devreadmachine/util/ReadUtils.java

@@ -4,6 +4,9 @@ import com.uhf.api.cls.Reader;
 import com.uhf.api.cls.Reader.*;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -329,7 +332,7 @@ public class ReadUtils {
 		er=Jreader.LockTag(1, (byte)Lock_Obj.LOCK_OBJECT_BANK1.value(), (short)Lock_Type.BANK1_UNLOCK.value(), data, (short)1000);
 	}
 
-	public void testsetip(String ip ,String mask,String gateway) {
+	public void testsetip(String ip ,String mask,String gateway) throws UnsupportedEncodingException {
 		Reader_Ip rip=Jreader.new Reader_Ip();
 		/*
 		rip.ip=new byte[]{'1','9','2','.','1','6','8','.','1','.','1','0','1'};
@@ -340,9 +343,9 @@ public class ReadUtils {
 //		rip.ip="192.168.1.100".getBytes();
 //		rip.mask="255.255.255.0".getBytes();
 //		rip.gateway="192.168.1.1".getBytes();
-		rip.ip=ip.getBytes();
-		rip.mask=mask.getBytes();
-		rip.gateway=gateway.getBytes();
+		rip.ip=ip.getBytes("US-ASCII");
+		rip.mask=mask.getBytes("US-ASCII");
+		rip.gateway=gateway.getBytes("US-ASCII");
 		//*/
 		READER_ERR er=Jreader.ParamSet(Mtr_Param.MTR_PARAM_READER_IP, rip);