创建路由器、队列

src/main/java/com/fjhx/config/RFIDConfig.java

@@ -1,11 +1,11 @@
 package com.fjhx.config;
 
-import com.fjhx.entity.rfid.Hyy;
-import com.fjhx.entity.rfid.Log;
-import com.fjhx.entity.rfid.Sd;
-import com.fjhx.entity.rfid.Service;
-import com.fjhx.entity.rfid.Tcp;
-import com.fjhx.entity.rfid.Udp;
+import com.fjhx.entity.Hyy;
+import com.fjhx.entity.Log;
+import com.fjhx.entity.Sd;
+import com.fjhx.entity.Service;
+import com.fjhx.entity.Tcp;
+import com.fjhx.entity.Udp;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 

src/main/java/com/fjhx/entity/rfid/Hyy.java → src/main/java/com/fjhx/entity/Hyy.java

@@ -1,4 +1,4 @@
-package com.fjhx.entity.rfid;
+package com.fjhx.entity;
 
 import lombok.Data;
 

src/main/java/com/fjhx/entity/rfid/Log.java → src/main/java/com/fjhx/entity/Log.java

@@ -1,4 +1,4 @@
-package com.fjhx.entity.rfid;
+package com.fjhx.entity;
 
 import lombok.Data;
 

src/main/java/com/fjhx/entity/rfid/RFIDClient.java → src/main/java/com/fjhx/entity/RFIDClient.java

@@ -1,4 +1,4 @@
-package com.fjhx.entity.rfid;
+package com.fjhx.entity;
 
 import lombok.Data;
 

src/main/java/com/fjhx/entity/rfid/Sd.java → src/main/java/com/fjhx/entity/Sd.java

@@ -1,4 +1,4 @@
-package com.fjhx.entity.rfid;
+package com.fjhx.entity;
 
 import lombok.Data;
 

src/main/java/com/fjhx/entity/rfid/Service.java → src/main/java/com/fjhx/entity/Service.java

@@ -1,4 +1,4 @@
-package com.fjhx.entity.rfid;
+package com.fjhx.entity;
 
 import lombok.Data;
 

src/main/java/com/fjhx/entity/rfid/Tcp.java → src/main/java/com/fjhx/entity/Tcp.java

@@ -1,4 +1,4 @@
-package com.fjhx.entity.rfid;
+package com.fjhx.entity;
 
 import lombok.Data;
 

src/main/java/com/fjhx/entity/rfid/Udp.java → src/main/java/com/fjhx/entity/Udp.java

@@ -1,4 +1,4 @@
-package com.fjhx.entity.rfid;
+package com.fjhx.entity;
 
 import lombok.Data;
 

src/main/java/com/fjhx/entity/rfid/QrCode.java

@@ -1,65 +0,0 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
-package com.fjhx.entity.rfid;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-/**
- * 二维码工单表实体类
- *
- * @author BladeX
- * @since 2022-09-01
- */
-@Data
-@TableName("t_pro_qr_code")
-public class QrCode implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	* 订单id
-	*/
-	private String id;
-	/**
-	* 二维码
-	*/
-	private String qrcode;
-	/**
-	* 视觉设备标识
-	*/
-	private String veId;
-	/**
-	* 创建者ID
-	*/
-	private String createUser;
-	/**
-	* 创建时间
-	*/
-	private LocalDateTime createTime;
-	/**
-	* 更新者iID
-	*/
-	private String updateUser;
-	/**
-	* 更新时间
-	*/
-	private LocalDateTime updateTime;
-
-
-}

src/main/java/com/fjhx/entity/rfid/base/BasicsEntity.java

