【feat】 添加对外服务 api

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-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/HuimvManageApplication.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 HuimvManageApplication {
+    public static void main(String[] args)   {
+        SpringApplication.run(HuimvManageApplication.class, args);
+    }
+    @Bean
+    public static RestTemplate getRestTemplate(){
+        return new RestTemplate();
+    }
+}

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

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.manage2.config;
+package com.huimv.eartag2.api.config;
 
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;

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

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.manage2.config;
+package com.huimv.eartag2.api.config;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

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

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.manage2.config;
+package com.huimv.eartag2.api.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

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

@@ -1,15 +1,11 @@
-package com.huimv.eartag2.manage2.controller;
+package com.huimv.eartag2.api.controller;
 
 
-import com.huimv.eartag2.common.common.token.TokenSign;
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.manage2.service.BaseFarmService;
-import org.apache.ibatis.annotations.Param;
+import com.huimv.eartag2.api.service.BaseFarmService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
 import java.util.Map;
 
 /**

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

@@ -1,13 +1,12 @@
-package com.huimv.eartag2.manage2.controller;
+package com.huimv.eartag2.api.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.extension.conditions.query.QueryChainWrapper;
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.common.utils.ResultCode;
-import com.huimv.eartag2.manage2.pojo.BaseFarmer;
-import com.huimv.eartag2.manage2.service.BaseFarmerService;
+import com.huimv.eartag2.api.pojo.BaseFarmer;
+import com.huimv.eartag2.api.service.BaseFarmerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

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

@@ -1,18 +1,13 @@
-package com.huimv.eartag2.manage2.controller;
+package com.huimv.eartag2.api.controller;
 
 
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.manage2.service.BasePigpenService;
-import net.bytebuddy.utility.RandomString;
+import com.huimv.eartag2.api.service.BasePigpenService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
-import java.util.concurrent.ThreadLocalRandom;
-
-import static java.util.concurrent.ThreadLocalRandom.*;
 
 /**
  * <p>

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

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.manage2.controller;
+package com.huimv.eartag2.api.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -1,7 +1,7 @@
-package com.huimv.eartag2.manage2.controller;
+package com.huimv.eartag2.api.controller;
 
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.manage2.service.BizBaseStageService;
+import com.huimv.eartag2.api.service.BizBaseStageService;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.*;
 

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.common.utils.Result;
+import com.huimv.eartag2.common.utils.ResultCode;
+import com.huimv.eartag2.api.pojo.BaseMap;
+import com.huimv.eartag2.api.service.*;
+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("/getWarning")
+    public Result getWarning(@RequestBody Map<String, String> paramsMap) throws ParseException {
+        return eartagAbnormalAlarmService.getWarning(paramsMap);
+    }*/
+
+    //美维首页群体健康
+    @PostMapping("/allHealthy")
+    public Result healthy(@RequestBody Map<String, String> paramsMap) throws ParseException {
+        return eartagAbnormalAlarmService.allHealthy(paramsMap);
+    }
+    //美维首页羊只健康
+  /*  @PostMapping("/getWarning")
+    public Result getWarning(@RequestBody Map<String, String> paramsMap) throws ParseException {
+        return eartagAbnormalAlarmService.getWarning(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-manage2/src/main/java/com/huimv/eartag2/manage2/controller/EartagAbnormalCountController.java

@@ -1,8 +1,8 @@
-package com.huimv.eartag2.manage2.controller;
+package com.huimv.eartag2.api.controller;
 
 
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.manage2.service.EartagAbnormalCountService;
+import com.huimv.eartag2.api.service.EartagAbnormalCountService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -31,5 +31,14 @@ public class EartagAbnormalCountController {
         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-manage2/src/main/java/com/huimv/eartag2/manage2/controller/EartagData2Controller.java

@@ -1,9 +1,9 @@
-package com.huimv.eartag2.manage2.controller;
+package com.huimv.eartag2.api.controller;
 
 
 import com.huimv.eartag2.common.common.token.TokenSign;
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.manage2.service.IEartagData2Service;
+import com.huimv.eartag2.api.service.IEartagData2Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

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

@@ -1,9 +1,8 @@
-package com.huimv.eartag2.manage2.controller;
+package com.huimv.eartag2.api.controller;
 
 
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.manage2.pojo.EartagData;
-import com.huimv.eartag2.manage2.service.EartagDataService;
+import com.huimv.eartag2.api.service.EartagDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

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

@@ -1,9 +1,8 @@
-package com.huimv.eartag2.manage2.controller;
+package com.huimv.eartag2.api.controller;
 
 
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.manage2.service.EartagDeviceRegisterService;
-import org.apache.ibatis.annotations.Param;
+import com.huimv.eartag2.api.service.EartagDeviceRegisterService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

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-manage2/src/main/java/com/huimv/eartag2/manage2/controller/EartagHourActController.java

@@ -1,9 +1,8 @@
-package com.huimv.eartag2.manage2.controller;
+package com.huimv.eartag2.api.controller;
 
 
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.manage2.mapper.EartagHourActMapper;
-import com.huimv.eartag2.manage2.service.EartagHourActService;
+import com.huimv.eartag2.api.service.EartagHourActService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.manage2.controller;
+package com.huimv.eartag2.api.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -1,9 +1,8 @@
-package com.huimv.eartag2.manage2.controller;
+package com.huimv.eartag2.api.controller;
 
 import com.huimv.eartag2.common.common.token.TokenSign;
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.manage2.service.IEartagEartagRegister2Service;
-import com.huimv.eartag2.manage2.service.IEartagEartagRegisterService;
+import com.huimv.eartag2.api.service.IEartagEartagRegister2Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

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

@@ -1,9 +1,8 @@
-package com.huimv.eartag2.manage2.controller;
+package com.huimv.eartag2.api.controller;
 
 
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.manage2.service.EartagResetCountService;
-import com.huimv.eartag2.manage2.service.impl.EartagResetServiceImpl;
+import com.huimv.eartag2.api.service.impl.EartagResetServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -1,8 +1,8 @@
-package com.huimv.eartag2.manage2.controller;
+package com.huimv.eartag2.api.controller;
 
 
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.manage2.service.EartagResetCountService;
+import com.huimv.eartag2.api.service.EartagResetCountService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

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

@@ -1,8 +1,8 @@
-package com.huimv.eartag2.manage2.controller;
+package com.huimv.eartag2.api.controller;
 
 
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.manage2.service.FarmerAdoptService;
+import com.huimv.eartag2.api.service.FarmerAdoptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

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

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.manage2.controller;
+package com.huimv.eartag2.api.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.manage2.controller;
+package com.huimv.eartag2.api.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.manage2.controller;
+package com.huimv.eartag2.api.controller;
 
-import com.huimv.eartag2.manage2.service.IEartagData2Service;
+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;

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

@@ -1,8 +1,8 @@
-package com.huimv.eartag2.manage2.controller;
+package com.huimv.eartag2.api.controller;
 
 
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.manage2.service.IEartagEartagRegisterService;
+import com.huimv.eartag2.api.service.IEartagEartagRegisterService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

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

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.manage2.controller;
+package com.huimv.eartag2.api.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -1,14 +1,11 @@
-package com.huimv.eartag2.manage2.controller;
+package com.huimv.eartag2.api.controller;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.eartag2.common.utils.Result;
-import com.huimv.eartag2.manage2.pojo.PliersDemo;
-import com.huimv.eartag2.manage2.service.IPliersDemoService;
+import com.huimv.eartag2.api.service.IPliersDemoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
 import java.util.Map;
 
 /**

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

@@ -0,0 +1,120 @@
+/*
+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);
+    }
+
+    */
+/**
+     * @description: 【删除】
+     * @author: 静静
+     * @date: 2022/7/19 5:10 下午
+     * @param: ids
+     **//*
+
+    @PostMapping("/remove")
+    public Result removeConfig(@RequestBody List<String> ids){
+        return sysBaseConfigService.remove(ids);
+    }
+
+    */
+/**
+     * @description: 【修改】
+     * @author: 静静
+     * @date: 2022/7/19 5:10 下午
+     * @param: maps
+     **//*
+
+    @PostMapping("/update")
+    public Result updateConfig(@RequestBody  List<Map<String, String>> maps){
+        return sysBaseConfigService.update(maps);
+    }
+
+    */
+/**
+     * @description: 【查询】根据id查询配置
+     * @author: 静静
+     * @date: 2022/7/19 5:11 下午
+     * @param: ids
+     **//*
+
+    @GetMapping("/getDateById")
+    public Result getDateById(@Param("id") String id){
+        return sysBaseConfigService.getDateById(id);
+    }
+
+
+    */
+/**
+     * @description: 【查询】 分页查询配置表
+     * @author: 静静
+     * @date: 2022/7/19 5:11 下午
+     * @param: paramsMap
+     **//*
+
+    @PostMapping("/list")
+    public Result list(@RequestBody Map<String,String> paramsMap){
+        return sysBaseConfigService.list(paramsMap);
+    }
+
+    */
+/**
+     * @description: 【数据同步】 将牧场数据同步到注册中心
+     * @author: 静静
+     * @date: 2022/7/20 3:37 下午
+     * @param: farmCode
+     **//*
+
+    @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-manage2/src/main/java/com/huimv/eartag2/manage2/mapper/BaseFarmMapper.java

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.manage2.mapper;
+package com.huimv.eartag2.api.mapper;
 
-import com.huimv.eartag2.manage2.pojo.BaseFarm;
+import com.huimv.eartag2.api.pojo.BaseFarm;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

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

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.manage2.mapper;
+package com.huimv.eartag2.api.mapper;
 
-import com.huimv.eartag2.manage2.pojo.BaseFarmer;
+import com.huimv.eartag2.api.pojo.BaseFarmer;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import java.util.List;

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

@@ -1,7 +1,7 @@
-package com.huimv.eartag2.manage2.mapper;
+package com.huimv.eartag2.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huimv.eartag2.manage2.pojo.BaseMap;
+import com.huimv.eartag2.api.pojo.BaseMap;
 
 /**
  * <p>

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

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.manage2.mapper;
+package com.huimv.eartag2.api.mapper;
 
-import com.huimv.eartag2.manage2.pojo.BasePigpen;
+import com.huimv.eartag2.api.pojo.BasePigpen;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

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

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.manage2.mapper;
+package com.huimv.eartag2.api.mapper;
 
-import com.huimv.eartag2.manage2.pojo.BaseStage;
+import com.huimv.eartag2.api.pojo.BaseStage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

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

@@ -1,7 +1,7 @@
-package com.huimv.eartag2.manage2.mapper;
+package com.huimv.eartag2.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huimv.eartag2.manage2.pojo.BizBaseStage;
+import com.huimv.eartag2.api.pojo.BizBaseStage;
 
 /**
  * <p>

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

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.manage2.mapper;
+package com.huimv.eartag2.api.mapper;
 
-import com.huimv.eartag2.manage2.pojo.EartagAbnormalAlarm;
+import com.huimv.eartag2.api.pojo.EartagAbnormalAlarm;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

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

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.manage2.mapper;
+package com.huimv.eartag2.api.mapper;
 
-import com.huimv.eartag2.manage2.pojo.EartagAbnormalCount;
+import com.huimv.eartag2.api.pojo.EartagAbnormalCount;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

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

@@ -0,0 +1,29 @@
+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 java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2022-07-29
+ */
+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);
+
+}

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

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.manage2.mapper;
+package com.huimv.eartag2.api.mapper;
 
