完成所有功能。

registration-center/pom.xml

@@ -32,10 +32,10 @@
             <version>1.2.28</version>
         </dependency>
         <!-- JPA -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-data-jpa</artifactId>-->
+<!--        </dependency>-->
         <!-- mysql -->
         <dependency>
             <groupId>mysql</groupId>
@@ -145,6 +145,14 @@
             <version>3.5.2</version>
         </dependency>
 
+        <!-- 连接池 -->
+        <dependency>
+            <!--自动配置-->
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>1.1.14</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-core</artifactId>

registration-center/registration-center.iml

@@ -88,33 +88,12 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.14" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.8.4" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.28" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.6.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.6.2" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.6.2" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.14" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.transaction:jakarta.transaction-api:1.3.3" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.persistence:jakarta.persistence-api:2.2.3" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.6.3.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.3.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.1.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jaxb:txw2:2.3.5" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:3.0.12" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:2.6.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.6.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-orm:5.3.14" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.14" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:5.3.14" level="project" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.27" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.6.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.6.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.6.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.6.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.14" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.14" level="project" />
     <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.72.Final" level="project" />
@@ -136,6 +115,7 @@
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-undertow:2.6.2" level="project" />
     <orderEntry type="library" name="Maven: io.undertow:undertow-core:2.2.14.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.2.Final" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.xnio:xnio-api:3.8.4.Final" level="project" />
     <orderEntry type="library" name="Maven: org.wildfly.common:wildfly-common:1.5.2.Final" level="project" />
     <orderEntry type="library" name="Maven: org.wildfly.client:wildfly-client-config:1.0.1.Final" level="project" />
@@ -159,6 +139,9 @@
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3.4" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3.4" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.6.2" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.14" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.2" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.5.2" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.5.2" level="project" />
@@ -170,12 +153,31 @@
     <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.7" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.14" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.14" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.32" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-freemarker:2.6.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.14" level="project" />
     <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.8.2" level="project" />
     <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
     <orderEntry type="library" name="Maven: com.huimv:huimv-eartag2-common:0.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.transaction:jakarta.transaction-api:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.persistence:jakarta.persistence-api:2.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.6.3.Final" level="project" />
+    <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss:jandex:2.2.3.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.1.2.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.glassfish.jaxb:txw2:2.3.5" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:3.0.12" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:2.6.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:5.3.14" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aspects:5.3.14" level="project" />
   </component>
 </module>

registration-center/src/main/java/com/huimv/center/HuimvRegistrationCenterApplication.java

@@ -19,9 +19,7 @@ import org.springframework.context.ApplicationContext;
 public class HuimvRegistrationCenterApplication {
     public static void main(String[] args) throws InterruptedException {
         ApplicationContext applicationContext = SpringApplication.run(HuimvRegistrationCenterApplication.class, args);
-        //EartagServer
-//        applicationContext.getBean(EartagServer.class).start();
-        //EartagServer2
+        // 启动RegisterServer
         applicationContext.getBean(RegisterServer.class).run();
     }
 }

registration-center/src/main/java/com/huimv/center/config/TopicRabbitMQConfig.java

@@ -84,5 +84,20 @@ public class TopicRabbitMQConfig {
         return BindingBuilder.bind(syncDeviceQueue()).to(syncDeviceExchange()).with(Const.ROUTING_KEY_SYNC_DEVICE);
     }
 
+    // 原始数据队列
+    @Bean
+    public Queue askCmdQueue() {
+        return new Queue(Const.QUEUE_ASK_CMD);
+    }
+    // 原始数据交换机
+    @Bean
+    TopicExchange askCmdExchange() {
+        return new TopicExchange(Const.EXCHANGE_ASK_CMD);
+    }
+    // 原始数据绑定关系
+    @Bean
+    Binding bindingAskCmdExchangeMessage() {
+        return BindingBuilder.bind(askCmdQueue()).to(askCmdExchange()).with(Const.ROUTING_KEY_ASK_CMD);
+    }
 
 }

registration-center/src/main/java/com/huimv/center/controller/BizRawDataController.java

@@ -0,0 +1,21 @@
+package com.huimv.center.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author zn
+ * @since 2022-06-23
+ */
+@RestController
+@RequestMapping("/biz-raw-data")
+public class BizRawDataController {
+
+}
+

registration-center/src/main/java/com/huimv/center/listener/DeviceListener.java

@@ -0,0 +1,127 @@
+package com.huimv.center.listener;
+
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.center.service.*;
+import com.huimv.center.service.impl.BizRawDataServiceImpl;
+import com.huimv.center.utils.Const;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.ParseException;
+import java.util.Map;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@Component
+@Slf4j
+public class DeviceListener {
+    @Autowired
+    private BizDeviceRegisteredFlowService deviceRegisteredFlowService;
+    @Autowired
+    private BizDeviceRegisterService deviceRegisterService;
+    @Autowired
+    private BizDeviceAnswerFlowService deviceAnswerFlowService;
+    @Autowired
+    private BizDeviceUnregisteredService deviceUnregisteredService;
+    @Autowired
+    private BizDeviceUnregisteredFlowService deviceUnregisteredFlowService;
+    @Autowired
+    private BizRawDataServiceImpl bizRawDataServiceImpl;
+
+    /**
+     * @Method      : processDeviceRegisteredFlow
+     * @Description : 监听已注册设备
+     * @Params      : [askMap]
+     * @Return      : void
+     *
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/22
+     * @Time        : 20:11
+     */
+    @RabbitListener(queues = Const.QUEUE_DEVICE_REGISTERED)
+    @RabbitHandler
+    @Transactional
+    public void processDeviceRegisteredFlow(Map askMap) throws ParseException {
+        System.out.println("<<<<<<<<<<<<<<< askMap>>"+askMap.toString());
+        String chipId = askMap.get("chipId").toString();
+        String deviceCode = askMap.get("deviceCode").toString();
+        String clientIp = askMap.get("clientIp").toString();
+        System.out.println("<<<<<<<<<<<<<<<<<<<<<<< 处理注册设备 1 <<<<<<<<<<<<<<<<<<<<<<<");
+
+        // 添加已注册流水
+        deviceRegisteredFlowService.addRegisteredFlow(chipId,deviceCode,clientIp);
+        // 更新已注册设备信息
+        deviceRegisterService.updateDeviceRegisterTimes(chipId);
+
+//        updateDeviceRegistered(askMap);
+    }
+
+    public void updateDeviceRegistered(Map askMap) throws ParseException {
+    }
+
+    /**
+     * @Method      : processDeviceUnregisteredFlow
+     * @Description : 监听未注册设备
+     * @Params      : [askMap]
+     * @Return      : void
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/22       
+     * @Time        : 20:13
+     */
+    @RabbitListener(queues = Const.QUEUE_DEVICE_UNREGISTERED)
+    @RabbitHandler
+    public void processDeviceUnregisteredFlow(Map askMap) throws ParseException {
+        System.out.println("<<<<<<<<<<<<<<< askMap>>"+askMap.toString());
+        String askText = askMap.get("deviceUnregistered").toString();
+        String chipId = askMap.get("deviceUnregistered").toString();
+        System.out.println("<<<<<<<<<<<<<<<<<<<<<<< 处理未注册设备 2 <<<<<<<<<<<<<<<<<<<<<<<");
+        // 添加非注册流水（统计次数）
+        deviceUnregisteredFlowService.addDeviceUnregisteredFlow(chipId);
+
+        // 添加非注册信息
+        deviceUnregisteredService.updateDeviceRegisterTimes(chipId);
+    }
+
+    /**
+     * @Method      : processDeviceAnswer
+     * @Description : 监听设备应答
+     * @Params      : [askMap]
+     * @Return      : void
+     *
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/22
+     * @Time        : 20:15
+     */
+    @RabbitListener(queues = Const.QUEUE_DEVICE_ANSWER)
+    @RabbitHandler
+    public void processDeviceAnswer(Map askMap) throws ParseException {
+        System.out.println("<<<<<<<<<<<<<<< askMap>>"+askMap.toString());
+        String askText = askMap.get("deviceAnswer").toString();
+        String chipId = askMap.get("chipId").toString();
+        String deviceCode = askMap.get("deviceCode").toString();
+        System.out.println("<<<<<<<<<<<<<<<<<<<<<<< 处理应答 3 <<<<<<<<<<<<<<<<<<<<<<<");
+
+        // 添加设备应答信息流水信息
+        deviceAnswerFlowService.addDeviceAnswer(chipId,deviceCode,askText);
+    }
+
+    @RabbitListener(queues = Const.QUEUE_ASK_CMD)
+    @RabbitHandler
+    public void processAskCmd(Map askMap) throws ParseException {
+        System.out.println("<<<<<<<<<<<<<<< askMap>>"+askMap.toString());
+        String askCmd = askMap.get("askCmd").toString();
+        // 添加原始数据信息
+        bizRawDataServiceImpl.addRawData(askCmd);
+    }
+}

registration-center/src/main/java/com/huimv/center/listener/Listener.java

