电子车牌文件夹改成rfid

src/main/java/com/gzlh/api/OpenApi.java

@@ -6,7 +6,7 @@ import com.gzlh.config.ModuleEnum;
 import com.gzlh.bus.EventBus;
 import com.gzlh.config.SystemObject;
 import com.gzlh.config.dto.SerialSetting;
-import com.gzlh.device.electron.job.ElectronReadJob;
+import com.gzlh.device.rfid.job.ElectronReadJob;
 import com.gzlh.device.led.event.LedDefaultEvent;
 import com.gzlh.device.led.utils.LedOptions;
 import com.gzlh.utils.ResultJson;

src/main/java/com/gzlh/bus/EventThread.java

@@ -13,23 +13,19 @@ import com.gzlh.config.dto.SerialSetting;
 import com.gzlh.device.capture.factory.CaptureFactory;
 import com.gzlh.config.ModuleEnum;
 import com.gzlh.config.SystemObject;
-import com.gzlh.device.electron.factory.ElectronFactory;
+import com.gzlh.device.rfid.factory.ElectronFactory;
 
 import com.gzlh.device.led.factory.LedFactory;
 import com.gzlh.device.led.utils.LedOptions;
 import com.gzlh.device.plc.event.PLCEvent;
 import com.gzlh.device.plc.handler.PLCHadnler;
-import com.gzlh.device.weighbridge.action.WeighbridgeCommonAction;
 import com.gzlh.device.weighbridge.factory.WeighbridgeFactory;
 import com.gzlh.device.weighbridge.handler.impl.CommonWeighbridgeHandler;
 import com.gzlh.entity.CommandBO;
-import com.gzlh.entity.ReqBO;
 import com.gzlh.utils.DeviceCache;
 import com.gzlh.utils.WordHandlerUtils;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 @Slf4j

src/main/java/com/gzlh/config/SystemObject.java

@@ -1,7 +1,7 @@
 package com.gzlh.config;
 
 import com.gzlh.device.capture.factory.CaptureFactory;
-import com.gzlh.device.electron.factory.ElectronFactory;
+import com.gzlh.device.rfid.factory.ElectronFactory;
 import com.gzlh.device.led.factory.LedFactory;
 import com.gzlh.device.weighbridge.factory.WeighbridgeFactory;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/gzlh/device/plc/service/PLCService.java

@@ -8,8 +8,7 @@ import com.gzlh.bus.SysConfig;
 import com.gzlh.bus.EventDataManager;
 import com.gzlh.config.ModuleEnum;
 import com.gzlh.config.dto.SerialSetting;
-import com.gzlh.device.capture.event.CaptureEvent;
-import com.gzlh.device.electron.job.ElectronReadJob;
+import com.gzlh.device.rfid.job.ElectronReadJob;
 import com.gzlh.device.plc.event.PLCEvent;
 import com.gzlh.device.weighbridge.event.WeighbridgeEvent;
 import com.gzlh.entity.ReqBO;

src/main/java/com/gzlh/device/electron/action/IElectronAction.java → src/main/java/com/gzlh/device/rfid/action/IElectronAction.java