@@ -1,107 +0,0 @@
-package com.fjhx.entity.rfid.base;
-import com.baomidou.mybatisplus.annotation.TableField;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 基础实体类
- */
-public abstract class BasicsEntity implements Serializable {
-
-    private static final long serialVersionUID = 3568046178869491465L;
-
-    /**
-     * 主键id
-     */
-    private String id;
-
-    /**
-     * 创建人id
-     */
-    private String createUser;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 更新人id
-     */
-    private String updateUser;
-
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-
-    /**
-     * 当前页
-     */
-    @TableField(exist = false)
-
-    private Integer pageNum =1;
-
-    /**
-     * 每页显示条数
-     */
-    @TableField(exist = false)
-    private Integer pageSize =10;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getCreateUser() {
-        return createUser;
-    }
-
-    public void setCreateUser(String createUser) {
-        this.createUser = createUser;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateUser() {
-        return updateUser;
-    }
-
-    public void setUpdateUser(String updateUser) {
-        this.updateUser = updateUser;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public Integer getPageNum() {
-        return pageNum;
-    }
-
-    public void setPageNum(Integer pageNum) {
-        this.pageNum = pageNum;
-    }
-
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-}

src/main/java/com/fjhx/rfid/r2000/controller/TcpController.java

@@ -1,6 +1,6 @@
 package com.fjhx.rfid.r2000.controller;
 
-import com.fjhx.entity.rfid.RFIDClient;
+import com.fjhx.entity.RFIDClient;
 import com.fjhx.rfid.r2000.tcp.service.TcpService;
 import com.fjhx.utils.AjaxResult;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/fjhx/rfid/r2000/controller/UdpController.java

@@ -1,6 +1,6 @@
 package com.fjhx.rfid.r2000.controller;
 
-import com.fjhx.entity.rfid.RFIDClient;
+import com.fjhx.entity.RFIDClient;
 import com.fjhx.rfid.r2000.udp.service.UdpService;
 import com.fjhx.utils.AjaxResult;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/fjhx/rfid/r2000/tcp/service/TcpService.java

@@ -1,6 +1,6 @@
 package com.fjhx.rfid.r2000.tcp.service;
 
-import com.fjhx.entity.rfid.RFIDClient;
+import com.fjhx.entity.RFIDClient;
 import com.fjhx.utils.AjaxResult;
 
 /**

src/main/java/com/fjhx/rfid/r2000/tcp/service/TcpServiceV2.java

@@ -1,6 +1,6 @@
 package com.fjhx.rfid.r2000.tcp.service;
 
-import com.fjhx.entity.rfid.RFIDClient;
+import com.fjhx.entity.RFIDClient;
 import com.fjhx.utils.AjaxResult;
 
 import java.util.List;

src/main/java/com/fjhx/rfid/r2000/tcp/service/impl/TcpServiceImpl.java

@@ -3,7 +3,7 @@ package com.fjhx.rfid.r2000.tcp.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.fjhx.constant.RFIDConstant;
 import com.fjhx.constant.RedisKeyConstant;
-import com.fjhx.entity.rfid.RFIDClient;
+import com.fjhx.entity.RFIDClient;
 import com.fjhx.redis.RedisCache;
 import com.fjhx.rfid.r2000.tcp.callback.TcpCallBackSaveLog;
 import com.fjhx.rfid.r2000.tcp.service.TcpService;

src/main/java/com/fjhx/rfid/r2000/tcp/service/impl/TcpServiceImplV2.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.fjhx.config.RFIDConfig;
 import com.fjhx.constant.RFIDConstant;
 import com.fjhx.constant.RedisKeyConstant;
-import com.fjhx.entity.rfid.RFIDClient;
+import com.fjhx.entity.RFIDClient;
 import com.fjhx.rabbitmq.enums.MsgSourceEnum;
 import com.fjhx.rabbitmq.service.RabbitmqService;
 import com.fjhx.redis.RedisCache;
@@ -25,7 +25,6 @@ import org.springframework.stereotype.Service;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;

src/main/java/com/fjhx/rfid/r2000/udp/service/UdpService.java

@@ -1,6 +1,6 @@
 package com.fjhx.rfid.r2000.udp.service;
 
-import com.fjhx.entity.rfid.RFIDClient;
+import com.fjhx.entity.RFIDClient;
 import com.fjhx.utils.AjaxResult;
 
 /**

src/main/java/com/fjhx/rfid/r2000/udp/service/impl/UdpServiceImpl.java

@@ -3,7 +3,7 @@ package com.fjhx.rfid.r2000.udp.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.fjhx.constant.RFIDConstant;
 import com.fjhx.constant.RedisKeyConstant;
-import com.fjhx.entity.rfid.RFIDClient;
+import com.fjhx.entity.RFIDClient;
 import com.fjhx.redis.RedisCache;
 import com.fjhx.rfid.r2000.udp.callback.UdpCallBackSaveLog;
 import com.fjhx.rfid.r2000.udp.service.UdpService;