@@ -1,129 +0,0 @@
-package com.huimv.center.listener;
-
-import com.alibaba.fastjson.JSONObject;
-import com.huimv.center.utils.Const;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.stereotype.Component;
-
-import java.text.ParseException;
-import java.util.Map;
-
-/**
- * @Project : huimv.shiwan
- * @Package : com.huimv.biosafety.uface.controller
- * @Description : TODO
- * @Version : 1.0
- * @Author : ZhuoNing
- * @Create : 2020-12-25
- **/
-@Component
-@Slf4j
-public class Listener {
-
-    /**
-     * @Method      : processDeviceRegisteredFlow
-     * @Description : 监听已注册设备
-     * @Params      : [RawMap]
-     * @Return      : void
-     *
-     * @Author      : ZhuoNing
-     * @Date        : 2022/6/22
-     * @Time        : 20:11
-     */
-    @RabbitListener(queues = Const.QUEUE_DEVICE_REGISTERED)
-    @RabbitHandler
-    public void processDeviceRegisteredFlow(Map RawMap) throws ParseException {
-        System.out.println("<<<<<<<<<<<<<<< RawMap>>"+RawMap.toString());
-        String askText = RawMap.get("deviceRegistered").toString();
-        String chipId = RawMap.get("chipId").toString();
-        String deviceCode = RawMap.get("deviceCode").toString();
-        System.out.println("<<<<<<<<<<<<<<<<<<<<<<< 处理注册设备 1 <<<<<<<<<<<<<<<<<<<<<<<");
-
-        // 添加设备注册信息
-        // 添加设备注册流水信息，并统计次数
-        //++++++++++++++++++++++++++++++++++++++++++++++++++
-
-
-        //本模块主要执行保存以下4类数据：（其他注册数据，在线数据，状态数据等都是由其他模块工程执行处理-process2模块工程）
-        //--保存原始流水数据（原始流水表）
-        //--保存设备心跳流水数据（设备心跳流水表）
-        //--保存设备环境流水数据（设备温度流水表）
-        //--保存耳标流水数据（耳标流水表）
-
-        //{处理请求报文}
-//        Map askMap = handleAskText(askText);
-//        String type = askMap.get("type").toString();
-//        JSONObject dataJo = (JSONObject) askMap.get("data");
-//        System.out.println("## dataJo>>"+dataJo);
-//        //
-//        String earmark = dataJo.getString("earmark");
-//        System.out.println("earmark>>"+earmark);
-
-
-        //测试代码(属于测试耳标才能进行测试)
-//        if(checkTestRange(earmark)){
-//            if(type.trim().equalsIgnoreCase("eartag")){
-//                //{处理耳标数据}
-//                eartagService.handleEartag(dataJo);
-//            }
-//        }else{
-//            System.out.println("## 已过滤非测试耳标");
-//        }
-
-//        //正式代码
-//        if(type.trim().equalsIgnoreCase("eartag")){
-//            System.out.println("askText>>"+askText);
-//            //{处理耳标数据}
-//            eartagService.handleEartag(dataJo);
-//        }
-    }
-
-    /**
-     * @Method      : processDeviceUnregisteredFlow
-     * @Description : 监听未注册设备
-     * @Params      : [RawMap]
-     * @Return      : void
-     * 
-     * @Author      : ZhuoNing
-     * @Date        : 2022/6/22       
-     * @Time        : 20:13
-     */
-    @RabbitListener(queues = Const.QUEUE_DEVICE_UNREGISTERED)
-    @RabbitHandler
-    public void processDeviceUnregisteredFlow(Map RawMap) throws ParseException {
-        System.out.println("<<<<<<<<<<<<<<< RawMap>>"+RawMap.toString());
-        String askText = RawMap.get("deviceUnregistered").toString();
-        System.out.println("<<<<<<<<<<<<<<<<<<<<<<< 处理未注册设备 2 <<<<<<<<<<<<<<<<<<<<<<<");
-        // 添加非注册信息
-        // 添加非注册流水，并统计次数
-        // ++++++++++++++++++++++++++++++++++++++++++++++++++
-
-
-    }
-
-    /**
-     * @Method      : processDeviceAnswer
-     * @Description : 监听设备应答
-     * @Params      : [RawMap]
-     * @Return      : void
-     *
-     * @Author      : ZhuoNing
-     * @Date        : 2022/6/22
-     * @Time        : 20:15
-     */
-    @RabbitListener(queues = Const.QUEUE_DEVICE_ANSWER)
-    @RabbitHandler
-    public void processDeviceAnswer(Map RawMap) throws ParseException {
-        System.out.println("<<<<<<<<<<<<<<< RawMap>>"+RawMap.toString());
-        String askText = RawMap.get("deviceAnswer").toString();
-        String chipId = RawMap.get("chipId").toString();
-        System.out.println("<<<<<<<<<<<<<<<<<<<<<<< 处理应答 3 <<<<<<<<<<<<<<<<<<<<<<<");
-
-        // 添加应答信息流水信息
-        // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-
-    }
-}

registration-center/src/main/java/com/huimv/center/mapper/BizRawDataMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.center.mapper;
+
+import com.huimv.center.pojo.BizRawData;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zn
+ * @since 2022-06-23
+ */
+public interface BizRawDataMapper extends BaseMapper<BizRawData> {
+
+}

registration-center/src/main/java/com/huimv/center/mapper/xml/BizDeviceRegisterMapper.xml

@@ -14,7 +14,7 @@
         <result column="first_time" property="firstTime" />
         <result column="last_time" property="lastTime" />
         <result column="remark" property="remark" />
-        <result column="times" property="ask_times" />
+        <result column="times" property="askTimes" />
     </resultMap>
 
     <!-- 通用查询结果列 -->

registration-center/src/main/java/com/huimv/center/mapper/xml/BizRawDataMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.center.mapper.BizRawDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.center.pojo.BizRawData">
+        <id column="id" property="id" />
+        <result column="ask_cmd" property="askCmd" />
+        <result column="add_time" property="addTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, ask_cmd, add_time
+    </sql>
+
+</mapper>

registration-center/src/main/java/com/huimv/center/pojo/BizDeviceRegister.java

@@ -45,7 +45,7 @@ public class BizDeviceRegister implements Serializable {
 
     private String remark;
 
-    private String ask_times;
+    private Integer askTimes;
 
 
 }

registration-center/src/main/java/com/huimv/center/pojo/BizRawData.java

@@ -0,0 +1,33 @@
+package com.huimv.center.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zn
+ * @since 2022-06-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BizRawData implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String askCmd;
+
+    private Date addTime;
+
+
+}

registration-center/src/main/java/com/huimv/center/producer/Producer.java

