Merge remote-tracking branch 'origin/master'

huimv-eartag2-platform/data-process/src/main/resources/application-goldpig.yml

@@ -6,7 +6,7 @@ spring:
     name: huimv-eartag2-input
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-goldpig?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-goldpig?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -82,7 +82,7 @@ spring:
 #  datasource:
 ##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: hm123456
 #    driver-class-name: com.mysql.cj.jdbc.Driver

huimv-eartag2-platform/data-process2/src/main/resources/application-eartag.yml

@@ -6,7 +6,7 @@ spring:
     name: huimv-eartag2-input
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -82,7 +82,7 @@ spring:
 #  datasource:
 ##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: hm123456
 #    driver-class-name: com.mysql.cj.jdbc.Driver

huimv-eartag2-platform/data-process2/src/main/resources/application-eartag2.yml

@@ -6,7 +6,7 @@ spring:
     name: huimv-eartag2-input
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-demo-eartag20_2?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-demo-eartag20_2?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -82,7 +82,7 @@ spring:
 #  datasource:
 ##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: hm123456
 #    driver-class-name: com.mysql.cj.jdbc.Driver

huimv-eartag2-platform/gateway/src/main/resources/application-dev.yml

@@ -35,6 +35,12 @@ spring:
             - Path=/manage/**
           filters:
             - StripPrefix=1
+        - id: api
+          uri: http://127.0.0.1:8093
+          predicates:
+            - Path=/api/**
+          filters:
+            - StripPrefix=1
 logging:
   level:
     org.springframework.cloud.gateway: debug  # Gateway调试模式

huimv-eartag2-platform/huimv-eartag2-admin/src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ spring:
     name: huimv-eartag2-admin
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -89,7 +89,7 @@ spring:
 #  datasource:
 ##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://192.168.1.7:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: hm123456
 #    driver-class-name: com.mysql.cj.jdbc.Driver

huimv-eartag2-platform/huimv-eartag2-api/pom.xml

@@ -0,0 +1,135 @@
+<?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>huimv-eartag2-platform</artifactId>
+        <groupId>com.huimv</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>huimv-eartag2-api</artifactId>
+    <dependencies>
+        <!-- eartag2-common -->
+        <dependency>
+            <groupId>com.huimv</groupId>
+            <artifactId>huimv-eartag2-common</artifactId>
+            <version>0.0.2-SNAPSHOT</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <!-- 排除Tomcat容器 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <!-- 移除掉默认支持的 Tomcat -->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- 添加 Undertow 容器 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-undertow</artifactId>
+        </dependency>
+        <!-- -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.5</version>
+        </dependency>
+        <!--Mybatis-Plus生成器依赖-->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+            <!--            <version>3.3.1.tmp</version>-->
+            <version>3.3.2</version>
+        </dependency>
+        <!--freemarker 模板引擎(没有用原生的模板引擎)-->
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+            <version>2.3.31</version>
+        </dependency>
+        <!--mybits-plus-->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <!--            <version>3.4.2</version>-->
+            <version>3.4.3.4</version>
+        </dependency>
+        <!-- mybatis-plus-extension -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-extension</artifactId>
+            <version>3.5.2</version>
+        </dependency>
+        <!-- 连接池 -->
+        <dependency>
+            <!--自动配置-->
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>1.1.14</version>
+        </dependency>
+        <!-- velocity -->
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-engine-core</artifactId>
+            <version>2.0</version>
+        </dependency>
+        <!-- freemarker -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-freemarker</artifactId>
+        </dependency>
+        <!-- junit -->
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-commons</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!--  -->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <!--  -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
+</project>

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/HuimvApiApplication.java

@@ -0,0 +1,34 @@
+package com.huimv.eartag2.api;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@SpringBootApplication
+@EnableScheduling
+@MapperScan("com.huimv.eartag2.api.mapper")
+@EntityScan(value = "com.huimv.eartag2.common.dao.entity")
+@EnableJpaRepositories(basePackages = "com.huimv.eartag2.common.dao.repo")
+//@Import(InterceptorConfig.class)
+public class HuimvApiApplication {
+    public static void main(String[] args)   {
+        SpringApplication.run(HuimvApiApplication.class, args);
+    }
+    @Bean
+    public static RestTemplate getRestTemplate(){
+        return new RestTemplate();
+    }
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/config/MybatisPlusConfig.java

@@ -0,0 +1,44 @@
+package com.huimv.eartag2.api.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@Configuration
+public class MybatisPlusConfig {
+    /**
+     * 注册插件
+     */
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        // 添加分页插件
+        PaginationInnerInterceptor pageInterceptor = new PaginationInnerInterceptor();
+        // 设置请求的页面大于最大页后操作，true调回到首页，false继续请求。默认false
+        pageInterceptor.setOverflow(false);
+        // 单页分页条数限制，默认无限制
+        pageInterceptor.setMaxLimit(500L);
+        // 设置数据库类型
+        pageInterceptor.setDbType(DbType.MYSQL);
+
+        interceptor.addInnerInterceptor(pageInterceptor);
+        return interceptor;
+
+//        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+//        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+//        return interceptor;
+
+
+    }
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/config/WebSocket.java