@@ -1,4 +1,4 @@
-package com.gzlh.device.electron.action;
+package com.gzlh.device.rfid.action;
 
 public interface IElectronAction {
     /**

src/main/java/com/gzlh/device/electron/brand/ElectronBrandType.java → src/main/java/com/gzlh/device/rfid/brand/ElectronBrandType.java

@@ -1,6 +1,5 @@
-package com.gzlh.device.electron.brand;
+package com.gzlh.device.rfid.brand;
 
-import com.gzlh.device.capture.brand.CaptureBrandType;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

src/main/java/com/gzlh/device/electron/client/ElectronClientHandler.java → src/main/java/com/gzlh/device/rfid/client/ElectronClientHandler.java

@@ -1,10 +1,10 @@
-package com.gzlh.device.electron.client;
+package com.gzlh.device.rfid.client;
 
 import cn.hutool.core.util.StrUtil;
 import com.gzlh.bus.SysConfig;
 import com.gzlh.config.ModuleEnum;
 import com.gzlh.config.SystemObject;
-import com.gzlh.device.electron.action.IElectronAction;
+import com.gzlh.device.rfid.action.IElectronAction;
 import com.gzlh.utils.DeviceCache;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;

src/main/java/com/gzlh/device/electron/client/ElectronNettyConfig.java → src/main/java/com/gzlh/device/rfid/client/ElectronNettyConfig.java

@@ -1,4 +1,4 @@
-package com.gzlh.device.electron.client;
+package com.gzlh.device.rfid.client;
 
 import com.gzlh.bus.SysConfig;
 import com.gzlh.config.dto.SerialSetting;

src/main/java/com/gzlh/device/electron/event/CarDefaultEvent.java → src/main/java/com/gzlh/device/rfid/event/CarDefaultEvent.java

@@ -1,4 +1,4 @@
-package com.gzlh.device.electron.event;
+package com.gzlh.device.rfid.event;
 
 /**
  * Car内置事件

src/main/java/com/gzlh/device/electron/factory/ElectronFactory.java → src/main/java/com/gzlh/device/rfid/factory/ElectronFactory.java

@@ -1,9 +1,8 @@
-package com.gzlh.device.electron.factory;
+package com.gzlh.device.rfid.factory;
 
 
 
-import com.gzlh.device.capture.handler.ICaptureHandler;
-import com.gzlh.device.electron.handler.IElectronHandler;
+import com.gzlh.device.rfid.handler.IElectronHandler;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/gzlh/device/electron/handler/IElectronHandler.java → src/main/java/com/gzlh/device/rfid/handler/IElectronHandler.java

@@ -1,7 +1,6 @@
-package com.gzlh.device.electron.handler;
+package com.gzlh.device.rfid.handler;
 
-import com.gzlh.device.capture.brand.CaptureBrandType;
-import com.gzlh.device.electron.brand.ElectronBrandType;
+import com.gzlh.device.rfid.brand.ElectronBrandType;
 
 public interface IElectronHandler {
 

src/main/java/com/gzlh/device/electron/handler/impl/ElectronHandlerRuiDe.java → src/main/java/com/gzlh/device/rfid/handler/impl/ElectronHandlerRuiDe.java

@@ -1,13 +1,13 @@
-package com.gzlh.device.electron.handler.impl;
+package com.gzlh.device.rfid.handler.impl;
 
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.StrUtil;
 import com.gzlh.bus.EventDataManager;
-import com.gzlh.device.electron.action.IElectronAction;
-import com.gzlh.device.electron.brand.ElectronBrandType;
-import com.gzlh.device.electron.client.ElectronNettyConfig;
-import com.gzlh.device.electron.handler.IElectronHandler;
-import com.gzlh.device.electron.utils.CheckNumUtils;
+import com.gzlh.device.rfid.action.IElectronAction;
+import com.gzlh.device.rfid.brand.ElectronBrandType;
+import com.gzlh.device.rfid.client.ElectronNettyConfig;
+import com.gzlh.device.rfid.handler.IElectronHandler;
+import com.gzlh.device.rfid.utils.CheckNumUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 

src/main/java/com/gzlh/device/electron/job/ElectronReadJob.java → src/main/java/com/gzlh/device/rfid/job/ElectronReadJob.java

@@ -1,8 +1,8 @@
-package com.gzlh.device.electron.job;
+package com.gzlh.device.rfid.job;
 
 import com.gzlh.bus.SysConfig;
 import com.gzlh.config.SystemObject;
-import com.gzlh.device.electron.action.IElectronAction;
+import com.gzlh.device.rfid.action.IElectronAction;
 
 /**
  *下发指令读取卡

src/main/java/com/gzlh/device/electron/utils/CheckNumUtils.java → src/main/java/com/gzlh/device/rfid/utils/CheckNumUtils.java

@@ -1,4 +1,4 @@
-package com.gzlh.device.electron.utils;
+package com.gzlh.device.rfid.utils;
 
 import cn.hutool.core.util.HexUtil;
 

src/main/java/com/gzlh/startup/StartupRunner.java

@@ -7,12 +7,11 @@ import com.gzlh.bus.SysConfig;
 import com.gzlh.config.dto.CaputreSetting;
 import com.gzlh.config.dto.SerialSetting;
 import com.gzlh.config.ModuleEnum;
-import com.gzlh.config.SystemObject;
 import com.gzlh.bus.EventBus;
 import com.gzlh.config.hksdk.HCNetSDK;
 import com.gzlh.config.hksdk.HkUtils;
 import com.gzlh.config.hksdk.bo.HKCacheManager;
-import com.gzlh.device.electron.client.ElectronNettyConfig;
+import com.gzlh.device.rfid.client.ElectronNettyConfig;
 import com.gzlh.device.led.client.LedNettyConfig;
 import com.gzlh.device.plc.client.PlcNettyConfig;
 import com.gzlh.device.plc.event.PLCEvent;

src/main/java/com/gzlh/utils/DeviceCache.java

@@ -4,11 +4,10 @@ package com.gzlh.utils;
 import cn.hutool.json.JSONUtil;
 import com.gzlh.bus.SysConfig;
 import com.gzlh.config.ModuleEnum;
-import com.gzlh.config.SystemObject;
 import com.gzlh.config.dto.CaputreSetting;
 import com.gzlh.config.dto.SerialSetting;
 import com.gzlh.device.capture.brand.CaptureBrandType;
-import com.gzlh.device.electron.brand.ElectronBrandType;
+import com.gzlh.device.rfid.brand.ElectronBrandType;
 import com.gzlh.device.led.brand.LedBrandType;
 import com.gzlh.device.weighbridge.brand.WeighbridgeBrandType;
 import com.gzlh.entity.DeviceStatus;