From 4d079f7943bc2d1a484bd7159f96b17e56c47db1 Mon Sep 17 00:00:00 2001
From: yiming <wang.yiming@hzleaper.com>
Date: Fri, 6 May 2022 13:41:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96RFID=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zhehekeji/web/service/PlcService.java |  5 ++++
 .../zhehekeji/web/service/RFIDService.java    | 26 +++++++++++++++++++
 web/src/main/resources/application-dev.yml    |  2 +-
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 web/src/main/java/com/zhehekeji/web/service/RFIDService.java

diff --git a/web/src/main/java/com/zhehekeji/web/service/PlcService.java b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
index 939eb7b..91ff6a2 100644
--- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
@@ -7,6 +7,7 @@ import com.zhehekeji.web.entity.*;
 import com.zhehekeji.web.lib.*;
 import com.zhehekeji.web.mapper.*;
 import com.zhehekeji.web.pojo.OrderVO;
+import com.zhehekeji.web.service.RFID.RFIDSocket;
 import com.zhehekeji.web.service.ksec.KsecNettyClient;
 import com.zhehekeji.web.service.sick.SickSocket;
 import lombok.extern.slf4j.Slf4j;
@@ -60,6 +61,8 @@ public class PlcService {
     @Resource
     private SensorService sensorService;
     @Resource
+    private RFIDService rfidService;
+    @Resource
     private CheckLogMapper checkLogMapper;
 
     private static ThreadPoolExecutor threadPoolExecutor =  new ThreadPoolExecutor(1,8,200,TimeUnit.MINUTES,new ArrayBlockingQueue<>(100000));
@@ -574,6 +577,8 @@ public class PlcService {
 
         }else if(configProperties.getScanCodeMode().getTray() == 3){
             //RFID
+            RFID rfid = rfidService.getRFIDByPlc(street.getId());
+
         }
         StockCheckRunnable stockCheckRunnable = new StockCheckRunnable(street,plcCmdInfo,cmdCode,stockMapper,path,checkLogMapper,configProperties.getScanCodeMode().getGoods(),wmsCode,wmsTrayCode,trayCode,trayCheck,configProperties);
         threadPoolExecutor.execute(stockCheckRunnable);
diff --git a/web/src/main/java/com/zhehekeji/web/service/RFIDService.java b/web/src/main/java/com/zhehekeji/web/service/RFIDService.java
new file mode 100644
index 0000000..c5d60ff
--- /dev/null
+++ b/web/src/main/java/com/zhehekeji/web/service/RFIDService.java
@@ -0,0 +1,26 @@
+package com.zhehekeji.web.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.zhehekeji.web.entity.RFID;
+import com.zhehekeji.web.entity.SensorGun;
+import com.zhehekeji.web.mapper.RFIDMapper;
+import com.zhehekeji.web.mapper.SensorGunMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class RFIDService {
+
+    @Resource
+    private RFIDMapper rfidMapper;
+
+    public RFID getRFIDByPlc(Integer streetId){
+        List<RFID> list = rfidMapper.selectList(new QueryWrapper<RFID>().eq("street_id",streetId));
+        if(list.size() > 0){
+            return list.get(0);
+        }
+        return null;
+    }
+}
diff --git a/web/src/main/resources/application-dev.yml b/web/src/main/resources/application-dev.yml
index d749fc2..dcd1afd 100644
--- a/web/src/main/resources/application-dev.yml
+++ b/web/src/main/resources/application-dev.yml
@@ -68,7 +68,7 @@ sensor:
 # -----goods 货物
 # 扫码模式  1：球机扫码   2：sick扫码枪  3:南北达RFID
 scanCodeMode:
-  tray: 1
+  tray: 2
   goods: 0
   goodsCodeTypes:
     - 14