-import com.huimv.eartag2.manage2.pojo.EartagData;
+import com.huimv.eartag2.api.pojo.EartagData;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

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

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.manage2.mapper;
+package com.huimv.eartag2.api.mapper;
 
-import com.huimv.eartag2.manage2.pojo.EartagDeviceRegister;
+import com.huimv.eartag2.api.pojo.EartagDeviceRegister;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 

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

@@ -1,10 +1,10 @@
-package com.huimv.eartag2.manage2.mapper;
+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.manage2.pojo.EartagEartagRegister2;
+import com.huimv.eartag2.api.pojo.EartagEartagRegister2;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huimv.eartag2.manage2.pojo.pojovo.QingShanData;
+import com.huimv.eartag2.api.pojo.pojovo.QingShanData;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;

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

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.manage2.mapper;
+package com.huimv.eartag2.api.mapper;
 
-import com.huimv.eartag2.manage2.pojo.EartagEartagRegister;
+import com.huimv.eartag2.api.pojo.EartagEartagRegister;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

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

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.manage2.mapper;
+package com.huimv.eartag2.api.mapper;
 
-import com.huimv.eartag2.manage2.pojo.EartagHourAct;
+import com.huimv.eartag2.api.pojo.EartagHourAct;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

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

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.manage2.mapper;
+package com.huimv.eartag2.api.mapper;
 