@@ -25,35 +25,47 @@ public class Producer {
     RabbitTemplate rabbitTemplate;  //使用RabbitTemplate,这提供了接收/发送等等方法
 
     //发送已注册消息
-    public String sendDeviceRegistered(String idCode,String deviceCode, String registerText) {
+    public String sendDeviceRegistered(String idCode, String deviceCode, String registerText, String clientIp) {
         Map map = new HashMap();
         map.put("chipId",idCode);
         map.put("deviceCode",deviceCode);
         map.put("deviceRegistered",registerText);
+        map.put("clientIp",clientIp);
         rabbitTemplate.convertAndSend(Const.EXCHANGE_DEVICE_REGISTERED, Const.ROUTING_KEY_DEVICE_REGISTERED, map);
         System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 发送设备已注册消息 >>"+registerText);
         return "ok";
     }
 
     //发送未注册消息
-    public String sendDeviceUnregistered(String unregisterText) {
+    public String sendDeviceUnregistered(String idCode, String unregisterText) {
         Map map = new HashMap();
         map.put("deviceUnregistered",unregisterText);
+        map.put("chipId",idCode);
         rabbitTemplate.convertAndSend(Const.EXCHANGE_DEVICE_UNREGISTERED, Const.ROUTING_KEY_DEVICE_UNREGISTERED, map);
         System.out.println("--------------------------------------- 发送设备未注册消息 >>"+unregisterText);
         return "ok";
     }
 
     // 发送应答消息
-    public String sendDeviceAnswer(String idCode, String answerText) {
+    public String sendDeviceAnswer(String idCode, String deviceCode, String answerText) {
         Map map = new HashMap();
         map.put("chipId",idCode);
+        map.put("deviceCode",deviceCode);
         map.put("deviceAnswer",answerText);
         rabbitTemplate.convertAndSend(Const.EXCHANGE_DEVICE_ANSWER, Const.ROUTING_KEY_DEVICE_ANSWER, map);
         System.out.println("--------------------------------------- 发送设备应答消息 >>"+answerText);
         return "ok";
     }
 
+    // 保存原始数据
+    public String sendAskCmdRawData(String askCmd) {
+        Map map = new HashMap();
+        map.put("askCmd",askCmd);
+        rabbitTemplate.convertAndSend(Const.EXCHANGE_ASK_CMD, Const.ROUTING_KEY_ASK_CMD, map);
+        System.out.println("--------------------------------------- 发送设备请求原始数据 >>"+askCmd);
+        return "ok";
+    }
+
     // 同步注册信息
 
 

registration-center/src/main/java/com/huimv/center/server/RegisterServerHandler.java

@@ -58,17 +58,16 @@ public class RegisterServerHandler extends ChannelInboundHandlerAdapter {
         String clientAskText = data.toString(CharsetUtil.UTF_8);
         //保存实例内的客户端请求
         appendClientAsk(clientAskText);
-
-        InetSocketAddress ipSocket = (InetSocketAddress)ctx.channel().remoteAddress();
-        String clientIp = ipSocket.getAddress().getHostAddress();
-        log.info("客户端ip地址：{}",clientIp);
     }
 
     @Override
     public void channelReadComplete(ChannelHandlerContext ctx) throws Exception {
         if (askTextSb.toString().indexOf("end") != -1) {
+            InetSocketAddress ipSocket = (InetSocketAddress)ctx.channel().remoteAddress();
+            String clientIp = ipSocket.getAddress().getHostAddress();
+            log.info("客户端ip地址：{}",clientIp);
             // 处理客户端消息（业务入口）
-            handleBusinessMessage(askTextSb.toString(), ctx);
+            handleBusinessMessage(askTextSb.toString(), ctx,clientIp);
             //清空重置;
             askTextSb.delete(0, askTextSb.length());
         }
@@ -92,7 +91,7 @@ public class RegisterServerHandler extends ChannelInboundHandlerAdapter {
      * @Date : 2022/3/28
      * @Time : 17:36
      */
-    private void handleBusinessMessage(String clientAskText, ChannelHandlerContext ctx) throws ParseException {
+    private void handleBusinessMessage(String clientAskText, ChannelHandlerContext ctx, String clientIp) throws ParseException {
         clientAskText = clientAskText.replaceAll("\r", "").replaceAll("\n", "");
         System.out.println("服务端开始接收数据 >>" + clientAskText);
         // 计算+号数量
@@ -105,7 +104,7 @@ public class RegisterServerHandler extends ChannelInboundHandlerAdapter {
             for (int a = 0; a < askJa.size(); a++) {
                 String askText = askJa.getString(a);
                 //
-                handleCommandLine(askText, ctx);
+                handleCommandLine(askText, ctx,clientIp);
             }
         }
     }
@@ -119,7 +118,7 @@ public class RegisterServerHandler extends ChannelInboundHandlerAdapter {
      * @Date : 2022/3/23
      * @Time : 18:08
      */
-    private void handleCommandLine(String askText, ChannelHandlerContext ctx) throws ParseException {
+    private void handleCommandLine(String askText, ChannelHandlerContext ctx, String clientIp) throws ParseException {
         String[] dataArray = askText.split("\\+");
         String cmdHeader = dataArray[0];
         //芯片id/设备编码
@@ -127,6 +126,8 @@ public class RegisterServerHandler extends ChannelInboundHandlerAdapter {
         String cmd = dataArray[2];
 //        Map map = new HashMap();
 //        map.put("askText", askText);
+        // 保存请求命令
+        producer.sendAskCmdRawData(askText);
         if (cmdHeader.trim().equalsIgnoreCase("hm")) {
             //采集器应答数据
             if (cmd.trim().equalsIgnoreCase("0")) {
@@ -137,17 +138,17 @@ public class RegisterServerHandler extends ChannelInboundHandlerAdapter {
                 if(resultMap.size()>0){
                     String deviceCode = resultMap.get("deviceCode").toString();
                     // 发送设备已注册消息
-                    producer.sendDeviceRegistered(idCode,deviceCode,askText);
+                    producer.sendDeviceRegistered(idCode,deviceCode,askText,clientIp);
                     String ip = resultMap.get("ip").toString();
                     String port = resultMap.get("port").toString();
                     String answer = "hm+0+0+"+ip+"+"+port+"+8+end";
                     log.info(">>命令0设备编码-应答数据>>" + answer);
                     ctx.writeAndFlush(Unpooled.copiedBuffer(answer.getBytes()));
                     // 发送设备应答消息
-                    producer.sendDeviceAnswer(idCode,answer);
+                    producer.sendDeviceAnswer(idCode,deviceCode,answer);
                 }else{
                     // 发送设备未注册消息
-                    producer.sendDeviceUnregistered(askText);
+                    producer.sendDeviceUnregistered(idCode,askText);
                 }
 //            } else if (cmd.trim().equalsIgnoreCase("1")) {
 //                System.out.println("==>命令1请求 askText>>" + askText.trim());

registration-center/src/main/java/com/huimv/center/service/BizDeviceAnswerFlowService.java

@@ -2,6 +2,9 @@ package com.huimv.center.service;
 
 import com.huimv.center.pojo.BizDeviceAnswerFlow;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.eartag2.common.utils.Result;
+
+import java.text.ParseException;
 
 /**
  * <p>
@@ -13,4 +16,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface BizDeviceAnswerFlowService extends IService<BizDeviceAnswerFlow> {
 
+    Result addDeviceAnswer(String chipId, String deviceCode, String answer) throws ParseException;
+
+    Result removeDeviceAnswer(String ids);
+
+    Result listDeviceAnswer(Integer pageNo, Integer pageSize, String chipId, String deviceCode);
 }

registration-center/src/main/java/com/huimv/center/service/BizDeviceRegisterService.java

@@ -17,13 +17,15 @@ import java.util.Map;
  */
 public interface BizDeviceRegisterService extends IService<BizDeviceRegister> {
 
-    Result add(String chip_id, String device_code, String register_date, String server_ip, String server_port, String remark) throws ParseException;
+    Result add(String chipId, String deviceCode, String serverIp, String serverPort, String remark) throws ParseException;
 
-    Result edit(Integer id, String chip_id, String device_code, String register_date, String server_ip, String server_port, String remark) throws ParseException;
+    Result edit(Integer id, String chipId, String deviceCode, String serverIp, String serverPort, String remark) throws ParseException;
 
     Result remove(String ids);
 
     Result listAll(Integer pageNo,Integer pageSize);
 
     Map getServerAndIpByChipId(String idCode);
+
+    Result updateDeviceRegisterTimes(String chipId) throws ParseException;
 }

registration-center/src/main/java/com/huimv/center/service/BizDeviceRegisteredFlowService.java

@@ -2,6 +2,9 @@ package com.huimv.center.service;
 
 import com.huimv.center.pojo.BizDeviceRegisteredFlow;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.eartag2.common.utils.Result;
+
+import java.text.ParseException;
 
 /**
  * <p>
@@ -13,4 +16,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface BizDeviceRegisteredFlowService extends IService<BizDeviceRegisteredFlow> {
 
+    Result addRegisteredFlow(String chipId, String deviceCode, String clientIp) throws ParseException;
+
+    Result removeDeviceRegisteredFlow(String ids);
+
+    Result listDeviceRegisteredFlow(Integer pageNo, Integer pageSize, String chipId, String deviceCode);
 }

registration-center/src/main/java/com/huimv/center/service/BizDeviceUnregisteredFlowService.java

@@ -2,6 +2,9 @@ package com.huimv.center.service;
 
 import com.huimv.center.pojo.BizDeviceUnregisteredFlow;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.eartag2.common.utils.Result;
+
+import java.text.ParseException;
 
 /**
  * <p>
@@ -13,4 +16,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface BizDeviceUnregisteredFlowService extends IService<BizDeviceUnregisteredFlow> {
 
+    Result addDeviceUnregisteredFlow(String chipId) throws ParseException;
+
+    Result listDeviceUnregisteredFlow(Integer pageNo, Integer pageSize, String chipId);
 }

registration-center/src/main/java/com/huimv/center/service/BizDeviceUnregisteredService.java

@@ -2,6 +2,9 @@ package com.huimv.center.service;
 
 import com.huimv.center.pojo.BizDeviceUnregistered;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.eartag2.common.utils.Result;
+
+import java.text.ParseException;
 
 /**
  * <p>
@@ -13,4 +16,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface BizDeviceUnregisteredService extends IService<BizDeviceUnregistered> {
 
+    Result updateDeviceRegisterTimes(String chipId) throws ParseException;
+
+    Result listDeviceUnregistered(Integer pageNo, Integer pageSize, String chipId);
 }

registration-center/src/main/java/com/huimv/center/service/BizRawDataService.java

@@ -0,0 +1,22 @@
+package com.huimv.center.service;
+
+import com.huimv.center.pojo.BizRawData;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.eartag2.common.utils.Result;
+
+import java.text.ParseException;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author zn
+ * @since 2022-06-23
+ */
+public interface BizRawDataService extends IService<BizRawData> {
+
+    Result addRawData(String askCmd) throws ParseException;
+
+    Result listRawData(Integer pageNo, Integer pageSize, String searchText, String startDate, String endDate);
+}

registration-center/src/main/java/com/huimv/center/service/impl/BizDeviceAnswerFlowServiceImpl.java

@@ -1,11 +1,22 @@
 package com.huimv.center.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.center.pojo.BizDeviceAnswerFlow;
 import com.huimv.center.mapper.BizDeviceAnswerFlowMapper;
+import com.huimv.center.pojo.BizDeviceRegisteredFlow;
 import com.huimv.center.service.BizDeviceAnswerFlowService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.center.utils.IDUtil;
+import com.huimv.eartag2.common.utils.DateUtil;
+import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.common.utils.ResultCode;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.ParseException;
+
 /**
  * <p>
  *  服务实现类
@@ -16,5 +27,76 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class BizDeviceAnswerFlowServiceImpl extends ServiceImpl<BizDeviceAnswerFlowMapper, BizDeviceAnswerFlow> implements BizDeviceAnswerFlowService {
+    @Autowired
+    private BizDeviceAnswerFlowMapper deviceAnswerFlowMapper;
+    @Autowired
+    private com.huimv.center.utils.ResultUtil ResultUtil;
+    @Autowired
+    private IDUtil idUtil;
+
+    /**
+     * @Method      : addDeviceAnswer
+     * @Description : 
+     * @Params      : [chipId, deviceCode, answer]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/23       
+     * @Time        : 19:25
+     */
+    @Override
+    public Result addDeviceAnswer(String chipId, String deviceCode, String answer) throws ParseException {
+        DateUtil dateUtil = new DateUtil();
+        BizDeviceAnswerFlow deviceAnswerFlow = new BizDeviceAnswerFlow();
+        deviceAnswerFlow.setChipId(chipId);
+        deviceAnswerFlow.setDeviceCode(deviceCode);
+        deviceAnswerFlow.setAnswer(answer);
+        deviceAnswerFlow.setAddTime(dateUtil.getTodayDatetime());
+        int rows = deviceAnswerFlowMapper.insert(deviceAnswerFlow);
+        return ResultUtil.result(rows);
+    }
+
+    /**
+     * @Method      : removeDeviceAnswer
+     * @Description : 
+     * @Params      : [ids]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/23       
+     * @Time        : 19:25
+     */
+    @Override
+    public Result removeDeviceAnswer(String ids){
+        int rows = deviceAnswerFlowMapper.deleteBatchIds(idUtil.convert(ids));
+        return ResultUtil.result(rows);
+    }
 
+    /**
+     * @Method      : listDeviceAnswer
+     * @Description : 
+     * @Params      : [pageNo, pageSize, chipId, deviceCode]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/23       
+     * @Time        : 19:33
+     */
+    @Override
+    public Result listDeviceAnswer(Integer pageNo, Integer pageSize, String chipId, String deviceCode){
+        if(pageNo == 0){
+            pageNo = 1;
+        }
+        Page<BizDeviceAnswerFlow> page = new Page<>(pageNo, pageSize);
+        QueryWrapper<BizDeviceAnswerFlow> queryWrapper = new QueryWrapper<>();
+//        if(StringUtils.isNotEmpty(chipId)){
+//            queryWrapper.eq("chip_id", chipId);
+//        }
+        queryWrapper.like(StringUtils.isNotBlank(chipId),"chip_id", chipId);
+        queryWrapper.like(StringUtils.isNotBlank(deviceCode),"device_code", deviceCode);
+        //创建时间降序
+        queryWrapper.orderByDesc("id");
+        Page<BizDeviceAnswerFlow> pageBizDeviceAnswerFlow = deviceAnswerFlowMapper.selectPage(page, queryWrapper);
+        return new Result(ResultCode.SUCCESS,pageBizDeviceAnswerFlow);
+    }
 }

registration-center/src/main/java/com/huimv/center/service/impl/BizDeviceRegisterServiceImpl.java

@@ -7,8 +7,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.center.mapper.BizDeviceRegisterMapper;
 import com.huimv.center.pojo.BizDeviceRegister;
 import com.huimv.center.service.BizDeviceRegisterService;
-import com.huimv.center.utils.DateUtil;
+//import com.huimv.center.utils.DateUtil;
 import com.huimv.center.utils.IDUtil;
+import com.huimv.eartag2.common.utils.DateUtil;
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.common.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,30 +34,53 @@ public class BizDeviceRegisterServiceImpl extends ServiceImpl<BizDeviceRegisterM
     private BizDeviceRegisterMapper bizDeviceRegisterMapper;
     @Autowired
     private com.huimv.center.utils.ResultUtil ResultUtil;
-    @Autowired
-    private DateUtil dateUtil;
+//    @Autowired
+//    private DateUtil dateUtil;
     @Autowired
     private IDUtil idUtil;
 
+    /**
+     * @Method      : add
+     * @Description : 
+     * @Params      : [chipId, deviceCode, serverIp, serverPort, remark]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/23       
+     * @Time        : 20:47
+     */
     @Override
-    public Result add(String chipId, String deviceCode, String registerDate, String serverIp, String serverPort, String remark) throws ParseException {
+    public Result add(String chipId, String deviceCode, String serverIp, String serverPort, String remark) throws ParseException {
+        DateUtil dateUtil = new DateUtil();
         BizDeviceRegister deviceRegister = new BizDeviceRegister();
         deviceRegister.setChipId(chipId);
         deviceRegister.setDeviceCode(deviceCode);
-        deviceRegister.setRegisterDate(dateUtil.dateTextToTimestamp(registerDate));
+        deviceRegister.setRegisterDate(dateUtil.getTodayDatetime());
         deviceRegister.setServerIp(serverIp);
         deviceRegister.setServerPort(serverPort);
         deviceRegister.setRemark(remark);
+        deviceRegister.setAskTimes(0);
         int rows = bizDeviceRegisterMapper.insert(deviceRegister);
         return ResultUtil.result(rows);
     }
 
+    /**
+     * @Method      : edit
+     * @Description : 
+     * @Params      : [id, chipId, deviceCode, serverIp, serverPort, remark]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/23       
+     * @Time        : 21:00
+     */
     @Override
-    public Result edit(Integer id, String chipId, String deviceCode, String registerDate, String serverIp, String serverPort, String remark) throws ParseException {
+    public Result edit(Integer id, String chipId, String deviceCode, String serverIp, String serverPort, String remark) throws ParseException {
+        DateUtil dateUtil = new DateUtil();
         BizDeviceRegister deviceRegister = bizDeviceRegisterMapper.selectById(id);
         deviceRegister.setChipId(chipId);
         deviceRegister.setDeviceCode(deviceCode);
-        deviceRegister.setRegisterDate(dateUtil.dateTextToTimestamp(registerDate));
+        deviceRegister.setRegisterDate(dateUtil.getTodayDatetime());
         deviceRegister.setServerIp(serverIp);
         deviceRegister.setServerPort(serverPort);
         deviceRegister.setRemark(remark);
@@ -75,37 +99,29 @@ public class BizDeviceRegisterServiceImpl extends ServiceImpl<BizDeviceRegisterM
         if(pageNo == 0){
             pageNo = 1;
         }
-        // 分页显示
-//        QueryWrapper queryyWapper = new QueryWrapper<>();
-//        queryyWapper.eq("number","008");
-//        // 两个参数：current的值默认是1，从1开始，不是0。size是每一页的条数。
-//        Page<BizDeviceRegister> page = new Page<>(1, 4);
-//        Page<BizDeviceRegister> userPage = userdao.selectPage(page, queryyWapper);
-//        userPage.getRecords().forEach(System.out::println);
-
         Page<BizDeviceRegister> page = new Page<>(pageNo, pageSize);
-        List<BizDeviceRegister> pageDeviceRegisterList = bizDeviceRegisterMapper.findPage(page);
-        page.setRecords(pageDeviceRegisterList);
-//        page.setRecords(pageDeviceRegisterList).getRecords().forEach(System.out::println);
-        System.out.println("page>>"+page.toString());
-
-//        Page<BizDeviceRegister> page = new Page<>(1, 10);
-//        QueryWrapper<BizDeviceRegister> queryWrapper = new QueryWrapper<>();
-//        queryWrapper.eq("remark", "备注");
-//        Page<BizDeviceRegister> page1 = bizDeviceRegisterMapper.selectPage(page, queryWrapper);
-//        page.setRecords(page1.getRecords()).getRecords().forEach(System.out::println);
-
+        List<BizDeviceRegister> deviceRegisterList = bizDeviceRegisterMapper.findPage(page);
+        page.setRecords(deviceRegisterList);
         return new Result(ResultCode.SUCCESS,page);
     }
 
+    /**
+     * @Method      : getServerAndIpByChipId
+     * @Description : 
+     * @Params      : [idCode]
+     * @Return      : java.util.Map
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/23       
+     * @Time        : 20:45
+     */
     @Override
     public Map getServerAndIpByChipId(String idCode) {
         QueryWrapper<BizDeviceRegister> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("chip_id", idCode);
         queryWrapper.orderByDesc("id");
         queryWrapper.last("LIMIT 1");
-//        BizDeviceRegister deviceRegister = bizDeviceRegisterMapper.selectOne(queryWrapper);
-//        System.out.println("deviceRegister>>"+deviceRegister.toString());
+        // 查询注册设备
         List<BizDeviceRegister> deviceRegisterList = bizDeviceRegisterMapper.selectList(queryWrapper);
         Map resultMap = new HashMap();
         if(deviceRegisterList.size() > 0){
@@ -117,4 +133,34 @@ public class BizDeviceRegisterServiceImpl extends ServiceImpl<BizDeviceRegisterM
         }
         return resultMap;
     }
+
+    /**
+     * @Method      : updateDeviceRegisterTimes
+     * @Description : 
+     * @Params      : [chipId]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/23       
+     * @Time        : 20:45
+     */
+    @Override
+    public Result updateDeviceRegisterTimes(String chipId) throws ParseException {
+        DateUtil dateUtil = new DateUtil();
+        QueryWrapper<BizDeviceRegister> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("chip_id", chipId);
+        // 查询注册设备
+        BizDeviceRegister deviceRegister = bizDeviceRegisterMapper.selectOne(queryWrapper);
+        if(deviceRegister.getFirstTime() == null){
+            deviceRegister.setFirstTime(dateUtil.getTodayDatetime());
+        }
+        deviceRegister.setLastTime(dateUtil.getTodayDatetime());
+        Integer times = deviceRegister.getAskTimes();
+        if(times == null){
+            times = 0;
+        }
+        deviceRegister.setAskTimes(++times);
+        int rows = bizDeviceRegisterMapper.updateById(deviceRegister);
+        return ResultUtil.result(rows);
+    }
 }

registration-center/src/main/java/com/huimv/center/service/impl/BizDeviceRegisteredFlowServiceImpl.java

@@ -1,11 +1,21 @@
 package com.huimv.center.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.center.pojo.BizDeviceRegisteredFlow;
 import com.huimv.center.mapper.BizDeviceRegisteredFlowMapper;
 import com.huimv.center.service.BizDeviceRegisteredFlowService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.center.utils.IDUtil;
+import com.huimv.eartag2.common.utils.DateUtil;
+import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.common.utils.ResultCode;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.ParseException;
+
 /**
  * <p>
  *  服务实现类
@@ -16,5 +26,77 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class BizDeviceRegisteredFlowServiceImpl extends ServiceImpl<BizDeviceRegisteredFlowMapper, BizDeviceRegisteredFlow> implements BizDeviceRegisteredFlowService {
+    @Autowired
+    private BizDeviceRegisteredFlowMapper deviceRegisteredFlowMapper;
+    @Autowired
+    private com.huimv.center.utils.ResultUtil ResultUtil;
+    @Autowired
+    private IDUtil idUtil;
+
+    /**
+     * @Method      : addRegisteredFlow
+     * @Description : 添加流水
+     * @Params      : [chipId, deviceCode, clientIp]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     *
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/23
+     * @Time        : 17:07
+     */
+    @Override
+    public Result addRegisteredFlow(String chipId,String deviceCode,String clientIp) throws ParseException {
+        DateUtil dateUtil = new DateUtil();
+        BizDeviceRegisteredFlow deviceRegisteredFlow = new BizDeviceRegisteredFlow();
+        deviceRegisteredFlow.setChipId(chipId);
+        deviceRegisteredFlow.setDeviceCode(deviceCode);
+        deviceRegisteredFlow.setClientIp(clientIp);
+        deviceRegisteredFlow.setAddTime(dateUtil.getTodayDatetime());
+        int rows = deviceRegisteredFlowMapper.insert(deviceRegisteredFlow);
+        return ResultUtil.result(rows);
+    }
+
+    /**
+     * @Method      : removeRegisteredFlow
+     * @Description : 
+     * @Params      : [ids]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/23       
+     * @Time        : 17:29
+     */
+    @Override
+    public Result removeDeviceRegisteredFlow(String ids){
+        int rows = deviceRegisteredFlowMapper.deleteBatchIds(idUtil.convert(ids));
+        return ResultUtil.result(rows);
+    }
+
+    /**
+     * @Method      : listDeviceRegisteredFlow
+     * @Description : 
+     * @Params      : [pageNo, pageSize, chipId]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/23       
+     * @Time        : 18:01
+     */
+    @Override
+    public Result listDeviceRegisteredFlow(Integer pageNo, Integer pageSize, String chipId, String deviceCode){
+        if(pageNo == 0){
+            pageNo = 1;
+        }
+        Page<BizDeviceRegisteredFlow> page = new Page<>(pageNo, pageSize);
+        QueryWrapper<BizDeviceRegisteredFlow> queryWrapper = new QueryWrapper<>();
+//        if(StringUtils.isNotEmpty(chipId)){
+//            queryWrapper.eq("chip_id", chipId);
+//        }
+        queryWrapper.like(StringUtils.isNotBlank(chipId),"chip_id", chipId);
+        queryWrapper.like(StringUtils.isNotBlank(deviceCode),"device_code", deviceCode);
+        //创建时间降序
+        queryWrapper.orderByDesc("id");
+        Page<BizDeviceRegisteredFlow> pageBizDeviceRegisteredFlow = deviceRegisteredFlowMapper.selectPage(page, queryWrapper);
+        return new Result(ResultCode.SUCCESS,pageBizDeviceRegisteredFlow);
+    }
 
 }

registration-center/src/main/java/com/huimv/center/service/impl/BizDeviceUnregisteredFlowServiceImpl.java

@@ -1,11 +1,23 @@
 package com.huimv.center.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.center.mapper.BizDeviceAnswerFlowMapper;
+import com.huimv.center.pojo.BizDeviceAnswerFlow;
 import com.huimv.center.pojo.BizDeviceUnregisteredFlow;
 import com.huimv.center.mapper.BizDeviceUnregisteredFlowMapper;
 import com.huimv.center.service.BizDeviceUnregisteredFlowService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.center.utils.IDUtil;
+import com.huimv.eartag2.common.utils.DateUtil;
+import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.common.utils.ResultCode;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.ParseException;
+
 /**
  * <p>
  *  服务实现类
@@ -16,5 +28,54 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class BizDeviceUnregisteredFlowServiceImpl extends ServiceImpl<BizDeviceUnregisteredFlowMapper, BizDeviceUnregisteredFlow> implements BizDeviceUnregisteredFlowService {
+    @Autowired
+    private BizDeviceUnregisteredFlowMapper deviceUnregisteredFlowMapper;
+    @Autowired
+    private com.huimv.center.utils.ResultUtil ResultUtil;
+    @Autowired
+    private IDUtil idUtil;
+
+    /**
+     * @Method      : addDeviceUnregisteredFlow
+     * @Description : 
+     * @Params      : [chipId]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/23       
+     * @Time        : 20:22
+     */
+    @Override
+    public Result addDeviceUnregisteredFlow(String chipId) throws ParseException {
+        DateUtil dateUtil = new DateUtil();
+        BizDeviceUnregisteredFlow deviceUnregisteredFlow = new BizDeviceUnregisteredFlow();
+        deviceUnregisteredFlow.setChipId(chipId);
+        deviceUnregisteredFlow.setAddTime(dateUtil.getTodayDatetime());
+        int rows = deviceUnregisteredFlowMapper.insert(deviceUnregisteredFlow);
+        return ResultUtil.result(rows);
+    }
 
+    /**
+     * @Method      : listDeviceUnregisteredFlow
+     * @Description : 
+     * @Params      : [pageNo, pageSize, chipId]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/23       
+     * @Time        : 20:22
+     */
+    @Override
+    public Result listDeviceUnregisteredFlow(Integer pageNo, Integer pageSize, String chipId){
+        if(pageNo == 0){
+            pageNo = 1;
+        }
+        Page<BizDeviceUnregisteredFlow> page = new Page<>(pageNo, pageSize);
+        QueryWrapper<BizDeviceUnregisteredFlow> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotBlank(chipId),"chip_id", chipId);
+        //创建时间降序
+        queryWrapper.orderByDesc("id");
+        Page<BizDeviceUnregisteredFlow> pageBizDeviceUnregisteredFlow = deviceUnregisteredFlowMapper.selectPage(page, queryWrapper);
+        return new Result(ResultCode.SUCCESS,pageBizDeviceUnregisteredFlow);
+    }
 }

registration-center/src/main/java/com/huimv/center/service/impl/BizDeviceUnregisteredServiceImpl.java

@@ -1,11 +1,22 @@
 package com.huimv.center.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.center.pojo.BizDeviceAnswerFlow;
+import com.huimv.center.pojo.BizDeviceRegister;
 import com.huimv.center.pojo.BizDeviceUnregistered;
 import com.huimv.center.mapper.BizDeviceUnregisteredMapper;
 import com.huimv.center.service.BizDeviceUnregisteredService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.eartag2.common.utils.DateUtil;
+import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.common.utils.ResultCode;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.ParseException;
+
 /**
  * <p>
  *  服务实现类
@@ -16,5 +27,70 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class BizDeviceUnregisteredServiceImpl extends ServiceImpl<BizDeviceUnregisteredMapper, BizDeviceUnregistered> implements BizDeviceUnregisteredService {
+    @Autowired
+    private BizDeviceUnregisteredMapper deviceUnregisteredMapper;
+    @Autowired
+    private com.huimv.center.utils.ResultUtil ResultUtil;
+
+    /**
+     * @Method      : updateDeviceRegisterTimes
+     * @Description : 
+     * @Params      : [chipId]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/23       
+     * @Time        : 20:16
+     */
+    @Override
+    public Result updateDeviceRegisterTimes(String chipId) throws ParseException {
+        DateUtil dateUtil = new DateUtil();
+        QueryWrapper<BizDeviceUnregistered> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("chip_id", chipId);
+        // 查询注册设备
+        BizDeviceUnregistered deviceRegister = deviceUnregisteredMapper.selectOne(queryWrapper);
+        int rows = 0;
+        if(deviceRegister == null){
+            BizDeviceUnregistered newDeviceUnregistered = new BizDeviceUnregistered();
+            newDeviceUnregistered.setChipId(chipId);
+            newDeviceUnregistered.setAskTimes(1);
+            newDeviceUnregistered.setFirstTime(dateUtil.getTodayDatetime());
+            newDeviceUnregistered.setLastTime(dateUtil.getTodayDatetime());
+            rows = deviceUnregisteredMapper.insert(newDeviceUnregistered);
+        }else{
+            Integer times = deviceRegister.getAskTimes();
+            if(times == null){
+                times = 0;
+            }
+            deviceRegister.setAskTimes(++times);
+            deviceRegister.setLastTime(dateUtil.getTodayDatetime());
+            rows = deviceUnregisteredMapper.updateById(deviceRegister);
+        }
+        return ResultUtil.result(rows);
+    }
+
+    /**
+     * @Method      : listDeviceUnregistered
+     * @Description : 
+     * @Params      : [pageNo, pageSize, chipId]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/23       
+     * @Time        : 20:22
+     */
+    @Override
+    public Result listDeviceUnregistered(Integer pageNo,Integer pageSize,String chipId){
+        if(pageNo == 0){
+            pageNo = 1;
+        }
+        Page<BizDeviceUnregistered> page = new Page<>(pageNo, pageSize);
+        QueryWrapper<BizDeviceUnregistered> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotBlank(chipId),"chip_id", chipId);
+        //创建时间降序
+        queryWrapper.orderByDesc("id");
+        Page<BizDeviceUnregistered> pageBizDeviceUnregistered = deviceUnregisteredMapper.selectPage(page, queryWrapper);
+        return new Result(ResultCode.SUCCESS,pageBizDeviceUnregistered);
+    }
 
 }

registration-center/src/main/java/com/huimv/center/service/impl/BizRawDataServiceImpl.java

@@ -0,0 +1,87 @@
+package com.huimv.center.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.center.pojo.BizDeviceUnregisteredFlow;
+import com.huimv.center.pojo.BizRawData;
+import com.huimv.center.mapper.BizRawDataMapper;
+import com.huimv.center.service.BizRawDataService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.eartag2.common.utils.DateUtil;
+import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.common.utils.ResultCode;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zn
+ * @since 2022-06-23
+ */
+@Service
+public class BizRawDataServiceImpl extends ServiceImpl<BizRawDataMapper, BizRawData> implements BizRawDataService {
+    @Autowired
+    private BizRawDataMapper BizRawDataMapper;
+    @Autowired
+    private com.huimv.center.utils.ResultUtil ResultUtil;
+    @Autowired
+    private com.huimv.center.utils.DateUtil dateUtil;
+
+    /**
+     * @Method      : addRawData
+     * @Description : 
+     * @Params      : [askCmd]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/23       
+     * @Time        : 21:04
+     */
+    @Override
+    public Result addRawData(String askCmd) throws ParseException {
+        DateUtil dateUtil = new DateUtil();
+        BizRawData bizRawData = new BizRawData();
+        bizRawData.setAskCmd(askCmd);
+        bizRawData.setAddTime(dateUtil.getTodayDatetime());
+        int rows = BizRawDataMapper.insert(bizRawData);
+        return ResultUtil.result(rows);
+    }
+
+    /**
+     * @Method      : listRawData
+     * @Description : 
+     * @Params      : [pageNo, pageSize, searchText]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/23       
+     * @Time        : 21:04
+     */
+    @Override
+    public Result listRawData(Integer pageNo, Integer pageSize, String searchText,String startDate,String endDate){
+        if(pageNo == 0){
+            pageNo = 1;
+        }
+        startDate = dateUtil.buildStartDate(startDate);
+        endDate = dateUtil.buildEndDate(endDate);
+        System.out.println("startDate>>"+startDate);
+        System.out.println("endDate>>"+endDate);
+        Page<BizRawData> page = new Page<>(pageNo, pageSize);
+        QueryWrapper<BizRawData> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotBlank(searchText),"ask_cmd", searchText);
+        queryWrapper.ge(StringUtils.isNotBlank(startDate),"add_time",startDate);
+        queryWrapper.le(StringUtils.isNotBlank(endDate),"add_time",endDate);
+        //创建时间降序
+        queryWrapper.orderByDesc("id");
+        Page<BizRawData> pageBizRawData = BizRawDataMapper.selectPage(page, queryWrapper);
+        return new Result(ResultCode.SUCCESS,pageBizRawData);
+    }
+
+
+}

registration-center/src/main/java/com/huimv/center/utils/Const.java

@@ -29,4 +29,7 @@ public class Const {
     public final static String EXCHANGE_SYNC_DEVICE = "topic.syncDevice.exchange";
     public final static String ROUTING_KEY_SYNC_DEVICE = "topic.syncDevice.routeKey";
 
+    public static final String QUEUE_ASK_CMD = "topic.askCmd.queue";
+    public final static String EXCHANGE_ASK_CMD = "topic.askCmd.exchange";
+    public final static String ROUTING_KEY_ASK_CMD = "topic.askCmd.routeKey";
 }

registration-center/src/main/java/com/huimv/center/utils/DateUtil.java

@@ -1,5 +1,6 @@
 package com.huimv.center.utils;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.sql.Timestamp;
@@ -22,4 +23,40 @@ public class DateUtil {
         DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         return new Timestamp(sdf.parse(date).getTime());
     }
+
+    /**
+     * @Method      : buildEndDate
+     * @Description :
+     * @Params      : [endDate]
+     * @Return      : java.lang.String
+     *
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/23
+     * @Time        : 21:46
+     */
+    public String buildEndDate(String endDate) {
+        if(StringUtils.isNotBlank(endDate)) {
+            return endDate + " 23:59:59";
+        }else{
+            return endDate;
+        }
+    }
+
+    /**
+     * @Method      : buildStartDate
+     * @Description :
+     * @Params      : [startDate]
+     * @Return      : java.lang.String
+     *
+     * @Author      : ZhuoNing
+     * @Date        : 2022/6/23
+     * @Time        : 21:46
+     */
+    public String buildStartDate(String startDate) {
+        if(StringUtils.isNotBlank(startDate)){
+            return startDate+" 00:00:00";
+        }else{
+            return startDate;
+        }
+    }
 }

registration-center/src/main/resources/application-dev.yml

@@ -9,13 +9,13 @@ spring:
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
-  jpa:
-    show-sql: true
-    database: mysql
-    hibernate:
-      ddl-auto: update
-    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
-    open-in-view: true
+#  jpa:
+#    show-sql: true
+#    database: mysql
+#    hibernate:
+#      ddl-auto: update
+#    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+#    open-in-view: true
 
     #配置rabbitMq 服务器
     #  rabbitmq:
@@ -109,3 +109,4 @@ mybatis-plus:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
   # mapper.xml文件所存放的位置
   mapper-locations: classpath*:com/huimv/center/mapper/xml/*.xml  # 不加这一行出错：“org.apache.ibatis.binding.BindingException:  Invalid bound statement (not found)”
+#  mapper-locations: classpath:com/huimv/center/mappers/**/*Mapper.xml

registration-center/src/main/resources/application-pool1.yml

@@ -0,0 +1,144 @@
+server:
+  port: 9090
+spring:
+  application:
+    name: huimv-registration
+
+  datasource:
+    url: jdbc:mysql://192.168.1.7:3306/huimv_registration_center?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: hm123456
+#    driver-class-name: com.mysql.cj.jdbc.Driver
+    type: com.alibaba.druid.pool.DruidDataSource
+    #连接池
+    druid:
+      defaultAutoCommit: false
+      defaultReadOnly: false
+      #初始化大小
+      initialSize: 2
+      #最大值
+      maxActive: 5
+      #最小值
+      minIdle: 2
+      #配置间隔多久才进行一次检测，检测需要关闭的空闲连接
+      timeBetweenEvictionRunsMillis: 18000
+      #配置一个连接在池中最小生存的时间
+      minEvictableIdleTimeMillis: 600000
+      maxEvictableIdleTimeMillis: 1200000
+      poolPreparedStatements: true
+      maxOpenPreparedStatements: 100
+      testOnBorrow: true
+      testOnReturn: true
+      testWhileIdle: true
+      validationQuery: select 1
+      removeAbandonedOnBorrow: true
+      removeAbandoned: true
+      removeAbandonedOnMaintenance: true
+      removeAbandonedTimeout: 300
+      maxWaitMillis: 3000
+      keepalive: true
+      phyMaxUseCount: 2000
+      #'wall'用于防火墙，SpringBoot中没有log4j，我改成了log4j2
+      filters: stat,log4j2,config
+
+#  jpa:
+#    show-sql: true
+#    database: mysql
+#    hibernate:
+#      ddl-auto: update
+#    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+#    open-in-view: true
+
+    #配置rabbitMq 服务器
+    #  rabbitmq:
+    #    host: 10.0.0.4
+    #    port: 5672
+    #    username: huimv
+    #    password: hm123456
+    #    #虚拟host 可以不设置,使用server默认host
+    #    virtual-host: /
+    #redis
+    #  redis:
+    #    database: 0
+    #    host: 192.168.1.68
+    #    port: 6379
+    #    password: hm123456
+    #    timeout: 5000ms
+    #    jedis:
+    #      pool:
+    #        max-active: 20
+    #        max-wait: -1
+    #        max-idle: 10
+    #        min-idle: 0
+    #    lettuce:
+    #      pool:
+    #        max-active: 3
+    #        min-idle: 2
+    #        max-idle: 3
+    #        max-wait: 1
+    #      shutdown-timeout: 100
+
+    #  data:
+    #    redis:
+    #      repositories:
+    #        enabled: false
+
+    #是否缓存空值
+    #  cache:
+    #    redis:
+    #      cache-null-values: false
+    #server:
+  #  port: 9110
+  #spring:
+  #  application:
+  #    name: huimv-hy-autoGetData
+  #
+  #  datasource:
+  ##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+  #    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+  #        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+  #    username: root
+  #    password: hm123456
+  #    driver-class-name: com.mysql.cj.jdbc.Driver
+  #  jpa:
+  #    properties:
+  #      hibernate:
+  #        enable_lazy_load_no_trans: true
+  #    show-sql: true
+  #    database: mysql
+  #    hibernate:
+  #      ddl-auto: update
+  #    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+  #    open-in-view: true
+
+  rabbitmq:
+    host: 121.36.134.218
+    port: 5672
+    username: admin
+    password: admin
+    #虚拟host 可以不设置,使用server默认host
+    virtual-host: /registration_center
+    listener:
+      simple:
+        acknowledge-mode: none
+
+  #redis
+  redis:
+    database: 0
+    host: 121.36.134.218
+    port: 6379
+    password: hm123456
+    timeout: 5000ms
+    jedis:
+      pool:
+        max-active: 20
+        max-wait: -1
+        max-idle: 10
+        min-idle: 0
+
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  # mapper.xml文件所存放的位置
+  mapper-locations: classpath*:com/huimv/center/mapper/xml/*.xml  # 不加这一行出错：“org.apache.ibatis.binding.BindingException:  Invalid bound statement (not found)”
+#  mapper-locations: classpath:com/huimv/center/mappers/**/*Mapper.xml

registration-center/src/main/resources/application.properties

@@ -1,4 +1,4 @@
-spring.profiles.active=dev
+spring.profiles.active=pool1
 
 #¿ªÆô½¡¿µ¼à¿Ø
 management.endpoints.web.exposure.include=*

registration-center/src/test/java/com/huimv/center/service/BizDeviceAnswerFlowServiceTest.java

@@ -0,0 +1,51 @@
+package com.huimv.center.service;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.center.pojo.BizDeviceAnswerFlow;
+import com.huimv.eartag2.common.utils.Result;
+import org.junit.Test;
+import org.junit.jupiter.api.TestTemplate;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.List;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@SpringBootTest
+@RunWith(SpringRunner.class)
+public class BizDeviceAnswerFlowServiceTest {
+    @Autowired
+    private BizDeviceAnswerFlowService deviceAnswerFlowService;
+
+    @Test
+    public void testListDeviceAnswer(){
+        Integer pageNo = 1;
+        Integer pageSize = 10;
+        String chipId = "";
+        chipId = "869401041283458";
+        String deviceCode = "";
+        deviceCode = "hz001b";
+        Result result = deviceAnswerFlowService.listDeviceAnswer(pageNo, pageSize, chipId,deviceCode);
+        System.out.println("isSuccess>>"+result.isSuccess());
+        Page page = (Page) result.getData();
+        System.out.println(page.getTotal());
+        System.out.println(page.getPages());
+        System.out.println(page.getCurrent());
+        System.out.println(page.getSize());
+        List<BizDeviceAnswerFlow> listBizDeviceAnswerFlow = page.getRecords();
+        System.out.println("listBizDeviceAnswerFlow.size="+listBizDeviceAnswerFlow.size());
+        for(BizDeviceAnswerFlow BizDeviceAnswerFlow:listBizDeviceAnswerFlow){
+            System.out.println(""+BizDeviceAnswerFlow);
+        }
+    }
+}

registration-center/src/test/java/com/huimv/center/service/BizDeviceRegisterTest.java

@@ -1,5 +1,6 @@
 package com.huimv.center.service;
 
+import cn.hutool.core.text.csv.CsvUtil;
 import com.huimv.center.utils.DateUtil;
 import com.huimv.eartag2.common.utils.Result;
 import org.junit.Test;
@@ -53,7 +54,7 @@ public class BizDeviceRegisterTest {
         String serverIp = "192.168.1.5";
         String serverPort = "10023";
         String remark = "备注";
-        Result result = bizDeviceRegisterService.add( chipId,  deviceCode,  registerDate,  serverIp,  serverPort,  remark);
+        Result result = bizDeviceRegisterService.add( chipId,  deviceCode,  serverIp,  serverPort,  remark);
         System.out.println("result>>"+result);
     }
 
@@ -61,8 +62,16 @@ public class BizDeviceRegisterTest {
     public void testGetServerAndIpByChipId(){
         String chipId = "123";
         bizDeviceRegisterService.getServerAndIpByChipId(chipId);
+    }
 
+    @Test
+    public void testUpdateDeviceRegisterTimes() throws ParseException {
+        String chipId = "869401041283458";
+        Result result = bizDeviceRegisterService.updateDeviceRegisterTimes(chipId);
+        System.out.println("result>>"+result.getCode());
+        System.out.println(""+result.isSuccess());
     }
 
 
+
 }

registration-center/src/test/java/com/huimv/center/service/BizDeviceRegisteredFlowServiceTest.java

@@ -0,0 +1,39 @@
+package com.huimv.center.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.eartag2.common.utils.Result;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.List;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@SpringBootTest
+@RunWith(SpringRunner.class)
+public class BizDeviceRegisteredFlowServiceTest {
+    @Autowired
+    private BizDeviceRegisteredFlowService deviceRegisteredFlowService;
+
+    @Test
+    public void testListDeviceRegisteredFlow(){
+        Integer pageNo = 1;
+        Integer pageSize = 10;
+        String chipId = "";
+        String deviceCode = "hz001b";
+        Result result = deviceRegisteredFlowService.listDeviceRegisteredFlow( pageNo, pageSize, chipId,deviceCode);
+        System.out.println("isSuccess>>"+result.isSuccess());
+        Page page = (Page) result.getData();
+        List list = page.getRecords();
+        System.out.println("list.size="+list.size());
+    }
+}

registration-center/src/test/java/com/huimv/center/service/BizRawDataServiceTest.java

@@ -0,0 +1,35 @@
+package com.huimv.center.service;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@SpringBootTest
+@RunWith(SpringRunner.class)
+public class BizRawDataServiceTest {
+    @Autowired
+    private BizRawDataService bizRawDataService;
+
+    @Test
+    public void testList(){
+        Integer pageNo = 1;
+        Integer pageSize = 10;
+        String askText = "";
+        String startDate = "";
+        startDate = "2022-06-19";
+        String endDate = "";
+//        endDate = "2022-06-20";
+
+        bizRawDataService.listRawData(pageNo,pageSize,askText,startDate,endDate);
+    }
+}

registration-center/target/classes/application-dev.yml

@@ -9,13 +9,13 @@ spring:
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
-  jpa:
-    show-sql: true
-    database: mysql
-    hibernate:
-      ddl-auto: update
-    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
-    open-in-view: true
+#  jpa:
+#    show-sql: true
+#    database: mysql
+#    hibernate:
+#      ddl-auto: update
+#    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+#    open-in-view: true
 
     #配置rabbitMq 服务器
     #  rabbitmq:
@@ -109,3 +109,4 @@ mybatis-plus:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
   # mapper.xml文件所存放的位置
   mapper-locations: classpath*:com/huimv/center/mapper/xml/*.xml  # 不加这一行出错：“org.apache.ibatis.binding.BindingException:  Invalid bound statement (not found)”
+#  mapper-locations: classpath:com/huimv/center/mappers/**/*Mapper.xml

registration-center/target/classes/application-pool1.yml

@@ -0,0 +1,144 @@
+server:
+  port: 9090
+spring:
+  application:
+    name: huimv-registration
+
+  datasource:
+    url: jdbc:mysql://192.168.1.7:3306/huimv_registration_center?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: hm123456
+#    driver-class-name: com.mysql.cj.jdbc.Driver
+    type: com.alibaba.druid.pool.DruidDataSource
+    #连接池
+    druid:
+      defaultAutoCommit: false
+      defaultReadOnly: false
+      #初始化大小
+      initialSize: 2
+      #最大值
+      maxActive: 5
+      #最小值
+      minIdle: 2
+      #配置间隔多久才进行一次检测，检测需要关闭的空闲连接
+      timeBetweenEvictionRunsMillis: 18000
+      #配置一个连接在池中最小生存的时间
+      minEvictableIdleTimeMillis: 600000
+      maxEvictableIdleTimeMillis: 1200000
+      poolPreparedStatements: true
+      maxOpenPreparedStatements: 100
+      testOnBorrow: true
+      testOnReturn: true
+      testWhileIdle: true
+      validationQuery: select 1
+      removeAbandonedOnBorrow: true
+      removeAbandoned: true
+      removeAbandonedOnMaintenance: true
+      removeAbandonedTimeout: 300
+      maxWaitMillis: 3000
+      keepalive: true
+      phyMaxUseCount: 2000
+      #'wall'用于防火墙，SpringBoot中没有log4j，我改成了log4j2
+      filters: stat,log4j2,config
+
+#  jpa:
+#    show-sql: true
+#    database: mysql
+#    hibernate:
+#      ddl-auto: update
+#    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+#    open-in-view: true
+
+    #配置rabbitMq 服务器
+    #  rabbitmq:
+    #    host: 10.0.0.4
+    #    port: 5672
+    #    username: huimv
+    #    password: hm123456
+    #    #虚拟host 可以不设置,使用server默认host
+    #    virtual-host: /
+    #redis
+    #  redis:
+    #    database: 0
+    #    host: 192.168.1.68
+    #    port: 6379
+    #    password: hm123456
+    #    timeout: 5000ms
+    #    jedis:
+    #      pool:
+    #        max-active: 20
+    #        max-wait: -1
+    #        max-idle: 10
+    #        min-idle: 0
+    #    lettuce:
+    #      pool:
+    #        max-active: 3
+    #        min-idle: 2
+    #        max-idle: 3
+    #        max-wait: 1
+    #      shutdown-timeout: 100
+
+    #  data:
+    #    redis:
+    #      repositories:
+    #        enabled: false
+
+    #是否缓存空值
+    #  cache:
+    #    redis:
+    #      cache-null-values: false
+    #server:
+  #  port: 9110
+  #spring:
+  #  application:
+  #    name: huimv-hy-autoGetData
+  #
+  #  datasource:
+  ##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+  #    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+  #        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+  #    username: root
+  #    password: hm123456
+  #    driver-class-name: com.mysql.cj.jdbc.Driver
+  #  jpa:
+  #    properties:
+  #      hibernate:
+  #        enable_lazy_load_no_trans: true
+  #    show-sql: true
+  #    database: mysql
+  #    hibernate:
+  #      ddl-auto: update
+  #    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+  #    open-in-view: true
+
+  rabbitmq:
+    host: 121.36.134.218
+    port: 5672
+    username: admin
+    password: admin
+    #虚拟host 可以不设置,使用server默认host
+    virtual-host: /registration_center
+    listener:
+      simple:
+        acknowledge-mode: none
+
+  #redis
+  redis:
+    database: 0
+    host: 121.36.134.218
+    port: 6379
+    password: hm123456
+    timeout: 5000ms
+    jedis:
+      pool:
+        max-active: 20
+        max-wait: -1
+        max-idle: 10
+        min-idle: 0
+
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  # mapper.xml文件所存放的位置
+  mapper-locations: classpath*:com/huimv/center/mapper/xml/*.xml  # 不加这一行出错：“org.apache.ibatis.binding.BindingException:  Invalid bound statement (not found)”
+#  mapper-locations: classpath:com/huimv/center/mappers/**/*Mapper.xml

registration-center/target/classes/application.properties

@@ -1,4 +1,4 @@
-spring.profiles.active=dev
+spring.profiles.active=pool1
 
 #¿ªÆô½¡¿µ¼à¿Ø
 management.endpoints.web.exposure.include=*

registration-center/target/classes/com/huimv/center/mapper/xml/BizDeviceRegisterMapper.xml

@@ -14,7 +14,7 @@
         <result column="first_time" property="firstTime" />
         <result column="last_time" property="lastTime" />
         <result column="remark" property="remark" />
-        <result column="times" property="ask_times" />
+        <result column="times" property="askTimes" />
     </resultMap>
 
     <!-- 通用查询结果列 -->

registration-center/target/classes/com/huimv/center/mapper/xml/BizRawDataMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.center.mapper.BizRawDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.center.pojo.BizRawData">
+        <id column="id" property="id" />
+        <result column="ask_cmd" property="askCmd" />
+        <result column="add_time" property="addTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, ask_cmd, add_time
+    </sql>
+
+</mapper>

registration-center/target/maven-archiver/pom.properties

@@ -0,0 +1,3 @@
+artifactId=registration-center
+groupId=org.example
+version=1.0-SNAPSHOT

registration-center/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,60 @@
+com\huimv\center\listener\DeviceListener.class
+com\huimv\center\HuimvRegistrationCenterApplication.class
+com\huimv\center\service\impl\BizDeviceUnregisteredServiceImpl.class
+com\huimv\center\controller\BizRawDataController.class
+com\huimv\center\service\impl\BizDeviceAnswerFlowServiceImpl.class
+com\huimv\center\pojo\BizDeviceUnregisteredFlow.class
+com\huimv\center\service\impl\BizDeviceRegisterServiceImpl.class
+com\huimv\center\service\impl\BizTransferHistoryServiceImpl.class
+com\huimv\center\service\BizDeviceRegisteredFlowService.class
+com\huimv\center\pojo\BizDeviceAnswerFlow.class
+com\huimv\center\controller\BizDeviceRegisteredFlowController.class
+com\huimv\center\controller\BizTransferHistoryController.class
+com\huimv\center\pojo\BizDeviceRegister.class
+com\huimv\center\service\BizDeviceRegisterService.class
+com\huimv\center\mapper\BizDeviceUnregisteredMapper.class
+com\huimv\center\server\RegisterServerHandler.class
+com\huimv\center\service\BizDeviceUnregisteredFlowService.class
+com\huimv\center\utils\Constant.class
+com\huimv\center\mapper\BizRawDataMapper.class
+com\huimv\center\service\impl\BizDeviceUnregisteredFlowServiceImpl.class
+com\huimv\center\pojo\BizRawData.class
+com\huimv\center\utils\Constant$MenuType.class
+com\huimv\center\service\BizTransferHistoryService.class
+com\huimv\center\utils\ResultUtil.class
+com\huimv\center\pojo\BizDeviceUnregistered.class
+com\huimv\center\mapper\BizTransferHistoryMapper.class
+com\huimv\center\controller\BizDeviceUnregisteredController.class
+com\huimv\center\service\BizDeviceUnregisteredService.class
+com\huimv\center\mapper\BizDeviceRegisterMapper.class
+com\huimv\center\mapper\BizDeviceUnregisteredFlowMapper.class
+com\huimv\center\utils\Constant$ScheduleStatus.class
+com\huimv\center\service\impl\BizFarmServiceImpl.class
+com\huimv\center\utils\Constant$CloudService.class
+com\huimv\center\producer\Producer.class
+com\huimv\center\service\BizDeviceAnswerFlowService.class
+com\huimv\center\pojo\BizDeviceRegisteredFlow.class
+com\huimv\center\config\MybatisPlusConfig.class
+com\huimv\center\mapper\BizDeviceAnswerFlowMapper.class
+com\huimv\center\service\BizFarmService.class
+com\huimv\center\result\RRException.class
+com\huimv\center\server\RegisterServer.class
+com\huimv\center\controller\BizDeviceAnswerFlowController.class
+com\huimv\center\mapper\BizDeviceRegisteredFlowMapper.class
+com\huimv\center\pojo\BizTransferHistory.class
+com\huimv\center\utils\SQLFilter.class
+com\huimv\center\controller\BizFarmController.class
+com\huimv\center\mapper\BizFarmMapper.class
+com\huimv\center\utils\Query.class
+com\huimv\center\controller\BizDeviceRegisterController.class
+com\huimv\center\utils\Const.class
+com\huimv\center\utils\IDUtil.class
+com\huimv\center\service\BizRawDataService.class
+com\huimv\center\server\RegisterServer$1.class
+com\huimv\center\pojo\BizFarm.class
+com\huimv\center\utils\RegexUtil.class
+com\huimv\center\config\TopicRabbitMQConfig.class
+com\huimv\center\controller\BizDeviceUnregisteredFlowController.class
+com\huimv\center\service\impl\BizDeviceRegisteredFlowServiceImpl.class
+com\huimv\center\service\impl\BizRawDataServiceImpl.class
+com\huimv\center\utils\DateUtil.class

registration-center/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,56 @@
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\config\TopicRabbitMQConfig.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\service\impl\BizDeviceAnswerFlowServiceImpl.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\utils\Query.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\config\MybatisPlusConfig.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\mapper\BizDeviceUnregisteredMapper.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\service\BizDeviceUnregisteredFlowService.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\service\BizDeviceAnswerFlowService.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\service\impl\BizFarmServiceImpl.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\server\RegisterServerHandler.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\service\impl\BizRawDataServiceImpl.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\service\BizDeviceUnregisteredService.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\service\impl\BizDeviceUnregisteredFlowServiceImpl.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\utils\Constant.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\controller\BizTransferHistoryController.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\service\BizDeviceRegisteredFlowService.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\mapper\BizRawDataMapper.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\pojo\BizTransferHistory.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\controller\BizDeviceUnregisteredFlowController.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\controller\BizDeviceAnswerFlowController.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\mapper\BizTransferHistoryMapper.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\server\RegisterServer.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\pojo\BizDeviceRegister.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\service\BizDeviceRegisterService.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\service\impl\BizDeviceUnregisteredServiceImpl.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\controller\BizDeviceRegisterController.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\controller\BizDeviceUnregisteredController.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\mapper\BizDeviceAnswerFlowMapper.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\listener\DeviceListener.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\mapper\BizDeviceRegisteredFlowMapper.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\pojo\BizFarm.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\service\BizRawDataService.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\utils\Const.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\utils\DateUtil.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\service\impl\BizTransferHistoryServiceImpl.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\producer\Producer.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\controller\BizFarmController.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\utils\IDUtil.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\controller\BizDeviceRegisteredFlowController.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\result\RRException.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\service\impl\BizDeviceRegisteredFlowServiceImpl.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\pojo\BizDeviceUnregistered.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\service\BizTransferHistoryService.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\pojo\BizDeviceRegisteredFlow.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\pojo\BizDeviceUnregisteredFlow.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\utils\RegexUtil.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\service\BizFarmService.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\controller\BizRawDataController.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\pojo\BizRawData.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\mapper\BizDeviceRegisterMapper.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\service\impl\BizDeviceRegisterServiceImpl.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\pojo\BizDeviceAnswerFlow.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\utils\SQLFilter.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\HuimvRegistrationCenterApplication.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\mapper\BizDeviceUnregisteredFlowMapper.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\utils\ResultUtil.java
+D:\idea4\registration.center\registration-center\src\main\java\com\huimv\center\mapper\BizFarmMapper.java

registration-center/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

@@ -0,0 +1,9 @@
+com\huimv\center\service\BizDeviceAnswerFlowServiceTest.class
+com\huimv\center\MybatisGenerator$2.class
+com\huimv\center\MybatisGenerator$1.class
+com\huimv\center\service\BizDeviceRegisteredFlowServiceTest.class
+com\huimv\center\CodeGenerator.class
+com\huimv\center\service\BizDeviceRegisterTest.class
+com\huimv\center\service\BizFarmServiceTest.class
+com\huimv\center\service\BizRawDataServiceTest.class
+com\huimv\center\MybatisGenerator.class

registration-center/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

@@ -0,0 +1,7 @@
+D:\idea4\registration.center\registration-center\src\test\java\com\huimv\center\service\BizDeviceRegisteredFlowServiceTest.java
+D:\idea4\registration.center\registration-center\src\test\java\com\huimv\center\service\BizDeviceRegisterTest.java
+D:\idea4\registration.center\registration-center\src\test\java\com\huimv\center\service\BizDeviceAnswerFlowServiceTest.java
+D:\idea4\registration.center\registration-center\src\test\java\com\huimv\center\MybatisGenerator.java
+D:\idea4\registration.center\registration-center\src\test\java\com\huimv\center\CodeGenerator.java
+D:\idea4\registration.center\registration-center\src\test\java\com\huimv\center\service\BizFarmServiceTest.java
+D:\idea4\registration.center\registration-center\src\test\java\com\huimv\center\service\BizRawDataServiceTest.java