重建2个子工程

ear_tag/huimv-eartag-manager/pom.xml

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<!--    <parent>-->
+<!--        <artifactId>ear_tag</artifactId>-->
+<!--        <groupId>com.huimv</groupId>-->
+<!--        <version>0.0.1-SNAPSHOT</version>-->
+<!--    </parent>-->
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.4.2</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.huimv</groupId>
+    <artifactId>huimv-eartag-manager</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+
+<!--    <dependencies>-->
+<!--    <dependency>-->
+<!--        <groupId>com.huimv</groupId>-->
+<!--        <artifactId>huimv-eartag-common</artifactId>-->
+<!--        <version>0.0.1-SNAPSHOT</version>-->
+<!--    </dependency>-->
+<!--    </dependencies>-->
+
+<!--    <build>-->
+<!--        <plugins>-->
+<!--            <plugin>-->
+<!--                <groupId>org.springframework.boot</groupId>-->
+<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
+<!--            </plugin>-->
+<!--        </plugins>-->
+<!--    </build>-->
+
+    <properties>
+        <java.version>1.8</java.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-log4j2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.62</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>persistence-api</artifactId>
+            <version>1.0</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <!--通用mapper起步依赖-->
+        <dependency>
+            <groupId>tk.mybatis</groupId>
+            <artifactId>mapper-spring-boot-starter</artifactId>
+            <version>2.1.5</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>1.2.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <!--自定义依赖-->
+        <dependency>
+            <groupId>com.huimv</groupId>
+            <artifactId>huimv-common</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
+    </dependencies>
+
+        <build>
+            <plugins>
+                <plugin>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-maven-plugin</artifactId>
+                </plugin>
+            </plugins>
+        </build>
+</project>

ear_tag/huimv-eartag-manager/src/main/java/com/huimv/eartag/manager/EartagManagerApplication.java

@@ -0,0 +1,23 @@
+package com.huimv.eartag.manager;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
+import tk.mybatis.spring.annotation.MapperScan;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+//@ComponentScan(basePackages={"com.huimv.eartag.dao","com.huimv.eartag.entity","com.huimv.eartag.pojo","com.huimv.eartag.manager"})
+@MapperScan(basePackages = {"com.huimv.eartag.manager.dao"})
+@SpringBootApplication
+public class EartagManagerApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(EartagManagerApplication.class, args);
+    }
+}

ear_tag/src/main/java/com/huimv/eartag/controller/EartagDataController.java

@@ -1,11 +1,11 @@
-package com.huimv.eartag.controller;
+package com.huimv.eartag.manager.controller;
 
 
 import com.github.pagehelper.PageInfo;
-import com.huimv.eartag.entity.Result;
-import com.huimv.eartag.entity.StatusCode;
-import com.huimv.eartag.pojo.EartagData;
-import com.huimv.eartag.service.EartagDataService;
+import com.huimv.eartag.manager.entity.Result;
+import com.huimv.eartag.manager.entity.StatusCode;
+import com.huimv.eartag.manager.pojo.EartagData;
+import com.huimv.eartag.manager.service.EartagDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

ear_tag/src/main/java/com/huimv/eartag/controller/FarmInfoController.java

@@ -1,12 +1,12 @@
-package com.huimv.eartag.controller;
+package com.huimv.eartag.manager.controller;
 
 
 
 import com.github.pagehelper.PageInfo;
-import com.huimv.eartag.entity.Result;
-import com.huimv.eartag.entity.StatusCode;
-import com.huimv.eartag.pojo.FarmInfo;
-import com.huimv.eartag.service.FarmInfoService;
+import com.huimv.eartag.manager.entity.Result;
+import com.huimv.eartag.manager.entity.StatusCode;
+import com.huimv.eartag.manager.pojo.FarmInfo;
+import com.huimv.eartag.manager.service.FarmInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

ear_tag/src/main/java/com/huimv/eartag/controller/JqidController.java

@@ -1,12 +1,12 @@
-package com.huimv.eartag.controller;
+package com.huimv.eartag.manager.controller;
 
 
 
 import com.github.pagehelper.PageInfo;
-import com.huimv.eartag.entity.Result;
-import com.huimv.eartag.entity.StatusCode;
-import com.huimv.eartag.pojo.Jqid;
-import com.huimv.eartag.service.JqidService;
+import com.huimv.eartag.manager.entity.Result;
+import com.huimv.eartag.manager.entity.StatusCode;
+import com.huimv.eartag.manager.pojo.Jqid;
+import com.huimv.eartag.manager.service.JqidService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

ear_tag/src/main/java/com/huimv/eartag/controller/PigHomeController.java

@@ -1,12 +1,12 @@
-package com.huimv.eartag.controller;
+package com.huimv.eartag.manager.controller;
 
 
 
 import com.github.pagehelper.PageInfo;
-import com.huimv.eartag.entity.Result;
-import com.huimv.eartag.entity.StatusCode;
-import com.huimv.eartag.pojo.PigHome;
-import com.huimv.eartag.service.PigHomeService;
+import com.huimv.eartag.manager.entity.Result;
+import com.huimv.eartag.manager.entity.StatusCode;
+import com.huimv.eartag.manager.pojo.PigHome;
+import com.huimv.eartag.manager.service.PigHomeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

ear_tag/src/main/java/com/huimv/eartag/dao/EartagDataMapper.java

@@ -1,7 +1,7 @@
-package com.huimv.eartag.dao;
+package com.huimv.eartag.manager.dao;
 
 
-import com.huimv.eartag.pojo.EartagData;
+import com.huimv.eartag.manager.pojo.EartagData;
 import tk.mybatis.mapper.common.Mapper;
 
 /****

ear_tag/src/main/java/com/huimv/eartag/dao/FarmInfoMapper.java

@@ -1,7 +1,7 @@
-package com.huimv.eartag.dao;
+package com.huimv.eartag.manager.dao;
 
 
-import com.huimv.eartag.pojo.FarmInfo;
+import com.huimv.eartag.manager.pojo.FarmInfo;
 import tk.mybatis.mapper.common.Mapper;
 
 /****

ear_tag/huimv-eartag-manager/src/main/java/com/huimv/eartag/manager/dao/JqidMapper.java

@@ -0,0 +1,22 @@
+package com.huimv.eartag.manager.dao;
+
+
+import com.huimv.eartag.manager.pojo.Jqid;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import tk.mybatis.mapper.common.Mapper;
+import tk.mybatis.spring.annotation.MapperScan;
+
+/****
+ * @Author:shenkunlin
+ * @Description:Jqid的Dao
+ * @Date 2019/6/14 0:12
+ *****/
+@MapperScan(basePackages = {"com.huimv.eartag.dao"})
+@SpringBootApplication
+public interface JqidMapper extends Mapper<Jqid> {
+
+    @Select("select * from jqid where JQcode =#{serialNo}")
+    Jqid getDeviceIdByJQcode(@Param("serialNo") String serialNo);
+}

ear_tag/src/main/java/com/huimv/eartag/dao/PigHomeMapper.java

@@ -1,7 +1,8 @@
-package com.huimv.eartag.dao;
+package com.huimv.eartag.manager.dao;
 
 
-import com.huimv.eartag.pojo.PigHome;
+//import com.huimv.eartag.pojo.PigHome;
+import com.huimv.eartag.manager.pojo.PigHome;
 import tk.mybatis.mapper.common.Mapper;
 
 /****

ear_tag/src/main/java/com/huimv/eartag/entity/BCrypt.java

@@ -12,7 +12,7 @@
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-package com.huimv.eartag.entity;
+package com.huimv.eartag.manager.entity;
 
 import java.io.UnsupportedEncodingException;
 import java.security.SecureRandom;

ear_tag/src/main/java/com/huimv/eartag/entity/CacheKey.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag.entity;
+package com.huimv.eartag.manager.entity;
 
 /****
  * @Author:www.itheima.com

ear_tag/src/main/java/com/huimv/eartag/entity/ChineseUtils.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag.entity;
+package com.huimv.eartag.manager.entity;
 
 import java.io.UnsupportedEncodingException;
 import java.util.Random;

ear_tag/src/main/java/com/huimv/eartag/entity/IdWorker.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag.entity;
+package com.huimv.eartag.manager.entity;
 
 import java.lang.management.ManagementFactory;
 import java.net.InetAddress;

ear_tag/src/main/java/com/huimv/eartag/entity/Page.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag.entity;
+package com.huimv.eartag.manager.entity;
 
 import java.io.Serializable;
 import java.util.List;

ear_tag/src/main/java/com/huimv/eartag/entity/PageResult.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag.entity;
+package com.huimv.eartag.manager.entity;
 
 import java.util.List;
 

ear_tag/src/main/java/com/huimv/eartag/entity/RandomValueUtil.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag.entity;
+package com.huimv.eartag.manager.entity;
 
 /***
  *

ear_tag/src/main/java/com/huimv/eartag/entity/Result.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag.entity;
+package com.huimv.eartag.manager.entity;
 
 import java.io.Serializable;
 

ear_tag/src/main/java/com/huimv/eartag/entity/StatusCode.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag.entity;
+package com.huimv.eartag.manager.entity;
 
 /**
  * 返回码

ear_tag/src/main/java/com/huimv/eartag/pojo/EartagData.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag.pojo;
+package com.huimv.eartag.manager.pojo;
 
 import javax.persistence.*;
 import java.io.Serializable;

ear_tag/src/main/java/com/huimv/eartag/pojo/FarmInfo.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag.pojo;
+package com.huimv.eartag.manager.pojo;
 
 import javax.persistence.*;
 import java.io.Serializable;

ear_tag/src/main/java/com/huimv/eartag/pojo/Jqid.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag.pojo;
+package com.huimv.eartag.manager.pojo;
 
 import javax.persistence.*;
 import java.io.Serializable;

ear_tag/src/main/java/com/huimv/eartag/pojo/PigHome.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag.pojo;
+package com.huimv.eartag.manager.pojo;
 
 import javax.persistence.*;
 import java.io.Serializable;

ear_tag/src/main/java/com/huimv/eartag/service/EartagDataService.java

@@ -1,10 +1,10 @@
-package com.huimv.eartag.service;
+package com.huimv.eartag.manager.service;
 
 
 
 
 import com.github.pagehelper.PageInfo;
-import com.huimv.eartag.pojo.EartagData;
+import com.huimv.eartag.manager.pojo.EartagData;
 
 import java.util.List;
 

ear_tag/src/main/java/com/huimv/eartag/service/FarmInfoService.java

@@ -1,8 +1,8 @@
-package com.huimv.eartag.service;
+package com.huimv.eartag.manager.service;
 
 
 import com.github.pagehelper.PageInfo;
-import com.huimv.eartag.pojo.FarmInfo;
+import com.huimv.eartag.manager.pojo.FarmInfo;
 
 import java.util.List;
 

ear_tag/src/main/java/com/huimv/eartag/service/IClientDataPacketService.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag.service;
+package com.huimv.eartag.manager.service;
 
 import java.text.ParseException;
 

ear_tag/src/main/java/com/huimv/eartag/service/JqidService.java

@@ -1,7 +1,7 @@
-package com.huimv.eartag.service;
+package com.huimv.eartag.manager.service;
 
 import com.github.pagehelper.PageInfo;
-import com.huimv.eartag.pojo.Jqid;
+import com.huimv.eartag.manager.pojo.Jqid;
 
 import java.util.List;
 
@@ -66,4 +66,16 @@ public interface JqidService {
      * @return
      */
     List<Jqid> findAll();
+
+    /**
+     * @Method      : findDeviceIdByJQcode
+     * @Description : 
+     * @Params      : [serialNo]
+     * @Return      : java.lang.String
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/1/16       
+     * @Time        : 18:36
+     */
+    String findDeviceIdByJQcode(String serialNo);
 }

ear_tag/src/main/java/com/huimv/eartag/service/PigHomeService.java

@@ -1,8 +1,8 @@
-package com.huimv.eartag.service;
+package com.huimv.eartag.manager.service;
 
 
 import com.github.pagehelper.PageInfo;
-import com.huimv.eartag.pojo.PigHome;
+import com.huimv.eartag.manager.pojo.PigHome;
 
 import java.util.List;
 

ear_tag/src/main/java/com/huimv/eartag/service/impl/ClientDataPacketServiceImpl.java

@@ -1,6 +1,6 @@
-package com.huimv.eartag.service.impl;
+package com.huimv.eartag.manager.service.impl;
 