@@ -0,0 +1,61 @@
+package com.huimv.eartag2.api.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.websocket.OnClose;
+import javax.websocket.OnMessage;
+import javax.websocket.OnOpen;
+import javax.websocket.Session;
+import javax.websocket.server.ServerEndpoint;
+import java.util.concurrent.CopyOnWriteArraySet;
+
+//注册成组件
+@Component
+//定义websocket服务器端，它的功能主要是将目前的类定义成一个websocket服务器端。注解的值将被用于监听用户连接的终端访问URL地址
+@ServerEndpoint("/websocket")
+//如果不想每次都写private  final Logger logger = LoggerFactory.getLogger(当前类名.class); 可以用注解@Slf4j;可以直接调用log.info
+@Slf4j
+public class WebSocket {
+ 
+    //实例一个session，这个session是websocket的session
+    private Session session;
+ 
+    //存放websocket的集合（本次demo不会用到，聊天室的demo会用到）
+    private static CopyOnWriteArraySet<WebSocket> webSocketSet = new CopyOnWriteArraySet<>();
+ 
+    //前端请求时一个websocket时
+    @OnOpen
+    public void onOpen(Session session) {
+        this.session = session;
+        webSocketSet.add(this);
+        log.info("【websocket消息】有新的连接, 总数:{}", webSocketSet.size());
+    }
+ 
+    //前端关闭时一个websocket时
+    @OnClose
+    public void onClose() {
+        webSocketSet.remove(this);
+        log.info("【websocket消息】连接断开, 总数:{}", webSocketSet.size());
+    }
+ 
+    //前端向后端发送消息
+    @OnMessage
+    public void onMessage(String message) {
+        log.info("【websocket消息】收到客户端发来的消息:{}", message);
+    }
+
+    //新增一个方法用于主动向客户端发送消息
+    public static void sendMessage(String message) {
+        for (WebSocket webSocket: webSocketSet) {
+            log.info("【websocket消息】广播消息, message={}", message);
+            try {
+                webSocket.session.getBasicRemote().sendText(message);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/config/WebSocketConfig.java

@@ -0,0 +1,19 @@
+package com.huimv.eartag2.api.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+
+/**
+ * websocket
+ * 的配置信息
+ */
+@Configuration
+public class WebSocketConfig {
+
+    @Bean
+    public ServerEndpointExporter serverEndpointExporter() {
+
+        return new ServerEndpointExporter();
+    }
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/BaseFarmController.java

@@ -0,0 +1,66 @@
+package com.huimv.eartag2.api.controller;
+
+
+import com.huimv.eartag2.api.service.BaseFarmService;
+import com.huimv.eartag2.common.utils.Result;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * <p>
+ *      牧场基础配置
+ * </p>
+ *
+ * @author zn
+ * @since 2022-07-27
+ */
+@RestController
+@RequestMapping("/base-farm")
+public class BaseFarmController {
+    @Resource
+    private BaseFarmService baseFarmService;
+
+    /**
+     * @description: 【增加】
+     * @author: 静静
+     * @param: maps
+     **/
+    @PostMapping("/add")
+    public Result addConfig(@RequestBody Map<String, String> maps){
+        return baseFarmService.add(maps);
+    }
+
+    /**
+     * @description: 【删除】
+     * @author: 静静
+     * @param: ids
+     **/
+    @PostMapping("/remove")
+    public Result removeConfig(@RequestBody String ids){
+        return baseFarmService.remove(ids);
+    }
+
+    /**
+     * @description: 【修改】
+     * @author: 静静
+     * @param: maps
+     **/
+    @PostMapping("/update")
+    public Result updateConfig(@RequestBody  Map<String, String> maps){
+        return baseFarmService.update(maps);
+    }
+    /**
+     * @description: 【查询】 分页查询配置表
+     * @author: 静静
+     * @param: paramsMap
+     **/
+    @PostMapping("/list")
+    public Result list(@RequestBody Map<String,String> paramsMap){
+        return baseFarmService.list(paramsMap);
+    }
+
+
+}
+

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/BaseFarmerController.java

@@ -0,0 +1,67 @@
+package com.huimv.eartag2.api.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.huimv.eartag2.api.service.BaseFarmerService;
+import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.common.utils.ResultCode;
+import com.huimv.eartag2.api.pojo.BaseFarmer;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.text.ParseException;
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-30
+ */
+@RestController
+@RequestMapping("/farmer")
+public class BaseFarmerController {
+
+    @Autowired
+    private BaseFarmerService baseFarmerService;
+    
+    @PostMapping("/add")
+    public Result add(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+        return baseFarmerService.add(paramsMap);
+    }
+
+    @PostMapping("/edit")
+    public Result edit(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+        return baseFarmerService.edit(paramsMap);
+    }
+
+    @PostMapping("/remove")
+    public Result remove(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+        return baseFarmerService.remove(paramsMap);
+    }
+
+    @PostMapping("/list")
+    public Result listByFarmCode(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+        return baseFarmerService.list(paramsMap);
+    }
+    @PostMapping("/listAll")
+    public Result listAll(@RequestBody Map<String, String> paramsMap) {
+        String farmCode = paramsMap.get("farmId");
+
+        return new Result(ResultCode.SUCCESS, baseFarmerService.list(new QueryWrapper<BaseFarmer>().eq(StringUtils.isNotBlank(farmCode),"farm_code",farmCode)));
+    }
+
+
+//    @PostMapping("/getLastAdoptByFarmCode")
+//    public Result getLastAdoptByFarmCode(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+//        return baseFarmerService.getLastAdoptByFarmCode(paramsMap);
+//    }
+}
+

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/BasePigpenController.java

@@ -0,0 +1,158 @@
+package com.huimv.eartag2.api.controller;
+
+
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.huimv.eartag2.api.service.BasePigpenService;
+import com.huimv.eartag2.common.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author zn
+ * @since 2022-07-22
+ */
+@RestController
+@RequestMapping("/base-pigpen")
+public class BasePigpenController {
+    @Autowired
+    private BasePigpenService basePigpenService;
+
+    @RequestMapping(value = "/list",method = RequestMethod.POST)
+    public Result list(@RequestBody Map<String, Object> paramsMap) {
+        System.out.println("paramsMap>>"+paramsMap.toString());
+        String farmCode = "";
+        if (paramsMap.get("farmId") != null) {
+            farmCode = paramsMap.get("farmId")+"";
+        }
+        String stageCode = "";
+        if (paramsMap.get("stageCode") != null) {
+            stageCode = paramsMap.get("stageCode")+"";
+        }
+        String pigpenName = "";
+        if (paramsMap.get("pigpenName") != null) {
+            pigpenName = paramsMap.get("pigpenName")+"";
+        }
+        return basePigpenService.list(farmCode,pigpenName,stageCode);
+    }
+
+
+
+    // 添加栋舍
+    /**
+     * @Method      : addBuilding
+     * @Description :  farmCode,buildingName,buildingCode,sort --以上必填
+     * @Params      : [paramsMap]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     *
+     * @Author      : ZhuoNing
+     * @Date        : 2022/7/23
+     * @Time        : 15:16
+     */
+    @RequestMapping(value = "/addBuilding",method = RequestMethod.POST)
+    public Result addBuilding(@RequestBody Map<String, Object> paramsMap){
+        // 牧场名称
+        String farmCode = paramsMap.get("farmId")+"";
+        // 栋名称
+        String buildingName = paramsMap.get("buildingName")+"";
+
+        // 栋编码
+//        String buildingCode = paramsMap.get("buildingCode")+"";
+        String buildingCode = System.currentTimeMillis()+"" ;
+        // 阶段
+        String stageCode = paramsMap.get("stageCode")+"";
+        // 排序
+        String sort = paramsMap.get("sort")+"";
+        if(StringUtils.isBlank(sort)){
+            sort = "1";
+        }
+        // 类型
+        Integer type = 1;
+        //
+        return basePigpenService.addBuilding(farmCode,buildingName,buildingCode,stageCode,Integer.parseInt(sort),type);
+    }
+
+    @RequestMapping(value = "/editBuilding",method = RequestMethod.POST)
+    public Result editBuilding(@RequestBody Map<String, Object> paramsMap){
+        // id
+        String id = paramsMap.get("id")+"";
+        // 栋名称
+        String buildingName = paramsMap.get("buildingName")+"";
+        // 栋编码
+//        String buildingCode = paramsMap.get("buildingCode")+"";
+        // 阶段
+        String stageCode = paramsMap.get("stageCode")+"";
+        // 排序
+        String sort = paramsMap.get("sort")+"";
+        if(StringUtils.isBlank(sort)){
+            sort = "1";
+        }
+        // 类型
+        Integer type = 1;
+        //
+        return basePigpenService.editBuilding(id,buildingName,stageCode,Integer.parseInt(sort),type);
+    }
+
+    // 删除栋舍
+    @RequestMapping(value = "/remove",method = RequestMethod.POST)
+    public Result remove(@RequestBody String ids){
+        //
+        return basePigpenService.remove(ids);
+    }
+
+    // 添加单元
+    @RequestMapping(value = "/addUnit",method = RequestMethod.POST)
+    public Result addUnit(@RequestBody Map<String, Object> paramsMap){
+        // 牧场名称
+        String farmCode = paramsMap.get("farmId")+"";
+        // 栋
+        String parentId = paramsMap.get("parentId")+"";
+        // 单元
+//        String unitCode = paramsMap.get("unitCode")+"";
+        String unitCode = System.currentTimeMillis()+"" ;
+        // 单元
+        String unitName = paramsMap.get("unitName")+"";
+        // 阶段
+        String stageCode = paramsMap.get("stageCode")+"";
+        // 排序
+        String sort = paramsMap.get("sort")+"";
+        if(StringUtils.isBlank(sort)){
+            sort = "1";
+        }
+        // 类型
+        Integer type = 2;
+        //
+        return basePigpenService.addUnit(farmCode,parentId,unitName,unitCode,stageCode,Integer.parseInt(sort),type);
+    }
+
+    @RequestMapping(value = "/editUnit",method = RequestMethod.POST)
+    public Result editUnit(@RequestBody Map<String, Object> paramsMap){
+        // id
+        String id = paramsMap.get("id")+"";
+        // 栋
+        String parentId = paramsMap.get("parentId")+"";
+        // 单元
+//        String unitCode = paramsMap.get("unitCode")+"";
+        // 单元
+        String unitName = paramsMap.get("unitName")+"";
+        // 阶段
+        String stageCode = paramsMap.get("stageCode")+"";
+        // 排序
+        String sort = paramsMap.get("sort")+"";
+        if(StringUtils.isBlank(sort)){
+            sort = "1";
+        }
+        // 类型
+        Integer type = 2;
+        //
+        return basePigpenService.editUnit(id,parentId,unitName,stageCode,Integer.parseInt(sort),type);
+    }
+
+
+}
+

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/BaseStageController.java

@@ -0,0 +1,21 @@
+package com.huimv.eartag2.api.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author zn
+ * @since 2022-07-22
+ */
+@RestController
+@RequestMapping("/base-stage")
+public class BaseStageController {
+
+}
+

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/BizBaseStageController.java

@@ -0,0 +1,52 @@
+package com.huimv.eartag2.api.controller;
+
+import com.huimv.eartag2.api.service.BizBaseStageService;
+import com.huimv.eartag2.common.utils.Result;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author zn
+ * @since 2022-07-23
+ */
+@RestController
+@RequestMapping("/bizBaseStage")
+public class BizBaseStageController {
+
+    @Resource
+    private BizBaseStageService bizBaseStageService;
+
+    @PostMapping("/add")
+    private Result addBizBaseStage(@RequestBody Map<String,String> param){
+      return bizBaseStageService.addBizBaseStage(param);
+    }
+
+    @PostMapping("/remove")
+    private Result removeBizBaseStage(@RequestBody List<String> ids){
+        return bizBaseStageService.removeBizBaseStage(ids);
+    }
+
+    @PostMapping("/update")
+    private Result updateBizBaseStage(@RequestBody Map<String,String> param){
+        return bizBaseStageService.updateBizBaseStage(param);
+    }
+
+    @PostMapping("/list")
+    private Result listBizBaseStage(@RequestBody Map<String,String> param){
+       return bizBaseStageService.listBizBaseStage(param);
+    }
+
+    @GetMapping ("/getData")
+     private Result getDataById(@Param("id") String id){
+        return bizBaseStageService.getDataById(id);
+    }
+}
+

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/EartagAbnormalAlarmController.java

@@ -0,0 +1,134 @@
+package com.huimv.eartag2.api.controller;
+
+
+import com.huimv.eartag2.api.service.*;
+import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.common.utils.ResultCode;
+import com.huimv.eartag2.api.pojo.BaseMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-30
+ */
+@RestController
+@RequestMapping("/pig")
+public class EartagAbnormalAlarmController {
+    @Autowired
+    private EartagAbnormalAlarmService eartagAbnormalAlarmService;
+    @Autowired
+    private FarmerAssetService farmerAssetService;
+    @Autowired
+    private IEartagEartagRegister2Service eartagRegisterService;
+    @Autowired
+    private IBaseMapService baseMapService;
+
+    //美维首页健康监测
+    @PostMapping("/getHealthy")
+    public Result getHealthy(@RequestBody Map<String, String> paramsMap) throws ParseException {
+        return eartagAbnormalAlarmService.getHealthy(paramsMap);
+    }
+
+    //美维首页群体健康
+    @PostMapping("/allHealthy")
+    public Result healthy(@RequestBody Map<String, String> paramsMap) throws ParseException {
+        return eartagAbnormalAlarmService.allHealthy(paramsMap);
+    }
+    //美维首页羊只健康
+    @PostMapping("/getSheepHealthy")
+    public Result getSheepHealthy(@RequestBody Map<String, String> paramsMap) throws ParseException {
+        return eartagAbnormalAlarmService.getSheepHealthy(paramsMap);
+    }
+    //获取报警接口
+    @PostMapping("/getWarning")
+    public Result getWarning(@RequestBody Map<String, String> paramsMap) throws ParseException {
+        return eartagAbnormalAlarmService.getWarning(paramsMap);
+    }
+
+    //下面是之前接口，暂时不动
+    @PostMapping("/getEarTemWarning")
+    public Result getEarTemWarning(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+        return eartagAbnormalAlarmService.getEarTemWarning(paramsMap);
+    }
+    @PostMapping("/listFarmer")
+    public Result listFarmer() throws ParseException {
+        return eartagAbnormalAlarmService.listFarmer();
+    }
+    @PostMapping("/getNewPig")
+    public Result getNewPig(@RequestBody Map<String, String> paramsMap) throws ParseException {
+        return eartagAbnormalAlarmService.getNewPig(paramsMap);
+    }
+
+    @PostMapping("/getAssetStatistics")
+    public Result getAssetStatistics(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+        return farmerAssetService.getAssetStatistics(paramsMap);
+    }
+
+    @PostMapping("/countAll")
+    public Result countAll(@RequestBody Map<String, Object> paramsMap)   {
+        return eartagAbnormalAlarmService.countAll(paramsMap);
+    }
+
+    @PostMapping("/pigMonitor")
+    public Result pigMonitor(@RequestBody Map<String, Object> paramsMap)  {
+        return eartagAbnormalAlarmService.pigMonitor(paramsMap);
+    }
+
+    @PostMapping("/getFarmerAndPig")
+    public Result getFarmerAndPig(@RequestBody Map<String, Object> paramsMap)  {
+        return eartagAbnormalAlarmService.getFarmerAndPig(paramsMap);
+    }
+
+    @Autowired
+    private IEartagData2Service eartagDataService;
+    @PostMapping("/getEnvByTime")
+    public Result getEnvByTime(@RequestBody Map<String,String> map, HttpServletRequest request){
+        return eartagDataService.getEnvByTimePanan(map);
+    }
+
+    @PostMapping("/getEnvLast")
+    public Result getEnvLast(@RequestBody Map<String,String> map){
+        return eartagDataService.getEnvLast(map);
+    }
+
+    @RequestMapping("/listFarmUnitEartagData")
+    public Result listFarmUnitEartagData(@RequestBody Map<String, String> params, HttpServletRequest req){
+//        Integer userId = TokenSign.getMemberIdByJwtToken(req);
+//        params.put("userId",userId+"");
+        return eartagRegisterService.listFarmUnitEartagDataQingshan(params);
+    }
+    @PostMapping("/mapAdd")
+    public Result mapAdd(@RequestBody BaseMap baseMap){
+        baseMapService.save(baseMap);
+        return new Result(10000,"添加成功",true);
+    }
+    @PostMapping("/mapUpdate")
+    public Result mmapUpdateapAdd(@RequestBody BaseMap baseMap){
+        baseMapService.updateById(baseMap);
+        return new Result(10000,"删除成功",true);
+    }
+    @PostMapping("/mapDelete")
+    public Result mapDelete(@RequestBody BaseMap baseMap){
+        baseMapService.removeById(baseMap);
+        return new Result(10000,"删除成功",true);
+    }
+    @PostMapping("/mapList")
+    public Result mapList(@RequestBody Map<String,Integer> map){
+        return new Result(ResultCode.SUCCESS, baseMapService.list());
+    }
+
+}
+

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/EartagAbnormalCountController.java

@@ -0,0 +1,44 @@
+package com.huimv.eartag2.api.controller;
+
+
+import com.huimv.eartag2.api.service.EartagAbnormalCountService;
+import com.huimv.eartag2.common.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-20
+ */
+@RestController
+@RequestMapping("/eartag-abnormal-count")
+public class EartagAbnormalCountController {
+    @Autowired
+    private EartagAbnormalCountService eartagAbnormalCountService;
+
+    @PostMapping("/listAbnormalCount")
+    public Result listAbnormalCount(@RequestBody Map<String,String> map){
+        return eartagAbnormalCountService.listAbnormalCount(map);
+    }
+
+    @PostMapping("/listAbnoramAll")
+    public Result listAbnoramAll(@RequestBody Map<String,String> map){
+        return eartagAbnormalCountService.listAbnoramAll(map);
+    }
+    @PostMapping("/listAbnoramDev")
+    public Result listAbnoramDev(@RequestBody Map<String,String> map){
+        return eartagAbnormalCountService.listAbnoramDev(map);
+    }
+
+}
+

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/EartagData2Controller.java

@@ -0,0 +1,77 @@
+package com.huimv.eartag2.api.controller;
+
+
+import com.huimv.eartag2.api.service.IEartagData2Service;
+import com.huimv.eartag2.common.common.token.TokenSign;
+import com.huimv.eartag2.common.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2022-07-29
+ */
+@RestController
+@RequestMapping("/eartagData")
+public class EartagData2Controller {
+    @Autowired
+    private IEartagData2Service eartagDataService;
+
+    @PostMapping("/getEnvByTime")
+    public Result getEnvByTime(@RequestBody Map<String,String> map, HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        map.put("userId",userId+"");
+        return eartagDataService.getEnvByTime(map);
+    }
+
+    @PostMapping("/api/getEnvByTime")
+    public Result getEnvByTime2(@RequestBody Map<String,String> map, HttpServletRequest request){
+        return eartagDataService.getEnvByTime2(map);
+    }
+
+    /**
+     * @Method      : getEartagDataByEarmark
+     * @Description : earmark,startDate,endDate
+     * @Params      : [map, request]
+     * @Return      : com.huimv.eartag2.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/10/15       
+     * @Time        : 15:55
+     */
+    @PostMapping("/api/getEartagDataByEarmark")
+    public Result getEartagDataByEarmark(@RequestBody Map<String,String> map, HttpServletRequest request){
+        Integer userId = TokenSign.getMemberIdByJwtToken(request);
+        map.put("userId",userId+"");
+        return eartagDataService.getEartagDataByEarmark(map);
+    }
+
+    @PostMapping("/api/eartagData/getTemp")
+    public Result getTemp(@RequestBody Map<String,String> map){
+
+        return eartagDataService.getTemp(map);
+    }
+
+    @PostMapping("/api/eartagData/getAct")
+    public Result getAct(@RequestBody Map<String,String> map){
+
+        return eartagDataService.getAct(map);
+    }
+
+    @PostMapping("/api/qingshan/countEartag")
+    public Result countEartag(@RequestBody Map<String,String> map){
+
+        return eartagDataService.countEartag(map);
+    }
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/EartagDataController.java

@@ -0,0 +1,35 @@
+package com.huimv.eartag2.api.controller;
+
+
+import com.huimv.eartag2.api.service.EartagDataService;
+import com.huimv.eartag2.common.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author zn
+ * @since 2022-07-18
+ */
+@RestController
+@RequestMapping("/eartagData2")
+public class EartagDataController {
+    @Autowired
+    private EartagDataService eartagDataService;
+
+    @PostMapping("getEnvByTime")
+    public Result getEnvByTime(@RequestBody Map<String,String> map){
+       return eartagDataService.getEnvByTime(map);
+    }
+
+}
+

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/EartagDeviceRegisterController.java

@@ -0,0 +1,99 @@
+package com.huimv.eartag2.api.controller;
+
+
+import com.huimv.eartag2.api.service.EartagDeviceRegisterService;
+import com.huimv.eartag2.common.utils.Result;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author zn
+ * @since 2022-07-22
+ */
+@RestController
+@RequestMapping("/eartag-device-register")
+public class EartagDeviceRegisterController {
+
+    @Resource
+    private EartagDeviceRegisterService eartagDeviceRegisterService;
+
+    /**
+     * @description: 【添加】设置栋舍单元
+     * @author: 静静
+     * @param: maps
+     **/
+    @PostMapping("/setPigpen")
+    public Result setDeviceRegister(@RequestBody List<Map<String, String>> maps){
+        return eartagDeviceRegisterService.set(maps);
+    }
+
+
+    @PostMapping("/setFarmer")
+    public Result setFarmer(@RequestBody List<Map<String, Integer>> maps){
+        return eartagDeviceRegisterService.setFarmer(maps);
+    }
+    /**
+     * @description: 【删除】
+     * @author: 静静
+     * @param: ids
+     **/
+    @PostMapping("/remove")
+    public Result removeDeviceRegister(@RequestBody String ids){
+        return eartagDeviceRegisterService.remove(ids);
+    }
+
+    /**
+     * @description: 【修改】
+     * @author: 静静
+     * @param: maps
+     **/
+    @PostMapping("/update")
+    public Result updateDeviceRegister(@RequestBody  Map<String, String> maps){
+        return eartagDeviceRegisterService.update(maps);
+    }
+    /**
+     * @description: 【查询】 分页查询
+     * @author: 静静
+     * @param: paramsMap
+     **/
+    @PostMapping("/list")
+    public Result list(@RequestBody Map<String,String> paramsMap){
+        return eartagDeviceRegisterService.list(paramsMap);
+    }
+
+    /**
+     * @description: 【增加】
+     * @author: 静静
+     * @param: maps
+     **/
+    @PostMapping("/add")
+    public Result add(@RequestBody Map<String, String> maps){
+        return eartagDeviceRegisterService.add(maps);
+    }
+
+    /**
+     * @description: 【删除】取消栋舍单元设置
+     * @author: 静静
+     **/
+    @PostMapping("/cancel")
+    public Result cancelPigpen(@RequestBody String ids){
+        return eartagDeviceRegisterService.cancel(ids);
+    }
+
+    /**
+     * @description: 【查询】根据farmID获取设备编码
+     * @author: 静静
+     **/
+    @GetMapping("/getDeviceCode")
+    public Result getDeviceCode(@RequestParam(name = "farmId") String farmCode){
+        return eartagDeviceRegisterService.getDeviceCode(farmCode);
+    }
+}
+

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/EartagEartagRegister2Controller.java

@@ -0,0 +1,20 @@
+package com.huimv.eartag2.api.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2022-08-04
+ */
+@RestController
+@RequestMapping("/eartagRegister2")
+public class EartagEartagRegister2Controller {
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/EartagHourActController.java

@@ -0,0 +1,52 @@
+package com.huimv.eartag2.api.controller;
+
+
+import com.huimv.eartag2.api.service.EartagHourActService;
+import com.huimv.eartag2.common.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.text.ParseException;
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-12
+ */
+@RestController
+@RequestMapping("/eartag-hour-act")
+public class EartagHourActController {
+    @Autowired
+    private EartagHourActService eartagHourActService;
+
+    @RequestMapping(value = "/getAct",method = RequestMethod.POST)
+    public Result list(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+        String farmCode = "";
+        if (paramsMap.get("farmId") != null) {
+            farmCode = paramsMap.get("farmId")+"";
+        }
+        String startDate = "";
+        if (paramsMap.get("startDate") != null) {
+            startDate = paramsMap.get("startDate")+"";
+        }
+        String endDate = "";
+        if (paramsMap.get("endDate") != null) {
+            endDate = paramsMap.get("endDate")+"";
+        }
+        String earmark = "";
+        if (paramsMap.get("earmark") != null) {
+            earmark = paramsMap.get("earmark")+"";
+        }
+        return eartagHourActService.getHourAct(farmCode,startDate,endDate,earmark);
+    }
+
+}
+

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/EartagOnlineStatusController.java

@@ -0,0 +1,21 @@
+package com.huimv.eartag2.api.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-06
+ */
+@RestController
+@RequestMapping("/eartag-online-status")
+public class EartagOnlineStatusController {
+
+}
+

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/EartagRegisterController.java

@@ -0,0 +1,64 @@
+package com.huimv.eartag2.api.controller;
+
+import com.huimv.eartag2.api.service.IEartagEartagRegister2Service;
+import com.huimv.eartag2.common.common.token.TokenSign;
+import com.huimv.eartag2.common.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : 耳标注册
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@RestController
+@RequestMapping("/eartagRegister")
+public class EartagRegisterController {
+    @Autowired
+    private IEartagEartagRegister2Service eartagRegisterService;
+
+   /* @RequestMapping("/listFarmUnitEartagData")
+    public Result listFarmUnitEartagData(@RequestBody Map<String, String> params){
+        return eartagRegisterService.listFarmUnitEartagData(params);
+    }*/
+
+    @RequestMapping("/listFarmUnitEartagData")
+    public Result listFarmUnitEartagData(@RequestBody Map<String, String> params, HttpServletRequest req){
+        Integer userId = TokenSign.getMemberIdByJwtToken(req);
+        params.put("userId",userId+"");
+        return eartagRegisterService.listFarmUnitEartagData(params);
+    }
+    @PostMapping("/listUserEartagData")
+    public Result listUserEartagData(@RequestBody Map<String, String> params, HttpServletRequest req){
+        Integer userId = TokenSign.getMemberIdByJwtToken(req);
+        params.put("userId",userId+"");
+        return eartagRegisterService.listUserEartagData(params);
+    }
+
+    @RequestMapping("/listFarmUnitEartagData2")
+    public Result listFarmUnitEartagData2(@RequestBody Map<String, String> params, HttpServletRequest req){
+        Integer userId = TokenSign.getMemberIdByJwtToken(req);
+        params.put("userId",userId+"");
+        return eartagRegisterService.listFarmUnitEartagData2(params);
+    }
+
+    @RequestMapping("/listFarmUnitEartagDataByFarmer")
+    public Result listFarmUnitEartagDataByFarmer(@RequestBody Map<String, String> params){
+        return eartagRegisterService.listFarmUnitEartagDataByFarmer(params);
+    }
+
+    @RequestMapping("/removeByEarmark")
+    public Result removeByEarmark(@RequestBody Map<String, String> params, HttpServletRequest req){
+        return eartagRegisterService.removeByEarmark(params,req);
+    }
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/EartagResetController.java

@@ -0,0 +1,59 @@
+package com.huimv.eartag2.api.controller;
+
+
+import com.huimv.eartag2.api.service.impl.EartagResetServiceImpl;
+import com.huimv.eartag2.common.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.text.ParseException;
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-12
+ */
+@RestController
+@RequestMapping("/eartag-reset")
+public class EartagResetController {
+    @Autowired
+    private EartagResetServiceImpl eartagResetServiceImpl;
+
+    @RequestMapping(value = "/getEartagResetDetails",method = RequestMethod.POST)
+    public Result getEartagResetDetails(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+        String farmCode = "";
+        if (paramsMap.get("farmId") != null) {
+            farmCode = paramsMap.get("farmId")+"";
+        }
+        String startDate = "";
+        if (paramsMap.get("startDate") != null) {
+            startDate = paramsMap.get("startDate")+"";
+        }
+        String endDate = "";
+        if (paramsMap.get("endDate") != null) {
+            endDate = paramsMap.get("endDate")+"";
+        }
+        String earmark = "";
+        if (paramsMap.get("earmark") != null) {
+            earmark = paramsMap.get("earmark")+"";
+        }
+        int pageNo = 1;
+        if (paramsMap.get("pageNo") != null) {
+            pageNo = Integer.parseInt(paramsMap.get("pageNo")+"");
+        }
+        int pageSize = 0;
+        if (paramsMap.get("pageSize") != null) {
+            pageSize = Integer.parseInt(paramsMap.get("pageSize")+"");
+        }
+        return eartagResetServiceImpl.getEartagResetDetails(farmCode,startDate,endDate,earmark,pageNo,pageSize);
+    }
+}
+

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/EartagResetCountController.java

@@ -0,0 +1,53 @@
+package com.huimv.eartag2.api.controller;
+
+
+import com.huimv.eartag2.api.service.EartagResetCountService;
+import com.huimv.eartag2.common.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.text.ParseException;
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-12
+ */
+@RestController
+@RequestMapping("/eartagResetCount")
+public class EartagResetCountController {
+    @Autowired
+    private EartagResetCountService eartagResetCountService;
+
+    @RequestMapping(value = "/getEartagResetCount",method = RequestMethod.POST)
+    public Result getResetCount(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+        String farmCode = "";
+        if (paramsMap.get("farmId") != null) {
+            farmCode = paramsMap.get("farmId")+"";
+        }
+        String startDate = "";
+        if (paramsMap.get("startDate") != null) {
+            startDate = paramsMap.get("startDate")+"";
+        }
+        String endDate = "";
+        if (paramsMap.get("endDate") != null) {
+            endDate = paramsMap.get("endDate")+"";
+        }
+        String earmark = "";
+        if (paramsMap.get("earmark") != null) {
+            earmark = paramsMap.get("earmark")+"";
+        }
+        return eartagResetCountService.getEartagResetCount(farmCode,startDate,endDate,earmark);
+    }
+
+    @PostMapping(value = "/listEartagResetCount")
+    public Result listEartagResetCount(@RequestBody Map<String, String> paramsMap) throws ParseException {
+
+        return eartagResetCountService.listEartagResetCount(paramsMap);
+    }
+}
+

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/FarmerAdoptController.java

@@ -0,0 +1,55 @@
+package com.huimv.eartag2.api.controller;
+
+
+import com.huimv.eartag2.api.service.FarmerAdoptService;
+import com.huimv.eartag2.common.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.text.ParseException;
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-29
+ */
+@RestController
+@RequestMapping("/farmer-adopt")
+public class FarmerAdoptController {
+    @Autowired
+    private FarmerAdoptService farmerAdoptService;
+
+    @PostMapping("/add")
+    public Result add(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+        return farmerAdoptService.add(paramsMap);
+    }
+
+    @PostMapping("/edit")
+    public Result edit(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+        return farmerAdoptService.edit(paramsMap);
+    }
+
+    @PostMapping("/remove")
+    public Result remove(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+        return farmerAdoptService.remove(paramsMap);
+    }
+
+    @PostMapping("/listByFarmCode")
+    public Result listByFarmCode(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+        return farmerAdoptService.listByFarmCode(paramsMap);
+    }
+
+    @PostMapping("/getLastAdoptByFarmCode")
+    public Result getLastAdoptByFarmCode(@RequestBody Map<String, Object> paramsMap) throws ParseException {
+        return farmerAdoptService.getLastAdoptByFarmCode(paramsMap);
+    }
+}
+

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/FarmerAssetController.java

@@ -0,0 +1,21 @@
+package com.huimv.eartag2.api.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-29
+ */
+@RestController
+@RequestMapping("/farmer-asset")
+public class FarmerAssetController {
+
+}
+

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/FarmerDayageWeightController.java

@@ -0,0 +1,21 @@
+package com.huimv.eartag2.api.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-30
+ */
+@RestController
+@RequestMapping("/farmer-dayage-weight")
+public class FarmerDayageWeightController {
+
+}
+

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/OpenApi.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag2.api.controller;
+
+import com.huimv.eartag2.api.service.IEartagData2Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/openApi")
+public class OpenApi {
+
+    @Autowired
+    private IEartagData2Service eartagDataService;
+
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/OpenController.java

@@ -0,0 +1,32 @@
+package com.huimv.eartag2.api.controller;
+
+
+import com.huimv.eartag2.api.service.IEartagEartagRegisterService;
+import com.huimv.eartag2.common.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@RestController
+@RequestMapping("/pig")
+public class OpenController {
+
+
+
+    @Autowired
+    private IEartagEartagRegisterService eartagEartagRegisterService;
+
+    @PostMapping
+    public Result getNewPig(@RequestBody Map<String,String> map){
+        String areaId = map.get("areaId");
+
+        return null;
+    }
+
+
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/PliersDemoController.java

@@ -0,0 +1,20 @@
+package com.huimv.eartag2.api.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2022-08-03
+ */
+@RestController
+@RequestMapping("/pliers-demo")
+public class PliersDemoController {
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/StationLibController.java

@@ -0,0 +1,31 @@
+package com.huimv.eartag2.api.controller;
+
+
+import com.huimv.eartag2.api.service.IPliersDemoService;
+import com.huimv.eartag2.common.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2022-08-03
+ */
+@RestController
+@RequestMapping("/stationLib")
+public class StationLibController {
+    @Autowired
+    private IPliersDemoService pliersDemoService;
+    @PostMapping("/listByPliersId")
+    public Result getPlierDemo(@RequestBody Map<String,String> map)   {
+
+        return pliersDemoService.listByPliersId(map);
+
+    }
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/controller/SysBaseConfigController.java

@@ -0,0 +1,86 @@
+package com.huimv.eartag2.api.controller;
+
+
+import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.api.service.SysBaseConfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 系统基础配置
+ * @Author: 静静
+ * @CreateTime: 2022-07-19  09:14
+ * @Version: 1.0*/
+
+
+@RestController
+@RequestMapping(value = "/config")
+@Slf4j
+public class SysBaseConfigController {
+
+    @Resource
+    private SysBaseConfigService sysBaseConfigService;
+
+/**
+     * @description: 【增加】
+     * @author: 静静
+     * @date: 2022/7/19 5:08 下午
+     * @param: maps
+     **/
+
+    @PostMapping("/add")
+    public Result addConfig(@RequestBody List<Map<String, String>> maps){
+        return sysBaseConfigService.add(maps);
+    }
+
+
+
+    @PostMapping("/remove")
+    public Result removeConfig(@RequestBody List<String> ids){
+        return sysBaseConfigService.remove(ids);
+    }
+
+
+
+    @PostMapping("/update")
+    public Result updateConfig(@RequestBody  List<Map<String, String>> maps){
+        return sysBaseConfigService.update(maps);
+    }
+
+
+
+    @GetMapping("/getDateById")
+    public Result getDateById(@Param("id") String id){
+        return sysBaseConfigService.getDateById(id);
+    }
+
+
+
+
+    @PostMapping("/list")
+    public Result list(@RequestBody Map<String,String> paramsMap){
+        return sysBaseConfigService.list(paramsMap);
+    }
+
+
+
+//    @PostMapping("/sync")
+//    public Result syncConfig(@RequestBody Map<String,String> paramsMap){
+//        return sysBaseConfigService.syncCong(paramsMap);
+//    }
+
+    @PostMapping("/listWarning")
+    public Result listWarning(@RequestBody Map<String,String> paramsMap){
+        return sysBaseConfigService.listWarning(paramsMap);
+    }
+    @PostMapping("/updateWarning")
+    public Result updateWarning(@RequestBody Map<String,String> paramsMap){
+        return sysBaseConfigService.updateWarning(paramsMap);
+    }
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/BaseFarmMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag2.api.mapper;
+
+import com.huimv.eartag2.api.pojo.BaseFarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zn
+ * @since 2022-07-27
+ */
+public interface BaseFarmMapper extends BaseMapper<BaseFarm> {
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/BaseFarmerMapper.java

@@ -0,0 +1,19 @@
+package com.huimv.eartag2.api.mapper;
+
+import com.huimv.eartag2.api.pojo.BaseFarmer;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-30
+ */
+public interface BaseFarmerMapper extends BaseMapper<BaseFarmer> {
+
+    List<BaseFarmer> getFarmer();
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/BaseMapMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag2.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.eartag2.api.pojo.BaseMap;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2022-12-06
+ */
+public interface BaseMapMapper extends BaseMapper<BaseMap> {
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/BasePigpenMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag2.api.mapper;
+
+import com.huimv.eartag2.api.pojo.BasePigpen;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zn
+ * @since 2022-07-22
+ */
+public interface BasePigpenMapper extends BaseMapper<BasePigpen> {
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/BaseStageMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag2.api.mapper;
+
+import com.huimv.eartag2.api.pojo.BaseStage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zn
+ * @since 2022-07-22
+ */
+public interface BaseStageMapper extends BaseMapper<BaseStage> {
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/BizBaseStageMapper.java

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

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/EartagAbnormalAlarmMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag2.api.mapper;
+
+import com.huimv.eartag2.api.pojo.EartagAbnormalAlarm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-30
+ */
+public interface EartagAbnormalAlarmMapper extends BaseMapper<EartagAbnormalAlarm> {
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/EartagAbnormalCountMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag2.api.mapper;
+
+import com.huimv.eartag2.api.pojo.EartagAbnormalCount;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-20
+ */
+public interface EartagAbnormalCountMapper extends BaseMapper<EartagAbnormalCount> {
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/EartagData2Mapper.java

@@ -0,0 +1,32 @@
+package com.huimv.eartag2.api.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.huimv.eartag2.api.pojo.EartagData2;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.eartag2.api.pojo.pojovo.AllHelthyDto;
+import com.huimv.eartag2.api.pojo.pojovo.EartagDataDto;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2022-07-29
+ */
+@Repository
+public interface EartagData2Mapper extends BaseMapper<EartagData2> {
+    //
+    List<EartagData2> getEartagDataByEarmark(@Param("earmark") String earmark, @Param("recordCount") String recordCount);
+
+    List<EartagDataDto> getAct(@Param(Constants.WRAPPER) QueryWrapper<EartagData2> wrapper);
+
+    List<AllHelthyDto> allHealthy(@Param(Constants.WRAPPER) QueryWrapper<EartagData2> wrapper);
+
+    List<AllHelthyDto> allHealthy2(@Param(Constants.WRAPPER) QueryWrapper<EartagData2> wrapper);
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/EartagDataMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag2.api.mapper;
+
+import com.huimv.eartag2.api.pojo.EartagData;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zn
+ * @since 2022-07-18
+ */
+public interface EartagDataMapper extends BaseMapper<EartagData> {
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/EartagDeviceRegisterMapper.java

@@ -0,0 +1,22 @@
+package com.huimv.eartag2.api.mapper;
+
+import com.huimv.eartag2.api.pojo.EartagDeviceRegister;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2022-07-20
+ */
+public interface EartagDeviceRegisterMapper extends BaseMapper<EartagDeviceRegister> {
+
+    String getDeviceIdByFarmerId(@Param("farmerId") String farmerId);
+
+    List<String> getDeviceIdListByFarmerId(@Param("farmerId") Integer farmerId);
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/EartagEartagRegister2Mapper.java

@@ -0,0 +1,34 @@
+package com.huimv.eartag2.api.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.eartag2.api.pojo.EartagEartagRegister2;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.eartag2.api.pojo.pojovo.QingShanData;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2022-08-04
+ */
+public interface EartagEartagRegister2Mapper extends BaseMapper<EartagEartagRegister2> {
+
+    Date getLastBatchCreateDate(@Param("deviceCode") String deviceCode);
+
+    List<EartagEartagRegister2> getLastBatchPig(@Param("deviceCode") String deviceCode, @Param("createDate") Date createDate);
+
+    List<EartagEartagRegister2> getEartagByDeviceCode(@Param("deviceCode") String deviceCode);
+
+    List<QingShanData> qingShanData(@Param("farmCode") String farmCode);
+
+    Page<EartagEartagRegister2> page(Page<Object> objectPage, QueryWrapper<EartagEartagRegister2> wrapper);
+
+//    Integer countEartagAbnormal(@Param("farmId")String farmId, @Param("eartagMaxTem")String eartagMaxTem,@Param("eartagMinTem") String eartagMinTem, @Param("envMaxTem")String envMaxTem, @Param("envMinTem")String envMinTem);
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/EartagEartagRegisterMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag2.api.mapper;
+
+import com.huimv.eartag2.api.pojo.EartagEartagRegister;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2022-07-20
+ */
+public interface EartagEartagRegisterMapper extends BaseMapper<EartagEartagRegister> {
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/EartagHourActMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag2.api.mapper;
+
+import com.huimv.eartag2.api.pojo.EartagHourAct;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-12
+ */
+public interface EartagHourActMapper extends BaseMapper<EartagHourAct> {
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/EartagOnlineStatusMapper.java

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

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/EartagResetCountMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag2.api.mapper;
+
+import com.huimv.eartag2.api.pojo.EartagResetCount;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-12
+ */
+public interface EartagResetCountMapper extends BaseMapper<EartagResetCount> {
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/EartagResetMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag2.api.mapper;
+
+import com.huimv.eartag2.api.pojo.EartagReset;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-12
+ */
+public interface EartagResetMapper extends BaseMapper<EartagReset> {
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/FarmerAdoptMapper.java

@@ -0,0 +1,18 @@
+package com.huimv.eartag2.api.mapper;
+
+import com.huimv.eartag2.api.pojo.FarmerAdopt;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-29
+ */
+public interface FarmerAdoptMapper extends BaseMapper<FarmerAdopt> {
+
+    FarmerAdopt getLastAdoptByFarmCode(@Param("farmCode") String farmCode);
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/FarmerAssetMapper.java

@@ -0,0 +1,29 @@
+package com.huimv.eartag2.api.mapper;
+
+import com.huimv.eartag2.api.pojo.FarmerAsset;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-29
+ */
+public interface FarmerAssetMapper extends BaseMapper<FarmerAsset> {
+
+    List<FarmerAsset> getLastManyMonthAssets(@Param("farmCode") String farmCode, @Param("manyMonth") String manyMonth);
+
+    BigDecimal getPigWeightByDayage(@Param("days") long days);
+
+    List<FarmerAsset> getAssetByMonth(@Param("months") int months, @Param("farmCode") String farmerId);
+
+    List<FarmerAsset> getPigWeight();
+
+    FarmerAsset getAssetByFarmerIdAndYearAndMonth(@Param("farmerId") Integer farmerId, @Param("year") String year, @Param("month") String month);
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/FarmerDayageWeightMapper.java

@@ -0,0 +1,19 @@
+package com.huimv.eartag2.api.mapper;
+
+import com.huimv.eartag2.api.pojo.FarmerDayageWeight;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-30
+ */
+public interface FarmerDayageWeightMapper extends BaseMapper<FarmerDayageWeight> {
+
+    List<FarmerDayageWeight> getAllDayageWeight();
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/PliersDemoMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag2.api.mapper;
+
+import com.huimv.eartag2.api.pojo.PliersDemo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2022-08-03
+ */
+public interface PliersDemoMapper extends BaseMapper<PliersDemo> {
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/StationLibMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.eartag2.api.mapper;
+
+import com.huimv.eartag2.api.pojo.StationLib;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2022-08-03
+ */
+public interface StationLibMapper extends BaseMapper<StationLib> {
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/SysAccountMultilevelMapper.java

@@ -0,0 +1,18 @@
+package com.huimv.eartag2.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.eartag2.api.pojo.SysAccountMultilevel;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-10-14
+ */
+@Repository
+public interface SysAccountMultilevelMapper extends BaseMapper<SysAccountMultilevel> {
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/SysBaseConfigMapper.java

@@ -0,0 +1,26 @@
+package com.huimv.eartag2.api.mapper;
+
+import com.huimv.eartag2.api.pojo.SysBaseConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.lettuce.core.dynamic.annotation.Param;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zn
+ * @since 2022-07-19
+ */
+
+@Component
+public interface SysBaseConfigMapper extends BaseMapper<SysBaseConfig> {
+
+    List<SysBaseConfig> selectByRowIdList(@Param("rowIds") List<String> rowIds);
+
+    List<SysBaseConfig> selectSysBaseConfig(String rowId);
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/BaseFarmMapper.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.eartag2.api.mapper.BaseFarmMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.BaseFarm">
+        <id column="id" property="id" />
+        <result column="farm_code" property="farmCode" />
+        <result column="farm_name" property="farmName" />
+        <result column="location" property="location" />
+        <result column="leader" property="leader" />
+        <result column="phone" property="phone" />
+        <result column="remark" property="remark" />
+        <result column="area_code" property="areaCode" />
+        <result column="code1" property="code1" />
+        <result column="code2" property="code2" />
+        <result column="ip" property="ip" />
+        <result column="port" property="port" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, farm_code, farm_name, location, leader, phone, remark, area_code, code1, code2, ip, port
+    </sql>
+
+</mapper>

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/BaseFarmerMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.eartag2.api.mapper.BaseFarmerMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.BaseFarmer">
+        <id column="id" property="id" />
+        <result column="farmer" property="farmer" />
+        <result column="phone" property="phone" />
+        <result column="address" property="address" />
+        <result column="farm_code" property="farmCode" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, farmer, phone, address,farm_code
+    </sql>
+    <select id="getFarmer" resultType="com.huimv.eartag2.api.pojo.BaseFarmer">
+        select * from base_farmer
+    </select>
+
+</mapper>

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/BasePigpenMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.eartag2.api.mapper.BasePigpenMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.BasePigpen">
+        <id column="id" property="id" />
+        <result column="pigpen_name" property="pigpenName" />
+        <result column="pigpen_code" property="pigpenCode" />
+        <result column="parent_id" property="parentId" />
+        <result column="f_type" property="fType" />
+        <result column="farm_code" property="farmCode" />
+        <result column="sort" property="sort" />
+        <result column="stage_code" property="stageCode" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, pigpen_name, parent_id, f_type, farm_code
+    </sql>
+
+</mapper>

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/BaseStageMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.eartag2.api.mapper.BaseStageMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.BaseStage">
+        <id column="id" property="id" />
+        <result column="stage_code" property="stageCode" />
+        <result column="stage_name" property="stageName" />
+        <result column="sort" property="sort" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, stage_code, stage_name, sort
+    </sql>
+
+</mapper>

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/BizBaseStageMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.eartag2.api.mapper.BizBaseStageMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.BizBaseStage">
+        <id column="id" property="id" />
+        <result column="stage_code" property="stageCode" />
+        <result column="stage_name" property="stageName" />
+        <result column="sort" property="sort" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, stage_code, stage_name, sort
+    </sql>
+
+</mapper>

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/EartagAbnormalAlarmMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.eartag2.api.mapper.EartagAbnormalAlarmMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.EartagAbnormalAlarm">
+        <id column="id" property="id" />
+        <result column="farm_code" property="farmCode" />
+        <result column="add_date" property="addDate" />
+        <result column="add_time" property="addTime" />
+        <result column="content" property="content" />
+        <result column="alarm_from" property="alarmFrom" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_sort" property="alarmSort" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, farm_code, add_date, add_time, content, alarm_from, alarm_type, alarm_sort
+    </sql>
+
+</mapper>

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/EartagAbnormalCountMapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.eartag2.api.mapper.EartagAbnormalCountMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.EartagAbnormalCount">
+        <id column="id" property="id" />
+        <result column="farm_code" property="farmCode" />
+        <result column="station_data_count" property="stationDataCount" />
+        <result column="station_data_upate_time" property="stationDataUpateTime" />
+        <result column="station_status_count" property="stationStatusCount" />
+        <result column="station_status_upate_time" property="stationStatusUpateTime" />
+        <result column="eartag_data_count" property="eartagDataCount" />
+        <result column="eartag_data_upate_time" property="eartagDataUpateTime" />
+        <result column="eartag_status_count" property="eartagStatusCount" />
+        <result column="eartag_status_upate_time" property="eartagStatusUpateTime" />
+        <result column="add_date" property="addDate" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, farm_code, station_data_count, station_data_upate_time, station_status_count, station_status_upate_time, eartag_data_count, eartag_data_upate_time, eartag_status_count, eartag_status_upate_time, add_date
+    </sql>
+
+</mapper>

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/EartagData2Mapper.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.eartag2.api.mapper.EartagData2Mapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.EartagData2">
+        <id column="id" property="id" />
+        <result column="cmd_header" property="cmdHeader" />
+        <result column="device" property="device" />
+        <result column="earmark" property="earmark" />
+        <result column="bat" property="bat" />
+        <result column="ear_temp" property="earTemp" />
+        <result column="ear_temp1" property="earTemp1" />
+        <result column="env_temp" property="envTemp" />
+        <result column="env_temp1" property="envTemp1" />
+        <result column="act" property="act" />
+        <result column="act1" property="act1" />
+        <result column="signal1" property="signal1" />
+        <result column="ask_time" property="askTime" />
+        <result column="other" property="other" />
+        <result column="add_time" property="addTime" />
+        <result column="create_date" property="createDate" />
+        <result column="farm_id" property="farmId" />
+        <result column="ask_date" property="askDate" />
+    </resultMap>
+    <select id="getEartagDataByEarmark" resultType="com.huimv.eartag2.api.pojo.EartagData2">
+        SELECT * FROM eartag_data2 WHERE earmark=${earmark} ORDER BY add_time DESC LIMIT ${recordCount}
+    </select>
+    <select id="getAct" resultType="com.huimv.eartag2.api.pojo.pojovo.EartagDataDto">
+          SELECT SUM(act1) `value` ,DATE_FORMAT(  ask_time, '%m-%d' ) `time` FROM `eartag_data2`
+     ${ew.customSqlSegment}
+
+    </select>
+    <select id="allHealthy" resultType="com.huimv.eartag2.api.pojo.pojovo.AllHelthyDto">
+        SELECT  IFNULL (ROUND(AVG(ear_temp1),2) ,"0.0")  earTemp, IFNULL (ROUND(AVG(env_temp1),2) ,"0.0") envTemp , DATE_FORMAT(ask_time,'%m-%d %H')  addTime
+         FROM `eartag_data2`
+         ${ew.customSqlSegment}
+         GROUP BY  DATE_FORMAT(ask_time,'%m-%d %H')
+    </select>
+    <select id="allHealthy2" resultType="com.huimv.eartag2.api.pojo.pojovo.AllHelthyDto">
+         SELECT  IFNULL (ROUND(AVG(ear_temp1),2) ,"0.0")  earTemp, IFNULL (ROUND(AVG(env_temp1),2) ,"0.0") envTemp , DATE_FORMAT(ask_time,'%m-%d %H')  addTime
+         FROM `eartag_data2`
+         ${ew.customSqlSegment}
+          GROUP BY  DATE_FORMAT(ask_time,'%m-%d %H')   ORDER BY id DESC limit 1
+    </select>
+
+
+</mapper>

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/EartagDataMapper.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.eartag2.api.mapper.EartagDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.EartagData">
+        <id column="id" property="id" />
+        <result column="cmd_header" property="cmdHeader" />
+        <result column="device" property="device" />
+        <result column="earmark" property="earmark" />
+        <result column="bat" property="bat" />
+        <result column="ear_temp" property="earTemp" />
+        <result column="ear_temp1" property="earTemp1" />
+        <result column="env_temp" property="envTemp" />
+        <result column="env_temp1" property="envTemp1" />
+        <result column="act" property="act" />
+        <result column="act1" property="act1" />
+        <result column="signal1" property="signal1" />
+        <result column="ask_time" property="askTime" />
+        <result column="other" property="other" />
+        <result column="add_time" property="addTime" />
+        <result column="create_date" property="createDate" />
+        <result column="farm_id" property="farmId" />
+        <result column="ask_date" property="askDate" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, cmd_header, device, earmark, bat, ear_temp, ear_temp1, env_temp, env_temp1, act, act1, signal1, ask_time, other, add_time, create_date, farm_id, ask_date
+    </sql>
+
+</mapper>

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/EartagDeviceRegisterMapper.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.eartag2.api.mapper.EartagDeviceRegisterMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.EartagDeviceRegister">
+        <id column="id" property="id" />
+        <result column="device_code" property="deviceCode" />
+        <result column="chip_id" property="chipId" />
+        <result column="county_code" property="countyCode" />
+        <result column="county_name" property="countyName" />
+        <result column="farm_id" property="farmId" />
+        <result column="farm_name" property="farmName" />
+        <result column="type_f" property="typeF" />
+        <result column="stage" property="stage" />
+        <result column="pigpen_id" property="pigpenId" />
+        <result column="unit_id" property="unitId" />
+        <result column="register_time" property="registerTime" />
+        <result column="last_time" property="lastTime" />
+        <result column="active_status" property="activeStatus" />
+        <result column="active_time" property="activeTime" />
+        <result column="device_status" property="deviceStatus" />
+        <result column="device_alias" property="deviceAlias" />
+        <result column="location" property="location" />
+        <result column="remark" property="remark" />
+        <result column="create_date" property="createDate" />
+        <result column="update_type" property="updateType" />
+        <result column="sync_time" property="syncTime" />
+        <result column="device_type" property="deviceType" />
+        <result column="imei" property="imei" />
+        <result column="upgrade" property="upgrade" />
+        <result column="farmer_id" property="farmerId" />
+        <result column="farmer_name" property="farmerName" />
+    </resultMap>
+    <select id="getDeviceIdByFarmerId" resultType="java.lang.String" parameterType="java.lang.String">
+        SELECT device_code FROM eartag_device_register WHERE farmer_id=#{farmerId}
+    </select>
+
+    <select id="getDeviceIdListByFarmerId" resultType="java.lang.String" parameterType="java.lang.String">
+        SELECT device_code FROM eartag_device_register WHERE farmer_id=#{farmerId}
+    </select>
+
+</mapper>

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/EartagEartagRegister2Mapper.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.eartag2.api.mapper.EartagEartagRegister2Mapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.EartagEartagRegister2">
+        <id column="id" property="id" />
+        <result column="earmark" property="earmark" />
+        <result column="first_time" property="firstTime" />
+        <result column="last_time" property="lastTime" />
+        <result column="first_device" property="firstDevice" />
+        <result column="belong_device" property="belongDevice" />
+        <result column="last_device" property="lastDevice" />
+        <result column="register_time" property="registerTime" />
+        <result column="register_type" property="registerType" />
+        <result column="remark" property="remark" />
+        <result column="farm_id" property="farmId" />
+        <result column="active_status" property="activeStatus" />
+        <result column="active_time" property="activeTime" />
+        <result column="live_status" property="liveStatus" />
+        <result column="create_date" property="createDate" />
+        <result column="bat" property="bat" />
+        <result column="reboot_times" property="rebootTimes" />
+        <result column="on_day_age" property="onDayAge" />
+        <result column="day_age" property="dayAge" />
+        <result column="stage_code" property="stageCode" />
+        <result column="stage_name" property="stageName" />
+        <result column="pigpen_id" property="pigpenId" />
+        <result column="pigpen_name" property="pigpenName" />
+        <result column="unit_id" property="unitId" />
+        <result column="unit_name" property="unitName" />
+        <result column="act_range" property="actRange" />
+        <result column="ear_temp1" property="earTemp1" />
+        <result column="env_temp1" property="envTemp1" />
+        <result column="act" property="act" />
+        <result column="signal1" property="signal1" />
+        <result column="other" property="other" />
+        <result column="ask_time" property="askTime" />
+        <result column="env_abnormal" property="envAbnormal" />
+        <result column="ear_abnormal" property="earAbnormal" />
+        <result column="view_code" property="viewCode" />
+        <result column="rfid_id" property="rfidId" />
+    </resultMap>
+    <select id="getLastBatchCreateDate" resultType="java.util.Date"
+            parameterType="java.lang.String">
+        SELECT create_date FROM eartag_eartag_register2 WHERE last_device=#{deviceCode} ORDER BY register_time DESC LIMIT 1
+    </select>
+    <select id="getLastBatchPig" resultType="com.huimv.eartag2.api.pojo.EartagEartagRegister2">
+        SELECT * FROM eartag_eartag_register2 WHERE last_device=#{deviceCode} AND create_date=#{createDate} ORDER BY register_time DESC
+    </select>
+    <select id="getEartagByDeviceCode" resultType="com.huimv.eartag2.api.pojo.EartagEartagRegister2"
+            parameterType="java.lang.String">
+        SELECT * FROM eartag_eartag_register2 WHERE last_device=${deviceCode}  ORDER BY register_time DESC
+    </select>
+
+
+    <select id="qingShanData" resultType="com.huimv.eartag2.api.pojo.pojovo.QingShanData"
+            parameterType="java.lang.String">
+        SELECT DATE_FORMAT(add_time,'%m-%d %H') add_time , ROUND(AVG(env_temp1),2) env_temp , ROUND(AVG(ear_temp1),2) ear_temp
+         FROM `eartag_data2` WHERE farm_id=#{farmCode}
+           GROUP BY  DATE_FORMAT(add_time,'%m-%d %H')
+           ORDER BY add_time DESC LIMIT 12
+    </select>
+    <select id="page" resultType="com.huimv.eartag2.api.pojo.EartagEartagRegister2">
+
+    </select>
+
+
+</mapper>

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/EartagEartagRegisterMapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.eartag2.api.mapper.EartagEartagRegisterMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.EartagEartagRegister">
+        <id column="id" property="id" />
+        <result column="earmark" property="earmark" />
+        <result column="first_time" property="firstTime" />
+        <result column="last_time" property="lastTime" />
+        <result column="first_device" property="firstDevice" />
+        <result column="belong_device" property="belongDevice" />
+        <result column="last_device" property="lastDevice" />
+        <result column="register_time" property="registerTime" />
+        <result column="register_type" property="registerType" />
+        <result column="remark" property="remark" />
+        <result column="farm_id" property="farmId" />
+        <result column="active_status" property="activeStatus" />
+        <result column="active_time" property="activeTime" />
+        <result column="live_status" property="liveStatus" />
+        <result column="create_date" property="createDate" />
+        <result column="bat" property="bat" />
+    </resultMap>
+
+</mapper>

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/EartagHourActMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.eartag2.api.mapper.EartagHourActMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.EartagHourAct">
+        <id column="id" property="id" />
+        <result column="earmark" property="earmark" />
+        <result column="hour" property="hour" />
+        <result column="act" property="act" />
+        <result column="add_date" property="addDate" />
+        <result column="farm_code" property="farmCode" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, earmark, hour, act, add_date, farm_code
+    </sql>
+
+</mapper>

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/EartagOnlineStatusMapper.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.eartag2.api.mapper.EartagOnlineStatusMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.EartagOnlineStatus">
+        <id column="id" property="id" />
+        <result column="farm_id" property="farmId" />
+        <result column="unit_id" property="unitId" />
+        <result column="unit_name" property="unitName" />
+        <result column="total" property="total" />
+        <result column="online" property="online" />
+        <result column="offline" property="offline" />
+        <result column="online_earmark" property="onlineEarmark" />
+        <result column="offline_earmark" property="offlineEarmark" />
+        <result column="add_time" property="addTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, farm_id, unit_id, unit_name, total, online, offline, online_earmark, offline_earmark, add_time
+    </sql>
+
+</mapper>

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/EartagResetCountMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.eartag2.api.mapper.EartagResetCountMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.EartagResetCount">
+        <id column="id" property="id" />
+        <result column="earmark" property="earmark" />
+        <result column="times" property="times" />
+        <result column="add_date" property="addDate" />
+        <result column="farm_code" property="farmCode" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, earmark, times, add_date, farm_code
+    </sql>
+
+</mapper>

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/EartagResetMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.eartag2.api.mapper.EartagResetMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.EartagReset">
+        <id column="id" property="id" />
+        <result column="earmark" property="earmark" />
+        <result column="reset_time" property="resetTime" />
+        <result column="add_date" property="addDate" />
+        <result column="farm_code" property="farmCode" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, earmark, reset_time, add_date, farm_code
+    </sql>
+
+</mapper>

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/FarmerAdoptMapper.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.eartag2.api.mapper.FarmerAdoptMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.FarmerAdopt">
+        <id column="id" property="id" />
+        <result column="batch_code" property="batchCode" />
+        <result column="adopt_date" property="adoptDate" />
+        <result column="adopt_age" property="adoptAge" />
+        <result column="days" property="days" />
+        <result column="quantity" property="quantity" />
+        <result column="pig_price" property="pigPrice" />
+        <result column="weight" property="weight" />
+        <result column="plan_incomde" property="planIncome" />
+        <result column="farm_code" property="farmCode" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, batch_code, adopt_date, adopt_age, days, quantity, meat_price, plan_incomde, farm_code
+    </sql>
+    <select id="getLastAdoptByFarmCode" resultType="com.huimv.eartag2.api.pojo.FarmerAdopt"
+            parameterType="java.lang.String">
+        SELECT * FROM farmer_adopt WHERE farm_code = #{farmCode} ORDER BY batch_code DESC LIMIT 1
+    </select>
+
+</mapper>

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/FarmerAssetMapper.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.eartag2.api.mapper.FarmerAssetMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.FarmerAsset">
+        <id column="id" property="id" />
+        <result column="farm_code" property="farmCode" />
+        <result column="year" property="year" />
+        <result column="month" property="month" />
+        <result column="avail_asset" property="availAsset" />
+        <result column="unavail_asset" property="unavailAsset" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, farm_code, year, month, avail_asset, unavail_asset
+    </sql>
+    <select id="getLastManyMonthAssets" resultType="com.huimv.eartag2.api.pojo.FarmerAsset">
+        SELECT * FROM farmer_asset WHERE farm_code = #{farmCode} ORDER BY year desc,month desc;
+    </select>
+    <select id="getPigWeightByDayage" resultType="java.math.BigDecimal" parameterType="long">
+        SELECT weight FROM farmer_dayage_weight WHERE start_dayage &lt;= #{days} AND #{days} &lt;= end_dayage
+    </select>
+    <select id="getAssetByMonth" resultType="com.huimv.eartag2.api.pojo.FarmerAsset" parameterType="int">
+        SELECT * FROM farmer_asset WHERE farm_code=${farmCode} ORDER BY YEAR DESC,MONTH DESC LIMIT ${months}
+    </select>
+    <select id="getPigWeight" resultType="com.huimv.eartag2.api.pojo.FarmerAsset">
+        SELECT * FROM farmer_dayage_weight
+    </select>
+    <select id="getAssetByFarmerIdAndYearAndMonth" resultType="com.huimv.eartag2.api.pojo.FarmerAsset">
+        SELECT * FROM farmer_asset WHERE farm_code=${farmerId} AND year=${year} AND month=${month}
+    </select>
+
+</mapper>

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/FarmerDayageWeightMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.eartag2.api.mapper.FarmerDayageWeightMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.FarmerDayageWeight">
+        <id column="id" property="id" />
+        <result column="start_dayage" property="startDayage" />
+        <result column="end_dayage" property="endDayage" />
+        <result column="weight" property="weight" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, start_dayage, end_dayage, weight
+    </sql>
+    <select id="getAllDayageWeight" resultType="com.huimv.eartag2.api.pojo.FarmerDayageWeight">
+        SELECT * FROM farmer_dayage_weight
+    </select>
+
+</mapper>

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/PliersDemoMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.eartag2.api.mapper.PliersDemoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.PliersDemo">
+        <id column="id" property="id" />
+        <result column="earmark" property="earmark" />
+        <result column="pliers_id" property="pliersId" />
+        <result column="update_time" property="updateTime" />
+        <result column="usege_times" property="usegeTimes" />
+        <result column="lat" property="lat" />
+        <result column="lon" property="lon" />
+        <result column="address" property="address" />
+    </resultMap>
+
+</mapper>

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/StationLibMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.eartag2.api.mapper.StationLibMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.StationLib">
+        <id column="id" property="id" />
+        <result column="errcode" property="errcode" />
+        <result column="lat" property="lat" />
+        <result column="lon" property="lon" />
+        <result column="radius" property="radius" />
+        <result column="address" property="address" />
+        <result column="lac" property="lac" />
+        <result column="ci" property="ci" />
+    </resultMap>
+
+</mapper>

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/mapper/xml/SysBaseConfigMapper.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.eartag2.api.mapper.SysBaseConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.eartag2.api.pojo.SysBaseConfig">
+        <id column="id" property="id" />
+        <result column="config_name" property="configName" />
+        <result column="config_key" property="configKey" />
+        <result column="config_value" property="configValue" />
+        <result column="row_id" property="rowId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, config_name, config_key, config_value, row_id
+    </sql>
+
+    <select id="selectByRowIdList" resultMap="BaseResultMap" parameterType="list">
+        select id, config_name, config_key, config_value, row_id
+        from sys_base_config
+
+        <where>
+            <if test=" rowIds != null and rowIds.size > 0 ">
+                AND row_id in
+                <foreach item="item" collection="rowIds" separator="," open="(" close=")" index="">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <select id="selectSysBaseConfig" resultMap="BaseResultMap" parameterType="String">
+         select id, config_name, config_key, config_value, row_id
+         from sys_base_config
+         where row_id = #{rowId}
+    </select>
+
+</mapper>

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/BaseFarm.java

@@ -0,0 +1,49 @@
+package com.huimv.eartag2.api.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zn
+ * @since 2022-07-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseFarm implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String farmCode;
+
+    private String farmName;
+
+    private String location;
+
+    private String leader;
+
+    private String phone;
+
+    private String remark;
+
+    private String areaCode;
+
+    private String code1;
+
+    private String code2;
+
+    private String ip;
+
+    private String port;
+
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/BaseFarmer.java

@@ -0,0 +1,34 @@
+package com.huimv.eartag2.api.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseFarmer implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String farmer;
+
+    private String phone;
+
+    private String address;
+
+    private String farmCode;
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/BaseMap.java

@@ -0,0 +1,40 @@
+package com.huimv.eartag2.api.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2022-12-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("base_map")
+public class BaseMap implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String location;
+
+    private String farmName;
+
+    private String lon;
+
+    private String locationUrl;
+
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/BasePigpen.java

@@ -0,0 +1,39 @@
+package com.huimv.eartag2.api.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zn
+ * @since 2022-07-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BasePigpen implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String pigpenCode;
+
+    private String pigpenName;
+
+    private Integer parentId;
+
+    private Integer fType;
+
+    private String farmCode;
+
+    private  int sort;
+
+    private String stageCode;
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/BaseStage.java

@@ -0,0 +1,33 @@
+package com.huimv.eartag2.api.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zn
+ * @since 2022-07-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStage implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String stageCode;
+
+    private String stageName;
+
+    private Integer sort;
+
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/BizBaseStage.java

@@ -0,0 +1,34 @@
+package com.huimv.eartag2.api.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zn
+ * @since 2022-07-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BizBaseStage implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String stageCode;
+
+    private String stageName;
+
+    private String sort;
+
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/EartagAbnormalAlarm.java

@@ -0,0 +1,46 @@
+package com.huimv.eartag2.api.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class EartagAbnormalAlarm implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String farmCode;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date addDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date addTime;
+
+    private String content;
+
+    private Integer alarmFrom;
+
+    private Integer alarmType;
+
+    private Integer alarmSort;
+
+    private String tempValue;
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/EartagAbnormalCount.java

@@ -0,0 +1,49 @@
+package com.huimv.eartag2.api.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class EartagAbnormalCount implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String farmCode;
+
+    private Integer stationDataCount;
+
+    private Date stationDataUpateTime;
+
+    private Integer stationStatusCount;
+
+    private Date stationStatusUpateTime;
+
+    private Integer eartagDataCount;
+
+    private Date eartagDataUpateTime;
+
+    private Integer eartagStatusCount;
+
+    private Date eartagStatusUpateTime;
+
+    private Date addDate;
+
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/EartagData.java

@@ -0,0 +1,68 @@
+package com.huimv.eartag2.api.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zn
+ * @since 2022-07-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class EartagData implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String cmdHeader;
+
+    private String device;
+
+    private String earmark;
+
+    private Integer bat;
+
+    private Integer earTemp;
+
+    private Float earTemp1;
+
+    private Integer envTemp;
+
+    private Float envTemp1;
+
+    private Integer act;
+
+    private Integer act1;
+
+    private Integer signal1;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date askTime;
+
+    private String other;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date addTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date createDate;
+
+    private String farmId;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date askDate;
+
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/EartagData2.java

@@ -0,0 +1,74 @@
+package com.huimv.eartag2.api.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2022-07-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("eartag_data2")
+public class EartagData2 implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String cmdHeader;
+
+    private String device;
+
+    private String earmark;
+
+    private Integer bat;
+
+    private Integer earTemp;
+
+    private Float earTemp1;
+
+    private Integer envTemp;
+
+    private Float envTemp1;
+
+    private Long act;
+
+    private Long act1;
+
+    private Integer signal1;
+
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private String  askTime;
+
+    private String other;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date addTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date createDate;
+
+    private String farmId;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date askDate;
+
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/EartagDeviceRegister.java

@@ -0,0 +1,82 @@
+package com.huimv.eartag2.api.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2022-07-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("eartag_device_register")
+public class EartagDeviceRegister implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String deviceCode;
+
+    private String chipId;
+
+    private String countyCode;
+
+    private String countyName;
+
+    private String farmId;
+
+    private String farmName;
+
+    private Integer typeF;
+
+    private Integer stage;
+
+    private Integer pigpenId;
+
+    private Integer unitId;
+
+    private Date registerTime;
+
+    private Date lastTime;
+
+    private Integer activeStatus;
+
+    private Date activeTime;
+
+    private Integer deviceStatus;
+
+    private String deviceAlias;
+
+    private String location;
+
+    private String remark;
+
+    private Date createDate;
+
+    private String updateType;
+
+    private Date syncTime;
+
+    private Integer deviceType;
+
+    private String imei;
+    private Integer upgrade;
+    private Integer farmerId;
+    private String farmerName;
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/EartagEartagRegister.java

@@ -0,0 +1,76 @@
+package com.huimv.eartag2.api.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2022-07-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("eartag_eartag_register")
+public class EartagEartagRegister implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String earmark;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date firstTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date lastTime;
+
+    private String firstDevice;
+
+    private String belongDevice;
+
+    private String lastDevice;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date registerTime;
+
+    private Integer registerType;
+
+    private String remark;
+
+    private String farmId;
+
+    private Integer activeStatus;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date activeTime;
+
+    private Integer liveStatus;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date createDate;
+
+    private Integer bat;
+    private Integer unitId;
+    private String unitName;
+
+    private Integer pigpenId;
+
+    private String pigpenName;
+
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/EartagEartagRegister2.java

@@ -0,0 +1,115 @@
+package com.huimv.eartag2.api.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2022-08-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("eartag_eartag_register2")
+public class EartagEartagRegister2 implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String earmark;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date firstTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date lastTime;
+
+    private String firstDevice;
+
+    private String belongDevice;
+
+    private String lastDevice;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date registerTime;
+
+    private Integer registerType;
+
+    private String remark;
+
+    private String farmId;
+
+    private Integer activeStatus;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date activeTime;
+
+    private Integer liveStatus;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date createDate;
+
+    private Integer bat;
+
+    private Integer rebootTimes;
+
+    private Integer onDayAge;
+
+    private Integer dayAge;
+
+    private String stageCode;
+
+    private String stageName;
+
+    private Integer pigpenId;
+
+    private String pigpenName;
+
+    private Integer unitId;
+
+    private String unitName;
+
+    private Long actRange;
+
+    private Float earTemp1;
+
+    private Float envTemp1;
+
+    private Long act;
+
+    private Integer signal1;
+
+    private String other;
+
+    private String askTime;
+
+    private Integer envAbnormal;
+
+    private Integer earAbnormal;
+
+    /**
+     * 可视码
+     */
+    private String viewCode;
+
+    /**
+     * RFID id号
+     */
+    private String rfidId;
+
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/EartagHourAct.java

@@ -0,0 +1,39 @@
+package com.huimv.eartag2.api.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class EartagHourAct implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String earmark;
+
+    private Integer hour;
+
+    private Integer act;
+
+    private Date addDate;
+
+    private String farmCode;
+
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/EartagOnlineStatus.java

@@ -0,0 +1,47 @@
+package com.huimv.eartag2.api.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class EartagOnlineStatus implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String farmId;
+
+    private String unitId;
+
+    private String unitName;
+
+    private Integer total;
+
+    private Integer online;
+
+    private Integer offline;
+
+    private String onlineEarmark;
+
+    private String offlineEarmark;
+
+    private Date addTime;
+
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/EartagReset.java

@@ -0,0 +1,42 @@
+package com.huimv.eartag2.api.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class EartagReset implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String earmark;
+
+    private Date resetTime;
+
+    private Date addDate;
+
+    private String farmCode;
+
+    private Integer lastId;
+
+    private Long lastAct;
+
+    private Long act;
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/EartagResetCount.java

@@ -0,0 +1,40 @@
+package com.huimv.eartag2.api.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class EartagResetCount implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String earmark;
+
+    private Integer times;
+
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date addDate;
+
+    private String farmCode;
+
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/FarmerAdopt.java

@@ -0,0 +1,48 @@
+package com.huimv.eartag2.api.pojo;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class FarmerAdopt implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String batchCode;
+
+    private Date adoptDate;
+
+    private Integer adoptAge;
+
+    private Integer days;
+
+    private Integer quantity;
+
+    private BigDecimal pigPrice;
+
+    private BigDecimal weight;
+
+    private BigDecimal planIncome;
+
+    private String farmCode;
+
+
+}

huimv-eartag2-platform/huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/pojo/FarmerAsset.java

@@ -0,0 +1,38 @@
+package com.huimv.eartag2.api.pojo;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zn
+ * @since 2022-08-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class FarmerAsset implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String farmCode;
+
+    private Integer year;
+
+    private Integer month;
+
+    private BigDecimal availAsset;
+
+    private BigDecimal unavailAsset;
+
+
+}