-import com.huimv.eartag2.manage2.pojo.EartagOnlineStatus;
+import com.huimv.eartag2.api.pojo.EartagOnlineStatus;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

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

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.manage2.mapper;
+package com.huimv.eartag2.api.mapper;
 
-import com.huimv.eartag2.manage2.pojo.EartagResetCount;
+import com.huimv.eartag2.api.pojo.EartagResetCount;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

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

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.manage2.mapper;
+package com.huimv.eartag2.api.mapper;
 
-import com.huimv.eartag2.manage2.pojo.EartagReset;
+import com.huimv.eartag2.api.pojo.EartagReset;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

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

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.manage2.mapper;
+package com.huimv.eartag2.api.mapper;
 
-import com.huimv.eartag2.manage2.pojo.FarmerAdopt;
+import com.huimv.eartag2.api.pojo.FarmerAdopt;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 

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-manage2/src/main/java/com/huimv/eartag2/manage2/mapper/FarmerDayageWeightMapper.java

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.manage2.mapper;
+package com.huimv.eartag2.api.mapper;
 
-import com.huimv.eartag2.manage2.pojo.FarmerDayageWeight;
+import com.huimv.eartag2.api.pojo.FarmerDayageWeight;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import java.util.List;

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

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.manage2.mapper;
+package com.huimv.eartag2.api.mapper;
 