-import com.huimv.eartag.service.IClientDataPacketService;
+import com.huimv.eartag.manager.service.IClientDataPacketService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,14 +33,11 @@ public class ClientDataPacketServiceImpl implements IClientDataPacketService {
 //        String matcher = "\\+";
         String[] clientMessageArray = clientMessageTxt.split(matcher);
         String cmd = clientMessageArray[2];
-        System.out.println("cmd>>" + cmd);
         log.info("命令>>" + cmd);
         StringBuilder echoResultSb = new StringBuilder();
         // 校验后边再做；
         if (Integer.parseInt(cmd) == 1) {
             // 绑定序列号返回的设备id
-//            echoResultSb.append("hm").append("+");
-//            return "hm+1+0+设备id+000+8+end";
             return sendPackageService.getDeviceId(clientMessageArray);
         } else if (Integer.parseInt(cmd) == 2) {
             // 处理获取服务器时间

ear_tag/src/main/java/com/huimv/eartag/service/impl/EartagDataServiceImpl.java

@@ -1,12 +1,12 @@
-package com.huimv.eartag.service.impl;
+package com.huimv.eartag.manager.service.impl;
 
 
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.huimv.eartag.dao.EartagDataMapper;
-import com.huimv.eartag.pojo.EartagData;
-import com.huimv.eartag.service.EartagDataService;
+import com.huimv.eartag.manager.dao.EartagDataMapper;
+import com.huimv.eartag.manager.pojo.EartagData;
+import com.huimv.eartag.manager.service.EartagDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;

ear_tag/src/main/java/com/huimv/eartag/service/impl/FarmInfoServiceImpl.java

@@ -1,13 +1,13 @@
-package com.huimv.eartag.service.impl;
+package com.huimv.eartag.manager.service.impl;
 
 
 
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.huimv.eartag.dao.FarmInfoMapper;
-import com.huimv.eartag.pojo.FarmInfo;
-import com.huimv.eartag.service.FarmInfoService;
+import com.huimv.eartag.manager.dao.FarmInfoMapper;
+import com.huimv.eartag.manager.pojo.FarmInfo;
+import com.huimv.eartag.manager.service.FarmInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;

ear_tag/src/main/java/com/huimv/eartag/service/impl/JqidServiceImpl.java

@@ -1,14 +1,14 @@
-package com.huimv.eartag.service.impl;
+package com.huimv.eartag.manager.service.impl;
 
 
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.huimv.eartag.dao.JqidMapper;
-import com.huimv.eartag.pojo.Jqid;
-import com.huimv.eartag.service.FarmInfoService;
-import com.huimv.eartag.service.JqidService;
-import com.huimv.eartag.service.PigHomeService;
+import com.huimv.eartag.manager.dao.JqidMapper;
+import com.huimv.eartag.manager.pojo.Jqid;
+import com.huimv.eartag.manager.service.FarmInfoService;
+import com.huimv.eartag.manager.service.JqidService;
+import com.huimv.eartag.manager.service.PigHomeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -178,4 +178,12 @@ public class JqidServiceImpl implements JqidService {
     public List<Jqid> findAll() {
         return jqidMapper.selectAll();
     }
+
+    @Override
+    public String findDeviceIdByJQcode(String serialNo) {
+        // 根据序列号读取设备id
+        Jqid jqidObj = jqidMapper.getDeviceIdByJQcode(serialNo);
+        String deviceId = jqidObj.getJQID();
+        return deviceId;
+    }
 }

ear_tag/src/main/java/com/huimv/eartag/service/impl/PigHomeServiceImpl.java

@@ -1,11 +1,11 @@
-package com.huimv.eartag.service.impl;
+package com.huimv.eartag.manager.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.huimv.eartag.dao.PigHomeMapper;
-import com.huimv.eartag.pojo.PigHome;
-import com.huimv.eartag.service.FarmInfoService;
-import com.huimv.eartag.service.PigHomeService;
+import com.huimv.eartag.manager.dao.PigHomeMapper;
+import com.huimv.eartag.manager.pojo.PigHome;
+import com.huimv.eartag.manager.service.FarmInfoService;
+import com.huimv.eartag.manager.service.PigHomeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;

ear_tag/src/main/java/com/huimv/eartag/service/impl/ReceivePackageSerivce.java

@@ -1,16 +1,15 @@
-package com.huimv.eartag.service.impl;
+package com.huimv.eartag.manager.service.impl;
 
 import com.huimv.common.date.DateUtil;
-import com.huimv.common.result.Result;
-import com.huimv.eartag.pojo.EartagData;
-import com.huimv.eartag.service.EartagDataService;
-import com.huimv.eartag.utils.Const;
+import com.huimv.eartag.manager.pojo.EartagData;
+import com.huimv.eartag.manager.service.EartagDataService;
+
+import com.huimv.eartag.manager.utils.Const;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.text.ParseException;
-import java.util.Date;
 
 /**
  * @Project : huimv.shiwan
@@ -36,7 +35,7 @@ public class ReceivePackageSerivce {
      * @Date        : 2021/1/16       
      * @Time        : 12:08
      */
-    public Result handleEartagData(String[] clientMessageArray) throws ParseException {
+    public String handleEartagData(String[] clientMessageArray) throws ParseException {
         log.info("开始添加耳标数据......");
         String commandHeader = clientMessageArray[0];
         String deviceId = clientMessageArray[1];
@@ -76,7 +75,9 @@ public class ReceivePackageSerivce {
         // 保存耳标数据
         eartagDataService.add(eartagData);
         log.info(Const.EARTAG_SAVE_SUCCESS);
-        return new Result(10000,Const.EARTAG_SAVE_SUCCESS,true);
+        StringBuilder returnSb = new StringBuilder();
+//        return returnSb.append("hm").append("+").append(6).append("+").append(0).append("+").append(6).append("+").append("end").toString();
+        return "hm+6+0+6+end";
     }
 
     /**

ear_tag/huimv-eartag-manager/src/main/java/com/huimv/eartag/manager/service/impl/SendPackageService.java

@@ -0,0 +1,70 @@
+package com.huimv.eartag.manager.service.impl;
+
+import com.huimv.common.date.DateUtil;
+import com.huimv.eartag.manager.service.JqidService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@Component
+public class SendPackageService {
+
+    @Autowired
+    private JqidService jqidService;
+
+    /**
+     * @Method      : _handleGetDeviceId
+     * @Description : 获取设备id
+     * @Params      : [clientMessageArray]
+     * @Return      : java.lang.String
+     *
+     * @Author      : ZhuoNing
+     * @Date        : 2021/1/15
+     * @Time        : 17:41
+     */
+    public String getDeviceId(String[] clientMessageArray) {
+        String serialNo = clientMessageArray[1];
+        System.out.println("serialNo>>"+serialNo);
+        // 查询机器id
+        String jqid = jqidService.findDeviceIdByJQcode(serialNo);
+        return "hm+"+jqid+"+1+7+end";
+    }
+
+    /**
+     * @Method      : _handleGetServerDateTime
+     * @Description : 获取获取服务器日期时间
+     * @Params      : [clientMessageArray]
+     * @Return      : java.lang.String
+     *
+     * @Author      : ZhuoNing
+     * @Date        : 2021/1/15
+     * @Time        : 17:38
+     */
+    public String getServerDateTime(String[] clientMessageArray) {
+        //
+        String formatNow = DateUtil.getNowWithDigital();
+        System.out.println("formatNow>>"+formatNow);
+        return "hm+2+"+formatNow+"+0+end";
+    }
+
+    /**
+     * @Method      : _handleGetHeartbeatBag
+     * @Description : 获取心跳包
+     * @Params      : [clientMessageArray]
+     * @Return      : java.lang.String
+     *
+     * @Author      : ZhuoNing
+     * @Date        : 2021/1/15
+     * @Time        : 17:38
+     */
+    public String getHeartbeatBag(String[] clientMessageArray) {
+        return "hm+3+0+6+end";
+    }
+}

ear_tag/huimv-eartag-manager/src/main/java/com/huimv/eartag/manager/utils/Const.java

@@ -0,0 +1,8 @@
+package com.huimv.eartag.manager.utils;
+
+import org.springframework.stereotype.Component;
+
+//@Component
+public class Const {
+    public static final String EARTAG_SAVE_SUCCESS = "保存耳标数据成功";
+}

ear_tag/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8091
+  port: 8092
 spring:
   #给项目来个名字
   application:

ear_tag/src/test/java/com/huimv/eartag/service/DateTimeTest.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag.service;
+package com.huimv.eartag.manager.service;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

ear_tag/huimv-eartag-manager/src/test/java/com/huimv/eartag/manager/service/ParseClientMessageTest.java

@@ -0,0 +1,54 @@
+package com.huimv.eartag.manager.service;
+
+import com.huimv.eartag.manager.service.IClientDataPacketService;
+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.text.ParseException;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class ParseClientMessageTest {
+
+    @Autowired
+    private IClientDataPacketService iParseClientPacket;
+
+    @Test
+    public void testParseClientMessage() throws ParseException {
+        String clientMessage = "hm+123456789012345+1+7+end";
+        String t = iParseClientPacket.parseClientSendPacket(clientMessage);
+        System.out.println("t>>" + t);
+    }
+
+    @Test
+    public void testHandleEartagData() throws ParseException {
+        String clientMessage = "hm+0+6+1.0+002d4895+668519+89+2100+10902+1550+2+84+20201230175903+9+end";
+        String t = iParseClientPacket.parseClientSendPacket(clientMessage).toString();
+        System.out.println("测试结果>>" + t);
+    }
+
+    @Test
+    public void testGetServerDateTime() throws ParseException {
+    String clientMessage = "hm+158+2+9+end";
+    String t = iParseClientPacket.parseClientSendPacket(clientMessage).toString();
+        System.out.println("测试结果>>"+t);
+    }
+
+    @Test
+    public void testGetDeviceId() throws ParseException {
+        String clientMessage = "hm+123456789012345+1+7+end";
+        String t = iParseClientPacket.parseClientSendPacket(clientMessage).toString();
+        System.out.println("测试结果>>"+t);
+    }
+}

ear_tag/huimv-eartag-monitor/pom.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ear_tag</artifactId>
+        <groupId>com.huimv</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>huimv-eartag-monitor</artifactId>
+
+    <properties>
+        <java.version>1.8</java.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-log4j2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.62</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>persistence-api</artifactId>
+            <version>1.0</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <!--通用mapper起步依赖-->
+        <dependency>
+            <groupId>tk.mybatis</groupId>
+            <artifactId>mapper-spring-boot-starter</artifactId>
+            <version>2.1.5</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>1.2.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <!--自定义依赖-->
+        <dependency>
+            <groupId>com.huimv</groupId>
+            <artifactId>huimv-common</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/EartagMonitorApplication.java

@@ -0,0 +1,22 @@
+package com.huimv.eartag.monitor;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import tk.mybatis.spring.annotation.MapperScan;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@MapperScan(basePackages = {"com.huimv.eartag.monitor.dao"})
+@SpringBootApplication
+public class EartagMonitorApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(EartagMonitorApplication.class, args);
+    }
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/controller/EartagDataController.java

@@ -0,0 +1,128 @@
+package com.huimv.eartag.monitor.controller;
+
+
+import com.github.pagehelper.PageInfo;
+import com.huimv.eartag.monitor.entity.Result;
+import com.huimv.eartag.monitor.entity.StatusCode;
+import com.huimv.eartag.monitor.pojo.EartagData;
+import com.huimv.eartag.monitor.service.EartagDataService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/****
+ * @Author:shenkunlin
+ * @Description:
+ * @Date 2019/6/14 0:18
+ *****/
+
+@RestController
+@RequestMapping("/eartagData")
+@CrossOrigin
+public class EartagDataController {
+
+    @Autowired
+    private EartagDataService eartagDataService;
+
+    /***
+     * EartagData分页条件搜索实现
+     * @param eartagData
+     * @param page
+     * @param size
+     * @return
+     */
+    @PostMapping(value = "/search/{page}/{size}" )
+    public Result<PageInfo> findPage(@RequestBody(required = false) EartagData eartagData, @PathVariable  int page, @PathVariable  int size){
+        //调用EartagDataService实现分页条件查询EartagData
+        PageInfo<EartagData> pageInfo = eartagDataService.findPage(eartagData, page, size);
+        return new Result(true, StatusCode.OK,"查询成功",pageInfo);
+    }
+
+    /***
+     * EartagData分页搜索实现
+     * @param page:当前页
+     * @param size:每页显示多少条
+     * @return
+     */
+    @GetMapping(value = "/search/{page}/{size}" )
+    public Result<PageInfo> findPage(@PathVariable  int page, @PathVariable  int size){
+        //调用EartagDataService实现分页查询EartagData
+        PageInfo<EartagData> pageInfo = eartagDataService.findPage(page, size);
+        return new Result<PageInfo>(true,StatusCode.OK,"查询成功",pageInfo);
+    }
+
+    /***
+     * 多条件搜索品牌数据
+     * @param eartagData
+     * @return
+     */
+    @PostMapping(value = "/search" )
+    public Result<List<EartagData>> findList(@RequestBody(required = false)  EartagData eartagData){
+        //调用EartagDataService实现条件查询EartagData
+        List<EartagData> list = eartagDataService.findList(eartagData);
+        return new Result<List<EartagData>>(true,StatusCode.OK,"查询成功",list);
+    }
+
+    /***
+     * 根据ID删除品牌数据
+     * @param id
+     * @return
+     */
+    @DeleteMapping(value = "/{id}" )
+    public Result delete(@PathVariable Integer id){
+        //调用EartagDataService实现根据主键删除
+        eartagDataService.delete(id);
+        return new Result(true,StatusCode.OK,"删除成功");
+    }
+
+    /***
+     * 修改EartagData数据
+     * @param eartagData
+     * @param id
+     * @return
+     */
+    @PutMapping(value="/{id}")
+    public Result update(@RequestBody  EartagData eartagData,@PathVariable Integer id){
+        //设置主键值
+        eartagData.setId(id);
+        //调用EartagDataService实现修改EartagData
+        eartagDataService.update(eartagData);
+        return new Result(true,StatusCode.OK,"修改成功");
+    }
+
+    /***
+     * 新增EartagData数据
+     * @param eartagData
+     * @return
+     */
+    @PostMapping
+    public Result add(@RequestBody   EartagData eartagData){
+        //调用EartagDataService实现添加EartagData
+        eartagDataService.add(eartagData);
+        return new Result(true, StatusCode.OK,"添加成功");
+    }
+
+    /***
+     * 根据ID查询EartagData数据
+     * @param id
+     * @return
+     */
+    @GetMapping("/{id}")
+    public Result<EartagData> findById(@PathVariable Integer id){
+        //调用EartagDataService实现根据主键查询EartagData
+        EartagData eartagData = eartagDataService.findById(id);
+        return new Result<EartagData>(true,StatusCode.OK,"查询成功",eartagData);
+    }
+
+    /***
+     * 查询EartagData全部数据
+     * @return
+     */
+    @GetMapping
+    public Result<List<EartagData>> findAll(){
+        //调用EartagDataService实现查询所有EartagData
+        List<EartagData> list = eartagDataService.findAll();
+        return new Result<List<EartagData>>(true, StatusCode.OK,"查询成功",list) ;
+    }
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/controller/FarmInfoController.java

@@ -0,0 +1,135 @@
+package com.huimv.eartag.monitor.controller;
+
+
+
+import com.github.pagehelper.PageInfo;
+import com.huimv.eartag.monitor.entity.Result;
+import com.huimv.eartag.monitor.entity.StatusCode;
+import com.huimv.eartag.monitor.pojo.FarmInfo;
+import com.huimv.eartag.monitor.service.FarmInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/****
+ * @Author:shenkunlin
+ * @Description:
+ * @Date 2019/6/14 0:18
+ *****/
+
+@RestController
+@RequestMapping("/farmInfo")
+@CrossOrigin
+public class FarmInfoController {
+
+    @Autowired
+    private FarmInfoService farmInfoService;
+
+    /***
+     * FarmInfo分页条件搜索实现
+     * @param farmInfo
+     * @param page
+     * @param size
+     * @return
+     */
+    @PostMapping(value = "/search/{page}/{size}" )
+    public Result<PageInfo> findPage(@RequestBody(required = false) FarmInfo farmInfo, @PathVariable  int page, @PathVariable  int size){
+        //调用FarmInfoService实现分页条件查询FarmInfo
+        PageInfo<FarmInfo> pageInfo = farmInfoService.findPage(farmInfo, page, size);
+        return new Result(true, StatusCode.OK,"查询成功",pageInfo);
+    }
+
+    /***
+     * FarmInfo分页搜索实现
+     * @param page:当前页
+     * @param size:每页显示多少条
+     * @return
+     */
+    @GetMapping(value = "/search/{page}/{size}" )
+    public Result<PageInfo> findPage(@PathVariable  int page, @PathVariable  int size){
+        //调用FarmInfoService实现分页查询FarmInfo
+        PageInfo<FarmInfo> pageInfo = farmInfoService.findPage(page, size);
+        return new Result<PageInfo>(true,StatusCode.OK,"查询成功",pageInfo);
+    }
+
+
+
+
+    /***
+     * 多条件搜索品牌数据
+     * @param farmInfo
+     * @return
+     */
+    @PostMapping(value = "/search" )
+    public Result<List<FarmInfo>> findList(@RequestBody(required = false)  FarmInfo farmInfo){
+        //调用FarmInfoService实现条件查询FarmInfo
+        List<FarmInfo> list = farmInfoService.findList(farmInfo);
+        return new Result<List<FarmInfo>>(true,StatusCode.OK,"查询成功",list);
+    }
+
+    /***
+     * 根据ID删除品牌数据
+     * @param id
+     * @return
+     */
+    @DeleteMapping(value = "/{id}" )
+    public Result delete(@PathVariable Integer id){
+        //调用FarmInfoService实现根据主键删除
+        farmInfoService.delete(id);
+        return new Result(true,StatusCode.OK,"删除成功");
+    }
+
+    /***
+     * 修改FarmInfo数据
+     * @param farmInfo
+     * @param id
+     * @return
+     */
+    @PutMapping(value="/{id}")
+    public Result update(@RequestBody  FarmInfo farmInfo,@PathVariable Integer id){
+        //设置主键值
+        farmInfo.setId(id);
+        //调用FarmInfoService实现修改FarmInfo
+        farmInfoService.update(farmInfo);
+        return new Result(true,StatusCode.OK,"修改成功");
+    }
+
+
+
+    /***
+     * 新增FarmInfo数据
+     * @param farmInfo
+     * @return
+     */
+    @PostMapping
+    public Result add(@RequestBody   FarmInfo farmInfo){
+        //调用FarmInfoService实现添加FarmInfo
+        farmInfoService.add(farmInfo);
+        return new Result(true, StatusCode.OK,"添加成功");
+    }
+
+
+    /***
+     * 根据ID查询FarmInfo数据
+     * @param id
+     * @return
+     */
+    @GetMapping("/{id}")
+    public Result<FarmInfo> findById(@PathVariable Integer id){
+        //调用FarmInfoService实现根据主键查询FarmInfo
+        FarmInfo farmInfo = farmInfoService.findById(id);
+        return new Result<FarmInfo>(true,StatusCode.OK,"查询成功",farmInfo);
+    }
+
+    /***
+     * 查询FarmInfo全部数据
+     * @return
+     */
+    @GetMapping
+    public Result<List<FarmInfo>> findAll(){
+        //调用FarmInfoService实现查询所有FarmInfo
+        List<FarmInfo> list = farmInfoService.findAll();
+        return new Result<List<FarmInfo>>(true, StatusCode.OK,"查询成功",list) ;
+    }
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/controller/JqidController.java

@@ -0,0 +1,129 @@
+package com.huimv.eartag.monitor.controller;
+
+
+
+import com.github.pagehelper.PageInfo;
+import com.huimv.eartag.monitor.entity.Result;
+import com.huimv.eartag.monitor.entity.StatusCode;
+import com.huimv.eartag.monitor.pojo.Jqid;
+import com.huimv.eartag.monitor.service.JqidService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/****
+ * @Author:shenkunlin
+ * @Description:
+ * @Date 2019/6/14 0:18
+ *****/
+
+@RestController
+@RequestMapping("/jqid")
+@CrossOrigin
+public class JqidController {
+
+    @Autowired
+    private JqidService jqidService;
+
+    /***
+     * Jqid分页条件搜索实现
+     * @param jqid
+     * @param page
+     * @param size
+     * @return
+     */
+    @PostMapping(value = "/search/{page}/{size}" )
+    public Result<PageInfo> findPage(@RequestBody(required = false) Jqid jqid, @PathVariable  int page, @PathVariable  int size){
+        //调用JqidService实现分页条件查询Jqid
+        PageInfo<Jqid> pageInfo = jqidService.findPage(jqid, page, size);
+        return new Result(true, StatusCode.OK,"查询成功",pageInfo);
+    }
+
+    /***
+     * Jqid分页搜索实现
+     * @param page:当前页
+     * @param size:每页显示多少条
+     * @return
+     */
+    @GetMapping(value = "/search/{page}/{size}" )
+    public Result<PageInfo> findPage(@PathVariable  int page, @PathVariable  int size){
+        //调用JqidService实现分页查询Jqid
+        PageInfo<Jqid> pageInfo = jqidService.findPage(page, size);
+        return new Result<PageInfo>(true,StatusCode.OK,"查询成功",pageInfo);
+    }
+
+    /***
+     * 多条件搜索品牌数据
+     * @param jqid
+     * @return
+     */
+    @PostMapping(value = "/search" )
+    public Result<List<Jqid>> findList(@RequestBody(required = false)  Jqid jqid){
+        //调用JqidService实现条件查询Jqid
+        List<Jqid> list = jqidService.findList(jqid);
+        return new Result<List<Jqid>>(true,StatusCode.OK,"查询成功",list);
+    }
+
+    /***
+     * 根据ID删除品牌数据
+     * @param id
+     * @return
+     */
+    @DeleteMapping(value = "/{id}" )
+    public Result delete(@PathVariable Integer id){
+        //调用JqidService实现根据主键删除
+        jqidService.delete(id);
+        return new Result(true,StatusCode.OK,"删除成功");
+    }
+
+    /***
+     * 修改Jqid数据
+     * @param jqid
+     * @param id
+     * @return
+     */
+    @PutMapping(value="/{id}")
+    public Result update(@RequestBody  Jqid jqid,@PathVariable Integer id){
+        //设置主键值
+        jqid.setId(id);
+        //调用JqidService实现修改Jqid
+        jqidService.update(jqid);
+        return new Result(true,StatusCode.OK,"修改成功");
+    }
+
+    /***
+     * 新增Jqid数据
+     * @param jqid
+     * @return
+     */
+    @PostMapping
+    public Result add(@RequestBody   Jqid jqid){
+        //调用JqidService实现添加Jqid
+        jqidService.add(jqid);
+        return new Result(true, StatusCode.OK,"添加成功");
+    }
+
+    /***
+     * 根据ID查询Jqid数据
+     * @param id
+     * @return
+     */
+    @GetMapping("/{id}")
+    public Result<Jqid> findById(@PathVariable Integer id){
+        //调用JqidService实现根据主键查询Jqid
+        Jqid jqid = jqidService.findById(id);
+        return new Result<Jqid>(true,StatusCode.OK,"查询成功",jqid);
+    }
+
+    /***
+     * 查询Jqid全部数据
+     * @return
+     */
+    @GetMapping
+    public Result<List<Jqid>> findAll(){
+        //调用JqidService实现查询所有Jqid
+        List<Jqid> list = jqidService.findAll();
+        return new Result<List<Jqid>>(true, StatusCode.OK,"查询成功",list) ;
+    }
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/controller/PigHomeController.java

@@ -0,0 +1,129 @@
+package com.huimv.eartag.monitor.controller;
+
+
+
+import com.github.pagehelper.PageInfo;
+import com.huimv.eartag.monitor.entity.Result;
+import com.huimv.eartag.monitor.entity.StatusCode;
+import com.huimv.eartag.monitor.pojo.PigHome;
+import com.huimv.eartag.monitor.service.PigHomeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/****
+ * @Author:shenkunlin
+ * @Description:
+ * @Date 2019/6/14 0:18
+ *****/
+
+@RestController
+@RequestMapping("/pigHome")
+@CrossOrigin
+public class PigHomeController {
+
+    @Autowired
+    private PigHomeService pigHomeService;
+
+    /***
+     * PigHome分页条件搜索实现
+     * @param pigHome
+     * @param page
+     * @param size
+     * @return
+     */
+    @PostMapping(value = "/search/{page}/{size}" )
+    public Result<PageInfo> findPage(@RequestBody(required = false) PigHome pigHome, @PathVariable  int page, @PathVariable  int size){
+        //调用PigHomeService实现分页条件查询PigHome
+        PageInfo<PigHome> pageInfo = pigHomeService.findPage(pigHome, page, size);
+        return new Result(true, StatusCode.OK,"查询成功",pageInfo);
+    }
+
+    /***
+     * PigHome分页搜索实现
+     * @param page:当前页
+     * @param size:每页显示多少条
+     * @return
+     */
+    @GetMapping(value = "/search/{page}/{size}" )
+    public Result<PageInfo> findPage(@PathVariable  int page, @PathVariable  int size){
+        //调用PigHomeService实现分页查询PigHome
+        PageInfo<PigHome> pageInfo = pigHomeService.findPage(page, size);
+        return new Result<PageInfo>(true,StatusCode.OK,"查询成功",pageInfo);
+    }
+
+    /***
+     * 多条件搜索品牌数据
+     * @param pigHome
+     * @return
+     */
+    @PostMapping(value = "/search" )
+    public Result<List<PigHome>> findList(@RequestBody(required = false)  PigHome pigHome){
+        //调用PigHomeService实现条件查询PigHome
+        List<PigHome> list = pigHomeService.findList(pigHome);
+        return new Result<List<PigHome>>(true,StatusCode.OK,"查询成功",list);
+    }
+
+    /***
+     * 根据ID删除品牌数据
+     * @param id
+     * @return
+     */
+    @DeleteMapping(value = "/{id}" )
+    public Result delete(@PathVariable Integer id){
+        //调用PigHomeService实现根据主键删除
+        pigHomeService.delete(id);
+        return new Result(true,StatusCode.OK,"删除成功");
+    }
+
+    /***
+     * 修改PigHome数据
+     * @param pigHome
+     * @param id
+     * @return
+     */
+    @PutMapping(value="/{id}")
+    public Result update(@RequestBody  PigHome pigHome,@PathVariable Integer id){
+        //设置主键值
+        pigHome.setId(id);
+        //调用PigHomeService实现修改PigHome
+        pigHomeService.update(pigHome);
+        return new Result(true, StatusCode.OK,"修改成功");
+    }
+
+    /***
+     * 新增PigHome数据
+     * @param pigHome
+     * @return
+     */
+    @PostMapping
+    public Result add(@RequestBody   PigHome pigHome){
+        //调用PigHomeService实现添加PigHome
+        pigHomeService.add(pigHome);
+        return new Result(true,StatusCode.OK,"添加成功");
+    }
+
+    /***
+     * 根据ID查询PigHome数据
+     * @param id
+     * @return
+     */
+    @GetMapping("/{id}")
+    public Result<PigHome> findById(@PathVariable Integer id){
+        //调用PigHomeService实现根据主键查询PigHome
+        PigHome pigHome = pigHomeService.findById(id);
+        return new Result<PigHome>(true,StatusCode.OK,"查询成功",pigHome);
+    }
+
+    /***
+     * 查询PigHome全部数据
+     * @return
+     */
+    @GetMapping
+    public Result<List<PigHome>> findAll(){
+        //调用PigHomeService实现查询所有PigHome
+        List<PigHome> list = pigHomeService.findAll();
+        return new Result<List<PigHome>>(true, StatusCode.OK,"查询成功",list) ;
+    }
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/dao/EartagDataMapper.java

@@ -0,0 +1,13 @@
+package com.huimv.eartag.monitor.dao;
+
+
+import com.huimv.eartag.monitor.pojo.EartagData;
+import tk.mybatis.mapper.common.Mapper;
+
+/****
+ * @Author:shenkunlin
+ * @Description:EartagData的Dao
+ * @Date 2019/6/14 0:12
+ *****/
+public interface EartagDataMapper extends Mapper<EartagData> {
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/dao/FarmInfoMapper.java

@@ -0,0 +1,14 @@
+package com.huimv.eartag.monitor.dao;
+
+
+import com.huimv.eartag.monitor.pojo.FarmInfo;
+import tk.mybatis.mapper.common.Mapper;
+
+/****
+ * @Author:shenkunlin
+ * @Description:FarmInfo的Dao
+ * @Date 2019/6/14 0:12
+ *****/
+
+public interface FarmInfoMapper extends Mapper<FarmInfo> {
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/dao/JqidMapper.java

@@ -0,0 +1,23 @@
+package com.huimv.eartag.monitor.dao;
+
+
+import com.huimv.eartag.monitor.pojo.Jqid;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import tk.mybatis.mapper.common.Mapper;
+import tk.mybatis.spring.annotation.MapperScan;
+
+/****
+ * @Author:shenkunlin
+ * @Description:Jqid的Dao
+ * @Date 2019/6/14 0:12
+ *****/
+@MapperScan(basePackages = {"com.huimv.eartag.dao"})
+@SpringBootApplication
+public interface JqidMapper extends Mapper<Jqid> {
+
+//    @Select("<script>select * from jqid where JQcode =#{serialNo}</script>")
+    @Select("select * from jqid where JQcode =#{serialNo}")
+    Jqid getDeviceIdByJQcode(@Param("serialNo") String serialNo);
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/dao/PigHomeMapper.java

@@ -0,0 +1,14 @@
+package com.huimv.eartag.monitor.dao;
+
+
+//import com.huimv.eartag.pojo.PigHome;
+import com.huimv.eartag.monitor.pojo.PigHome;
+import tk.mybatis.mapper.common.Mapper;
+
+/****
+ * @Author:shenkunlin
+ * @Description:PigHome的Dao
+ * @Date 2019/6/14 0:12
+ *****/
+public interface PigHomeMapper extends Mapper<PigHome> {
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/entity/BCrypt.java

@@ -0,0 +1,792 @@
+// Copyright (c) 2006 Damien Miller <djm@mindrot.org>
+//
+// Permission to use, copy, modify, and distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+package com.huimv.eartag.monitor.entity;
+
+import java.io.UnsupportedEncodingException;
+import java.security.SecureRandom;
+
+/**
+ * BCrypt implements OpenBSD-style Blowfish password hashing using
+ * the scheme described in "A Future-Adaptable Password Scheme" by
+ * Niels Provos and David Mazieres.
+ * <p>
+ * This password hashing system tries to thwart off-line password
+ * cracking using a computationally-intensive hashing algorithm,
+ * based on Bruce Schneier's Blowfish cipher. The work factor of
+ * the algorithm is parameterised, so it can be increased as
+ * computers get faster.
+ * <p>
+ * Usage is really simple. To hash a password for the first time,
+ * call the hashpw method with a random salt, like this:
+ * <p>
+ * <code>
+ * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt()); <br />
+ * </code>
+ * <p>
+ * To check whether a plaintext password matches one that has been
+ * hashed previously, use the checkpw method:
+ * <p>
+ * <code>
+ * if (BCrypt.checkpw(candidate_password, stored_hash))<br />
+ * &nbsp;&nbsp;&nbsp;&nbsp;System.out.println("It matches");<br />
+ * else<br />
+ * &nbsp;&nbsp;&nbsp;&nbsp;System.out.println("It does not match");<br />
+ * </code>
+ * <p>
+ * The gensalt() method takes an optional parameter (log_rounds)
+ * that determines the computational complexity of the hashing:
+ * <p>
+ * <code>
+ * String strong_salt = BCrypt.gensalt(10)<br />
+ * String stronger_salt = BCrypt.gensalt(12)<br />
+ * </code>
+ * <p>
+ * The amount of work increases exponentially (2**log_rounds), so 
+ * each increment is twice as much work. The default log_rounds is
+ * 10, and the valid range is 4 to 30.
+ *
+ * @version 0.2
+ */
+public class BCrypt {
+	// BCrypt parameters
+	private static final int GENSALT_DEFAULT_LOG2_ROUNDS = 10;
+	private static final int BCRYPT_SALT_LEN = 16;
+
+	// Blowfish parameters
+	private static final int BLOWFISH_NUM_ROUNDS = 16;
+
+	// Initial contents of key schedule
+	private static final int P_orig[] = {
+		0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
+		0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
+		0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
+		0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
+		0x9216d5d9, 0x8979fb1b
+	};
+	private static final int S_orig[] = {
+		0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
+		0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
+		0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
+		0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
+		0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
+		0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
+		0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
+		0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
+		0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
+		0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
+		0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
+		0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
+		0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
+		0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
+		0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
+		0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
+		0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
+		0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
+		0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
+		0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
+		0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
+		0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
+		0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
+		0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
+		0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
+		0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
+		0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
+		0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
+		0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
+		0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
+		0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
+		0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
+		0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
+		0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
+		0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
+		0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
+		0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
+		0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
+		0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
+		0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
+		0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
+		0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
+		0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
+		0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
+		0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
+		0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
+		0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
+		0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
+		0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
+		0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
+		0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
+		0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
+		0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
+		0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
+		0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
+		0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
+		0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
+		0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
+		0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
+		0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
+		0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
+		0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
+		0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
+		0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a,
+		0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
+		0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
+		0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
+		0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
+		0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
+		0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
+		0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
+		0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
+		0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
+		0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
+		0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
+		0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
+		0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
+		0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
+		0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
+		0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
+		0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
+		0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
+		0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
+		0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
+		0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
+		0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
+		0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
+		0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
+		0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
+		0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
+		0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
+		0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
+		0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
+		0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
+		0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
+		0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
+		0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
+		0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
+		0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
+		0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
+		0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
+		0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
+		0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
+		0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
+		0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
+		0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
+		0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
+		0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
+		0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
+		0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
+		0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
+		0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
+		0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
+		0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
+		0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
+		0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
+		0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
+		0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
+		0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
+		0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
+		0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
+		0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
+		0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
+		0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
+		0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
+		0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
+		0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
+		0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7,
+		0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
+		0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
+		0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
+		0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
+		0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
+		0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
+		0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
+		0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
+		0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
+		0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
+		0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
+		0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
+		0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
+		0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
+		0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
+		0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
+		0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
+		0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
+		0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
+		0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
+		0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
+		0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
+		0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
+		0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
+		0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
+		0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
+		0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
+		0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
+		0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
+		0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
+		0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
+		0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
+		0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
+		0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
+		0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
+		0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
+		0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
+		0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
+		0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
+		0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
+		0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
+		0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
+		0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
+		0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
+		0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
+		0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
+		0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
+		0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
+		0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
+		0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
+		0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
+		0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
+		0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
+		0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
+		0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
+		0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
+		0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
+		0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
+		0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
+		0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
+		0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
+		0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
+		0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
+		0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0,
+		0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
+		0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
+		0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
+		0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
+		0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
+		0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
+		0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
+		0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
+		0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
+		0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
+		0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
+		0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
+		0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
+		0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
+		0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
+		0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
+		0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
+		0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
+		0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
+		0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
+		0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
+		0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
+		0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
+		0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
+		0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
+		0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
+		0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
+		0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
+		0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
+		0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
+		0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
+		0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
+		0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
+		0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
+		0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
+		0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
+		0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
+		0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
+		0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
+		0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
+		0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
+		0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
+		0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
+		0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
+		0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
+		0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
+		0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
+		0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
+		0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
+		0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
+		0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
+		0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
+		0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
+		0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
+		0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
+		0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
+		0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
+		0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
+		0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
+		0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
+		0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
+		0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
+		0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
+		0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
+	};
+
+	// bcrypt IV: "OrpheanBeholderScryDoubt". The C implementation calls
+	// this "ciphertext", but it is really plaintext or an IV. We keep
+	// the name to make code comparison easier.
+	static private final int bf_crypt_ciphertext[] = {
+		0x4f727068, 0x65616e42, 0x65686f6c,
+		0x64657253, 0x63727944, 0x6f756274
+	};
+
+	// Table for Base64 encoding
+	static private final char base64_code[] = {
+		'.', '/', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
+		'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V',
+		'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h',
+		'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't',
+		'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5',
+		'6', '7', '8', '9'
+	};
+
+	// Table for Base64 decoding
+	static private final byte index_64[] = {
+		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+		-1, -1, -1, -1, -1, -1, 0, 1, 54, 55,
+		56, 57, 58, 59, 60, 61, 62, 63, -1, -1,
+		-1, -1, -1, -1, -1, 2, 3, 4, 5, 6,
+		7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
+		17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+		-1, -1, -1, -1, -1, -1, 28, 29, 30,
+		31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+		41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+		51, 52, 53, -1, -1, -1, -1, -1
+	};
+
+	// Expanded Blowfish key
+	private int P[];
+	private int S[];
+
+	/**
+	 * Encode a byte array using bcrypt's slightly-modified base64
+	 * encoding scheme. Note that this is *not* compatible with
+	 * the standard MIME-base64 encoding.
+	 *
+	 * @param d	the byte array to encode
+	 * @param len	the number of bytes to encode
+	 * @return	base64-encoded string
+	 * @exception IllegalArgumentException if the length is invalid
+	 */
+	private static String encode_base64(byte d[], int len)
+		throws IllegalArgumentException {
+		int off = 0;
+		StringBuffer rs = new StringBuffer();
+		int c1, c2;
+
+		if (len <= 0 || len > d.length) {
+			throw new IllegalArgumentException("Invalid len");
+		}
+		while (off < len) {
+			c1 = d[off++] & 0xff;
+			rs.append(base64_code[(c1 >> 2) & 0x3f]);
+			c1 = (c1 & 0x03) << 4;
+			if (off >= len) {
+				rs.append(base64_code[c1 & 0x3f]);
+				break;
+			}
+			c2 = d[off++] & 0xff;
+			c1 |= (c2 >> 4) & 0x0f;
+			rs.append(base64_code[c1 & 0x3f]);
+			c1 = (c2 & 0x0f) << 2;
+			if (off >= len) {
+				rs.append(base64_code[c1 & 0x3f]);
+				break;
+			}
+			c2 = d[off++] & 0xff;
+			c1 |= (c2 >> 6) & 0x03;
+			rs.append(base64_code[c1 & 0x3f]);
+			rs.append(base64_code[c2 & 0x3f]);
+		}
+		return rs.toString();
+	}
+
+	/**
+	 * Look up the 3 bits base64-encoded by the specified character,
+	 * range-checking againt conversion table
+	 * @param x	the base64-encoded value
+	 * @return	the decoded value of x
+	 */
+	private static byte char64(char x) {
+		if ((int)x < 0 || (int)x > index_64.length) {
+			return -1;
+		}
+		return index_64[(int)x];
+	}
+
+	/**
+	 * Decode a string encoded using bcrypt's base64 scheme to a
+	 * byte array. Note that this is *not* compatible with
+	 * the standard MIME-base64 encoding.
+	 * @param s	the string to decode
+	 * @param maxolen	the maximum number of bytes to decode
+	 * @return	an array containing the decoded bytes
+	 * @throws IllegalArgumentException if maxolen is invalid
+	 */
+	private static byte[] decode_base64(String s, int maxolen)
+		throws IllegalArgumentException {
+		StringBuffer rs = new StringBuffer();
+		int off = 0, slen = s.length(), olen = 0;
+		byte ret[];
+		byte c1, c2, c3, c4, o;
+
+		if (maxolen <= 0) {
+			throw new IllegalArgumentException("Invalid maxolen");
+		}
+		while (off < slen - 1 && olen < maxolen) {
+			c1 = char64(s.charAt(off++));
+			c2 = char64(s.charAt(off++));
+			if (c1 == -1 || c2 == -1) {
+				break;
+			}
+			o = (byte)(c1 << 2);
+			o |= (c2 & 0x30) >> 4;
+			rs.append((char)o);
+			if (++olen >= maxolen || off >= slen) {
+				break;
+			}
+			c3 = char64(s.charAt(off++));
+			if (c3 == -1) {
+				break;
+			}
+			o = (byte)((c2 & 0x0f) << 4);
+			o |= (c3 & 0x3c) >> 2;
+			rs.append((char)o);
+			if (++olen >= maxolen || off >= slen) {
+				break;
+			}
+			c4 = char64(s.charAt(off++));
+			o = (byte)((c3 & 0x03) << 6);
+			o |= c4;
+			rs.append((char)o);
+			++olen;
+		}
+
+		ret = new byte[olen];
+		for (off = 0; off < olen; off++) {
+			ret[off] = (byte) rs.charAt(off);
+		}
+		return ret;
+	}
+
+	/**
+	 * Blowfish encipher a single 64-bit block encoded as
+	 * two 32-bit halves
+	 * @param lr	an array containing the two 32-bit half blocks
+	 * @param off	the position in the array of the blocks
+	 */
+	private final void encipher(int lr[], int off) {
+		int i, n, l = lr[off], r = lr[off + 1];
+
+		l ^= P[0];
+		for (i = 0; i <= BLOWFISH_NUM_ROUNDS - 2;) {
+			// Feistel substitution on left word
+			n = S[(l >> 24) & 0xff];
+			n += S[0x100 | ((l >> 16) & 0xff)];
+			n ^= S[0x200 | ((l >> 8) & 0xff)];
+			n += S[0x300 | (l & 0xff)];
+			r ^= n ^ P[++i];
+
+			// Feistel substitution on right word
+			n = S[(r >> 24) & 0xff];
+			n += S[0x100 | ((r >> 16) & 0xff)];
+			n ^= S[0x200 | ((r >> 8) & 0xff)];
+			n += S[0x300 | (r & 0xff)];
+			l ^= n ^ P[++i];
+		}
+		lr[off] = r ^ P[BLOWFISH_NUM_ROUNDS + 1];
+		lr[off + 1] = l;
+	}
+
+	/**
+	 * Cycically extract a word of key material
+	 * @param data	the string to extract the data from
+	 * @param offp	a "pointer" (as a one-entry array) to the
+	 * current offset into data
+	 * @return	the next word of material from data
+	 */
+	private static int streamtoword(byte data[], int offp[]) {
+		int i;
+		int word = 0;
+		int off = offp[0];
+
+		for (i = 0; i < 4; i++) {
+			word = (word << 8) | (data[off] & 0xff);
+			off = (off + 1) % data.length;
+		}
+
+		offp[0] = off;
+		return word;
+	}
+
+	/**
+	 * Initialise the Blowfish key schedule
+	 */
+	private void init_key() {
+		P = (int[])P_orig.clone();
+		S = (int[])S_orig.clone();
+	}
+
+	/**
+	 * Key the Blowfish cipher
+	 * @param key	an array containing the key
+	 */
+	private void key(byte key[]) {
+		int i;
+		int koffp[] = { 0 };
+		int lr[] = { 0, 0 };
+		int plen = P.length, slen = S.length;
+
+		for (i = 0; i < plen; i++) {
+			P[i] = P[i] ^ streamtoword(key, koffp);
+		}
+		for (i = 0; i < plen; i += 2) {
+			encipher(lr, 0);
+			P[i] = lr[0];
+			P[i + 1] = lr[1];
+		}
+
+		for (i = 0; i < slen; i += 2) {
+			encipher(lr, 0);
+			S[i] = lr[0];
+			S[i + 1] = lr[1];
+		}
+	}
+
+	/**
+	 * Perform the "enhanced key schedule" step described by
+	 * Provos and Mazieres in "A Future-Adaptable Password Scheme"
+	 * http://www.openbsd.org/papers/bcrypt-paper.ps
+	 * @param data	salt information
+	 * @param key	password information
+	 */
+	private void ekskey(byte data[], byte key[]) {
+		int i;
+		int koffp[] = { 0 }, doffp[] = { 0 };
+		int lr[] = { 0, 0 };
+		int plen = P.length, slen = S.length;
+
+		for (i = 0; i < plen; i++) {
+			P[i] = P[i] ^ streamtoword(key, koffp);
+		}
+		for (i = 0; i < plen; i += 2) {
+			lr[0] ^= streamtoword(data, doffp);
+			lr[1] ^= streamtoword(data, doffp);
+			encipher(lr, 0);
+			P[i] = lr[0];
+			P[i + 1] = lr[1];
+		}
+
+		for (i = 0; i < slen; i += 2) {
+			lr[0] ^= streamtoword(data, doffp);
+			lr[1] ^= streamtoword(data, doffp);
+			encipher(lr, 0);
+			S[i] = lr[0];
+			S[i + 1] = lr[1];
+		}
+	}
+
+	/**
+	 * Perform the central password hashing step in the
+	 * bcrypt scheme
+	 * @param password	the password to hash
+	 * @param salt	the binary salt to hash with the password
+	 * @param log_rounds	the binary logarithm of the number
+	 * of rounds of hashing to apply
+	 * @param cdata         the plaintext to encrypt
+	 * @return	an array containing the binary hashed password
+	 */
+	public byte[] crypt_raw(byte password[], byte salt[], int log_rounds,
+	    int cdata[]) {
+		int rounds, i, j;
+		int clen = cdata.length;
+		byte ret[];
+
+		if (log_rounds < 4 || log_rounds > 30) {
+			throw new IllegalArgumentException("Bad number of rounds");
+		}
+		rounds = 1 << log_rounds;
+		if (salt.length != BCRYPT_SALT_LEN) {
+			throw new IllegalArgumentException("Bad salt length");
+		}
+		init_key();
+		ekskey(salt, password);
+		for (i = 0; i != rounds; i++) {
+			key(password);
+			key(salt);
+		}
+
+		for (i = 0; i < 64; i++) {
+			for (j = 0; j < (clen >> 1); j++) {
+				encipher(cdata, j << 1);
+			}
+		}
+
+		ret = new byte[clen * 4];
+		for (i = 0, j = 0; i < clen; i++) {
+			ret[j++] = (byte)((cdata[i] >> 24) & 0xff);
+			ret[j++] = (byte)((cdata[i] >> 16) & 0xff);
+			ret[j++] = (byte)((cdata[i] >> 8) & 0xff);
+			ret[j++] = (byte)(cdata[i] & 0xff);
+		}
+		return ret;
+	}
+
+	/**
+	 * Hash a password using the OpenBSD bcrypt scheme
+	 * @param password	the password to hash
+	 * @param salt	the salt to hash with (perhaps generated
+	 * using BCrypt.gensalt)
+	 * @return	the hashed password
+	 */
+	public static String hashpw(String password, String salt) {
+		BCrypt B;
+		String real_salt;
+		byte passwordb[], saltb[], hashed[];
+		char minor = (char)0;
+		int rounds, off = 0;
+		StringBuffer rs = new StringBuffer();
+
+		if (salt.charAt(0) != '$' || salt.charAt(1) != '2') {
+			throw new IllegalArgumentException("Invalid salt version");
+		}
+		if (salt.charAt(2) == '$') {
+			off = 3;
+		} else {
+			minor = salt.charAt(2);
+			if (minor != 'a' || salt.charAt(3) != '$') {
+				throw new IllegalArgumentException("Invalid salt revision");
+			}
+			off = 4;
+		}
+
+		// Extract number of rounds
+		if (salt.charAt(off + 2) > '$') {
+			throw new IllegalArgumentException("Missing salt rounds");
+		}
+		rounds = Integer.parseInt(salt.substring(off, off + 2));
+
+		real_salt = salt.substring(off + 3, off + 25);
+		try {
+			passwordb = (password + (minor >= 'a' ? "\000" : "")).getBytes("UTF-8");
+		} catch (UnsupportedEncodingException uee) {
+			throw new AssertionError("UTF-8 is not supported");
+		}
+
+		saltb = decode_base64(real_salt, BCRYPT_SALT_LEN);
+
+		B = new BCrypt();
+		hashed = B.crypt_raw(passwordb, saltb, rounds,
+		    (int[])bf_crypt_ciphertext.clone());
+
+		rs.append("$2");
+		if (minor >= 'a') {
+			rs.append(minor);
+		}
+		rs.append("$");
+		if (rounds < 10) {
+			rs.append("0");
+		}
+		if (rounds > 30) {
+			throw new IllegalArgumentException(
+			    "rounds exceeds maximum (30)");
+		}
+		rs.append(Integer.toString(rounds));
+		rs.append("$");
+		rs.append(encode_base64(saltb, saltb.length));
+		rs.append(encode_base64(hashed,
+		    bf_crypt_ciphertext.length * 4 - 1));
+		return rs.toString();
+	}
+
+	/**
+	 * Generate a salt for use with the BCrypt.hashpw() method
+	 * @param log_rounds	the log2 of the number of rounds of
+	 * hashing to apply - the work factor therefore increases as
+	 * 2**log_rounds.
+	 * @param random		an instance of SecureRandom to use
+	 * @return	an encoded salt value
+	 */
+	public static String gensalt(int log_rounds, SecureRandom random) {
+		StringBuffer rs = new StringBuffer();
+		byte rnd[] = new byte[BCRYPT_SALT_LEN];
+
+		random.nextBytes(rnd);
+
+		rs.append("$2a$");
+		if (log_rounds < 10) {
+			rs.append("0");
+		}
+		if (log_rounds > 30) {
+			throw new IllegalArgumentException(
+			    "log_rounds exceeds maximum (30)");
+		}
+		rs.append(Integer.toString(log_rounds));
+		rs.append("$");
+		rs.append(encode_base64(rnd, rnd.length));
+		return rs.toString();
+	}
+
+	/**
+	 * Generate a salt for use with the BCrypt.hashpw() method
+	 * @param log_rounds	the log2 of the number of rounds of
+	 * hashing to apply - the work factor therefore increases as
+	 * 2**log_rounds.
+	 * @return	an encoded salt value
+	 */
+	public static String gensalt(int log_rounds) {
+		return gensalt(log_rounds, new SecureRandom());
+	}
+
+	/**
+	 * Generate a salt for use with the BCrypt.hashpw() method,
+	 * selecting a reasonable default for the number of hashing
+	 * rounds to apply
+	 * @return	an encoded salt value
+	 */
+	public static String gensalt() {
+		return gensalt(GENSALT_DEFAULT_LOG2_ROUNDS);
+	}
+
+	/**
+	 * Check that a plaintext password matches a previously hashed
+	 * one
+	 * @param plaintext	the plaintext password to verify
+	 * @param hashed	the previously-hashed password
+	 * @return	true if the passwords match, false otherwise
+	 */
+	public static boolean checkpw(String plaintext, String hashed) {
+		byte hashed_bytes[];
+		byte try_bytes[];
+		try {
+			String try_pw = hashpw(plaintext, hashed);
+			hashed_bytes = hashed.getBytes("UTF-8");
+			try_bytes = try_pw.getBytes("UTF-8");
+		} catch (UnsupportedEncodingException uee) {
+			return false;
+		}
+		if (hashed_bytes.length != try_bytes.length) {
+			return false;
+		}
+		byte ret = 0;
+		for (int i = 0; i < try_bytes.length; i++) {
+			ret |= hashed_bytes[i] ^ try_bytes[i];
+		}
+		return ret == 0;
+	}
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/entity/CacheKey.java

@@ -0,0 +1,24 @@
+package com.huimv.eartag.monitor.entity;
+
+/****
+ * @Author:www.itheima.com
+ * @Description:
+ *****/
+public class CacheKey {
+
+    /**
+     * 商品分类
+     */
+    public static String CATEGORY="CATEGORY";
+
+    /**
+     * 品牌缓存
+     */
+    public static String BRAND="BRAND";
+
+    /**
+     * 规格
+     */
+    public static String SPEC="SPEC";
+
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/entity/ChineseUtils.java

@@ -0,0 +1,66 @@
+package com.huimv.eartag.monitor.entity;
+
+import java.io.UnsupportedEncodingException;
+import java.util.Random;
+
+/***
+ *
+ * @Author:www.itheima.com
+ * @Description:itheima
+ *
+ ****/
+public class ChineseUtils {
+
+    private static Random random = null;
+
+    private static Random getRandomInstance() {
+        if (random == null) {
+            random = new Random(System.currentTimeMillis());
+        }
+        return random;
+    }
+
+    public static String getChinese() {
+        String str = null;
+        int highPos, lowPos;
+        Random random = getRandomInstance();
+        highPos = (176 + Math.abs(random.nextInt(39)));
+        lowPos = 161 + Math.abs(random.nextInt(93));
+        byte[] b = new byte[2];
+        b[0] = (new Integer(highPos)).byteValue();
+        b[1] = (new Integer(lowPos)).byteValue();
+        try {
+            str = new String(b, "GB2312");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        return str;
+    }
+
+    public static String getFixedLengthChinese(int length) {
+        String str = "";
+        for (int i = length; i > 0; i--) {
+            str = str + ChineseUtils.getChinese();
+        }
+        return str;
+    }
+
+    public static String getRandomLengthChiness(int start, int end) {
+        String str = "";
+        int length = new Random().nextInt(end + 1);
+        if (length < start) {
+            str = getRandomLengthChiness(start, end);
+        } else {
+            for (int i = 0; i < length; i++) {
+                str = str + getChinese();
+            }
+        }
+        return str;
+    }
+
+    public static void main(String args[]) {
+        System.out.println(ChineseUtils.getChinese());
+        System.out.println(ChineseUtils.getFixedLengthChinese(20));
+        System.out.println(ChineseUtils.getRandomLengthChiness(2, 5));
+    }
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/entity/IdWorker.java

@@ -0,0 +1,170 @@
+package com.huimv.eartag.monitor.entity;
+
+import java.lang.management.ManagementFactory;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+
+/**
+ * <p>名称：IdWorker.java</p>
+ * <p>描述：分布式自增长ID</p>
+ * <pre>
+ *     Twitter的 Snowflake　JAVA实现方案
+ * </pre>
+ * 核心代码为其IdWorker这个类实现，其原理结构如下，我分别用一个0表示一位，用—分割开部分的作用：
+ * 1||0---0000000000 0000000000 0000000000 0000000000 0 --- 00000 ---00000 ---000000000000
+ * 在上面的字符串中，第一位为未使用（实际上也可作为long的符号位），接下来的41位为毫秒级时间，
+ * 然后5位datacenter标识位，5位机器ID（并不算标识符，实际是为线程标识），
+ * 然后12位该毫秒内的当前毫秒内的计数，加起来刚好64位，为一个Long型。
+ * 这样的好处是，整体上按照时间自增排序，并且整个分布式系统内不会产生ID碰撞（由datacenter和机器ID作区分），
+ * 并且效率较高，经测试，snowflake每秒能够产生26万ID左右，完全满足需要。
+ * <p>
+ * 64位ID (42(毫秒)+5(机器ID)+5(业务编码)+12(重复累加))
+ *
+ * @author Polim
+ */
+public class IdWorker {
+    // 时间起始标记点，作为基准，一般取系统的最近时间（一旦确定不能变动）
+    private final static long twepoch = 1288834974657L;
+    // 机器标识位数
+    private final static long workerIdBits = 5L;
+    // 数据中心标识位数
+    private final static long datacenterIdBits = 5L;
+    // 机器ID最大值
+    private final static long maxWorkerId = -1L ^ (-1L << workerIdBits);
+    // 数据中心ID最大值
+    private final static long maxDatacenterId = -1L ^ (-1L << datacenterIdBits);
+    // 毫秒内自增位
+    private final static long sequenceBits = 12L;
+    // 机器ID偏左移12位
+    private final static long workerIdShift = sequenceBits;
+    // 数据中心ID左移17位
+    private final static long datacenterIdShift = sequenceBits + workerIdBits;
+    // 时间毫秒左移22位
+    private final static long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits;
+
+    private final static long sequenceMask = -1L ^ (-1L << sequenceBits);
+    /* 上次生产id时间戳 */
+    private static long lastTimestamp = -1L;
+    // 0，并发控制
+    private long sequence = 0L;
+
+    private final long workerId;
+    // 数据标识id部分
+    private final long datacenterId;
+
+    public IdWorker(){
+        this.datacenterId = getDatacenterId(maxDatacenterId);
+        this.workerId = getMaxWorkerId(datacenterId, maxWorkerId);
+    }
+    /**
+     * @param workerId
+     *            工作机器ID
+     * @param datacenterId
+     *            序列号
+     */
+    public IdWorker(long workerId, long datacenterId) {
+        if (workerId > maxWorkerId || workerId < 0) {
+            throw new IllegalArgumentException(String.format("worker Id can't be greater than %d or less than 0", maxWorkerId));
+        }
+        if (datacenterId > maxDatacenterId || datacenterId < 0) {
+            throw new IllegalArgumentException(String.format("datacenter Id can't be greater than %d or less than 0", maxDatacenterId));
+        }
+        this.workerId = workerId;
+        this.datacenterId = datacenterId;
+    }
+    /**
+     * 获取下一个ID
+     *
+     * @return
+     */
+    public synchronized long nextId() {
+        long timestamp = timeGen();
+        if (timestamp < lastTimestamp) {
+            throw new RuntimeException(String.format("Clock moved backwards.  Refusing to generate id for %d milliseconds", lastTimestamp - timestamp));
+        }
+
+        if (lastTimestamp == timestamp) {
+            // 当前毫秒内，则+1
+            sequence = (sequence + 1) & sequenceMask;
+            if (sequence == 0) {
+                // 当前毫秒内计数满了，则等待下一秒
+                timestamp = tilNextMillis(lastTimestamp);
+            }
+        } else {
+            sequence = 0L;
+        }
+        lastTimestamp = timestamp;
+        // ID偏移组合生成最终的ID，并返回ID
+        long nextId = ((timestamp - twepoch) << timestampLeftShift)
+                | (datacenterId << datacenterIdShift)
+                | (workerId << workerIdShift) | sequence;
+
+        return nextId;
+    }
+
+    private long tilNextMillis(final long lastTimestamp) {
+        long timestamp = this.timeGen();
+        while (timestamp <= lastTimestamp) {
+            timestamp = this.timeGen();
+        }
+        return timestamp;
+    }
+
+    private long timeGen() {
+        return System.currentTimeMillis();
+    }
+
+    /**
+     * <p>
+     * 获取 maxWorkerId
+     * </p>
+     */
+    protected static long getMaxWorkerId(long datacenterId, long maxWorkerId) {
+        StringBuffer mpid = new StringBuffer();
+        mpid.append(datacenterId);
+        String name = ManagementFactory.getRuntimeMXBean().getName();
+        if (!name.isEmpty()) {
+            /*
+             * GET jvmPid
+             */
+            mpid.append(name.split("@")[0]);
+        }
+        /*
+         * MAC + PID 的 hashcode 获取16个低位
+         */
+        return (mpid.toString().hashCode() & 0xffff) % (maxWorkerId + 1);
+    }
+
+    /**
+     * <p>
+     * 数据标识id部分
+     * </p>
+     */
+    protected static long getDatacenterId(long maxDatacenterId) {
+        long id = 0L;
+        try {
+            InetAddress ip = InetAddress.getLocalHost();
+            NetworkInterface network = NetworkInterface.getByInetAddress(ip);
+            if (network == null) {
+                id = 1L;
+            } else {
+                byte[] mac = network.getHardwareAddress();
+                id = ((0x000000FF & (long) mac[mac.length - 1])
+                        | (0x0000FF00 & (((long) mac[mac.length - 2]) << 8))) >> 6;
+                id = id % (maxDatacenterId + 1);
+            }
+        } catch (Exception e) {
+            System.out.println(" getDatacenterId: " + e.getMessage());
+        }
+        return id;
+    }
+
+    public static void main(String[] args) {
+        IdWorker idWorker = new IdWorker(0,0);
+		
+        for (int i = 0; i <10000; i++) {
+            long nextId=idWorker.nextId();
+			System.out.println(nextId);
+        }
+    }
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/entity/Page.java

@@ -0,0 +1,238 @@
+package com.huimv.eartag.monitor.entity;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class Page <T> implements Serializable{
+
+	// 页数（第几页）
+	private long currentpage;
+
+	// 查询数据库里面对应的数据有多少条
+	private long total;// 从数据库查处的总记录数
+
+	// 每页查5条
+	private int size;
+
+	// 下页
+	private int next;
+	
+	private List<T> list;
+
+	// 最后一页
+	private int last;
+	
+	private int lpage;
+	
+	private int rpage;
+	
+	//从哪条开始查
+	private long start;
+	
+	//全局偏移量
+	public int offsize = 2;
+	
+	public Page() {
+		super();
+	}
+
+	/****
+	 *
+	 * @param currentpage
+	 * @param total
+	 * @param pagesize
+	 */
+	public void setCurrentpage(long currentpage,long total,long pagesize) {
+		//可以整除的情况下
+		long pagecount =  total/pagesize;
+
+		//如果整除表示正好分N页，如果不能整除在N页的基础上+1页
+		int totalPages = (int) (total%pagesize==0? total/pagesize : (total/pagesize)+1);
+
+		//总页数
+		this.last = totalPages;
+
+		//判断当前页是否越界,如果越界，我们就查最后一页
+		if(currentpage>totalPages){
+			this.currentpage = totalPages;
+		}else{
+			this.currentpage=currentpage;
+		}
+
+		//计算start
+		this.start = (this.currentpage-1)*pagesize;
+	}
+
+	//上一页
+	public long getUpper() {
+		return currentpage>1? currentpage-1: currentpage;
+	}
+
+	//总共有多少页，即末页
+	public void setLast(int last) {
+		this.last = (int) (total%size==0? total/size : (total/size)+1);
+	}
+
+	/****
+	 * 带有偏移量设置的分页
+	 * @param total
+	 * @param currentpage
+	 * @param pagesize
+	 * @param offsize
+	 */
+	public Page(long total,int currentpage,int pagesize,int offsize) {
+		this.offsize = offsize;
+		initPage(total, currentpage, pagesize);
+	}
+
+	/****
+	 *
+	 * @param total   总记录数
+	 * @param currentpage	当前页
+	 * @param pagesize	每页显示多少条
+	 */
+	public Page(long total,int currentpage,int pagesize) {
+		initPage(total,currentpage,pagesize);
+	}
+
+	/****
+	 * 初始化分页
+	 * @param total
+	 * @param currentpage
+	 * @param pagesize
+	 */
+	public void initPage(long total,int currentpage,int pagesize){
+		//总记录数
+		this.total = total;
+		//每页显示多少条
+		this.size=pagesize;
+
+		//计算当前页和数据库查询起始值以及总页数
+		setCurrentpage(currentpage, total, pagesize);
+
+		//分页计算
+		int leftcount =this.offsize,	//需要向上一页执行多少次
+				rightcount =this.offsize;
+
+		//起点页
+		this.lpage =currentpage;
+		//结束页
+		this.rpage =currentpage;
+
+		//2点判断
+		this.lpage = currentpage-leftcount;			//正常情况下的起点
+		this.rpage = currentpage+rightcount;		//正常情况下的终点
+
+		//页差=总页数和结束页的差
+		int topdiv = this.last-rpage;				//判断是否大于最大页数
+
+		/***
+		 * 起点页
+		 * 1、页差<0  起点页=起点页+页差值
+		 * 2、页差>=0 起点和终点判断
+		 */
+		this.lpage=topdiv<0? this.lpage+topdiv:this.lpage;
+
+		/***
+		 * 结束页
+		 * 1、起点页<=0   结束页=|起点页|+1
+		 * 2、起点页>0    结束页
+		 */
+		this.rpage=this.lpage<=0? this.rpage+(this.lpage*-1)+1: this.rpage;
+
+		/***
+		 * 当起点页<=0  让起点页为第一页
+		 * 否则不管
+		 */
+		this.lpage=this.lpage<=0? 1:this.lpage;
+
+		/***
+		 * 如果结束页>总页数   结束页=总页数
+		 * 否则不管
+		 */
+		this.rpage=this.rpage>last? this.last:this.rpage;
+	}
+
+	public long getNext() {
+		return  currentpage<last? currentpage+1: last;
+	}
+
+	public void setNext(int next) {
+		this.next = next;
+	}
+
+	public long getCurrentpage() {
+		return currentpage;
+	}
+
+	public long getTotal() {
+		return total;
+	}
+
+	public void setTotal(long total) {
+		this.total = total;
+	}
+
+	public long getSize() {
+		return size;
+	}
+
+	public void setSize(int size) {
+		this.size = size;
+	}
+
+	public long getLast() {
+		return last;
+	}
+
+	public long getLpage() {
+		return lpage;
+	}
+
+	public void setLpage(int lpage) {
+		this.lpage = lpage;
+	}
+
+	public long getRpage() {
+		return rpage;
+	}
+
+	public void setRpage(int rpage) {
+		this.rpage = rpage;
+	}
+
+	public long getStart() {
+		return start;
+	}
+
+	public void setStart(long start) {
+		this.start = start;
+	}
+
+	public void setCurrentpage(long currentpage) {
+		this.currentpage = currentpage;
+	}
+
+	/**
+	 * @return the list
+	 */
+	public List<T> getList() {
+		return list;
+	}
+
+	/**
+	 * @param list the list to set
+	 */
+	public void setList(List<T> list) {
+		this.list = list;
+	}
+
+	public static void main(String[] args) {
+			//总记录数
+			//当前页
+			//每页显示多少条
+			int cpage =17;
+			Page page = new Page(1001,cpage,50,7);
+			System.out.println("开始页:"+page.getLpage()+"__当前页："+page.getCurrentpage()+"__结束页"+page.getRpage()+"____总页数："+page.getLast());
+	}
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/entity/PageResult.java

@@ -0,0 +1,36 @@
+package com.huimv.eartag.monitor.entity;
+
+import java.util.List;
+
+/**
+ * 分页结果类
+ */
+public class PageResult<T> {
+
+    private Long total;//总记录数
+    private List<T> rows;//记录
+
+    public PageResult(Long total, List<T> rows) {
+        this.total = total;
+        this.rows = rows;
+    }
+
+    public PageResult() {
+    }
+
+    public Long getTotal() {
+        return total;
+    }
+
+    public void setTotal(Long total) {
+        this.total = total;
+    }
+
+    public List<T> getRows() {
+        return rows;
+    }
+
+    public void setRows(List<T> rows) {
+        this.rows = rows;
+    }
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/entity/Result.java

@@ -0,0 +1,69 @@
+package com.huimv.eartag.monitor.entity;
+
+import java.io.Serializable;
+
+/**
+ * 描述
+ *
+ * @author 三国的包子
+ * @version 1.0
+ * @package entity *
+ * @since 1.0
+ */
+public class Result<T> implements Serializable {
+    private boolean flag;//是否成功
+    private Integer code;//返回码
+    private String message;//返回消息
+    private T data;//返回数据
+
+    public Result(boolean flag, Integer code, String message, Object data) {
+        this.flag = flag;
+        this.code = code;
+        this.message = message;
+        this.data = (T) data;
+    }
+
+    public Result(boolean flag, Integer code, String message) {
+        this.flag = flag;
+        this.code = code;
+        this.message = message;
+    }
+
+    public Result() {
+        this.flag = true;
+        this.code = StatusCode.OK;
+        this.message = "操作成功!";
+    }
+
+    public boolean isFlag() {
+        return flag;
+    }
+
+    public void setFlag(boolean flag) {
+        this.flag = flag;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/entity/StatusCode.java

@@ -0,0 +1,14 @@
+package com.huimv.eartag.monitor.entity;
+
+/**
+ * 返回码
+ */
+public class StatusCode {
+    public static final int OK = 20000;//成功
+    public static final int ERROR = 20001;//失败
+    public static final int LOGINERROR = 20002;//用户名或密码错误
+    public static final int ACCESSERROR = 20003;//权限不足
+    public static final int REMOTEERROR = 20004;//远程调用失败
+    public static final int REPERROR = 20005;//重复操作
+    public static final int NOTFOUNDERROR = 20006;//没有对应的抢购数据
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/pojo/EartagData.java

@@ -0,0 +1,223 @@
+package com.huimv.eartag.monitor.pojo;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/****
+ * @Author:shenkunlin
+ * @Description:EartagData构建
+ * @Date 2019/6/14 19:13
+ *****/
+@Table(name="eartag_data")
+public class EartagData implements Serializable{
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+	private Integer id;//
+
+	@Column(name = "header")
+	private String header;//设备id
+
+    @Column(name = "SBID")
+	private Integer SBID;//设备id
+
+    @Column(name = "CMD")
+	private Integer CMD;//命令
+
+    @Column(name = "version")
+	private String version;//版本
+
+    @Column(name = "serial")
+	private Integer serial;//序列号
+
+    @Column(name = "eartag_id")
+	private String eartagId;//耳标id
+
+    @Column(name = "dl")
+	private Integer dl;//电量
+
+    @Column(name = "NBWD")
+	private Integer NBWD;//内部温度
+
+    @Column(name = "EBWD")
+	private Double EBWD;//耳标温度
+
+    @Column(name = "ntc")
+	private Integer ntc;//ntc
+
+    @Column(name = "YDL")
+	private Integer YDL;//运动量
+
+    @Column(name = "CQS")
+	private Integer CQS;//重启数
+
+    @Column(name = "RSSYI")
+	private Integer RSSYI;//rssi
+
+    @Column(name = "timestamp")
+	private Date timestamp;//时间戳
+
+    @Column(name = "check_number")
+	private Integer checkNumber;//校验码
+
+    @Column(name = "MLW")
+	private String MLW;//命令尾
+
+
+
+	//get方法
+	public Integer getId() {
+		return id;
+	}
+
+	//set方法
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	//get方法
+	public Integer getSBID() {
+		return SBID;
+	}
+
+	//set方法
+	public void setSBID(Integer SBID) {
+		this.SBID = SBID;
+	}
+	//get方法
+	public Integer getCMD() {
+		return CMD;
+	}
+
+	//set方法
+	public void setCMD(Integer CMD) {
+		this.CMD = CMD;
+	}
+	//get方法
+	public String getVersion() {
+		return version;
+	}
+
+	//set方法
+	public void setVersion(String version) {
+		this.version = version;
+	}
+	//get方法
+	public Integer getSerial() {
+		return serial;
+	}
+
+	//set方法
+	public void setSerial(Integer serial) {
+		this.serial = serial;
+	}
+	//get方法
+	public String getEartagId() {
+		return eartagId;
+	}
+
+	//set方法
+	public void setEartagId(String eartagId) {
+		this.eartagId = eartagId;
+	}
+	//get方法
+	public Integer getDl() {
+		return dl;
+	}
+
+	//set方法
+	public void setDl(Integer dl) {
+		this.dl = dl;
+	}
+	//get方法
+	public Integer getNBWD() {
+		return NBWD;
+	}
+
+	//set方法
+	public void setNBWD(Integer NBWD) {
+		this.NBWD = NBWD;
+	}
+	//get方法
+	public Double getEBWD() {
+		return EBWD;
+	}
+
+	//set方法
+	public void setEBWD(Double EBWD) {
+		this.EBWD = EBWD;
+	}
+	//get方法
+	public Integer getNtc() {
+		return ntc;
+	}
+
+	//set方法
+	public void setNtc(Integer ntc) {
+		this.ntc = ntc;
+	}
+	//get方法
+	public Integer getYDL() {
+		return YDL;
+	}
+
+	//set方法
+	public void setYDL(Integer YDL) {
+		this.YDL = YDL;
+	}
+	//get方法
+	public Integer getCQS() {
+		return CQS;
+	}
+
+	//set方法
+	public void setCQS(Integer CQS) {
+		this.CQS = CQS;
+	}
+	//get方法
+	public Integer getRSSYI() {
+		return RSSYI;
+	}
+
+	//set方法
+	public void setRSSYI(Integer RSSYI) {
+		this.RSSYI = RSSYI;
+	}
+	//get方法
+	public Date getTimestamp() {
+		return timestamp;
+	}
+
+	//set方法
+	public void setTimestamp(Date timestamp) {
+		this.timestamp = timestamp;
+	}
+	//get方法
+	public Integer getCheckNumber() {
+		return checkNumber;
+	}
+
+	//set方法
+	public void setCheckNumber(Integer checkNumber) {
+		this.checkNumber = checkNumber;
+	}
+	//get方法
+	public String getMLW() {
+		return MLW;
+	}
+
+	//set方法
+	public void setMLW(String MLW) {
+		this.MLW = MLW;
+	}
+
+
+	public String getHeader() {
+		return header;
+	}
+
+	public void setHeader(String header) {
+		this.header = header;
+	}
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/pojo/FarmInfo.java

@@ -0,0 +1,80 @@
+package com.huimv.eartag.monitor.pojo;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/****
+ * @Author:shenkunlin
+ * @Description:FarmInfo构建
+ * @Date 2019/6/14 19:13
+ *****/
+@Table(name="farm_info")
+public class FarmInfo implements Serializable{
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+	private Integer id;//
+
+    @Column(name = "name")
+	private String name;//牧场名称
+
+    @Column(name = "address")
+	private String address;//牧场地址
+
+    @Column(name = "tel")
+	private String tel;//电话
+
+    @Column(name = "remark")
+	private String remark;//备注
+
+
+
+	//get方法
+	public Integer getId() {
+		return id;
+	}
+
+	//set方法
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	//get方法
+	public String getName() {
+		return name;
+	}
+
+	//set方法
+	public void setName(String name) {
+		this.name = name;
+	}
+	//get方法
+	public String getAddress() {
+		return address;
+	}
+
+	//set方法
+	public void setAdress(String adress) {
+		this.address = adress;
+	}
+	//get方法
+	public String getTel() {
+		return tel;
+	}
+
+	//set方法
+	public void setTel(String tel) {
+		this.tel = tel;
+	}
+	//get方法
+	public String getRemark() {
+		return remark;
+	}
+
+	//set方法
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/pojo/Jqid.java

@@ -0,0 +1,116 @@
+package com.huimv.eartag.monitor.pojo;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/****
+ * @Author:shenkunlin
+ * @Description:Jqid构建
+ * @Date 2019/6/14 19:13
+ *****/
+@Table(name="jqid")
+public class Jqid implements Serializable{
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+	private Integer id;//
+
+    @Column(name = "farm_nameid")
+	private Integer farmNameid;//牧场名称
+
+    @Column(name = "farm_name")
+	private String farmName;//机器名称
+
+    @Column(name = "pig_homeid")
+	private Integer pigHomeid;//猪舍名称
+
+    @Column(name = "pig_home")
+	private String pigHome;//猪舍名称
+
+    @Column(name = "JQcode")
+	private String JQcode;//机器编码
+
+    @Column(name = "JQID")
+	private String JQID;//机器id
+
+    @Column(name = "remarmk")
+	private String remarmk;//备注
+
+
+
+	//get方法
+	public Integer getId() {
+		return id;
+	}
+
+	//set方法
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	//get方法
+	public Integer getFarmNameid() {
+		return farmNameid;
+	}
+
+	//set方法
+	public void setFarmNameid(Integer farmNameid) {
+		this.farmNameid = farmNameid;
+	}
+	//get方法
+	public String getFarmName() {
+		return farmName;
+	}
+
+	//set方法
+	public void setFarmName(String farmName) {
+		this.farmName = farmName;
+	}
+	//get方法
+	public Integer getPigHomeid() {
+		return pigHomeid;
+	}
+
+	//set方法
+	public void setPigHomeid(Integer pigHomeid) {
+		this.pigHomeid = pigHomeid;
+	}
+	//get方法
+	public String getPigHome() {
+		return pigHome;
+	}
+
+	//set方法
+	public void setPigHome(String pigHome) {
+		this.pigHome = pigHome;
+	}
+	//get方法
+	public String getJQcode() {
+		return JQcode;
+	}
+
+	//set方法
+	public void setJQcode(String JQcode) {
+		this.JQcode = JQcode;
+	}
+	//get方法
+	public String getJQID() {
+		return JQID;
+	}
+
+	//set方法
+	public void setJQID(String JQID) {
+		this.JQID = JQID;
+	}
+	//get方法
+	public String getRemarmk() {
+		return remarmk;
+	}
+
+	//set方法
+	public void setRemarmk(String remarmk) {
+		this.remarmk = remarmk;
+	}
+
+
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/pojo/PigHome.java

@@ -0,0 +1,80 @@
+package com.huimv.eartag.monitor.pojo;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/****
+ * @Author:shenkunlin
+ * @Description:PigHome构建
+ * @Date 2019/6/14 19:13
+ *****/
+@Table(name="pig_home")
+public class PigHome implements Serializable{
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+	private Integer id;//
+
+    @Column(name = "name")
+	private String name;//猪舍名称
+
+    @Column(name = "farm_id")
+	private Integer farmId;//牧场id
+
+    @Column(name = "remark")
+	private String remark;//备注
+
+    @Column(name = "farm_name")
+	private String farmName;//牧场名称
+
+
+
+	//get方法
+	public Integer getId() {
+		return id;
+	}
+
+	//set方法
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	//get方法
+	public String getName() {
+		return name;
+	}
+
+	//set方法
+	public void setName(String name) {
+		this.name = name;
+	}
+	//get方法
+	public Integer getFarmId() {
+		return farmId;
+	}
+
+	//set方法
+	public void setFarmId(Integer farmId) {
+		this.farmId = farmId;
+	}
+	//get方法
+	public String getRemark() {
+		return remark;
+	}
+
+	//set方法
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+	//get方法
+	public String getFarmName() {
+		return farmName;
+	}
+
+	//set方法
+	public void setFarmName(String farmName) {
+		this.farmName = farmName;
+	}
+
+
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/service/EartagDataService.java

@@ -0,0 +1,72 @@
+package com.huimv.eartag.monitor.service;
+
+
+
+
+import com.github.pagehelper.PageInfo;
+import com.huimv.eartag.monitor.pojo.EartagData;
+
+import java.util.List;
+
+/****
+ * @Author:shenkunlin
+ * @Description:EartagData业务层接口
+ * @Date 2019/6/14 0:16
+ *****/
+public interface EartagDataService {
+
+    /***
+     * EartagData多条件分页查询
+     * @param eartagData
+     * @param page
+     * @param size
+     * @return
+     */
+    PageInfo<EartagData> findPage(EartagData eartagData, int page, int size);
+
+    /***
+     * EartagData分页查询
+     * @param page
+     * @param size
+     * @return
+     */
+    PageInfo<EartagData> findPage(int page, int size);
+
+    /***
+     * EartagData多条件搜索方法
+     * @param eartagData
+     * @return
+     */
+    List<EartagData> findList(EartagData eartagData);
+
+    /***
+     * 删除EartagData
+     * @param id
+     */
+    void delete(Integer id);
+
+    /***
+     * 修改EartagData数据
+     * @param eartagData
+     */
+    void update(EartagData eartagData);
+
+    /***
+     * 新增EartagData
+     * @param eartagData
+     */
+    void add(EartagData eartagData);
+
+    /**
+     * 根据ID查询EartagData
+     * @param id
+     * @return
+     */
+     EartagData findById(Integer id);
+
+    /***
+     * 查询所有EartagData
+     * @return
+     */
+    List<EartagData> findAll();
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/service/FarmInfoService.java

@@ -0,0 +1,70 @@
+package com.huimv.eartag.monitor.service;
+
+
+import com.github.pagehelper.PageInfo;
+import com.huimv.eartag.monitor.pojo.FarmInfo;
+
+import java.util.List;
+
+/****
+ * @Author:shenkunlin
+ * @Description:FarmInfo业务层接口
+ * @Date 2019/6/14 0:16
+ *****/
+public interface FarmInfoService {
+
+    /***
+     * FarmInfo多条件分页查询
+     * @param farmInfo
+     * @param page
+     * @param size
+     * @return
+     */
+    PageInfo<FarmInfo> findPage(FarmInfo farmInfo, int page, int size);
+
+    /***
+     * FarmInfo分页查询
+     * @param page
+     * @param size
+     * @return
+     */
+    PageInfo<FarmInfo> findPage(int page, int size);
+
+    /***
+     * FarmInfo多条件搜索方法
+     * @param farmInfo
+     * @return
+     */
+    List<FarmInfo> findList(FarmInfo farmInfo);
+
+    /***
+     * 删除FarmInfo
+     * @param id
+     */
+    void delete(Integer id);
+
+    /***
+     * 修改FarmInfo数据
+     * @param farmInfo
+     */
+    void update(FarmInfo farmInfo);
+
+    /***
+     * 新增FarmInfo
+     * @param farmInfo
+     */
+    void add(FarmInfo farmInfo);
+
+    /**
+     * 根据ID查询FarmInfo
+     * @param id
+     * @return
+     */
+     FarmInfo findById(Integer id);
+
+    /***
+     * 查询所有FarmInfo
+     * @return
+     */
+    List<FarmInfo> findAll();
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/service/IClientDataPacketService.java

@@ -0,0 +1,9 @@
+package com.huimv.eartag.monitor.service;
+
+import java.text.ParseException;
+
+public interface IClientDataPacketService {
+
+    // 解析客户端数据包
+    public String parseClientSendPacket(String clientMessage) throws ParseException;
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/service/JqidService.java

@@ -0,0 +1,81 @@
+package com.huimv.eartag.monitor.service;
+
+import com.github.pagehelper.PageInfo;
+import com.huimv.eartag.monitor.pojo.Jqid;
+
+import java.util.List;
+
+/****
+ * @Author:shenkunlin
+ * @Description:Jqid业务层接口
+ * @Date 2019/6/14 0:16
+ *****/
+public interface JqidService {
+
+    /***
+     * Jqid多条件分页查询
+     * @param jqid
+     * @param page
+     * @param size
+     * @return
+     */
+    PageInfo<Jqid> findPage(Jqid jqid, int page, int size);
+
+    /***
+     * Jqid分页查询
+     * @param page
+     * @param size
+     * @return
+     */
+    PageInfo<Jqid> findPage(int page, int size);
+
+    /***
+     * Jqid多条件搜索方法
+     * @param jqid
+     * @return
+     */
+    List<Jqid> findList(Jqid jqid);
+
+    /***
+     * 删除Jqid
+     * @param id
+     */
+    void delete(Integer id);
+
+    /***
+     * 修改Jqid数据
+     * @param jqid
+     */
+    void update(Jqid jqid);
+
+    /***
+     * 新增Jqid
+     * @param jqid
+     */
+    void add(Jqid jqid);
+
+    /**
+     * 根据ID查询Jqid
+     * @param id
+     * @return
+     */
+     Jqid findById(Integer id);
+
+    /***
+     * 查询所有Jqid
+     * @return
+     */
+    List<Jqid> findAll();
+
+    /**
+     * @Method      : findDeviceIdByJQcode
+     * @Description : 
+     * @Params      : [serialNo]
+     * @Return      : java.lang.String
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/1/16       
+     * @Time        : 18:36
+     */
+    String findDeviceIdByJQcode(String serialNo);
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/service/PigHomeService.java

@@ -0,0 +1,70 @@
+package com.huimv.eartag.monitor.service;
+
+
+import com.github.pagehelper.PageInfo;
+import com.huimv.eartag.monitor.pojo.PigHome;
+
+import java.util.List;
+
+/****
+ * @Author:shenkunlin
+ * @Description:PigHome业务层接口
+ * @Date 2019/6/14 0:16
+ *****/
+public interface PigHomeService {
+
+    /***
+     * PigHome多条件分页查询
+     * @param pigHome
+     * @param page
+     * @param size
+     * @return
+     */
+    PageInfo<PigHome> findPage(PigHome pigHome, int page, int size);
+
+    /***
+     * PigHome分页查询
+     * @param page
+     * @param size
+     * @return
+     */
+    PageInfo<PigHome> findPage(int page, int size);
+
+    /***
+     * PigHome多条件搜索方法
+     * @param pigHome
+     * @return
+     */
+    List<PigHome> findList(PigHome pigHome);
+
+    /***
+     * 删除PigHome
+     * @param id
+     */
+    void delete(Integer id);
+
+    /***
+     * 修改PigHome数据
+     * @param pigHome
+     */
+    void update(PigHome pigHome);
+
+    /***
+     * 新增PigHome
+     * @param pigHome
+     */
+    void add(PigHome pigHome);
+
+    /**
+     * 根据ID查询PigHome
+     * @param id
+     * @return
+     */
+     PigHome findById(Integer id);
+
+    /***
+     * 查询所有PigHome
+     * @return
+     */
+    List<PigHome> findAll();
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/service/impl/ClientDataPacketServiceImpl.java

@@ -0,0 +1,63 @@
+package com.huimv.eartag.monitor.service.impl;
+
+import com.huimv.eartag.monitor.service.IClientDataPacketService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@Service
+@Slf4j
+public class ClientDataPacketServiceImpl implements IClientDataPacketService {
+
+    @Autowired
+    private ReceivePackageSerivce receivePackageSerivce;
+    @Autowired
+    private SendPackageService sendPackageService;
+
+    @Override
+    public String parseClientSendPacket(String clientMessageTxt) throws ParseException {
+        if (clientMessageTxt == null || clientMessageTxt.isEmpty()) {
+
+        }
+        String matcher = "[+]";
+//        String matcher = "\\+";
+        String[] clientMessageArray = clientMessageTxt.split(matcher);
+        String cmd = clientMessageArray[2];
+        log.info("命令>>" + cmd);
+        StringBuilder echoResultSb = new StringBuilder();
+        // 校验后边再做；
+        if (Integer.parseInt(cmd) == 1) {
+            // 绑定序列号返回的设备id
+            return sendPackageService.getDeviceId(clientMessageArray);
+        } else if (Integer.parseInt(cmd) == 2) {
+            // 处理获取服务器时间
+            return sendPackageService.getServerDateTime(clientMessageArray);
+        } else if (Integer.parseInt(cmd) == 3) {
+            // 处理心跳包
+            return sendPackageService.getHeartbeatBag(clientMessageArray);
+        } else if (Integer.parseInt(cmd) == 4) {
+            // 处理温度上传
+            return receivePackageSerivce.handleEartagTemperature(clientMessageArray);
+        } else if (Integer.parseInt(cmd) == 5) {
+            // 处理湿度上传
+            return receivePackageSerivce.handleEartagDampness(clientMessageArray);
+        } else if (Integer.parseInt(cmd) == 6) {
+            // 处理耳标数据
+            return receivePackageSerivce.handleEartagData(clientMessageArray).toString();
+        } else {
+            log.error("出错：当前命令cmd>>[" + cmd + "]未做任何处理.");
+            return null;
+        }
+    }
+
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/service/impl/EartagDataServiceImpl.java

@@ -0,0 +1,196 @@
+package com.huimv.eartag.monitor.service.impl;
+
+
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.huimv.eartag.monitor.dao.EartagDataMapper;
+import com.huimv.eartag.monitor.pojo.EartagData;
+import com.huimv.eartag.monitor.service.EartagDataService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import tk.mybatis.mapper.entity.Example;
+
+import java.util.List;
+
+/****
+ * @Author:shenkunlin
+ * @Description:EartagData业务层接口实现类
+ * @Date 2019/6/14 0:16
+ *****/
+@Service
+public class EartagDataServiceImpl implements EartagDataService {
+
+    @Autowired
+    private EartagDataMapper eartagDataMapper;
+
+
+    /**
+     * EartagData条件+分页查询
+     * @param eartagData 查询条件
+     * @param page 页码
+     * @param size 页大小
+     * @return 分页结果
+     */
+    @Override
+    public PageInfo<EartagData> findPage(EartagData eartagData, int page, int size){
+        //分页
+        PageHelper.startPage(page,size);
+        //搜索条件构建
+        Example example = createExample(eartagData);
+        //执行搜索
+        return new PageInfo<EartagData>(eartagDataMapper.selectByExample(example));
+    }
+
+    /**
+     * EartagData分页查询
+     * @param page
+     * @param size
+     * @return
+     */
+    @Override
+    public PageInfo<EartagData> findPage(int page, int size){
+        //静态分页
+        PageHelper.startPage(page,size);
+        //分页查询
+        return new PageInfo<EartagData>(eartagDataMapper.selectAll());
+    }
+
+    /**
+     * EartagData条件查询
+     * @param eartagData
+     * @return
+     */
+    @Override
+    public List<EartagData> findList(EartagData eartagData){
+        //构建查询条件
+        Example example = createExample(eartagData);
+        //根据构建的条件查询数据
+        return eartagDataMapper.selectByExample(example);
+    }
+
+
+    /**
+     * EartagData构建查询对象
+     * @param eartagData
+     * @return
+     */
+    public Example createExample(EartagData eartagData){
+        Example example=new Example(EartagData.class);
+        Example.Criteria criteria = example.createCriteria();
+        if(eartagData!=null){
+            // 
+            if(!StringUtils.isEmpty(eartagData.getId())){
+                    criteria.andEqualTo("id",eartagData.getId());
+            }
+            // 设备id
+            if(!StringUtils.isEmpty(eartagData.getSBID())){
+                    criteria.andEqualTo("SBID",eartagData.getSBID());
+            }
+            // 命令
+            if(!StringUtils.isEmpty(eartagData.getCMD())){
+                    criteria.andEqualTo("CMD",eartagData.getCMD());
+            }
+            // 版本
+            if(!StringUtils.isEmpty(eartagData.getVersion())){
+                    criteria.andEqualTo("version",eartagData.getVersion());
+            }
+            // 序列号
+            if(!StringUtils.isEmpty(eartagData.getSerial())){
+                    criteria.andEqualTo("serial",eartagData.getSerial());
+            }
+            // 耳标id
+            if(!StringUtils.isEmpty(eartagData.getEartagId())){
+                    criteria.andEqualTo("eartagId",eartagData.getEartagId());
+            }
+            // 电量
+            if(!StringUtils.isEmpty(eartagData.getDl())){
+                    criteria.andEqualTo("dl",eartagData.getDl());
+            }
+            // 内部温度
+            if(!StringUtils.isEmpty(eartagData.getNBWD())){
+                    criteria.andEqualTo("NBWD",eartagData.getNBWD());
+            }
+            // 耳标温度
+            if(!StringUtils.isEmpty(eartagData.getEBWD())){
+                    criteria.andEqualTo("EBWD",eartagData.getEBWD());
+            }
+            // ntc
+            if(!StringUtils.isEmpty(eartagData.getNtc())){
+                    criteria.andEqualTo("ntc",eartagData.getNtc());
+            }
+            // 运动量
+            if(!StringUtils.isEmpty(eartagData.getYDL())){
+                    criteria.andEqualTo("YDL",eartagData.getYDL());
+            }
+            // 重启数
+            if(!StringUtils.isEmpty(eartagData.getCQS())){
+                    criteria.andEqualTo("CQS",eartagData.getCQS());
+            }
+            // rssi
+            if(!StringUtils.isEmpty(eartagData.getRSSYI())){
+                    criteria.andEqualTo("RSSYI",eartagData.getRSSYI());
+            }
+            // 时间戳
+            if(!StringUtils.isEmpty(eartagData.getTimestamp())){
+                    criteria.andEqualTo("timestamp",eartagData.getTimestamp());
+            }
+            // 校验码
+            if(!StringUtils.isEmpty(eartagData.getCheckNumber())){
+                    criteria.andEqualTo("checkNumber",eartagData.getCheckNumber());
+            }
+            // 命令尾
+            if(!StringUtils.isEmpty(eartagData.getMLW())){
+                    criteria.andEqualTo("MLW",eartagData.getMLW());
+            }
+        }
+        return example;
+    }
+
+    /**
+     * 删除
+     * @param id
+     */
+    @Override
+    public void delete(Integer id){
+        eartagDataMapper.deleteByPrimaryKey(id);
+    }
+
+    /**
+     * 修改EartagData
+     * @param eartagData
+     */
+    @Override
+    public void update(EartagData eartagData){
+        eartagDataMapper.updateByPrimaryKey(eartagData);
+    }
+
+    /**
+     * 增加EartagData
+     * @param eartagData
+     */
+    @Override
+    public void add(EartagData eartagData){
+        eartagDataMapper.insert(eartagData);
+    }
+
+    /**
+     * 根据ID查询EartagData
+     * @param id
+     * @return
+     */
+    @Override
+    public EartagData findById(Integer id){
+        return  eartagDataMapper.selectByPrimaryKey(id);
+    }
+
+    /**
+     * 查询EartagData全部数据
+     * @return
+     */
+    @Override
+    public List<EartagData> findAll() {
+        return eartagDataMapper.selectAll();
+    }
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/service/impl/FarmInfoServiceImpl.java

@@ -0,0 +1,153 @@
+package com.huimv.eartag.monitor.service.impl;
+
+
+
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.huimv.eartag.monitor.dao.FarmInfoMapper;
+import com.huimv.eartag.monitor.pojo.FarmInfo;
+import com.huimv.eartag.monitor.service.FarmInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import tk.mybatis.mapper.entity.Example;
+
+import java.util.List;
+
+/****
+ * @Author:shenkunlin
+ * @Description:FarmInfo业务层接口实现类
+ * @Date 2019/6/14 0:16
+ *****/
+@Service
+public class FarmInfoServiceImpl implements FarmInfoService {
+
+    @Autowired
+    private FarmInfoMapper farmInfoMapper;
+
+
+    /**
+     * FarmInfo条件+分页查询
+     * @param farmInfo 查询条件
+     * @param page 页码
+     * @param size 页大小
+     * @return 分页结果
+     */
+    @Override
+    public PageInfo<FarmInfo> findPage(FarmInfo farmInfo, int page, int size){
+        //分页
+        PageHelper.startPage(page,size);
+        //搜索条件构建
+        Example example = createExample(farmInfo);
+        //执行搜索
+        return new PageInfo<FarmInfo>(farmInfoMapper.selectByExample(example));
+    }
+
+    /**
+     * FarmInfo分页查询
+     * @param page
+     * @param size
+     * @return
+     */
+    @Override
+    public PageInfo<FarmInfo> findPage(int page, int size){
+        //静态分页
+        PageHelper.startPage(page,size);
+        //分页查询
+        return new PageInfo<FarmInfo>(farmInfoMapper.selectAll());
+    }
+
+    /**
+     * FarmInfo条件查询
+     * @param farmInfo
+     * @return
+     */
+    @Override
+    public List<FarmInfo> findList(FarmInfo farmInfo){
+        //构建查询条件
+        Example example = createExample(farmInfo);
+        //根据构建的条件查询数据
+        return farmInfoMapper.selectByExample(example);
+    }
+
+
+    /**
+     * FarmInfo构建查询对象
+     * @param farmInfo
+     * @return
+     */
+    public Example createExample(FarmInfo farmInfo){
+        Example example=new Example(FarmInfo.class);
+        Example.Criteria criteria = example.createCriteria();
+        if(farmInfo!=null){
+            // 
+            if(!StringUtils.isEmpty(farmInfo.getId())){
+                    criteria.andEqualTo("id",farmInfo.getId());
+            }
+            // 牧场名称
+            if(!StringUtils.isEmpty(farmInfo.getName())){
+                    criteria.andLike("name","%"+farmInfo.getName()+"%");
+            }
+            // 牧场地址
+            if(!StringUtils.isEmpty(farmInfo.getAddress())){
+                    criteria.andEqualTo("address",farmInfo.getAddress());
+            }
+            // 电话
+            if(!StringUtils.isEmpty(farmInfo.getTel())){
+                    criteria.andEqualTo("tel",farmInfo.getTel());
+            }
+            // 备注
+            if(!StringUtils.isEmpty(farmInfo.getRemark())){
+                    criteria.andEqualTo("remark",farmInfo.getRemark());
+            }
+        }
+        return example;
+    }
+
+    /**
+     * 删除
+     * @param id
+     */
+    @Override
+    public void delete(Integer id){
+        farmInfoMapper.deleteByPrimaryKey(id);
+    }
+
+    /**
+     * 修改FarmInfo
+     * @param farmInfo
+     */
+    @Override
+    public void update(FarmInfo farmInfo){
+        farmInfoMapper.updateByPrimaryKey(farmInfo);
+    }
+
+    /**
+     * 增加FarmInfo
+     * @param farmInfo
+     */
+    @Override
+    public void add(FarmInfo farmInfo){
+        farmInfoMapper.insert(farmInfo);
+    }
+
+    /**
+     * 根据ID查询FarmInfo
+     * @param id
+     * @return
+     */
+    @Override
+    public FarmInfo findById(Integer id){
+        return  farmInfoMapper.selectByPrimaryKey(id);
+    }
+
+    /**
+     * 查询FarmInfo全部数据
+     * @return
+     */
+    @Override
+    public List<FarmInfo> findAll() {
+        return farmInfoMapper.selectAll();
+    }
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/service/impl/JqidServiceImpl.java

@@ -0,0 +1,195 @@
+package com.huimv.eartag.monitor.service.impl;
+
+
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.huimv.eartag.monitor.dao.JqidMapper;
+import com.huimv.eartag.monitor.pojo.Jqid;
+import com.huimv.eartag.monitor.service.FarmInfoService;
+import com.huimv.eartag.monitor.service.JqidService;
+import com.huimv.eartag.monitor.service.PigHomeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import tk.mybatis.mapper.entity.Example;
+
+import java.util.Date;
+import java.util.List;
+
+/****
+ * @Author:shenkunlin
+ * @Description:Jqid业务层接口实现类
+ * @Date 2019/6/14 0:16
+ *****/
+@Service
+@Slf4j
+public class JqidServiceImpl implements JqidService {
+
+    @Autowired
+    private JqidMapper jqidMapper;
+
+
+    @Autowired
+    private FarmInfoService farmInfoService;
+
+    @Autowired
+    private PigHomeService pigHomeService ;
+    /**
+     * Jqid条件+分页查询
+     * @param jqid 查询条件
+     * @param page 页码
+     * @param size 页大小
+     * @return 分页结果
+     */
+    @Override
+    public PageInfo<Jqid> findPage(Jqid jqid, int page, int size){
+        //分页
+        PageHelper.startPage(page,size);
+        //搜索条件构建
+        Example example = createExample(jqid);
+        //执行搜索
+        return new PageInfo<Jqid>(jqidMapper.selectByExample(example));
+    }
+
+    /**
+     * Jqid分页查询
+     * @param page
+     * @param size
+     * @return
+     */
+    @Override
+    public PageInfo<Jqid> findPage(int page, int size){
+        //静态分页
+        PageHelper.startPage(page,size);
+        //分页查询
+        return new PageInfo<Jqid>(jqidMapper.selectAll());
+    }
+
+    /**
+     * Jqid条件查询
+     * @param jqid
+     * @return
+     */
+    @Override
+    public List<Jqid> findList(Jqid jqid){
+        //构建查询条件
+        Example example = createExample(jqid);
+        //根据构建的条件查询数据
+        return jqidMapper.selectByExample(example);
+    }
+
+
+    /**
+     * Jqid构建查询对象
+     * @param jqid
+     * @return
+     */
+    public Example createExample(Jqid jqid){
+        Example example=new Example(Jqid.class);
+        Example.Criteria criteria = example.createCriteria();
+        if(jqid!=null){
+            // 
+            if(!StringUtils.isEmpty(jqid.getId())){
+                    criteria.andEqualTo("id",jqid.getId());
+            }
+            // 牧场名称
+            if(!StringUtils.isEmpty(jqid.getFarmNameid())){
+                    criteria.andEqualTo("farmNameid",jqid.getFarmNameid());
+            }
+            // 猪舍名称
+            if(!StringUtils.isEmpty(jqid.getPigHomeid())){
+                    criteria.andEqualTo("pigHomeid",jqid.getPigHomeid());
+            }
+            // 备注
+            if(!StringUtils.isEmpty(jqid.getRemarmk())){
+                    criteria.andEqualTo("remarmk",jqid.getRemarmk());
+            }
+            // 机器id
+            if(!StringUtils.isEmpty(jqid.getJQID())){
+                    criteria.andEqualTo("JQID",jqid.getJQID());
+            }
+            // 机器编码
+            if(!StringUtils.isEmpty(jqid.getJQcode())){
+                    criteria.andEqualTo("JQcode",jqid.getJQcode());
+            }
+            // 机器名称
+            if(!StringUtils.isEmpty(jqid.getFarmName())){
+                    criteria.andEqualTo("farmName",jqid.getFarmName());
+            }
+            // 猪舍名称
+            if(!StringUtils.isEmpty(jqid.getPigHome())){
+                    criteria.andEqualTo("pigHome",jqid.getPigHome());
+            }
+        }
+        return example;
+    }
+
+    /**
+     * 删除
+     * @param id
+     */
+    @Override
+    public void delete(Integer id){
+        jqidMapper.deleteByPrimaryKey(id);
+    }
+
+    /**
+     * 修改Jqid
+     * @param jqid
+     */
+    @Override
+    public void update(Jqid jqid){
+
+        jqid.setFarmName( farmInfoService.findById(jqid.getFarmNameid()).getName() );
+        jqid.setPigHome( pigHomeService.findById(jqid.getPigHomeid()).getName() );
+
+        jqidMapper.updateByPrimaryKey(jqid);
+    }
+
+    /**
+     * 增加Jqid
+     * @param jqid
+     */
+    @Override
+    public void add(Jqid jqid){
+
+        jqid.setFarmName( farmInfoService.findById(jqid.getFarmNameid()).getName() );
+        jqid.setPigHome( pigHomeService.findById(jqid.getPigHomeid()).getName() );
+        jqid.setJQID(new Date().getTime()+"");
+        jqidMapper.insert(jqid);
+    }
+
+    /**
+     * 根据ID查询Jqid
+     * @param id
+     * @return
+     */
+    @Override
+    public Jqid findById(Integer id){
+        return  jqidMapper.selectByPrimaryKey(id);
+    }
+
+    /**
+     * 查询Jqid全部数据
+     * @return
+     */
+    @Override
+    public List<Jqid> findAll() {
+        return jqidMapper.selectAll();
+    }
+
+    @Override
+    public String findDeviceIdByJQcode(String serialNo) {
+        // 根据序列号读取设备id
+        Jqid jqidPojo = jqidMapper.getDeviceIdByJQcode(serialNo);
+        String deviceId = "";
+        if(jqidPojo == null){
+            deviceId = "0000";
+            log.error("未查询到设备id(机器id)");
+        }
+         deviceId = jqidPojo.getJQID();
+        return deviceId;
+    }
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/service/impl/PigHomeServiceImpl.java

@@ -0,0 +1,154 @@
+package com.huimv.eartag.monitor.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.huimv.eartag.monitor.dao.PigHomeMapper;
+import com.huimv.eartag.monitor.pojo.PigHome;
+import com.huimv.eartag.monitor.service.FarmInfoService;
+import com.huimv.eartag.monitor.service.PigHomeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import tk.mybatis.mapper.entity.Example;
+
+import java.util.List;
+
+/****
+ * @Author:shenkunlin
+ * @Description:PigHome业务层接口实现类
+ * @Date 2019/6/14 0:16
+ *****/
+@Service
+public class PigHomeServiceImpl implements PigHomeService {
+
+    @Autowired
+    private PigHomeMapper pigHomeMapper;
+    @Autowired
+    private FarmInfoService farmInfoService;
+
+    /**
+     * PigHome条件+分页查询
+     * @param pigHome 查询条件
+     * @param page 页码
+     * @param size 页大小
+     * @return 分页结果
+     */
+    @Override
+    public PageInfo<PigHome> findPage(PigHome pigHome, int page, int size){
+        //分页
+        PageHelper.startPage(page,size);
+        //搜索条件构建
+        Example example = createExample(pigHome);
+        //执行搜索
+        return new PageInfo<PigHome>(pigHomeMapper.selectByExample(example));
+    }
+
+    /**
+     * PigHome分页查询
+     * @param page
+     * @param size
+     * @return
+     */
+    @Override
+    public PageInfo<PigHome> findPage(int page, int size){
+        //静态分页
+        PageHelper.startPage(page,size);
+        //分页查询
+        return new PageInfo<PigHome>(pigHomeMapper.selectAll());
+    }
+
+    /**
+     * PigHome条件查询
+     * @param pigHome
+     * @return
+     */
+    @Override
+    public List<PigHome> findList(PigHome pigHome){
+        //构建查询条件
+        Example example = createExample(pigHome);
+        //根据构建的条件查询数据
+        return pigHomeMapper.selectByExample(example);
+    }
+
+
+    /**
+     * PigHome构建查询对象
+     * @param pigHome
+     * @return
+     */
+    public Example createExample(PigHome pigHome){
+        Example example=new Example(PigHome.class);
+        Example.Criteria criteria = example.createCriteria();
+        if(pigHome!=null){
+            // 
+            if(!StringUtils.isEmpty(pigHome.getId())){
+                    criteria.andEqualTo("id",pigHome.getId());
+            }
+            // 猪舍名称
+            if(!StringUtils.isEmpty(pigHome.getName())){
+                    criteria.andLike("name","%"+pigHome.getName()+"%");
+            }
+            // 牧场id
+            if(!StringUtils.isEmpty(pigHome.getFarmId())){
+                    criteria.andEqualTo("farmId",pigHome.getFarmId());
+            }
+            // 备注
+            if(!StringUtils.isEmpty(pigHome.getRemark())){
+                    criteria.andEqualTo("remark",pigHome.getRemark());
+            }
+            // 牧场名称
+            if(!StringUtils.isEmpty(pigHome.getFarmName())){
+                    criteria.andEqualTo("farmName",pigHome.getFarmName());
+            }
+        }
+        return example;
+    }
+
+    /**
+     * 删除
+     * @param id
+     */
+    @Override
+    public void delete(Integer id){
+        pigHomeMapper.deleteByPrimaryKey(id);
+    }
+
+    /**
+     * 修改PigHome
+     * @param pigHome
+     */
+    @Override
+    public void update(PigHome pigHome){
+
+        pigHome.setFarmName( farmInfoService.findById(pigHome.getFarmId()).getName() );
+        pigHomeMapper.updateByPrimaryKey(pigHome);
+    }
+
+    /**
+     * 增加PigHome
+     * @param pigHome
+     */
+    @Override
+    public void add(PigHome pigHome){
+        pigHomeMapper.insert(pigHome);
+    }
+
+    /**
+     * 根据ID查询PigHome
+     * @param id
+     * @return
+     */
+    @Override
+    public PigHome findById(Integer id){
+        return  pigHomeMapper.selectByPrimaryKey(id);
+    }
+
+    /**
+     * 查询PigHome全部数据
+     * @return
+     */
+    @Override
+    public List<PigHome> findAll() {
+        return pigHomeMapper.selectAll();
+    }
+}

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/service/impl/ReceivePackageSerivce.java

@@ -0,0 +1,113 @@
+package com.huimv.eartag.monitor.service.impl;
+
+import com.huimv.common.date.DateUtil;
+import com.huimv.eartag.monitor.pojo.EartagData;
+import com.huimv.eartag.monitor.service.EartagDataService;
+import com.huimv.eartag.monitor.utils.Const;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.text.ParseException;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@Slf4j
+@Component
+public class ReceivePackageSerivce {
+
+    @Autowired
+    private EartagDataService eartagDataService;
+    /**
+     * @Method      : handleEartagData
+     * @Description : 处理耳标数据
+     * @Params      : [clientMessageArray]
+     * @Return      : java.lang.String
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/1/16       
+     * @Time        : 12:08
+     */
+    public String handleEartagData(String[] clientMessageArray) throws ParseException {
+        log.info("开始添加耳标数据......");
+        String commandHeader = clientMessageArray[0];
+        String deviceId = clientMessageArray[1];
+        String cmd = clientMessageArray[2];
+        String version = clientMessageArray[3];
+        String eartagId = clientMessageArray[4];
+        String serial = clientMessageArray[5];
+        String dl = clientMessageArray[6];
+        String nbwd = clientMessageArray[7];
+        String ntc = clientMessageArray[8];
+        String ebwd = "";
+        String ydl = clientMessageArray[9];
+        String cqs = clientMessageArray[10];
+        String rssi = clientMessageArray[11];
+        String timestamp = clientMessageArray[12];
+        String checkNumber = clientMessageArray[13];
+        String commandTail = clientMessageArray[14];
+
+        //
+        EartagData eartagData = new EartagData();
+        eartagData.setHeader(commandHeader);
+        eartagData.setCMD(Integer.parseInt(cmd));
+        eartagData.setSBID(Integer.parseInt(deviceId));
+        eartagData.setVersion(version);
+        eartagData.setSerial(Integer.parseInt(serial));
+        eartagData.setEartagId(eartagId);
+        eartagData.setDl(Integer.parseInt(dl));
+        eartagData.setNBWD(Integer.parseInt(nbwd));
+        eartagData.setEBWD(0.0);
+        eartagData.setNtc(Integer.parseInt(ntc));
+        eartagData.setYDL(Integer.parseInt(ydl));
+        eartagData.setCQS(Integer.parseInt(cqs));
+        eartagData.setRSSYI(Integer.parseInt(rssi));
+        eartagData.setTimestamp(DateUtil.parseDateTime(DateUtil.buildDateTimeString(timestamp)));
+        eartagData.setCheckNumber(Integer.parseInt(checkNumber));
+        eartagData.setMLW(commandTail);
+        // 保存耳标数据
+        eartagDataService.add(eartagData);
+        log.info(Const.EARTAG_SAVE_SUCCESS);
+        StringBuilder returnSb = new StringBuilder();
+//        return returnSb.append("hm").append("+").append(6).append("+").append(0).append("+").append(6).append("+").append("end").toString();
+        return "hm+6+0+6+end";
+    }
+
+    /**
+     * @Method      : _handleEartagDampness
+     * @Description : 处理耳标湿度
+     * @Params      : [clientMessageArray]
+     * @Return      : java.lang.String
+     *
+     * @Author      : ZhuoNing
+     * @Date        : 2021/1/15
+     * @Time        : 17:47
+     */
+    public String handleEartagDampness(String[] clientMessageArray) {
+//        String value = clientMessageArray[];
+
+        return "hm+5+0+8+end";
+    }
+
+    /**
+     * @Method      : _handleEartagTemperature
+     * @Description : 处理耳标温度
+     * @Params      : [clientMessageArray]
+     * @Return      : java.lang.String
+     *
+     * @Author      : ZhuoNing
+     * @Date        : 2021/1/15
+     * @Time        : 17:46
+     */
+    public String handleEartagTemperature(String[] clientMessageArray) {
+//        String value = clientMessageArray[];
+
+        return "hm+4+0+7+end";
+    }
+}

ear_tag/src/main/java/com/huimv/eartag/service/impl/SendPackageService.java

@@ -1,7 +1,9 @@
-package com.huimv.eartag.service.impl;
+package com.huimv.eartag.monitor.service.impl;
 
+import com.huimv.common.date.DateUtil;
+import com.huimv.eartag.monitor.service.JqidService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
 
 /**
  * @Project : huimv.shiwan
@@ -13,6 +15,10 @@ import org.springframework.stereotype.Service;
  **/
 @Component
 public class SendPackageService {
+
+    @Autowired
+    private JqidService jqidService;
+
     /**
      * @Method      : _handleGetDeviceId
      * @Description : 获取设备id
@@ -24,8 +30,11 @@ public class SendPackageService {
      * @Time        : 17:41
      */
     public String getDeviceId(String[] clientMessageArray) {
-
-        return null;
+        String serialNo = clientMessageArray[1];
+        System.out.println("serialNo>>"+serialNo);
+        // 查询机器id
+        String jqid = jqidService.findDeviceIdByJQcode(serialNo);
+        return "hm+"+jqid+"+1+7+end";
     }
 
     /**
@@ -39,8 +48,9 @@ public class SendPackageService {
      * @Time        : 17:38
      */
     public String getServerDateTime(String[] clientMessageArray) {
-
-        return null;
+        //
+        String formatNow = DateUtil.getNowWithDigital();
+        return "hm+2+"+formatNow+"+0+end";
     }
 
     /**
@@ -54,7 +64,6 @@ public class SendPackageService {
      * @Time        : 17:38
      */
     public String getHeartbeatBag(String[] clientMessageArray) {
-
-        return null;
+        return "hm+3+0+6+end";
     }
 }

ear_tag/src/main/java/com/huimv/eartag/socket/Server.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag.socket;
+package com.huimv.eartag.monitor.socket;
 
 
 import org.springframework.boot.CommandLineRunner;
@@ -7,6 +7,7 @@ import org.springframework.stereotype.Component;
 import java.io.*;
 import java.net.ServerSocket;
 import java.net.Socket;
+
 @Component
 public class Server implements CommandLineRunner {
 

ear_tag/src/main/java/com/huimv/eartag/socket/ServerThread.java

@@ -1,13 +1,14 @@
-package com.huimv.eartag.socket;
+package com.huimv.eartag.monitor.socket;
 
 
+import org.springframework.stereotype.Component;
+
 import java.io.*;
-import java.net.ServerSocket;
 import java.net.Socket;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-
+//@Component
 public class ServerThread extends Thread {
 
     private Socket socket;

ear_tag/src/main/java/com/huimv/eartag/utils/Const.java

@@ -1,6 +1,6 @@
-package com.huimv.eartag.utils;
-
+package com.huimv.eartag.monitor.utils;
 
+//@Component
 public class Const {
     public static final String EARTAG_SAVE_SUCCESS = "保存耳标数据成功";
 }

ear_tag/huimv-eartag-monitor/src/main/resources/application-dev.yml

@@ -0,0 +1,32 @@
+server:
+  port: 8093
+spring:
+  #给项目来个名字
+  application:
+    name: eartag
+
+  datasource:
+    url: jdbc:mysql://192.168.1.7:3306/eartag_db?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:
+    show-sql: true
+    database: mysql
+    hibernate:
+      ddl-auto: update
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+    open-in-view: true
+
+    #  redis:
+#    database: 0
+#    host: 119.3.84.55
+#    port: 6379
+#    password: hm123456
+#    jedis:
+#      pool:
+#        max-active: 20
+#        max-wait: -1
+#        max-idle: 10
+#        min-idle: 0
+#    timeout: 5000

ear_tag/huimv-eartag-monitor/src/main/resources/application-prod.yml

@@ -0,0 +1,32 @@
+server:
+  port: 8085
+spring:
+  #给项目来个名字
+  application:
+    name: env
+
+  datasource:
+    url: jdbc:mysql://192.168.1.7:3306/eartag_db?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:
+    show-sql: true
+    database: mysql
+    hibernate:
+      ddl-auto: update
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+    open-in-view: true
+
+    #  redis:
+#    database: 0
+#    host: 119.3.84.55
+#    port: 6379
+#    password: hm123456
+#    jedis:
+#      pool:
+#        max-active: 20
+#        max-wait: -1
+#        max-idle: 10
+#        min-idle: 0
+#    timeout: 5000

ear_tag/huimv-eartag-monitor/src/main/resources/application.properties

@@ -0,0 +1 @@
+spring.profiles.active=dev

ear_tag/huimv-eartag-monitor/src/test/java/com/huimv/eartag/monitor/service/DateTimeTest.java

@@ -0,0 +1,55 @@
+package com.huimv.eartag.monitor.service;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class DateTimeTest {
+
+    @Test
+    public void testParseDateTime() throws ParseException {
+        String str = "2008-08-08 20:08:08";
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        //String->Date
+        Date date = sdf.parse(str);
+        System.out.println(date);
+    }
+
+    @Test
+    public void testFormatDateTime() throws ParseException {
+        String date = "20201230175903";
+        String year = date.substring(0,4);
+        System.out.println("year>>"+year);
+        String month = date.substring(4,6);
+        System.out.println("month>>"+month);
+        String day = date.substring(6,8);
+        System.out.println("day>>"+day);
+        String hour = date.substring(8,10);
+        System.out.println("hour>>"+hour);
+        String minute = date.substring(10,12);
+        System.out.println("minute>>"+minute);
+        String seconds = date.substring(12,14);
+        System.out.println("seconds>>"+seconds);
+        String dateTime = year+"-"+month+"-"+day+" "+hour+":"+minute+":"+seconds;
+        System.out.println("dateTime>>"+dateTime);
+        //        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        //String->Date
+//        String date = sdf.format(str);
+//        System.out.println(date);
+    }
+}

ear_tag/src/test/java/com/huimv/eartag/service/ParseClientMessageTest.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag.service;
+package com.huimv.eartag.monitor.service;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -27,12 +27,27 @@ public class ParseClientMessageTest {
     public void testParseClientMessage() throws ParseException {
         String clientMessage = "hm+123456789012345+1+7+end";
         String t = iParseClientPacket.parseClientSendPacket(clientMessage);
-        System.out.println("t>>"+t);
+        System.out.println("t>>" + t);
     }
 
     @Test
     public void testHandleEartagData() throws ParseException {
         String clientMessage = "hm+0+6+1.0+002d4895+668519+89+2100+10902+1550+2+84+20201230175903+9+end";
         String t = iParseClientPacket.parseClientSendPacket(clientMessage).toString();
+        System.out.println("测试结果>>" + t);
+    }
+
+    @Test
+    public void testGetServerDateTime() throws ParseException {
+    String clientMessage = "hm+158+2+9+end";
+    String t = iParseClientPacket.parseClientSendPacket(clientMessage).toString();
+        System.out.println("测试结果>>"+t);
+    }
+
+    @Test
+    public void testGetDeviceId() throws ParseException {
+        String clientMessage = "hm+123456789012345+1+7+end";
+        String t = iParseClientPacket.parseClientSendPacket(clientMessage).toString();
+        System.out.println("测试结果>>"+t);
     }
 }

ear_tag/pom.xml

@@ -2,6 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <packaging>pom</packaging>
+    <modules>
+        <module>huimv-eartag-manager</module>
+        <module>huimv-eartag-monitor</module>
+<!--        <module>huimv-eartag-common</module>-->
+    </modules>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
@@ -82,15 +88,16 @@
             <artifactId>huimv-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
+<!--    <build>-->
+<!--        <plugins>-->
+<!--            <plugin>-->
+<!--                <groupId>org.springframework.boot</groupId>-->
+<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
+<!--            </plugin>-->
+<!--        </plugins>-->
+<!--    </build>-->
 
 </project>

ear_tag/src/main/java/com/huimv/eartag/EarTagApplication.java

@@ -1,15 +0,0 @@
-package com.huimv.eartag;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import tk.mybatis.spring.annotation.MapperScan;
-
-@MapperScan(basePackages = {"com.huimv.eartag.dao"})
-@SpringBootApplication
-public class EarTagApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(EarTagApplication.class, args);
-    }
-
-}

ear_tag/src/main/java/com/huimv/eartag/dao/JqidMapper.java

@@ -1,13 +0,0 @@
-package com.huimv.eartag.dao;
-
-
-import com.huimv.eartag.pojo.Jqid;
-import tk.mybatis.mapper.common.Mapper;
-
-/****
- * @Author:shenkunlin
- * @Description:Jqid的Dao
- * @Date 2019/6/14 0:12
- *****/
-public interface JqidMapper extends Mapper<Jqid> {
-}

ear_tag/src/test/java/com/huimv/eartag/EarTagApplicationTests.java

@@ -1,13 +0,0 @@
-package com.huimv.eartag;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class EarTagApplicationTests {
-
-    @Test
-    void contextLoads() {
-    }
-
-}