-import com.huimv.eartag2.manage2.pojo.PliersDemo;
+import com.huimv.eartag2.api.pojo.PliersDemo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

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

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.manage2.mapper;
+package com.huimv.eartag2.api.mapper;
 
-import com.huimv.eartag2.manage2.pojo.StationLib;
+import com.huimv.eartag2.api.pojo.StationLib;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

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

@@ -1,7 +1,7 @@
-package com.huimv.eartag2.manage2.mapper;
+package com.huimv.eartag2.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huimv.eartag2.manage2.pojo.SysAccountMultilevel;
+import com.huimv.eartag2.api.pojo.SysAccountMultilevel;
 import org.springframework.stereotype.Repository;
 
 /**

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

@@ -1,6 +1,6 @@
-package com.huimv.eartag2.manage2.mapper;
+package com.huimv.eartag2.api.mapper;
 
-import com.huimv.eartag2.manage2.pojo.SysBaseConfig;
+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;

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,42 @@
+<?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  NULLIF (ROUND(AVG(ear_temp1),2) ,0.0), NULLIF (ROUND(AVG(env_temp1),2) 0.0), DATE_FORMAT(add_time,'%m-%d %H') ask_time
+         FROM `eartag_data2`
+         ${ew.customSqlSegment}
+         GROUP BY  DATE_FORMAT(add_time,'%m-%d %H')
+    </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,70 @@
+<?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-manage2/src/main/java/com/huimv/eartag2/manage2/pojo/BaseFarm.java

@@ -1,7 +1,6 @@
-package com.huimv.eartag2.manage2.pojo;
+package com.huimv.eartag2.api.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import lombok.Data;

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

@@ -1,7 +1,6 @@
-package com.huimv.eartag2.manage2.pojo;
+package com.huimv.eartag2.api.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.manage2.pojo;
+package com.huimv.eartag2.api.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

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

@@ -1,7 +1,6 @@
-package com.huimv.eartag2.manage2.pojo;
+package com.huimv.eartag2.api.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import lombok.Data;

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

@@ -1,7 +1,6 @@
-package com.huimv.eartag2.manage2.pojo;
+package com.huimv.eartag2.api.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.manage2.pojo;
+package com.huimv.eartag2.api.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

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

@@ -1,10 +1,12 @@
-package com.huimv.eartag2.manage2.pojo;
+package com.huimv.eartag2.api.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
+
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -27,8 +29,9 @@ public class EartagAbnormalAlarm implements Serializable {
 
     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;

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

@@ -1,8 +1,8 @@
-package com.huimv.eartag2.manage2.pojo;
+package com.huimv.eartag2.api.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
+
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import lombok.Data;

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

@@ -1,8 +1,8 @@
-package com.huimv.eartag2.manage2.pojo;
+package com.huimv.eartag2.api.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
+
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 

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

@@ -1,13 +1,10 @@
-package com.huimv.eartag2.manage2.pojo;
+package com.huimv.eartag2.api.pojo;
 
-import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 
-import java.sql.Timestamp;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+
 import java.io.Serializable;
 import java.util.Date;
 

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

@@ -1,10 +1,9 @@
-package com.huimv.eartag2.manage2.pojo;
+package com.huimv.eartag2.api.pojo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+
 import java.io.Serializable;
 import java.util.Date;
 

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

@@ -1,10 +1,9 @@
-package com.huimv.eartag2.manage2.pojo;
+package com.huimv.eartag2.api.pojo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+
 import java.io.Serializable;
 import java.util.Date;
 

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

@@ -1,8 +1,7 @@
-package com.huimv.eartag2.manage2.pojo;
+package com.huimv.eartag2.api.pojo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import java.util.Date;

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

@@ -1,8 +1,8 @@
-package com.huimv.eartag2.manage2.pojo;
+package com.huimv.eartag2.api.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
+
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import lombok.Data;

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

@@ -1,8 +1,8 @@
-package com.huimv.eartag2.manage2.pojo;
+package com.huimv.eartag2.api.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
+
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import lombok.Data;

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

@@ -1,8 +1,8 @@
-package com.huimv.eartag2.manage2.pojo;
+package com.huimv.eartag2.api.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
+
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import lombok.Data;

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

@@ -1,8 +1,8 @@
-package com.huimv.eartag2.manage2.pojo;
+package com.huimv.eartag2.api.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
+
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 

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

@@ -1,9 +1,9 @@
-package com.huimv.eartag2.manage2.pojo;
+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.Version;
+
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import lombok.Data;

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

@@ -1,8 +1,7 @@
-package com.huimv.eartag2.manage2.pojo;
+package com.huimv.eartag2.api.pojo;
 
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import lombok.Data;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/pojo/FarmerDayageWeight.java

@@ -1,8 +1,7 @@
-package com.huimv.eartag2.manage2.pojo;
+package com.huimv.eartag2.api.pojo;
 
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import lombok.Data;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/pojo/PliersDemo.java

@@ -1,9 +1,9 @@
-package com.huimv.eartag2.manage2.pojo;
+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.time.LocalDateTime;
+
 import java.io.Serializable;
 import java.util.Date;
 

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/pojo/StationLib.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.manage2.pojo;
+package com.huimv.eartag2.api.pojo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/pojo/SysAccountMultilevel.java

@@ -1,4 +1,4 @@
-package com.huimv.eartag2.manage2.pojo;
+package com.huimv.eartag2.api.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;