Pārlūkot izejas kodu

为瑞安单独创建一个以免有问题

yang 3 gadi atpakaļ
revīzija
c0d81b15c3
100 mainītis faili ar 5958 papildinājumiem un 0 dzēšanām
  1. 48 0
      .gitignore
  2. 72 0
      LICENSE
  3. 3 0
      README.md
  4. 149 0
      cloud-platform-acquisition/pom.xml
  5. 35 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/HuimvSmartEartagDataAcquisitionApplication.java
  6. 24 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/autoconfigure/MybatisPlusConfiguration.java
  7. 79 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/BasePigpenController.java
  8. 79 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/CollectorRegisterController.java
  9. 78 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/DailyTabulateDataController.java
  10. 78 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/DeviceOffLineAlarmController.java
  11. 78 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/DeviceSendMessageAlarmController.java
  12. 78 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/DeviceTempController.java
  13. 151 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/EartagDataController.java
  14. 79 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/EartagRegisterController.java
  15. 78 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/EartagTempAlamController.java
  16. 78 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/EnvTempAlarmController.java
  17. 78 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/FarmStockController.java
  18. 84 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/HeartBeatRecordController.java
  19. 79 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/MovePigpenController.java
  20. 78 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/PigBasicInformationController.java
  21. 86 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/SowRankTableController.java
  22. 54 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/StockRankController.java
  23. 55 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/BaseFarmInfoEntity.java
  24. 43 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/BasePigpenEntity.java
  25. 41 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/CollectorRegisterEntity.java
  26. 88 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/DailyTabulateDataEntity.java
  27. 72 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/DeviceOffLineAlarmEntity.java
  28. 67 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/DeviceSendMessageAlarmEntity.java
  29. 63 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/DeviceTempEntity.java
  30. 46 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/EartagDataEntity.java
  31. 86 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/EartagRegisterEntity.java
  32. 76 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/EartagTempAlamEntity.java
  33. 76 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/EnvTempAlarmEntity.java
  34. 92 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/FarmStockEntity.java
  35. 68 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/HeartBeatRecordEntity.java
  36. 170 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/MovePigpenEntity.java
  37. 91 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/PigBasicInformationEntity.java
  38. 76 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/RawDataEntity.java
  39. 91 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/SowRankTableEntity.java
  40. 121 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/TempMovePenEntity.java
  41. 86 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/vo/CollectorRegisterVo.java
  42. 122 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/vo/EartagParamVo.java
  43. 19 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/BaseFarmInfoDao.java
  44. 20 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/BasePigpenDao.java
  45. 19 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/CollectorRegisterDao.java
  46. 19 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/DailyTabulateDataDao.java
  47. 18 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/DeviceOffLineAlarmDao.java
  48. 18 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/DeviceSendMessageAlarmDao.java
  49. 18 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/DeviceTempDao.java
  50. 24 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/EartagDataDao.java
  51. 20 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/EartagRegisterDao.java
  52. 18 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/EartagTempAlamDao.java
  53. 19 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/EnvTempAlarmDao.java
  54. 20 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/FarmStockDao.java
  55. 17 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/HeartBeatRecordDao.java
  56. 20 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/MovePigpenDao.java
  57. 19 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/PigBasicInformationDao.java
  58. 19 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/RawDataDao.java
  59. 19 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/SowRankTableDao.java
  60. 150 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/param/CollectorRegisterParam.java
  61. 56 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/response/ErrorResponseData.java
  62. 99 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/response/ResponseData.java
  63. 46 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/response/SuccessResponseData.java
  64. 272 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/result/BaseParam.java
  65. 58 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/result/R.java
  66. 48 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/result/RRException.java
  67. 116 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/result/RRExceptionHandler.java
  68. 20 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/BaseFarmInfoService.java
  69. 20 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/BasePigpenService.java
  70. 20 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/CollectorRegisterService.java
  71. 20 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/DailyTabulateDataService.java
  72. 24 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/DeviceOffLineAlarmService.java
  73. 22 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/DeviceSendMessageAlarmService.java
  74. 20 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/DeviceTempService.java
  75. 38 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/EartagDataService.java
  76. 22 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/EartagRegisterService.java
  77. 22 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/EartagTempAlamService.java
  78. 21 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/EnvTempAlarmService.java
  79. 20 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/FarmStockService.java
  80. 21 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/HeartBeatRecordService.java
  81. 21 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/MovePigpenService.java
  82. 20 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/PigBasicInformationService.java
  83. 22 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/RawDataService.java
  84. 22 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/SowRankTableService.java
  85. 35 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/BaseFarmInfoServiceImpl.java
  86. 35 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/BasePigpenServiceImpl.java
  87. 33 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/CollectorRegisterServiceImpl.java
  88. 35 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/DailyTabulateDataServiceImpl.java
  89. 35 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/DeviceOffLineAlarmServiceImpl.java
  90. 36 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/DeviceSendMessageAlarmServiceImpl.java
  91. 41 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/DeviceTempServiceImpl.java
  92. 635 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/EartagDataServiceImpl.java
  93. 35 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/EartagRegisterServiceImpl.java
  94. 35 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/EartagTempAlamServiceImpl.java
  95. 35 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/EnvTempAlarmServiceImpl.java
  96. 38 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/FarmStockServiceImpl.java
  97. 36 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/HeartBeatRecordServiceImpl.java
  98. 36 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/MovePigpenServiceImpl.java
  99. 36 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/PigBasicInformationServiceImpl.java
  100. 0 0
      cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/RawDataServiceImpl.java

+ 48 - 0
.gitignore

@@ -0,0 +1,48 @@
+# Compiled class file
+*.class
+*.iml
+*.idea
+target/
+logs/
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+*velocity.log*
+
+# Eclipse #
+.classpath
+.project
+.settings/
+
+.DS_Store
+
+_dockerCerts/
+
+.factorypath
+
+node_modules/
+dist/
+package-lock.json
+yarn.lock
+
+rebel.xml
+
+!DmJdbcDriver18.jar
+!kingbasejdbc3.jar

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 72 - 0
LICENSE


+ 3 - 0
README.md

@@ -0,0 +1,3 @@
+# huimv-cloud-eartag
+
+测试

+ 149 - 0
cloud-platform-acquisition/pom.xml

@@ -0,0 +1,149 @@
+<?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>cloud-platform</artifactId>
+        <groupId>com.huimv</groupId>
+        <version>1.6.0</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>cloud-platform-acquisition</artifactId>
+
+    <properties>
+        <java.version>1.8</java.version>
+    </properties>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+            <version>2.5.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+            <version>4.1.45.Final</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>2.5.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <version>2.5.3</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+            <version>2.5.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.4.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.62</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+            <version>2.5.3</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>LATEST</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.huimv</groupId>
+            <artifactId>platform-core</artifactId>
+            <version>1.6.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>5.2.5.RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+
+
+    </dependencies>
+
+
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+
+
+</project>

+ 35 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/HuimvSmartEartagDataAcquisitionApplication.java

@@ -0,0 +1,35 @@
+package com.huimv.acquisition;
+import com.huimv.acquisition.socket.eartagrecive.eartagsocket.EartagServer2;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ApplicationContext;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+/**
+ * @Project : huimv.ruian   --接受展示耳标数据   基站添加和删除
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ * 这个接受数据模块用的是人人的代码生成器,代码生成就搞了好几套,有点麻烦
+ **/
+//这是新项目深度优化版本,可以深度修改,改完了记得上传
+//只充当存储数据的服务是没有任何问题的----已经复原之前的功能仅仅
+@EnableScheduling
+//排除掉 security--不然接口会一直报错
+@SpringBootApplication(exclude = {org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class})
+public class HuimvSmartEartagDataAcquisitionApplication {
+    public static void main(String[] args) throws InterruptedException {
+      //  SpringApplication.run(HuimvSmartEartagDataAcquisitionApplication.class, args);
+        ApplicationContext applicationContext = SpringApplication.run(HuimvSmartEartagDataAcquisitionApplication.class, args);
+        applicationContext.getBean(EartagServer2.class).run();
+    }
+}
+
+
+
+
+
+
+

+ 24 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/autoconfigure/MybatisPlusConfiguration.java

@@ -0,0 +1,24 @@
+package com.huimv.acquisition.autoconfigure;
+
+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;
+
+/**
+ * @Author yinhao  测试
+ * @Date 2021/4/27 9:01
+ * @Description
+ */
+@Configuration
+public class MybatisPlusConfiguration {
+
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        return interceptor;
+    }
+
+}

+ 79 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/BasePigpenController.java

@@ -0,0 +1,79 @@
+ package com.huimv.acquisition.controller;
+
+ import com.huimv.acquisition.entity.BasePigpenEntity;
+ import com.huimv.acquisition.result.R;
+ import com.huimv.acquisition.service.BasePigpenService;
+ import com.huimv.acquisition.utils.PageUtils;
+ import org.springframework.beans.factory.annotation.Autowired;
+ import org.springframework.web.bind.annotation.*;
+
+ import java.util.Arrays;
+ import java.util.Map;
+
+
+ /**
+ * 栋舍表
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-30 16:02:09
+ */
+@RestController
+@RequestMapping("management/basepigpen")
+@CrossOrigin
+public class BasePigpenController {
+    @Autowired
+    private BasePigpenService basePigpenService;
+
+    /**
+     * 列表
+     */
+    @RequestMapping("/list")
+    public R list(@RequestParam Map<String, Object> params){
+        PageUtils page = basePigpenService.queryPage(params);
+
+        return R.ok().put("page", page);
+    }
+
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    public R info(@PathVariable("id") Integer id){
+		BasePigpenEntity basePigpen = basePigpenService.getById(id);
+
+        return R.ok().put("basePigpen", basePigpen);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    public R save(@RequestBody BasePigpenEntity basePigpen){
+		basePigpenService.save(basePigpen);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    public R update(@RequestBody BasePigpenEntity basePigpen){
+		basePigpenService.updateById(basePigpen);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    public R delete(@RequestBody Integer[] ids){
+		basePigpenService.removeByIds(Arrays.asList(ids));
+
+        return R.ok();
+    }
+
+}

+ 79 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/CollectorRegisterController.java

@@ -0,0 +1,79 @@
+ package com.huimv.acquisition.controller;
+
+import com.huimv.acquisition.entity.CollectorRegisterEntity;
+import com.huimv.acquisition.result.R;
+import com.huimv.acquisition.service.CollectorRegisterService;
+import com.huimv.acquisition.utils.PageUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.Map;
+
+
+ /**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-30 09:45:22
+ */
+@RestController
+@RequestMapping("management/collectorregister")
+@CrossOrigin
+public class CollectorRegisterController {
+    @Autowired
+    private CollectorRegisterService collectorRegisterService;
+
+    /**
+     * 列表
+     */
+    @RequestMapping("/list")
+    public R list(@RequestParam Map<String, Object> params){
+        PageUtils page = collectorRegisterService.queryPage(params);
+
+        return R.ok().put("page", page);
+    }
+
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    public R info(@PathVariable("id") Integer id){
+		CollectorRegisterEntity collectorRegister = collectorRegisterService.getById(id);
+
+        return R.ok().put("collectorRegister", collectorRegister);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    public R save(@RequestBody CollectorRegisterEntity collectorRegister){
+		collectorRegisterService.save(collectorRegister);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    public R update(@RequestBody CollectorRegisterEntity collectorRegister){
+		collectorRegisterService.updateById(collectorRegister);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    public R delete(@RequestBody Integer[] ids){
+		collectorRegisterService.removeByIds(Arrays.asList(ids));
+
+        return R.ok();
+    }
+
+}

+ 78 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/DailyTabulateDataController.java

@@ -0,0 +1,78 @@
+ package com.huimv.acquisition.controller;
+
+ import com.huimv.acquisition.entity.DailyTabulateDataEntity;
+ import com.huimv.acquisition.result.R;
+ import com.huimv.acquisition.service.DailyTabulateDataService;
+ import com.huimv.acquisition.utils.PageUtils;
+ import org.springframework.beans.factory.annotation.Autowired;
+ import org.springframework.web.bind.annotation.*;
+
+ import java.util.Arrays;
+ import java.util.Map;
+
+
+ /**
+  * 耳标每日汇总表
+  *
+  * @author yinhao
+  * @version ${version}
+  * @date 2021-08-04 14:59:05
+  */
+ @RestController
+ @RequestMapping("management/dailytabulatedata")
+ public class DailyTabulateDataController {
+     @Autowired
+     private DailyTabulateDataService dailyTabulateDataService;
+
+     /**
+      * 列表
+      */
+     @RequestMapping("/list")
+     public R list(@RequestParam Map<String, Object> params){
+         PageUtils page = dailyTabulateDataService.queryPage(params);
+
+         return R.ok().put("page", page);
+     }
+
+
+     /**
+      * 信息
+      */
+     @RequestMapping("/info/{id}")
+     public R info(@PathVariable("id") Integer id){
+         DailyTabulateDataEntity dailyTabulateData = dailyTabulateDataService.getById(id);
+
+         return R.ok().put("dailyTabulateData", dailyTabulateData);
+     }
+
+     /**
+      * 保存
+      */
+     @RequestMapping("/save")
+     public R save(@RequestBody DailyTabulateDataEntity dailyTabulateData){
+         dailyTabulateDataService.save(dailyTabulateData);
+
+         return R.ok();
+     }
+
+     /**
+      * 修改
+      */
+     @RequestMapping("/update")
+     public R update(@RequestBody DailyTabulateDataEntity dailyTabulateData){
+         dailyTabulateDataService.updateById(dailyTabulateData);
+
+         return R.ok();
+     }
+
+     /**
+      * 删除
+      */
+     @RequestMapping("/delete")
+     public R delete(@RequestBody Integer[] ids){
+         dailyTabulateDataService.removeByIds(Arrays.asList(ids));
+
+         return R.ok();
+     }
+
+ }

+ 78 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/DeviceOffLineAlarmController.java

@@ -0,0 +1,78 @@
+ package com.huimv.acquisition.controller;
+
+ import com.huimv.acquisition.entity.DeviceOffLineAlarmEntity;
+ import com.huimv.acquisition.result.R;
+ import com.huimv.acquisition.service.DeviceOffLineAlarmService;
+ import com.huimv.acquisition.utils.PageUtils;
+ import org.springframework.beans.factory.annotation.Autowired;
+ import org.springframework.web.bind.annotation.*;
+
+ import java.util.Arrays;
+ import java.util.Map;
+
+
+ /**
+  *
+  *
+  * @author yinhao
+  * @version ${version}
+  * @date 2021-08-05 21:54:09
+  */
+ @RestController
+ @RequestMapping("management/deviceofflinealarm")
+ public class DeviceOffLineAlarmController {
+     @Autowired
+     private DeviceOffLineAlarmService deviceOffLineAlarmService;
+
+     /**
+      * 列表
+      */
+     @RequestMapping("/list")
+     public R list(@RequestParam Map<String, Object> params){
+         PageUtils page = deviceOffLineAlarmService.queryPage(params);
+
+         return R.ok().put("page", page);
+     }
+
+
+     /**
+      * 信息
+      */
+     @RequestMapping("/info/{id}")
+     public R info(@PathVariable("id") Integer id){
+         DeviceOffLineAlarmEntity deviceOffLineAlarm = deviceOffLineAlarmService.getById(id);
+
+         return R.ok().put("deviceOffLineAlarm", deviceOffLineAlarm);
+     }
+
+     /**
+      * 保存
+      */
+     @RequestMapping("/save")
+     public R save(@RequestBody DeviceOffLineAlarmEntity deviceOffLineAlarm){
+         deviceOffLineAlarmService.save(deviceOffLineAlarm);
+
+         return R.ok();
+     }
+
+     /**
+      * 修改
+      */
+     @RequestMapping("/update")
+     public R update(@RequestBody DeviceOffLineAlarmEntity deviceOffLineAlarm){
+         deviceOffLineAlarmService.updateById(deviceOffLineAlarm);
+
+         return R.ok();
+     }
+
+     /**
+      * 删除
+      */
+     @RequestMapping("/delete")
+     public R delete(@RequestBody Integer[] ids){
+         deviceOffLineAlarmService.removeByIds(Arrays.asList(ids));
+
+         return R.ok();
+     }
+
+ }

+ 78 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/DeviceSendMessageAlarmController.java

@@ -0,0 +1,78 @@
+ package com.huimv.acquisition.controller;
+
+ import com.huimv.acquisition.entity.DeviceSendMessageAlarmEntity;
+ import com.huimv.acquisition.result.R;
+ import com.huimv.acquisition.service.DeviceSendMessageAlarmService;
+ import com.huimv.acquisition.utils.PageUtils;
+ import org.springframework.beans.factory.annotation.Autowired;
+ import org.springframework.web.bind.annotation.*;
+
+ import java.util.Arrays;
+ import java.util.Map;
+
+
+ /**
+  *
+  *
+  * @author yinhao
+  * @version ${version}
+  * @date 2021-08-05 21:54:09
+  */
+ @RestController
+ @RequestMapping("management/devicesendmessagealarm")
+ public class DeviceSendMessageAlarmController {
+     @Autowired
+     private DeviceSendMessageAlarmService deviceSendMessageAlarmService;
+
+     /**
+      * 列表
+      */
+     @RequestMapping("/list")
+     public R list(@RequestParam Map<String, Object> params){
+         PageUtils page = deviceSendMessageAlarmService.queryPage(params);
+
+         return R.ok().put("page", page);
+     }
+
+
+     /**
+      * 信息
+      */
+     @RequestMapping("/info/{id}")
+     public R info(@PathVariable("id") Integer id){
+         DeviceSendMessageAlarmEntity deviceSendMessageAlarm = deviceSendMessageAlarmService.getById(id);
+
+         return R.ok().put("deviceSendMessageAlarm", deviceSendMessageAlarm);
+     }
+
+     /**
+      * 保存
+      */
+     @RequestMapping("/save")
+     public R save(@RequestBody DeviceSendMessageAlarmEntity deviceSendMessageAlarm){
+         deviceSendMessageAlarmService.save(deviceSendMessageAlarm);
+
+         return R.ok();
+     }
+
+     /**
+      * 修改
+      */
+     @RequestMapping("/update")
+     public R update(@RequestBody DeviceSendMessageAlarmEntity deviceSendMessageAlarm){
+         deviceSendMessageAlarmService.updateById(deviceSendMessageAlarm);
+
+         return R.ok();
+     }
+
+     /**
+      * 删除
+      */
+     @RequestMapping("/delete")
+     public R delete(@RequestBody Integer[] ids){
+         deviceSendMessageAlarmService.removeByIds(Arrays.asList(ids));
+
+         return R.ok();
+     }
+
+ }

+ 78 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/DeviceTempController.java

@@ -0,0 +1,78 @@
+ package com.huimv.acquisition.controller;
+
+ import com.huimv.acquisition.entity.DeviceTempEntity;
+ import com.huimv.acquisition.result.R;
+ import com.huimv.acquisition.service.DeviceTempService;
+ import com.huimv.acquisition.utils.PageUtils;
+ import org.springframework.beans.factory.annotation.Autowired;
+ import org.springframework.web.bind.annotation.*;
+
+ import java.util.Arrays;
+ import java.util.Map;
+
+ /**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-28 16:59:32
+ */
+@RestController
+@RequestMapping("management/devicetemp")
+@CrossOrigin
+public class DeviceTempController {
+    @Autowired
+    private DeviceTempService deviceTempService;
+
+    /**
+     * 列表
+     */
+    @RequestMapping("/list")
+    public R list(@RequestParam Map<String, Object> params){
+        PageUtils page = deviceTempService.queryPage(params);
+
+        return R.ok().put("page", page);
+    }
+
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    public R info(@PathVariable("id") Integer id){
+		DeviceTempEntity deviceTemp = deviceTempService.getById(id);
+
+        return R.ok().put("deviceTemp", deviceTemp);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    public R save(@RequestBody DeviceTempEntity deviceTemp){
+		deviceTempService.save(deviceTemp);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    public R update(@RequestBody DeviceTempEntity deviceTemp){
+		deviceTempService.updateById(deviceTemp);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    public R delete(@RequestBody Integer[] ids){
+		deviceTempService.removeByIds(Arrays.asList(ids));
+
+        return R.ok();
+    }
+
+}

+ 151 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/EartagDataController.java

@@ -0,0 +1,151 @@
+package com.huimv.acquisition.controller;
+
+import com.huimv.acquisition.entity.EartagDataEntity;
+import com.huimv.acquisition.entity.vo.EartagParamVo;
+import com.huimv.acquisition.mapper.EartagDataDao;
+import com.huimv.acquisition.result.R;
+import com.huimv.acquisition.service.EartagDataService;
+import com.huimv.acquisition.utils.PageUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.text.ParseException;
+import java.util.Arrays;
+import java.util.Map;
+
+/**
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-24 16:29:33
+ */
+@RestController
+@RequestMapping("/eartagdata")
+@CrossOrigin
+public class EartagDataController {
+    @Autowired
+    private EartagDataService eartagDataService;
+
+    @Autowired
+    private EartagDataDao eartagDataDao;
+
+
+
+
+
+
+
+    /**
+     * 首页的数据
+     */
+    @RequestMapping("/listIndexNew")
+    public R listIndexNew(@RequestParam Map<String, Object> params) {
+        PageUtils page = eartagDataService.queryPage(params);
+        return R.ok().put("page", page);
+    }
+
+
+
+    /**
+     * 首页的数据
+     */
+    @GetMapping("/sout")
+    public R sout(@RequestParam Map<String, Object> params) {
+        System.out.println("test");
+        return R.ok().put("page", "121");
+    }
+
+
+
+
+
+
+
+    /**
+     * 列表
+     */
+    @RequestMapping("/list")
+    public R list(@RequestParam Map<String, Object> params) {
+        PageUtils page = eartagDataService.queryPage(params);
+        return R.ok().put("page", page);
+    }
+
+
+
+    //根据耳标电量查询
+    @RequestMapping("/findByConditions")
+    public R findByFarmId( @RequestParam Map<String, Object> params  ) throws ParseException {
+        PageUtils byConditions = eartagDataService.findByConditions(params);
+        return R.ok().put("page", byConditions);
+    }
+
+
+    @RequestMapping("/list_deatils")
+    public R listDeatils(@RequestParam Map<String, Object> params) throws ParseException {
+        Map queryDetailsMap = eartagDataService.queryDetails(params);
+        return R.ok().put("page", queryDetailsMap);
+    }
+
+
+
+    /**
+     * 列表  耳标个体数据----杭电展示专用--耳标写死了的
+     */
+    @RequestMapping("/listEartagDeatils")
+    public R listEartagDeatils( @RequestBody EartagParamVo eartagParamVo) throws ParseException {
+        System.out.println(eartagParamVo.toString());
+        System.out.println("ceshi");
+        Map  map = eartagDataService.queryEartagDeatils(eartagParamVo);
+        System.out.println(eartagParamVo.toString());
+        return R.ok().put("data", map);
+    }
+
+
+
+    
+
+    @RequestMapping("/list_deatils_byeartagno")
+    public R listDeatils01(@RequestParam Map<String, Object> params) throws ParseException {
+        Map queryDetailsMap = eartagDataService.queryDetailsByEarTag(params);
+        return R.ok().put("page", queryDetailsMap);
+    }
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    public R info(@PathVariable("id") Integer id) {
+        EartagDataEntity eartagData = eartagDataService.getById(id);
+        return R.ok().put("eartagData", eartagData);
+    }
+
+
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    public R save(@RequestBody EartagDataEntity eartagData) {
+        eartagDataService.save(eartagData);
+        return R.ok();
+    }
+
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    public R update(@RequestBody EartagDataEntity eartagData) {
+        eartagDataService.updateById(eartagData);
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    public R delete(@RequestBody Integer[] ids) {
+        eartagDataService.removeByIds(Arrays.asList(ids));
+        return R.ok();
+    }
+
+}

+ 79 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/EartagRegisterController.java

@@ -0,0 +1,79 @@
+ package com.huimv.acquisition.controller;
+
+ import com.huimv.acquisition.entity.EartagRegisterEntity;
+ import com.huimv.acquisition.result.R;
+ import com.huimv.acquisition.service.EartagRegisterService;
+ import com.huimv.acquisition.utils.PageUtils;
+ import org.springframework.beans.factory.annotation.Autowired;
+ import org.springframework.web.bind.annotation.*;
+
+ import java.util.Arrays;
+ import java.util.Map;
+
+
+ /**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-29 14:55:44
+ */
+@RestController
+@RequestMapping("management/eartagregister")
+@CrossOrigin
+public class EartagRegisterController {
+    @Autowired
+    private EartagRegisterService eartagRegisterService;
+
+    /**
+     * 列表
+     */
+    @RequestMapping("/list")
+    public R list(@RequestParam Map<String, Object> params){
+        PageUtils page = eartagRegisterService.queryPage(params);
+
+        return R.ok().put("page", page);
+    }
+
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    public R info(@PathVariable("id") Integer id){
+		EartagRegisterEntity eartagRegister = eartagRegisterService.getById(id);
+
+        return R.ok().put("eartagRegister", eartagRegister);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    public R save(@RequestBody EartagRegisterEntity eartagRegister){
+		eartagRegisterService.save(eartagRegister);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    public R update(@RequestBody EartagRegisterEntity eartagRegister){
+		eartagRegisterService.updateById(eartagRegister);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    public R delete(@RequestBody Integer[] ids){
+		eartagRegisterService.removeByIds(Arrays.asList(ids));
+
+        return R.ok();
+    }
+
+}

+ 78 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/EartagTempAlamController.java

@@ -0,0 +1,78 @@
+ package com.huimv.acquisition.controller;
+
+ import com.huimv.acquisition.entity.EartagTempAlamEntity;
+ import com.huimv.acquisition.result.R;
+ import com.huimv.acquisition.service.EartagTempAlamService;
+ import com.huimv.acquisition.utils.PageUtils;
+ import org.springframework.beans.factory.annotation.Autowired;
+ import org.springframework.web.bind.annotation.*;
+
+ import java.util.Arrays;
+ import java.util.Map;
+
+
+ /**
+  *
+  *
+  * @author yinhao
+  * @version ${version}
+  * @date 2021-08-05 21:54:09
+  */
+ @RestController
+ @RequestMapping("management/eartagtempalarm")
+ public class EartagTempAlamController {
+     @Autowired
+     private EartagTempAlamService eartagTempAlamService;
+
+     /**
+      * 列表
+      */
+     @RequestMapping("/list")
+     public R list(@RequestParam Map<String, Object> params){
+         PageUtils page = eartagTempAlamService.queryPage(params);
+
+         return R.ok().put("page", page);
+     }
+
+
+     /**
+      * 信息
+      */
+     @RequestMapping("/info/{id}")
+     public R info(@PathVariable("id") Integer id){
+         EartagTempAlamEntity eartagTempAlam = eartagTempAlamService.getById(id);
+
+         return R.ok().put("eartagTempAlam", eartagTempAlam);
+     }
+
+     /**
+      * 保存
+      */
+     @RequestMapping("/save")
+     public R save(@RequestBody EartagTempAlamEntity eartagTempAlam){
+         eartagTempAlamService.save(eartagTempAlam);
+
+         return R.ok();
+     }
+
+     /**
+      * 修改
+      */
+     @RequestMapping("/update")
+     public R update(@RequestBody EartagTempAlamEntity eartagTempAlam){
+         eartagTempAlamService.updateById(eartagTempAlam);
+
+         return R.ok();
+     }
+
+     /**
+      * 删除
+      */
+     @RequestMapping("/delete")
+     public R delete(@RequestBody Integer[] ids){
+         eartagTempAlamService.removeByIds(Arrays.asList(ids));
+
+         return R.ok();
+     }
+
+ }

+ 78 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/EnvTempAlarmController.java

@@ -0,0 +1,78 @@
+ package com.huimv.acquisition.controller;
+
+ import com.huimv.acquisition.entity.EnvTempAlarmEntity;
+ import com.huimv.acquisition.result.R;
+ import com.huimv.acquisition.service.EnvTempAlarmService;
+ import com.huimv.acquisition.utils.PageUtils;
+ import org.springframework.beans.factory.annotation.Autowired;
+ import org.springframework.web.bind.annotation.*;
+
+ import java.util.Arrays;
+ import java.util.Map;
+
+
+ /**
+  *
+  *
+  * @author yinhao
+  * @version ${version}
+  * @date 2021-08-05 21:54:09
+  */
+ @RestController
+ @RequestMapping("management/envtempalarm")
+ public class EnvTempAlarmController {
+     @Autowired
+     private EnvTempAlarmService envTempAlarmService;
+
+     /**
+      * 列表
+      */
+     @RequestMapping("/list")
+     public R list(@RequestParam Map<String, Object> params){
+         PageUtils page = envTempAlarmService.queryPage(params);
+
+         return R.ok().put("page", page);
+     }
+
+
+     /**
+      * 信息
+      */
+     @RequestMapping("/info/{id}")
+     public R info(@PathVariable("id") Integer id){
+         EnvTempAlarmEntity envTempAlarm = envTempAlarmService.getById(id);
+
+         return R.ok().put("envTempAlarm", envTempAlarm);
+     }
+
+     /**
+      * 保存
+      */
+     @RequestMapping("/save")
+     public R save(@RequestBody EnvTempAlarmEntity envTempAlarm){
+         envTempAlarmService.save(envTempAlarm);
+
+         return R.ok();
+     }
+
+     /**
+      * 修改
+      */
+     @RequestMapping("/update")
+     public R update(@RequestBody EnvTempAlarmEntity envTempAlarm){
+         envTempAlarmService.updateById(envTempAlarm);
+
+         return R.ok();
+     }
+
+     /**
+      * 删除
+      */
+     @RequestMapping("/delete")
+     public R delete(@RequestBody Integer[] ids){
+         envTempAlarmService.removeByIds(Arrays.asList(ids));
+
+         return R.ok();
+     }
+
+ }

+ 78 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/FarmStockController.java

@@ -0,0 +1,78 @@
+ package com.huimv.acquisition.controller;
+
+ import com.huimv.acquisition.entity.FarmStockEntity;
+ import com.huimv.acquisition.result.R;
+ import com.huimv.acquisition.service.FarmStockService;
+ import com.huimv.acquisition.utils.PageUtils;
+ import org.springframework.beans.factory.annotation.Autowired;
+ import org.springframework.web.bind.annotation.*;
+
+ import java.util.Arrays;
+ import java.util.Map;
+
+
+ /**
+  *
+  *
+  * @author yinhao
+  * @version ${version}
+  * @date 2021-08-04 14:13:15
+  */
+ @RestController
+ @RequestMapping("management/farmstock")
+ public class FarmStockController {
+     @Autowired
+     private FarmStockService farmStockService;
+
+     /**
+      * 列表
+      */
+     @RequestMapping("/list")
+     public R list(@RequestParam Map<String, Object> params){
+         PageUtils page = farmStockService.queryPage(params);
+
+         return R.ok().put("page", page);
+     }
+
+
+     /**
+      * 信息
+      */
+     @RequestMapping("/info/{id}")
+     public R info(@PathVariable("id") Integer id){
+         FarmStockEntity farmStock = farmStockService.getById(id);
+
+         return R.ok().put("farmStock", farmStock);
+     }
+
+     /**
+      * 保存
+      */
+     @RequestMapping("/save")
+     public R save(@RequestBody FarmStockEntity farmStock){
+         farmStockService.save(farmStock);
+
+         return R.ok();
+     }
+
+     /**
+      * 修改
+      */
+     @RequestMapping("/update")
+     public R update(@RequestBody FarmStockEntity farmStock){
+         farmStockService.updateById(farmStock);
+
+         return R.ok();
+     }
+
+     /**
+      * 删除
+      */
+     @RequestMapping("/delete")
+     public R delete(@RequestBody Integer[] ids){
+         farmStockService.removeByIds(Arrays.asList(ids));
+
+         return R.ok();
+     }
+
+ }

+ 84 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/HeartBeatRecordController.java

@@ -0,0 +1,84 @@
+ package com.huimv.acquisition.controller;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import com.huimv.acquisition.utils.PageUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.huimv.acquisition.entity.HeartBeatRecordEntity;
+import com.huimv.acquisition.service.HeartBeatRecordService;
+
+import com.huimv.acquisition.result.R;
+
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-11-10 16:19:11
+ */
+@RestController
+@RequestMapping("acquisition/heartbeatrecord")
+public class HeartBeatRecordController {
+    @Autowired
+    private HeartBeatRecordService heartBeatRecordService;
+
+    /**
+     * 列表
+     */
+    @RequestMapping("/list")
+    public R list(@RequestParam Map<String, Object> params){
+        PageUtils page = heartBeatRecordService.queryPage(params);
+
+        return R.ok().put("page", page);
+    }
+
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    public R info(@PathVariable("id") Integer id){
+		HeartBeatRecordEntity heartBeatRecord = heartBeatRecordService.getById(id);
+
+        return R.ok().put("heartBeatRecord", heartBeatRecord);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    public R save(@RequestBody HeartBeatRecordEntity heartBeatRecord){
+		heartBeatRecordService.save(heartBeatRecord);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    public R update(@RequestBody HeartBeatRecordEntity heartBeatRecord){
+		heartBeatRecordService.updateById(heartBeatRecord);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    public R delete(@RequestBody Integer[] ids){
+		heartBeatRecordService.removeByIds(Arrays.asList(ids));
+
+        return R.ok();
+    }
+
+}

+ 79 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/MovePigpenController.java

@@ -0,0 +1,79 @@
+ package com.huimv.acquisition.controller;
+
+ import com.huimv.acquisition.entity.MovePigpenEntity;
+ import com.huimv.acquisition.result.R;
+ import com.huimv.acquisition.service.MovePigpenService;
+ import com.huimv.acquisition.utils.PageUtils;
+ import org.springframework.beans.factory.annotation.Autowired;
+ import org.springframework.web.bind.annotation.*;
+
+ import java.util.Arrays;
+ import java.util.Map;
+
+
+ /**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-28 09:57:42
+ */
+@RestController
+@RequestMapping("management/movepigpen")
+@CrossOrigin
+public class MovePigpenController {
+    @Autowired
+    private MovePigpenService movePigpenService;
+
+    /**
+     * 列表
+     */
+    @RequestMapping("/list")
+    public R list(@RequestParam Map<String, Object> params){
+        PageUtils page = movePigpenService.queryPage(params);
+
+        return R.ok().put("page", page);
+    }
+
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    public R info(@PathVariable("id") Integer id){
+		MovePigpenEntity movePigpen = movePigpenService.getById(id);
+
+        return R.ok().put("movePigpen", movePigpen);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    public R save(@RequestBody MovePigpenEntity movePigpen){
+		movePigpenService.save(movePigpen);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    public R update(@RequestBody MovePigpenEntity movePigpen){
+		movePigpenService.updateById(movePigpen);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    public R delete(@RequestBody Integer[] ids){
+		movePigpenService.removeByIds(Arrays.asList(ids));
+
+        return R.ok();
+    }
+
+}

+ 78 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/PigBasicInformationController.java

@@ -0,0 +1,78 @@
+ package com.huimv.acquisition.controller;
+
+ import com.huimv.acquisition.entity.PigBasicInformationEntity;
+ import com.huimv.acquisition.result.R;
+ import com.huimv.acquisition.service.PigBasicInformationService;
+ import com.huimv.acquisition.utils.PageUtils;
+ import org.springframework.beans.factory.annotation.Autowired;
+ import org.springframework.web.bind.annotation.*;
+
+ import java.util.Arrays;
+ import java.util.Map;
+
+
+ /**
+  *
+  *
+  * @author yinhao
+  * @version ${version}
+  * @date 2021-08-11 17:05:02
+  */
+ @RestController
+ @RequestMapping("management/pigbasicinformation")
+ public class PigBasicInformationController {
+     @Autowired
+     private PigBasicInformationService pigBasicInformationService;
+
+     /**
+      * 列表
+      */
+     @RequestMapping("/list")
+     public R list(@RequestParam Map<String, Object> params){
+         PageUtils page = pigBasicInformationService.queryPage(params);
+
+         return R.ok().put("page", page);
+     }
+
+
+     /**
+      * 信息
+      */
+     @RequestMapping("/info/{id}")
+     public R info(@PathVariable("id") Integer id){
+         PigBasicInformationEntity pigBasicInformation = pigBasicInformationService.getById(id);
+
+         return R.ok().put("pigBasicInformation", pigBasicInformation);
+     }
+
+     /**
+      * 保存
+      */
+     @RequestMapping("/save")
+     public R save(@RequestBody PigBasicInformationEntity pigBasicInformation){
+         pigBasicInformationService.save(pigBasicInformation);
+
+         return R.ok();
+     }
+
+     /**
+      * 修改
+      */
+     @RequestMapping("/update")
+     public R update(@RequestBody PigBasicInformationEntity pigBasicInformation){
+         pigBasicInformationService.updateById(pigBasicInformation);
+
+         return R.ok();
+     }
+
+     /**
+      * 删除
+      */
+     @RequestMapping("/delete")
+     public R delete(@RequestBody Integer[] ids){
+         pigBasicInformationService.removeByIds(Arrays.asList(ids));
+
+         return R.ok();
+     }
+
+ }

+ 86 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/SowRankTableController.java

@@ -0,0 +1,86 @@
+ package com.huimv.acquisition.controller;
+
+ import com.huimv.acquisition.entity.SowRankTableEntity;
+ import com.huimv.acquisition.result.R;
+ import com.huimv.acquisition.service.SowRankTableService;
+ import com.huimv.acquisition.utils.PageUtils;
+ import org.springframework.beans.factory.annotation.Autowired;
+ import org.springframework.web.bind.annotation.*;
+
+ import java.util.Arrays;
+ import java.util.Map;
+
+
+ /**
+  *
+  *
+  * @author yinhao
+  * @version ${version}
+  * @date 2021-08-04 17:47:18
+  */
+ @CrossOrigin
+@RestController
+@RequestMapping("management/sowranktable")
+public class SowRankTableController {
+    @Autowired
+    private SowRankTableService sowRankTableService;
+
+    /**
+     * 列表
+     */
+    @RequestMapping("/list")
+    public R list(@RequestParam Map<String, Object> params){
+        PageUtils page = sowRankTableService.queryPage(params);
+
+        return R.ok().put("page", page);
+    }
+
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    public R info(@PathVariable("id") Integer id){
+		SowRankTableEntity sowRankTable = sowRankTableService.getById(id);
+
+        return R.ok().put("sowRankTable", sowRankTable);
+    }
+
+
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    public R save(@RequestBody SowRankTableEntity sowRankTable){
+		sowRankTableService.save(sowRankTable);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    public R update(@RequestBody SowRankTableEntity sowRankTable){
+		sowRankTableService.updateById(sowRankTable);
+        return R.ok();
+    }
+
+
+
+
+
+
+
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    public R delete(@RequestBody Integer[] ids){
+		sowRankTableService.removeByIds(Arrays.asList(ids));
+        return R.ok();
+    }
+
+}

+ 54 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/controller/StockRankController.java

@@ -0,0 +1,54 @@
+package com.huimv.acquisition.controller;
+
+import com.huimv.acquisition.mapper.EartagDataDao;
+import com.huimv.acquisition.result.R;
+import com.huimv.acquisition.service.EartagDataService;
+import com.huimv.acquisition.utils.PageUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * @Author Anchor
+ * @Date 2021/8/4 13:57
+ * @Version 1.0.1
+ */
+
+//存栏排名的接口
+@RestController
+@RequestMapping("manager/rank")
+@CrossOrigin
+public class StockRankController {
+
+
+    @Autowired
+    private EartagDataDao eartagDataDao;
+
+    @Autowired
+    private EartagDataService  eartagDataService  ;
+
+
+    /**
+     * 列表
+     */
+    @RequestMapping("/list")
+    public R list(@RequestParam Map<String, Object> params) {
+        PageUtils page = eartagDataService.queryPage(params);
+        return R.ok().put("page", page);
+    }
+
+
+
+
+
+
+
+
+
+
+
+}

+ 55 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/BaseFarmInfoEntity.java

@@ -0,0 +1,55 @@
+package com.huimv.acquisition.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-27 14:50:11
+ */
+@Data
+@TableName("base_farm_info")
+public class BaseFarmInfoEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 牧场编码
+	 */
+	private String farmCode;
+	/**
+	 * 牧场名称
+	 */
+	private String farmName;
+	/**
+	 * 联系人
+	 */
+	private String man;
+	/**
+	 * 联系电话
+	 */
+	private String phone;
+	/**
+	 * 区县   行政区划代码
+	 */
+	private String county;
+	/**
+	 * 地市   行政区划代码
+	 */
+	private String city;
+	/**
+	 * 备用
+	 */
+	private String province;
+
+}

+ 43 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/BasePigpenEntity.java

@@ -0,0 +1,43 @@
+package com.huimv.acquisition.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 栋舍表
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-30 16:02:09
+ */
+@Data
+@TableName("base_pigpen")
+public class BasePigpenEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 栋舍名称
+	 */
+	private String pigpenName;
+	/**
+	 * 上级id
+	 */
+	private Integer parentId;
+	/**
+	 * 1.猪舍 2.单元
+	 */
+	private Integer type;
+	/**
+	 * 
+	 */
+	private String farmCode;
+
+}

+ 41 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/CollectorRegisterEntity.java

@@ -0,0 +1,41 @@
+package com.huimv.acquisition.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.Date;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-30 09:45:22
+ */
+@Data
+@TableName("collector_register")
+public class CollectorRegisterEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+	private Integer id;
+	private BigInteger orgId;
+	private String orgName;
+	private String countyCode;
+	private String deviceCode;
+	private String registeCode;
+	private String farmCode;
+	private String farmName;
+	private Integer typeF;
+	private Integer stage;
+	private Integer pigpenId;
+	private String penName;
+	private Integer unitId;
+	private String unitName;
+	private String serverIp;
+	private Integer port;
+	private Date registerTime;
+	private Date lastTime;
+	private Integer canStatus;
+
+}

+ 88 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/DailyTabulateDataEntity.java

@@ -0,0 +1,88 @@
+package com.huimv.acquisition.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 耳标每日汇总表
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-04 14:59:05
+ */
+@Data
+@TableName("daily_tabulate_data")
+public class DailyTabulateDataEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 统计日期
+	 */
+	private Date statisticDate;
+	/**
+	 * 当日母猪总存栏
+	 */
+	private Integer stockTotal;
+	/**
+	 * 每日母猪新增耳标数
+	 */
+	private Integer stockNew;
+	/**
+	 * 每日离线耳标数
+	 */
+	private Integer offlineNo;
+	/**
+	 * 能繁母猪存栏数
+	 */
+	private Integer sowStock;
+	/**
+	 * 日龄占比(250-1000)
+	 */
+	private String ratio1;
+	/**
+	 * 日龄(1000-1700)
+	 */
+	private String ratio2;
+	/**
+	 * 日龄(1700-2400)
+	 */
+	private String ratio3;
+	/**
+	 * 日龄(>2400)
+	 */
+	private String ratio4;
+	/**
+	 * 配怀存栏
+	 */
+	private Integer stock1;
+	/**
+	 * 分娩存栏
+	 */
+	private Integer stock2;
+	/**
+	 * 空怀母猪
+	 */
+	private Integer stock3;
+	/**
+	 * 后备存栏
+	 */
+	private Integer stock4;
+	/**
+	 * 公猪存栏
+	 */
+	private Integer stock5;
+	/**
+	 * 牧场编码
+	 */
+	private String farmCode;
+
+}

+ 72 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/DeviceOffLineAlarmEntity.java

@@ -0,0 +1,72 @@
+package com.huimv.acquisition.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+@Data
+@TableName("device_off_line_alarm")
+public class DeviceOffLineAlarmEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 
+	 */
+	private String deviceCode;
+	/**
+	 * 
+	 */
+	private Integer deviceSignalValue;
+	/**
+	 * 
+	 */
+	private String farmCode;
+	/**
+	 * 
+	 */
+	private String farmName;
+	/**
+	 * 
+	 */
+	private Integer pigpenId;
+	/**
+	 * 
+	 */
+	private String pigpenName;
+	/**
+	 * 
+	 */
+	private Integer unitId;
+	/**
+	 * 
+	 */
+	private String unitName;
+	/**
+	 * 
+	 */
+	private String remark;
+	/**
+	 * 
+	 */
+	private Date createTime;
+	/**
+	 * 
+	 */
+	private Integer alarmKind;
+
+}

+ 67 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/DeviceSendMessageAlarmEntity.java

@@ -0,0 +1,67 @@
+package com.huimv.acquisition.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+@Data
+@TableName("device_send_message_alarm")
+public class DeviceSendMessageAlarmEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 
+	 */
+	private String deviceSendMessageAlarm;
+	/**
+	 * 
+	 */
+	private Integer alarmKind;
+	/**
+	 * 
+	 */
+	private String farmCode;
+	/**
+	 * 
+	 */
+	private String deviceCoed;
+	/**
+	 * 
+	 */
+	private String farmName;
+	/**
+	 * 
+	 */
+	private Integer pigpenId;
+	/**
+	 * 
+	 */
+	private String pigpenName;
+	/**
+	 * 
+	 */
+	private Integer unitId;
+	/**
+	 * 
+	 */
+	private String unitName;
+	/**
+	 * 
+	 */
+	private String remark;
+
+}

+ 63 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/DeviceTempEntity.java

@@ -0,0 +1,63 @@
+package com.huimv.acquisition.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.Date;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-28 16:59:32
+ */
+@Data
+@TableName("device_temp")
+public class DeviceTempEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 
+	 */
+	private String header;
+	/**
+	 * 
+	 */
+
+	private BigInteger orgId;
+	private String deviceCode;
+	/**
+	 * 
+	 */
+	private Integer cmd;
+	/**
+	 * 
+	 */
+	private Integer serialNo;
+	/**
+	 * 
+	 */
+	private Double tempValue;
+	/**
+	 * 
+	 */
+	private Date createDate;
+	/**
+	 * 
+	 */
+	private Integer checkCode;
+	/**
+	 * 
+	 */
+	private String tail;
+
+}

+ 46 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/EartagDataEntity.java

@@ -0,0 +1,46 @@
+package com.huimv.acquisition.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.Date;
+
+@Data
+@TableName("eartag_data")
+public class EartagDataEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录id(主键)
+     */
+    @TableId
+    private Integer id;
+    private String deviceCode;
+    private String eartagNo;
+    private Date time;
+    private double earTemp;
+    private Integer exercise;
+    private String pigpen;
+    private Double envTemp;
+    private Integer bat;
+    private Integer rssi;
+    private String head;
+    private String command;
+    private String version;
+    private Integer frameSerialNo;
+    private Integer rebootTimes;
+    private Integer unitId;
+    private String prepareField;
+    private BigInteger orgId;
+    private String chk;
+    private String farmCode;
+    private Integer stage;
+    private Integer sportGap;
+    private String tail;
+
+
+}

+ 86 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/EartagRegisterEntity.java

@@ -0,0 +1,86 @@
+package com.huimv.acquisition.entity;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.Date;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-29 14:55:44
+ */
+@Data
+@TableName("eartag_register")
+public class EartagRegisterEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 默认主键
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 
+	 */
+	private String eartagNo;
+	/**
+	 * 
+	 */
+	private Date registerDate;
+	/**
+	 * 
+	 */
+	private Integer age;
+	/**
+	 * 
+	 */
+	private String deviceCode;
+
+	private BigInteger orgId;
+
+
+
+
+	/**
+	 * 
+	 */
+	private String farmCode;
+	/**
+	 * 
+	 */
+	private Integer stage;
+	/**
+	 * 
+	 */
+	private String pigpen;
+
+
+
+
+	//为了统计上传次数增加的字段
+	@Excel(name = "")
+	private Integer countTimes;
+
+
+
+	//为了统计上传次数增加的字段
+	@Excel(name = "")
+	private double earTemp;
+
+
+
+	//为了统计上传次数增加的字段
+	@Excel(name = "")
+	private Integer earTempStatus;
+	
+
+
+
+}

+ 76 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/EartagTempAlamEntity.java

@@ -0,0 +1,76 @@
+package com.huimv.acquisition.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+@Data
+@TableName("eartag_temp_alam")
+public class EartagTempAlamEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 
+	 */
+	private Double eartagTempValue;
+	/**
+	 * 
+	 */
+	private Integer alarmKind;
+	/**
+	 * 
+	 */
+	private Date createTime;
+	/**
+	 * 
+	 */
+	private String farmCode;
+	/**
+	 * 
+	 */
+	private String deviceCoed;
+	/**
+	 * 
+	 */
+	private String farmName;
+	/**
+	 * 
+	 */
+	private Integer farmId;
+	/**
+	 * 
+	 */
+	private Integer pigpenId;
+	/**
+	 * 
+	 */
+	private String pigpenName;
+	/**
+	 * 
+	 */
+	private Integer unitId;
+	/**
+	 * 
+	 */
+	private String unitName;
+	/**
+	 * 
+	 */
+	private String remark;
+
+}

+ 76 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/EnvTempAlarmEntity.java

@@ -0,0 +1,76 @@
+package com.huimv.acquisition.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+@Data
+@TableName("env_temp_alarm")
+public class EnvTempAlarmEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 
+	 */
+	private Double envTempValue;
+	/**
+	 * 
+	 */
+	private Integer alarmKind;
+	/**
+	 * 
+	 */
+	private Date createTime;
+	/**
+	 * 
+	 */
+	private String farmCode;
+	/**
+	 * 
+	 */
+	private String deviceCoed;
+	/**
+	 * 
+	 */
+	private String farmName;
+	/**
+	 * 
+	 */
+	private Integer farmId;
+	/**
+	 * 
+	 */
+	private Integer pigpenId;
+	/**
+	 * 
+	 */
+	private String pigpenName;
+	/**
+	 * 
+	 */
+	private Integer unitId;
+	/**
+	 * 
+	 */
+	private String unitName;
+	/**
+	 * 
+	 */
+	private String remark;
+
+}

+ 92 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/FarmStockEntity.java

@@ -0,0 +1,92 @@
+package com.huimv.acquisition.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-04 14:13:15
+ */
+@Data
+@TableName("farm_stock")
+public class FarmStockEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 牧场代码
+	 */
+	private String farmCode;
+	/**
+	 * 牧场名称
+	 */
+	private String farmName;
+	/**
+	 * 母猪总存栏
+	 */
+	private Integer sowTotalStock;
+	/**
+	 * 母猪新增
+	 */
+	private Integer eartagNew;
+	/**
+	 * 耳标离线
+	 */
+	private Integer eartagOffone;
+	/**
+	 * 能繁母猪存栏
+	 */
+	private Integer sowStock;
+	/**
+	 * 配怀存栏
+	 */
+	private Integer stock1;
+	/**
+	 * 分娩存栏
+	 */
+	private Integer stock2;
+	/**
+	 * 空怀存栏
+	 */
+	private Integer stock3;
+	/**
+	 * 后备存栏
+	 */
+	private Integer stock4;
+	/**
+	 * 公猪存栏
+	 */
+	private Integer stock5;
+	/**
+	 * 月份
+	 */
+	private Integer month;
+	/**
+	 * 年度
+	 */
+	private Integer year;
+	/**
+	 * 地市代码
+	 */
+	private String cityCode;
+	/**
+	 * 区县代码
+	 */
+	private String countyCode;
+	/**
+	 * 创建时间
+	 */
+	private Date createTime;
+
+}

+ 68 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/HeartBeatRecordEntity.java

@@ -0,0 +1,68 @@
+package com.huimv.acquisition.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-11-10 16:19:11
+ */
+@Data
+@TableName("heart_beat_record")
+public class HeartBeatRecordEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 
+	 */
+	private String head;
+	/**
+	 * 
+	 */
+	private String deviceCode;
+	/**
+	 * 
+	 */
+	private Integer cmd;
+	/**
+	 * 
+	 */
+	private String checkNo;
+	/**
+	 * 
+	 */
+	private String tail;
+	/**
+	 * 地县编码
+	 */
+	private String countyCode;
+	/**
+	 * 牧场编码
+	 */
+	private String farmCode;
+	/**
+	 * 猪舍id
+	 */
+	private String pigpenId;
+	/**
+	 * 单元id
+	 */
+	private String unitId;
+	/**
+	 * 创建时间
+	 */
+	private Date createTime;
+
+}

+ 170 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/MovePigpenEntity.java

@@ -0,0 +1,170 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by Fernflower decompiler)
+//
+
+package com.huimv.acquisition.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.Date;
+
+@Data
+@TableName("move_pigpen")
+public class MovePigpenEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+	@TableId
+	private Integer id;
+	private String eartagNo;
+	private Date moveDate;
+	private Integer stage;
+	private String deviceCode;
+	private BigInteger orgId;
+
+	public MovePigpenEntity() {
+	}
+
+	public Integer getId() {
+		return this.id;
+	}
+
+	public String getEartagNo() {
+		return this.eartagNo;
+	}
+
+	public Date getMoveDate() {
+		return this.moveDate;
+	}
+
+	public Integer getStage() {
+		return this.stage;
+	}
+
+	public String getDeviceCode() {
+		return this.deviceCode;
+	}
+
+	public BigInteger getOrgId() {
+		return this.orgId;
+	}
+
+	public void setId(final Integer id) {
+		this.id = id;
+	}
+
+	public void setEartagNo(final String eartagNo) {
+		this.eartagNo = eartagNo;
+	}
+
+	public void setMoveDate(final Date moveDate) {
+		this.moveDate = moveDate;
+	}
+
+	public void setStage(final Integer stage) {
+		this.stage = stage;
+	}
+
+	public void setDeviceCode(final String deviceCode) {
+		this.deviceCode = deviceCode;
+	}
+
+	public void setOrgId(final BigInteger orgId) {
+		this.orgId = orgId;
+	}
+
+	public boolean equals(final Object o) {
+		if (o == this) {
+			return true;
+		} else if (!(o instanceof MovePigpenEntity)) {
+			return false;
+		} else {
+			MovePigpenEntity other = (MovePigpenEntity)o;
+			if (!other.canEqual(this)) {
+				return false;
+			} else {
+				Object this$id = this.getId();
+				Object other$id = other.getId();
+				if (this$id == null) {
+					if (other$id != null) {
+						return false;
+					}
+				} else if (!this$id.equals(other$id)) {
+					return false;
+				}
+
+				Object this$stage = this.getStage();
+				Object other$stage = other.getStage();
+				if (this$stage == null) {
+					if (other$stage != null) {
+						return false;
+					}
+				} else if (!this$stage.equals(other$stage)) {
+					return false;
+				}
+
+				Object this$eartagNo = this.getEartagNo();
+				Object other$eartagNo = other.getEartagNo();
+				if (this$eartagNo == null) {
+					if (other$eartagNo != null) {
+						return false;
+					}
+				} else if (!this$eartagNo.equals(other$eartagNo)) {
+					return false;
+				}
+
+				label62: {
+					Object this$moveDate = this.getMoveDate();
+					Object other$moveDate = other.getMoveDate();
+					if (this$moveDate == null) {
+						if (other$moveDate == null) {
+							break label62;
+						}
+					} else if (this$moveDate.equals(other$moveDate)) {
+						break label62;
+					}
+
+					return false;
+				}
+
+				label55: {
+					Object this$deviceCode = this.getDeviceCode();
+					Object other$deviceCode = other.getDeviceCode();
+					if (this$deviceCode == null) {
+						if (other$deviceCode == null) {
+							break label55;
+						}
+					} else if (this$deviceCode.equals(other$deviceCode)) {
+						break label55;
+					}
+
+					return false;
+				}
+
+				Object this$orgId = this.getOrgId();
+				Object other$orgId = other.getOrgId();
+				if (this$orgId == null) {
+					if (other$orgId != null) {
+						return false;
+					}
+				} else if (!this$orgId.equals(other$orgId)) {
+					return false;
+				}
+
+				return true;
+			}
+		}
+	}
+
+	protected boolean canEqual(final Object other) {
+		return other instanceof MovePigpenEntity;
+	}
+
+
+	public String toString() {
+		return "MovePigpenEntity(id=" + this.getId() + ", eartagNo=" + this.getEartagNo() + ", moveDate=" + this.getMoveDate() + ", stage=" + this.getStage() + ", deviceCode=" + this.getDeviceCode() + ", orgId=" + this.getOrgId() + ")";
+	}
+}

+ 91 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/PigBasicInformationEntity.java

@@ -0,0 +1,91 @@
+package com.huimv.acquisition.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-11 17:05:02
+ */
+@Data
+@TableName("pig_basic_information")
+public class PigBasicInformationEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 耳标号
+	 */
+	private String eartagNo;
+	/**
+	 * 创建时间
+	 */
+	private Date createTime;
+	/**
+	 * 更新时间
+	 */
+	private Date updateTime;
+	/**
+	 * 机器编码
+	 */
+	private String deviceCode;
+	/**
+	 * 猪的出生日期
+	 */
+	private Date birthDay;
+	/**
+	 * 佩标日期
+	 */
+	private Date wearTagTime;
+	/**
+	 * 牧场编号
+	 */
+	private String farmCode;
+	/**
+	 * 牧场名称
+	 */
+	private String farmName;
+	/**
+	 * 猪舍id
+	 */
+	private Integer penId;
+	/**
+	 * 猪舍名称
+	 */
+	private String penName;
+	/**
+	 * 单元id
+	 */
+	private Integer unitId;
+	/**
+	 * 单元名称
+	 */
+	private String unitName;
+	/**
+	 * 县id
+	 */
+	private Integer countyId;
+	/**
+	 * 县名称
+	 */
+	private String countyName;
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+
+	private Integer stage;
+
+}

+ 76 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/RawDataEntity.java

@@ -0,0 +1,76 @@
+/*
+Copyright [2020] [https://www.xiaonuo.vip]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Snowy采用APACHE LICENSE 2.0开源协议,您在使用过程中,需要注意以下几点:
+
+1.请不要删除和修改根目录下的LICENSE文件。
+2.请不要删除和修改Snowy源码头部的版权声明。
+3.请保留源码和相关描述文件的项目出处,作者声明等。
+4.分发源码时候,请注明软件出处 https://gitee.com/xiaonuobase/snowy
+5.在修改包名,模块名称,项目代码等时,请注明软件出处 https://gitee.com/xiaonuobase/snowy
+6.若您的项目无法满足以上几点,可申请商业授权,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
+ */
+package com.huimv.acquisition.entity;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.huimv.core.pojo.base.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 原始数据存储
+ *
+ * @author yangdi
+ * @date 2021-11-09 16:58:43
+ */
+
+@Data
+@TableName("raw_data")
+public class RawDataEntity   {
+
+    /**
+     * 
+     */
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 
+     */
+    @Excel(name = "")
+    private String detailData;
+
+    /**
+     * 
+     */
+    @Excel(name = "")
+    private Integer status;
+
+
+
+
+    //目前来说  没必要增加组织id 这个字段
+    private  Date    createTime;
+
+
+
+
+
+}

+ 91 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/SowRankTableEntity.java

@@ -0,0 +1,91 @@
+package com.huimv.acquisition.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-04 17:47:18
+ */
+@Data
+@TableName("sow_rank_table")
+public class SowRankTableEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * id
+	 */
+	@TableId(type = IdType.NONE)
+	private Integer id;
+	/**
+	 * 
+	 */
+	private String farmCode;
+	/**
+	 * 
+	 */
+	private String farmId;
+	/**
+	 * 母猪存栏
+	 */
+	private Integer sowLivestock;
+	/**
+	 * 排名
+	 */
+	private Integer sowLivestockRank;
+	/**
+	 * 存栏增长
+	 */
+	private Integer sowLivestockInc;
+	/**
+	 * 排名
+	 */
+	private Integer sowLivestockIncRank;
+	/**
+	 * 母猪msy
+	 */
+	private Double sowMsy;
+	/**
+	 * 排名
+	 */
+	private Integer sowMsyRank;
+	/**
+	 * 统计
+	 */
+	private Integer outStockCount;
+	/**
+	 * 预计
+	 */
+	private Integer outStockExpected;
+	/**
+	 * 目标
+	 */
+	private Integer ainOutStock;
+	/**
+	 * 完成度
+	 */
+	private String finishPercent;
+	/**
+	 * 备注
+	 */
+	private String remark;
+	/**
+	 * 排名备用
+	 */
+	private String rank;
+
+	//创建时间
+	private Date create_time;
+
+	//
+	private String farmName;
+
+}

+ 121 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/TempMovePenEntity.java

@@ -0,0 +1,121 @@
+package com.huimv.acquisition.entity;
+
+import java.util.Date;
+
+/**
+ * @Author Anchor
+ * @Date 2021/7/30 17:23
+ * @Version 1.0.1
+ */
+public class TempMovePenEntity {
+
+
+    private Integer id;
+    /**
+     * 耳标号
+     */
+    private String eartagNo;
+    /**
+     * 转舍日期
+     */
+    private Date moveDate;
+    /**
+     * 当前阶段
+     */
+    private Integer stage;
+    /**
+     * 设备编码
+     */
+    private String deviceCode;
+
+
+    //第几次转舍
+    private String removeSec;
+
+    //猪舍名称
+    private String penName;
+
+
+    //单元名称
+    private String unitname;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getEartagNo() {
+        return eartagNo;
+    }
+
+    public void setEartagNo(String eartagNo) {
+        this.eartagNo = eartagNo;
+    }
+
+    public Date getMoveDate() {
+        return moveDate;
+    }
+
+    public void setMoveDate(Date moveDate) {
+        this.moveDate = moveDate;
+    }
+
+    public Integer getStage() {
+        return stage;
+    }
+
+    public void setStage(Integer stage) {
+        this.stage = stage;
+    }
+
+    public String getDeviceCode() {
+        return deviceCode;
+    }
+
+    public void setDeviceCode(String deviceCode) {
+        this.deviceCode = deviceCode;
+    }
+
+    public String getRemoveSec() {
+        return removeSec;
+    }
+
+    public void setRemoveSec(String removeSec) {
+        this.removeSec = removeSec;
+    }
+
+    public String getPenName() {
+        return penName;
+    }
+
+    public void setPenName(String penName) {
+        this.penName = penName;
+    }
+
+    public String getUnitname() {
+        return unitname;
+    }
+
+    public void setUnitname(String unitname) {
+        this.unitname = unitname;
+    }
+
+
+    @Override
+    public String toString() {
+        return "MovePenEntity{" +
+                "id=" + id +
+                ", eartagNo='" + eartagNo + '\'' +
+                ", moveDate=" + moveDate +
+                ", stage=" + stage +
+                ", deviceCode='" + deviceCode + '\'' +
+                ", removeSec='" + removeSec + '\'' +
+                ", penName='" + penName + '\'' +
+                ", unitname='" + unitname + '\'' +
+                '}';
+    }
+}

+ 86 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/vo/CollectorRegisterVo.java

@@ -0,0 +1,86 @@
+package com.huimv.acquisition.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.manager.entity.vo
+ * @Description : TODO
+ * @Author : yuxuexuan
+ * @Create : 2021/7/24 0024 17:46
+ **/
+@Data
+public class CollectorRegisterVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录id(主键)
+     */
+    private Integer id;
+    /**
+     * 设备编码
+     */
+    private String deviceCode;
+    /**
+     * 地县编码
+     */
+    private String countyCode;
+    /**
+     * 区县名
+     */
+    private String countyName;
+    /**
+     * 牧场编码
+     */
+    private String farmCode;
+    /**
+     * 牧场名称
+     */
+    private String farmName;
+    /**
+     * 动物种类
+     */
+    private Integer typeF;
+    /**
+     * 阶段
+     */
+    private Integer stage;
+    /**
+     * 猪舍id
+     */
+    private Integer pigpenId;
+
+    private String pigpenName;
+
+    private String unitName;
+    /**
+     * 单元id
+     */
+    private Integer unitId;
+    /**
+     * 上传服务器地址
+     */
+    private String serverIp;
+    /**
+     * 端口
+     */
+    private Integer port;
+    /**
+     * 注册时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date registerTime;
+    /**
+     * 最后上传时间
+     */
+    private Date lastTime;
+
+    /**
+     * 状态 默认值 1  1.正常 2.异常
+     */
+    private Integer state;
+}

+ 122 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/entity/vo/EartagParamVo.java

@@ -0,0 +1,122 @@
+package com.huimv.acquisition.entity.vo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+
+/**
+ * 耳标相关的所有的参数提交用这个来接收
+ */
+@Data
+public class EartagParamVo {
+
+    /**
+     * 当前页
+     */
+    private String page;
+
+
+    /**
+     * 页数大小
+     */
+    private String limit;
+    
+
+    /**
+     * 传入时间(注册时间)
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date sendTime;
+
+
+    /**
+     * 开始时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date starTime;
+
+
+    /**
+     * 结束时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
+
+    /**
+     * 设备编码
+     */
+    private String deviceCode;
+
+
+    /**
+     * 阶段
+     */
+    private Integer stage;
+
+    /**
+     * 耳标高温
+     */
+    private String eartagHighTemp;
+
+
+    /**
+     * 耳标低高温
+     */
+    private String eartagLowTemp;
+
+
+    /**
+     * 耳标编号
+     */
+    private String eartagNo;
+
+
+    /**
+     * 栋舍编号
+     */
+    private String penNo;
+
+
+    /**
+     * 单元编号
+     */
+    private String unitNo;
+
+
+    /**
+     * 环境温度高值
+     */
+    private String envHighTemp;
+
+
+    /**
+     * 环境温度低值
+     */
+    private String envLowTemp;
+
+    /**
+     * 电池电量
+     */
+    private Integer bat;
+
+    /**
+     * 信号强度
+     */
+    private Integer rssi;
+
+
+    /**
+     * 耳标的温度异常情况 为  0   的时候就是异常
+     */
+    private Integer earTempStatus;
+
+
+}

+ 19 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/BaseFarmInfoDao.java

@@ -0,0 +1,19 @@
+package com.huimv.acquisition.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.acquisition.entity.BaseFarmInfoEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-27 14:50:11
+ */
+@Mapper
+@Repository
+public interface BaseFarmInfoDao extends BaseMapper<BaseFarmInfoEntity> {
+	
+}

+ 20 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/BasePigpenDao.java

@@ -0,0 +1,20 @@
+package com.huimv.acquisition.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.acquisition.entity.BasePigpenEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 栋舍表
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-30 16:02:09
+ */
+@Mapper
+@Repository
+public interface BasePigpenDao extends BaseMapper<BasePigpenEntity> {
+	
+}

+ 19 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/CollectorRegisterDao.java

@@ -0,0 +1,19 @@
+package com.huimv.acquisition.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.acquisition.entity.CollectorRegisterEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-30 09:45:22
+ */
+@Mapper
+@Repository
+public interface CollectorRegisterDao extends BaseMapper<CollectorRegisterEntity> {
+	
+}

+ 19 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/DailyTabulateDataDao.java

@@ -0,0 +1,19 @@
+package com.huimv.acquisition.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.acquisition.entity.DailyTabulateDataEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 耳标每日汇总表
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-04 14:59:05
+ */
+@Mapper
+@Repository
+public interface DailyTabulateDataDao extends BaseMapper<DailyTabulateDataEntity> {
+	
+}

+ 18 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/DeviceOffLineAlarmDao.java

@@ -0,0 +1,18 @@
+package com.huimv.acquisition.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.acquisition.entity.DeviceOffLineAlarmEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+@Mapper
+
+public interface DeviceOffLineAlarmDao extends BaseMapper<DeviceOffLineAlarmEntity> {
+	
+}

+ 18 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/DeviceSendMessageAlarmDao.java

@@ -0,0 +1,18 @@
+package com.huimv.acquisition.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.acquisition.entity.DeviceSendMessageAlarmEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+@Mapper
+public interface DeviceSendMessageAlarmDao extends BaseMapper<DeviceSendMessageAlarmEntity> {
+	
+}

+ 18 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/DeviceTempDao.java

@@ -0,0 +1,18 @@
+package com.huimv.acquisition.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.acquisition.entity.DeviceTempEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-28 16:59:32
+ */
+@Mapper
+public interface DeviceTempDao extends BaseMapper<DeviceTempEntity> {
+	
+}

+ 24 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/EartagDataDao.java

@@ -0,0 +1,24 @@
+package com.huimv.acquisition.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.huimv.acquisition.entity.EartagDataEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-24 16:29:33
+ */
+@Mapper
+@Repository
+public interface EartagDataDao extends BaseMapper<EartagDataEntity> {
+
+    IPage<EartagDataEntity> page(@Param("page") IPage<EartagDataEntity> page, @Param(Constants.WRAPPER) LambdaQueryWrapper<EartagDataEntity> wrapper);
+}

+ 20 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/EartagRegisterDao.java

@@ -0,0 +1,20 @@
+package com.huimv.acquisition.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.acquisition.entity.EartagRegisterEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-29 14:55:44
+ */
+@Mapper
+@Repository
+public interface EartagRegisterDao extends BaseMapper<EartagRegisterEntity> {
+	
+}

+ 18 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/EartagTempAlamDao.java

@@ -0,0 +1,18 @@
+package com.huimv.acquisition.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.acquisition.entity.EartagTempAlamEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+@Mapper
+public interface EartagTempAlamDao extends BaseMapper<EartagTempAlamEntity> {
+	
+}

+ 19 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/EnvTempAlarmDao.java

@@ -0,0 +1,19 @@
+package com.huimv.acquisition.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.acquisition.entity.EnvTempAlarmEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+@Mapper
+public interface EnvTempAlarmDao extends BaseMapper<EnvTempAlarmEntity> {
+
+
+
+}

+ 20 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/FarmStockDao.java

@@ -0,0 +1,20 @@
+package com.huimv.acquisition.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.acquisition.entity.FarmStockEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-04 14:13:15
+ */
+@Mapper
+@Repository
+public interface FarmStockDao extends BaseMapper<FarmStockEntity> {
+	
+}

+ 17 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/HeartBeatRecordDao.java

@@ -0,0 +1,17 @@
+package com.huimv.acquisition.mapper;
+
+import com.huimv.acquisition.entity.HeartBeatRecordEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-11-10 16:19:11
+ */
+@Mapper
+public interface HeartBeatRecordDao extends BaseMapper<HeartBeatRecordEntity> {
+	
+}

+ 20 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/MovePigpenDao.java

@@ -0,0 +1,20 @@
+package com.huimv.acquisition.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.acquisition.entity.MovePigpenEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-28 09:57:42
+ */
+@Mapper
+@Repository
+public interface MovePigpenDao extends BaseMapper<MovePigpenEntity> {
+	
+}

+ 19 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/PigBasicInformationDao.java

@@ -0,0 +1,19 @@
+package com.huimv.acquisition.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.acquisition.entity.PigBasicInformationEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-11 17:05:02
+ */
+@Mapper
+@Repository
+public interface PigBasicInformationDao extends BaseMapper<PigBasicInformationEntity> {
+	
+}

+ 19 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/RawDataDao.java

@@ -0,0 +1,19 @@
+package com.huimv.acquisition.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.acquisition.entity.RawDataEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+@Mapper
+public interface RawDataDao extends BaseMapper<RawDataEntity> {
+
+
+
+}

+ 19 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/mapper/SowRankTableDao.java

@@ -0,0 +1,19 @@
+package com.huimv.acquisition.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.acquisition.entity.SowRankTableEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-04 17:47:18
+ */
+@Mapper
+@Repository
+public interface SowRankTableDao extends BaseMapper<SowRankTableEntity> {
+	
+}

+ 150 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/param/CollectorRegisterParam.java

@@ -0,0 +1,150 @@
+/*
+Copyright [2020] [https://www.xiaonuo.vip]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Snowy采用APACHE LICENSE 2.0开源协议,您在使用过程中,需要注意以下几点:
+
+1.请不要删除和修改根目录下的LICENSE文件。
+2.请不要删除和修改Snowy源码头部的版权声明。
+3.请保留源码和相关描述文件的项目出处,作者声明等。
+4.分发源码时候,请注明软件出处 https://gitee.com/xiaonuobase/snowy
+5.在修改包名,模块名称,项目代码等时,请注明软件出处 https://gitee.com/xiaonuobase/snowy
+6.若您的项目无法满足以上几点,可申请商业授权,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
+ */
+package com.huimv.acquisition.param;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.huimv.acquisition.result.BaseParam;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+* 设备管理参数类
+ *
+ * @author yinhao
+ * @date 2021-08-19 09:43:52
+*/
+@Data
+public class CollectorRegisterParam extends BaseParam {
+
+    /**
+     * 记录id(主键)
+     */
+    private Integer id;
+
+    /**
+     * 组织id
+     */
+    private Long orgId;
+
+    /**
+     * 组织名称
+     */
+    private String orgName;
+
+    /**
+     * 设备编码
+     */
+    @NotBlank(message = "设备编码不能为空,请检查deviceCode参数", groups = {add.class, edit.class})
+    private String deviceCode;
+
+    /**
+     * 盒子的芯片编码
+     */
+    @NotBlank(message = "盒子的芯片编码不能为空,请检查registeCode参数", groups = {add.class, edit.class})
+    private String registeCode;
+
+    /**
+     * 牧场编码
+     */
+    private String farmCode;
+
+    /**
+     * 牧场名称
+     */
+    private String farmName;
+
+    /**
+     * 动物种类
+     */
+    private Integer typeF;
+
+
+    private Integer pageSize;
+
+
+    private Integer pageNum;
+
+    /**
+     * 阶段
+     */
+    @NotNull(message = "阶段不能为空,请检查stage参数", groups = {add.class, edit.class})
+    private Integer stage;
+
+    /**
+     * 猪舍id
+     */
+    @NotNull(message = "猪舍id不能为空,请检查pigpenId参数", groups = {add.class, edit.class})
+    private Integer pigpenId;
+
+    /**
+     * 栋舍名称
+     */
+    @NotBlank(message = "栋舍名称不能为空,请检查penName参数", groups = {add.class, edit.class})
+    private String penName;
+
+    /**
+     * 单元id
+     */
+    @NotNull(message = "单元id不能为空,请检查unitId参数", groups = {add.class, edit.class})
+    private Integer unitId;
+
+    /**
+     * 单元名称
+     */
+    @NotBlank(message = "单元名称不能为空,请检查unitName参数", groups = {add.class, edit.class})
+    private String unitName;
+
+    /**
+     * 上传服务器地址
+     */
+    private String serverIp;
+
+    /**
+     * 端口
+     */
+    private Integer port;
+
+    /**
+     * 注册时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date registerTime;
+
+    /**
+     * 最后上传时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date lastTime;
+
+    /**
+     * 0:正常,1:网络异常,2:采集异常,3:注销
+     */
+    private Integer canStatus;
+
+}

+ 56 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/response/ErrorResponseData.java

@@ -0,0 +1,56 @@
+/*
+Copyright [2020] [https://www.xiaonuo.vip]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Snowy采用APACHE LICENSE 2.0开源协议,您在使用过程中,需要注意以下几点:
+
+1.请不要删除和修改根目录下的LICENSE文件。
+2.请不要删除和修改Snowy源码头部的版权声明。
+3.请保留源码和相关描述文件的项目出处,作者声明等。
+4.分发源码时候,请注明软件出处 https://gitee.com/xiaonuobase/snowy
+5.在修改包名,模块名称,项目代码等时,请注明软件出处 https://gitee.com/xiaonuobase/snowy
+6.若您的项目无法满足以上几点,可申请商业授权,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
+ */
+package com.huimv.acquisition.response;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 失败响应结果
+ *
+ * @author xuyuxiang
+ * @date 2020/3/30 15:05
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class ErrorResponseData extends ResponseData {
+
+    /**
+     * 异常的具体类名称
+     */
+    private String exceptionClazz;
+
+    public ErrorResponseData(String message) {
+        super(false, DEFAULT_ERROR_CODE, message, null);
+    }
+
+    public ErrorResponseData(Integer code, String message) {
+        super(false, code, message, null);
+    }
+
+    ErrorResponseData(Integer code, String message, Object object) {
+        super(false, code, message, object);
+    }
+}

+ 99 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/response/ResponseData.java

@@ -0,0 +1,99 @@
+/*
+Copyright [2020] [https://www.xiaonuo.vip]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Snowy采用APACHE LICENSE 2.0开源协议,您在使用过程中,需要注意以下几点:
+
+1.请不要删除和修改根目录下的LICENSE文件。
+2.请不要删除和修改Snowy源码头部的版权声明。
+3.请保留源码和相关描述文件的项目出处,作者声明等。
+4.分发源码时候,请注明软件出处 https://gitee.com/xiaonuobase/snowy
+5.在修改包名,模块名称,项目代码等时,请注明软件出处 https://gitee.com/xiaonuobase/snowy
+6.若您的项目无法满足以上几点,可申请商业授权,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
+ */
+package com.huimv.acquisition.response;
+
+import lombok.Data;
+
+/**
+ * 响应结果数据
+ *
+ * @author xuyuxiang
+ * @date 2020/3/30 15:04
+ */
+@Data
+public class ResponseData {
+
+    public static final String DEFAULT_SUCCESS_MESSAGE = "请求成功";
+
+    public static final String DEFAULT_ERROR_MESSAGE = "网络异常";
+
+    public static final Integer DEFAULT_SUCCESS_CODE = 200;
+
+    public static final Integer DEFAULT_ERROR_CODE = 500;
+
+    /**
+     * 请求是否成功
+     */
+    private Boolean success;
+
+    /**
+     * 响应状态码
+     */
+    private Integer code;
+
+    /**
+     * 响应信息
+     */
+    private String message;
+
+    /**
+     * 响应对象
+     */
+    private Object data;
+
+    public ResponseData() {
+    }
+
+    public ResponseData(Boolean success, Integer code, String message, Object data) {
+        this.success = success;
+        this.code = code;
+        this.message = message;
+        this.data = data;
+    }
+
+    public static SuccessResponseData success() {
+        return new SuccessResponseData();
+    }
+
+    public static SuccessResponseData success(Object object) {
+        return new SuccessResponseData(object);
+    }
+
+    public static SuccessResponseData success(Integer code, String message, Object object) {
+        return new SuccessResponseData(code, message, object);
+    }
+
+    public static ErrorResponseData error(String message) {
+        return new ErrorResponseData(message);
+    }
+
+    public static ErrorResponseData error(Integer code, String message) {
+        return new ErrorResponseData(code, message);
+    }
+
+    public static ErrorResponseData error(Integer code, String message, Object object) {
+        return new ErrorResponseData(code, message, object);
+    }
+}

+ 46 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/response/SuccessResponseData.java

@@ -0,0 +1,46 @@
+/*
+Copyright [2020] [https://www.xiaonuo.vip]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Snowy采用APACHE LICENSE 2.0开源协议,您在使用过程中,需要注意以下几点:
+
+1.请不要删除和修改根目录下的LICENSE文件。
+2.请不要删除和修改Snowy源码头部的版权声明。
+3.请保留源码和相关描述文件的项目出处,作者声明等。
+4.分发源码时候,请注明软件出处 https://gitee.com/xiaonuobase/snowy
+5.在修改包名,模块名称,项目代码等时,请注明软件出处 https://gitee.com/xiaonuobase/snowy
+6.若您的项目无法满足以上几点,可申请商业授权,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
+ */
+package com.huimv.acquisition.response;
+
+/**
+ * 成功响应结果
+ *
+ * @author xuyuxiang
+ * @date 2020/3/30 15:04
+ */
+public class SuccessResponseData extends ResponseData {
+
+    public SuccessResponseData() {
+        super(true, DEFAULT_SUCCESS_CODE, DEFAULT_SUCCESS_MESSAGE, null);
+    }
+
+    public SuccessResponseData(Object object) {
+        super(true, DEFAULT_SUCCESS_CODE, DEFAULT_SUCCESS_MESSAGE, object);
+    }
+
+    public SuccessResponseData(Integer code, String message, Object object) {
+        super(true, code, message, object);
+    }
+}

+ 272 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/result/BaseParam.java

@@ -0,0 +1,272 @@
+/*
+Copyright [2020] [https://www.xiaonuo.vip]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Snowy采用APACHE LICENSE 2.0开源协议,您在使用过程中,需要注意以下几点:
+
+1.请不要删除和修改根目录下的LICENSE文件。
+2.请不要删除和修改Snowy源码头部的版权声明。
+3.请保留源码和相关描述文件的项目出处,作者声明等。
+4.分发源码时候,请注明软件出处 https://gitee.com/xiaonuobase/snowy
+5.在修改包名,模块名称,项目代码等时,请注明软件出处 https://gitee.com/xiaonuobase/snowy
+6.若您的项目无法满足以上几点,可申请商业授权,获取Snowy商业授权许可,请在官网购买授权,地址为 https://www.xiaonuo.vip
+ */
+package com.huimv.acquisition.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 通用基础参数,相关实体参数校验可继承此类
+ *
+ * @author xuyuxiang
+ * @date 2020/3/10 16:02
+ */
+@Data
+public class BaseParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 搜索值
+     */
+    private String searchValue;
+
+    /**
+     * 数据权限
+     */
+    private List<Long> dataScope;
+
+    /**
+     * 开始时间
+     */
+    private String searchBeginTime;
+
+    /**
+     * 结束时间
+     */
+    private String searchEndTime;
+
+    /**
+     * 状态(字典 0正常 1停用 2删除)
+     */
+    private Integer searchStatus;
+
+    /**
+     * 参数校验分组:分页
+     */
+    public @interface page {
+    }
+
+    /**
+     * 参数校验分组:列表
+     */
+    public @interface list {
+    }
+
+    /**
+     * 参数校验分组:下拉
+     */
+    public @interface dropDown {
+    }
+
+    /**
+     * 参数校验分组:增加
+     */
+    public @interface add {
+    }
+
+    /**
+     * 参数校验分组:编辑
+     */
+    public @interface edit {
+    }
+
+    /**
+     * 参数校验分组:更新信息
+     */
+    public @interface updateInfo {
+    }
+
+    /**
+     * 参数校验分组:修改密码
+     */
+    public @interface updatePwd {
+    }
+
+    /**
+     * 参数校验分组:重置密码
+     */
+    public @interface resetPwd {
+    }
+
+    /**
+     * 参数校验分组:修改头像
+     */
+    public @interface updateAvatar {
+    }
+
+    /**
+     * 参数校验分组:删除
+     */
+    public @interface delete {
+    }
+
+    /**
+     * 参数校验分组:详情
+     */
+    public @interface detail {
+    }
+
+    /**
+     * 参数校验分组:授权角色
+     */
+    public @interface grantRole {
+    }
+
+    /**
+     * 参数校验分组:授权菜单
+     */
+    public @interface grantMenu {
+    }
+
+    /**
+     * 参数校验分组:授权数据
+     */
+    public @interface grantData {
+    }
+
+    /**
+     * 参数校验分组:强退
+     */
+    public @interface force {
+    }
+
+    /**
+     * 参数校验分组:停用
+     */
+    public @interface stop {
+    }
+
+    /**
+     * 参数校验分组:启用
+     */
+    public @interface start {
+    }
+
+    /**
+     * 参数校验分组:部署
+     */
+    public @interface deploy {
+    }
+
+    /**
+     * 参数校验分组:挂起
+     */
+    public @interface suspend {
+    }
+
+    /**
+     * 参数校验分组:激活
+     */
+    public @interface active {
+    }
+
+    /**
+     * 参数校验分组:委托
+     */
+    public @interface entrust {
+    }
+
+    /**
+     * 参数校验分组:转办
+     */
+    public @interface turn {
+    }
+
+    /**
+     * 参数校验分组:追踪
+     */
+    public @interface trace {
+    }
+
+    /**
+     * 参数校验分组:跳转
+     */
+    public @interface jump {
+    }
+
+    /**
+     * 参数校验分组:提交
+     */
+    public @interface submit {
+    }
+
+    /**
+     * 参数校验分组:退回
+     */
+    public @interface back {
+    }
+
+    /**
+     * 参数校验分组:终止
+     */
+    public @interface end {
+    }
+
+    /**
+     * 参数校验分组:导出
+     */
+    public @interface export {
+    }
+
+    /**
+     * 参数校验分组:映射
+     */
+    public @interface mapping {
+    }
+
+    /**
+     * 参数校验分组:切换
+     */
+    public @interface change {
+    }
+
+    /**
+     * 参数校验分组:历史审批记录
+     */
+    public @interface commentHistory {
+    }
+
+    /**
+     * 参数校验分组:修改状态
+     */
+    public @interface changeStatus {
+    }
+
+    /**
+     * 参数校验分组:加签
+     */
+    public @interface addSign {
+    }
+
+    /**
+     * 参数校验分组:减签
+     */
+    public @interface deleteSign {
+    }
+
+}

+ 58 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/result/R.java

@@ -0,0 +1,58 @@
+package com.huimv.acquisition.result;
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class R extends HashMap<String, Object> {
+
+    private static final long serialVersionUID = 1L;
+
+    public R() {
+        put("code", 0);
+        put("msg", "success");
+    }
+
+    public static R error() {
+        return error(500, "未知异常,请联系管理员");
+    }
+
+    public static R error(String msg) {
+        return error(500, msg);
+    }
+
+    public static R error(int code, String msg) {
+        R r = new R();
+        r.put("code", code);
+        r.put("msg", msg);
+        return r;
+    }
+
+    public static R ok(String msg) {
+        R r = new R();
+        r.put("msg", msg);
+        return r;
+    }
+
+    public static R ok(Map<String, Object> map) {
+        R r = new R();
+        r.putAll(map);
+        return r;
+    }
+
+    public static R ok() {
+        return new R();
+    }
+
+    @Override
+    public R put(String key, Object value) {
+        super.put(key, value);
+        return this;
+    }
+
+    public static void main(String[] args) {
+        R r = new R();
+        System.out.println(r);
+
+    }
+}

+ 48 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/result/RRException.java

@@ -0,0 +1,48 @@
+package com.huimv.acquisition.result;
+
+public class RRException extends RuntimeException {
+	private static final long serialVersionUID = 1L;
+	
+    private String msg;
+    private int code = 500;
+    
+    public RRException(String msg) {
+		super(msg);
+		this.msg = msg;
+	}
+	
+	public RRException(String msg, Throwable e) {
+		super(msg, e);
+		this.msg = msg;
+	}
+	
+	public RRException(String msg, int code) {
+		super(msg);
+		this.msg = msg;
+		this.code = code;
+	}
+	
+	public RRException(String msg, int code, Throwable e) {
+		super(msg, e);
+		this.msg = msg;
+		this.code = code;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	public int getCode() {
+		return code;
+	}
+
+	public void setCode(int code) {
+		this.code = code;
+	}
+	
+	
+}

+ 116 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/result/RRExceptionHandler.java

@@ -0,0 +1,116 @@
+/**
+ * Copyright (c) 2016-2019 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有,侵权必究!
+ */
+
+package com.huimv.acquisition.result;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.validation.FieldError;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.HttpRequestMethodNotSupportedException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.MissingServletRequestParameterException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.servlet.NoHandlerFoundException;
+
+/**
+ * 异常处理器
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+@RestControllerAdvice
+public class RRExceptionHandler {
+	private Logger logger = LoggerFactory.getLogger(getClass());
+
+	/**
+	 * 处理自定义异常
+	 */
+	@ExceptionHandler(RRException.class)
+	public R handleRRException(RRException e){
+		R r = new R();
+		r.put("code", e.getCode());
+		r.put("msg", e.getMessage());
+		logger.error(e.getMsg(),e);
+		return r;
+	}
+
+	@ExceptionHandler(NoHandlerFoundException.class)
+	public R handlerNoFoundException(Exception e) {
+		logger.error(e.getMessage(), e);
+		return R.error(404, "路径不存在,请检查路径是否正确");
+	}
+
+	@ExceptionHandler(DuplicateKeyException.class)
+	public R handleDuplicateKeyException(DuplicateKeyException e){
+		logger.error(e.toString());
+		String message = e.getCause().getMessage();
+		String[] s = message.split(" ");
+		return R.error(600,s[2].replace("'","") + " 已经存在!");
+	}
+
+//	@ExceptionHandler(AuthorizationException.class)
+//	public R handleAuthorizationException(AuthorizationException e){
+//		logger.error(e.getMessage(), e);
+//		return R.error("没有权限,请联系管理员授权");
+//	}
+//
+//	@ExceptionHandler(value = LimitAccessException.class)
+//	public R handleLimitAccessException(LimitAccessException e) {
+//		logger.error("LimitAccessException", e);
+//		return  R.error(429,e.getMessage());
+//	}
+
+	//当校验失败时,会抛出MethodArgumentNotValidException
+	//输出错误原因到前端
+	@ExceptionHandler(MethodArgumentNotValidException.class)
+	public R handleMethodArgumentNotValidException(MethodArgumentNotValidException ex) {
+		logger.error(ex.getMessage(),ex);
+		StringBuilder sb = new StringBuilder();
+		for(ObjectError error : ex.getBindingResult().getAllErrors()){
+			if(error instanceof FieldError){
+				FieldError e = (FieldError) error;
+				sb.append(e.getField()).append(e.getDefaultMessage()).append(" ");
+			}
+		}
+		return R.error(1001,sb.toString());
+	}
+
+//	@ExceptionHandler(ConstraintViolationException.class)
+//	public R handleConstraintViolationException(ConstraintViolationException e) {
+//		logger.error(e.getMessage(),e);
+//		StringBuilder sb = new StringBuilder();
+//		e.getConstraintViolations().forEach(constraintViolation -> sb.append(constraintViolation.getMessage()).append(" "));
+//		return R.error(1001,sb.toString().substring(0,sb.length() - 1));
+//	}
+
+	@ExceptionHandler(MissingServletRequestParameterException.class)
+	public R handMissingServletRequestParameterException(MissingServletRequestParameterException e) {
+		logger.error(e.getMessage(),e);
+		return R.error(1001,e.getMessage());
+	}
+
+	@ExceptionHandler(DataIntegrityViolationException.class)
+	public R handDataIntegrityViolationException(DataIntegrityViolationException e) {
+		logger.error(e.getMessage(),e);
+		return R.error(1001,e.getCause().getMessage());
+	}
+
+	@ExceptionHandler(HttpRequestMethodNotSupportedException.class)
+	public R handHttpRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException e) {
+		logger.error(e.getMessage(), e);
+		return R.error(1001, e.getMessage());
+	}
+	@ExceptionHandler(Exception.class)
+	public R handleException(Exception e){
+		logger.error(e.getMessage(), e);
+		return R.error();
+	}
+}

+ 20 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/BaseFarmInfoService.java

@@ -0,0 +1,20 @@
+package com.huimv.acquisition.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.acquisition.entity.BaseFarmInfoEntity;
+import com.huimv.acquisition.utils.PageUtils;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-27 14:50:11
+ */
+public interface BaseFarmInfoService extends IService<BaseFarmInfoEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

+ 20 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/BasePigpenService.java

@@ -0,0 +1,20 @@
+package com.huimv.acquisition.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.acquisition.entity.BasePigpenEntity;
+import com.huimv.acquisition.utils.PageUtils;
+
+import java.util.Map;
+
+/**
+ * 栋舍表
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-30 16:02:09
+ */
+public interface BasePigpenService extends IService<BasePigpenEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

+ 20 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/CollectorRegisterService.java

@@ -0,0 +1,20 @@
+package com.huimv.acquisition.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.acquisition.entity.CollectorRegisterEntity;
+import com.huimv.acquisition.utils.PageUtils;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-30 09:45:22
+ */
+public interface CollectorRegisterService extends IService<CollectorRegisterEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

+ 20 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/DailyTabulateDataService.java

@@ -0,0 +1,20 @@
+package com.huimv.acquisition.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.acquisition.entity.DailyTabulateDataEntity;
+import com.huimv.acquisition.utils.PageUtils;
+
+import java.util.Map;
+
+/**
+ * 耳标每日汇总表
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-04 14:59:05
+ */
+public interface DailyTabulateDataService extends IService<DailyTabulateDataEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

+ 24 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/DeviceOffLineAlarmService.java

@@ -0,0 +1,24 @@
+package com.huimv.acquisition.service;
+
+
+
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.acquisition.entity.DeviceOffLineAlarmEntity;
+import com.huimv.acquisition.utils.PageUtils;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+public interface DeviceOffLineAlarmService extends IService<DeviceOffLineAlarmEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

+ 22 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/DeviceSendMessageAlarmService.java

@@ -0,0 +1,22 @@
+package com.huimv.acquisition.service;
+
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.acquisition.entity.DeviceSendMessageAlarmEntity;
+import com.huimv.acquisition.utils.PageUtils;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+public interface DeviceSendMessageAlarmService extends IService<DeviceSendMessageAlarmEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

+ 20 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/DeviceTempService.java

@@ -0,0 +1,20 @@
+package com.huimv.acquisition.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.acquisition.entity.DeviceTempEntity;
+import com.huimv.acquisition.utils.PageUtils;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-28 16:59:32
+ */
+public interface DeviceTempService extends IService<DeviceTempEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

+ 38 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/EartagDataService.java

@@ -0,0 +1,38 @@
+package com.huimv.acquisition.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.acquisition.entity.EartagDataEntity;
+import com.huimv.acquisition.entity.vo.EartagParamVo;
+import com.huimv.acquisition.utils.PageUtils;
+
+import java.text.ParseException;
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-24 16:29:33
+ */
+public interface EartagDataService extends IService<EartagDataEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+
+
+    PageUtils findByConditions(Map<String, Object> params) throws ParseException;
+
+
+     //这个是为了 杭电展示优化的版本  耳标号已经写死了
+    Map queryEartagDeatils(EartagParamVo eartagParamVo) throws ParseException;
+
+    Map<String, Object> queryDetails(Map<String, Object> params) throws ParseException;
+
+
+    Map<String, Object> queryDetailsByEarTag(Map<String, Object> params) throws ParseException;
+
+
+
+
+}
+

+ 22 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/EartagRegisterService.java

@@ -0,0 +1,22 @@
+package com.huimv.acquisition.service;
+
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.acquisition.entity.EartagRegisterEntity;
+import com.huimv.acquisition.utils.PageUtils;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-29 14:55:44
+ */
+public interface EartagRegisterService extends IService<EartagRegisterEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

+ 22 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/EartagTempAlamService.java

@@ -0,0 +1,22 @@
+package com.huimv.acquisition.service;
+
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.acquisition.entity.EartagTempAlamEntity;
+import com.huimv.acquisition.utils.PageUtils;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+public interface EartagTempAlamService extends IService<EartagTempAlamEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

+ 21 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/EnvTempAlarmService.java

@@ -0,0 +1,21 @@
+package com.huimv.acquisition.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.acquisition.entity.EnvTempAlarmEntity;
+import com.huimv.acquisition.utils.PageUtils;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+public interface EnvTempAlarmService extends IService<EnvTempAlarmEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

+ 20 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/FarmStockService.java

@@ -0,0 +1,20 @@
+package com.huimv.acquisition.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.acquisition.entity.FarmStockEntity;
+import com.huimv.acquisition.utils.PageUtils;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-04 14:13:15
+ */
+public interface FarmStockService extends IService<FarmStockEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

+ 21 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/HeartBeatRecordService.java

@@ -0,0 +1,21 @@
+package com.huimv.acquisition.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import com.huimv.acquisition.entity.HeartBeatRecordEntity;
+import com.huimv.acquisition.utils.PageUtils;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-11-10 16:19:11
+ */
+public interface HeartBeatRecordService extends IService<HeartBeatRecordEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

+ 21 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/MovePigpenService.java

@@ -0,0 +1,21 @@
+package com.huimv.acquisition.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.acquisition.entity.MovePigpenEntity;
+import com.huimv.acquisition.utils.PageUtils;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-28 09:57:42
+ */
+public interface MovePigpenService extends IService<MovePigpenEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+
+}
+

+ 20 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/PigBasicInformationService.java

@@ -0,0 +1,20 @@
+package com.huimv.acquisition.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.acquisition.entity.PigBasicInformationEntity;
+import com.huimv.acquisition.utils.PageUtils;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-11 17:05:02
+ */
+public interface PigBasicInformationService extends IService<PigBasicInformationEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

+ 22 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/RawDataService.java

@@ -0,0 +1,22 @@
+package com.huimv.acquisition.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.acquisition.entity.RawDataEntity;
+import com.huimv.acquisition.utils.PageUtils;
+
+import java.util.Map;
+
+/**
+ *
+
+   *
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-30 09:45:22
+ */
+public interface RawDataService extends IService<RawDataEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

+ 22 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/SowRankTableService.java

@@ -0,0 +1,22 @@
+package com.huimv.acquisition.service;
+
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.acquisition.entity.SowRankTableEntity;
+import com.huimv.acquisition.utils.PageUtils;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-04 17:47:18
+ */
+public interface SowRankTableService extends IService<SowRankTableEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

+ 35 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/BaseFarmInfoServiceImpl.java

@@ -0,0 +1,35 @@
+package com.huimv.acquisition.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.acquisition.entity.BaseFarmInfoEntity;
+import com.huimv.acquisition.mapper.BaseFarmInfoDao;
+import com.huimv.acquisition.service.BaseFarmInfoService;
+import com.huimv.acquisition.utils.PageUtils;
+import com.huimv.acquisition.utils.Query;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-27 14:50:11
+ */
+@Service("baseFarmInfoService")
+public class BaseFarmInfoServiceImpl extends ServiceImpl<BaseFarmInfoDao, BaseFarmInfoEntity> implements BaseFarmInfoService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<BaseFarmInfoEntity> page = this.page(
+                new Query<BaseFarmInfoEntity>().getPage(params),
+                new QueryWrapper<BaseFarmInfoEntity>()
+        );
+        return new PageUtils(page);
+    }
+
+}

+ 35 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/BasePigpenServiceImpl.java

@@ -0,0 +1,35 @@
+package com.huimv.acquisition.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.acquisition.entity.BasePigpenEntity;
+import com.huimv.acquisition.mapper.BasePigpenDao;
+import com.huimv.acquisition.service.BasePigpenService;
+import com.huimv.acquisition.utils.PageUtils;
+import com.huimv.acquisition.utils.Query;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 栋舍表
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-30 16:02:09
+ */
+@Service("basePigpenService")
+public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenDao, BasePigpenEntity> implements BasePigpenService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<BasePigpenEntity> page = this.page(
+                new Query<BasePigpenEntity>().getPage(params),
+                new QueryWrapper<BasePigpenEntity>()
+        );
+
+        return new PageUtils(page);
+    }
+
+}

+ 33 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/CollectorRegisterServiceImpl.java

@@ -0,0 +1,33 @@
+package com.huimv.acquisition.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.acquisition.entity.CollectorRegisterEntity;
+import com.huimv.acquisition.mapper.CollectorRegisterDao;
+import com.huimv.acquisition.service.CollectorRegisterService;
+import com.huimv.acquisition.utils.PageUtils;
+import com.huimv.acquisition.utils.Query;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-30 09:45:22
+ */
+@Service("collectorRegisterService")
+public class CollectorRegisterServiceImpl extends ServiceImpl<CollectorRegisterDao, CollectorRegisterEntity> implements CollectorRegisterService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<CollectorRegisterEntity> page = this.page(
+                new Query<CollectorRegisterEntity>().getPage(params),
+                new QueryWrapper<CollectorRegisterEntity>()
+        );
+        return new PageUtils(page);
+    }
+}

+ 35 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/DailyTabulateDataServiceImpl.java

@@ -0,0 +1,35 @@
+package com.huimv.acquisition.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.acquisition.entity.DailyTabulateDataEntity;
+import com.huimv.acquisition.mapper.DailyTabulateDataDao;
+import com.huimv.acquisition.service.DailyTabulateDataService;
+import com.huimv.acquisition.utils.PageUtils;
+import com.huimv.acquisition.utils.Query;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/*
+ * 耳标每日汇总表
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-04 14:59:05
+ */
+@Service("dailyTabulateDataService")
+public class DailyTabulateDataServiceImpl extends ServiceImpl<DailyTabulateDataDao, DailyTabulateDataEntity> implements DailyTabulateDataService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<DailyTabulateDataEntity> page = this.page(
+                new Query<DailyTabulateDataEntity>().getPage(params),
+                new QueryWrapper<DailyTabulateDataEntity>()
+        );
+
+        return new PageUtils(page);
+    }
+
+}

+ 35 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/DeviceOffLineAlarmServiceImpl.java

@@ -0,0 +1,35 @@
+package com.huimv.acquisition.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.acquisition.entity.DeviceOffLineAlarmEntity;
+import com.huimv.acquisition.mapper.DeviceOffLineAlarmDao;
+import com.huimv.acquisition.service.DeviceOffLineAlarmService;
+import com.huimv.acquisition.utils.PageUtils;
+import com.huimv.acquisition.utils.Query;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+@Service("deviceOffLineAlarmService")
+public class DeviceOffLineAlarmServiceImpl extends ServiceImpl<DeviceOffLineAlarmDao, DeviceOffLineAlarmEntity> implements DeviceOffLineAlarmService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<DeviceOffLineAlarmEntity> page = this.page(
+                new Query<DeviceOffLineAlarmEntity>().getPage(params),
+                new QueryWrapper<DeviceOffLineAlarmEntity>()
+        );
+
+        return new PageUtils(page);
+    }
+
+}

+ 36 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/DeviceSendMessageAlarmServiceImpl.java

@@ -0,0 +1,36 @@
+package com.huimv.acquisition.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.acquisition.entity.DeviceSendMessageAlarmEntity;
+import com.huimv.acquisition.mapper.DeviceSendMessageAlarmDao;
+import com.huimv.acquisition.service.DeviceSendMessageAlarmService;
+import com.huimv.acquisition.utils.PageUtils;
+import com.huimv.acquisition.utils.Query;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+@Service("deviceSendMessageAlarmService")
+public class DeviceSendMessageAlarmServiceImpl extends ServiceImpl<DeviceSendMessageAlarmDao, DeviceSendMessageAlarmEntity> implements DeviceSendMessageAlarmService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<DeviceSendMessageAlarmEntity> page = this.page(
+                new Query<DeviceSendMessageAlarmEntity>().getPage(params),
+                new QueryWrapper<DeviceSendMessageAlarmEntity>()
+        );
+
+        return new PageUtils(page);
+    }
+
+}

+ 41 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/DeviceTempServiceImpl.java

@@ -0,0 +1,41 @@
+package com.huimv.acquisition.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.acquisition.entity.DeviceTempEntity;
+import com.huimv.acquisition.mapper.DeviceTempDao;
+import com.huimv.acquisition.service.DeviceTempService;
+import com.huimv.acquisition.utils.PageUtils;
+import com.huimv.acquisition.utils.Query;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-28 16:59:32
+ */
+@Service("deviceTempService")
+public class DeviceTempServiceImpl extends ServiceImpl<DeviceTempDao, DeviceTempEntity> implements DeviceTempService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<DeviceTempEntity> page = this.page(
+                new Query<DeviceTempEntity>().getPage(params),
+                new QueryWrapper<DeviceTempEntity>()
+        );
+
+
+
+
+
+
+
+        return new PageUtils(page);
+    }
+
+}

+ 635 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/EartagDataServiceImpl.java

@@ -0,0 +1,635 @@
+package com.huimv.acquisition.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.acquisition.entity.*;
+import com.huimv.acquisition.entity.vo.EartagParamVo;
+import com.huimv.acquisition.mapper.BasePigpenDao;
+import com.huimv.acquisition.mapper.CollectorRegisterDao;
+import com.huimv.acquisition.mapper.EartagDataDao;
+import com.huimv.acquisition.mapper.MovePigpenDao;
+import com.huimv.acquisition.service.EartagDataService;
+import com.huimv.acquisition.socket.eartagrecive.util.DateUtilsPublic;
+import com.huimv.acquisition.socket.eartagrecive.util.StringUtilsWork;
+import com.huimv.acquisition.utils.PageUtils;
+import com.huimv.acquisition.utils.Query;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.DateFormat;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-24 16:29:33
+ */
+@Service("eartagDataService")
+public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagDataEntity> implements EartagDataService {
+
+    @Autowired
+    private EartagDataDao eartagDataDao;
+
+    @Autowired
+    private BasePigpenDao basePigpenDao;
+
+    @Autowired
+    private CollectorRegisterDao collectorRegisterDao ;
+
+    @Autowired
+    private MovePigpenDao movePigpenDao;
+
+
+    //这个接口写的太辣鸡了
+    @Override
+    public PageUtils findByConditions(Map<String, Object> params) throws ParseException {
+
+        String farmID = (String) params.get("farmID");//牧场编码
+        String starttime = (String) params.get("starttime");//开始时间
+        String endtime = (String) params.get("endtime");//结束时间
+        String eartagNo = (String) params.get("eartagNo");//耳标号
+        String dayAge = (String) params.get("dayAge");//配标日龄
+        String highEartagTemp = (String) params.get("highEartagTemp");//耳标温度
+        String lowEartagTemp = (String) params.get("lowEartagTemp");//耳标温度
+        String highEnvTemp = (String) params.get("highEnvTemp");//环境温度
+        String lowEnvTemp = (String) params.get("lowEnvTemp");//环境温度
+        String deviceCode = (String) params.get("deviceCode");//采集器编码
+        String bat = (String) params.get("bat");//电量
+        String dayAge2 = (String) params.get("dayage2");//日龄
+
+        System.out.println("采集器+condition---"+deviceCode+"耳标号"+eartagNo);
+        //只要首页限制在第一页,其余的不需要的
+
+        LambdaQueryWrapper<EartagDataEntity> wrapper = Wrappers.lambdaQuery();
+        if(StringUtils.isNotEmpty(farmID)){  //StringUtils.isNotEmpty(orderField) && StringUtils.isNotEmpty(order)
+            wrapper.eq(EartagDataEntity::getFarmCode, farmID );
+        }
+        if(StringUtilsWork.isNotBlank(eartagNo)){
+            wrapper.eq(EartagDataEntity::getEartagNo, eartagNo );
+        }
+        if(StringUtilsWork.isNotBlank(deviceCode)){
+            wrapper.eq(EartagDataEntity::getDeviceCode, deviceCode );
+        }
+        if(StringUtilsWork.isNotBlank(starttime)& StringUtilsWork.isNotBlank(endtime)) {
+            System.out.println(starttime+"***shijian**"+endtime);
+            DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            //格式化传入的时间
+            Date startTime = fmt.parse(starttime);
+            Date endTime = fmt.parse(endtime);
+            System.out.println("yangdi" + starttime + endtime);
+            //过滤时间
+            wrapper.between(EartagDataEntity::getTime, startTime, endTime);
+        }
+
+        if (StringUtilsWork.isNotBlank(dayAge)){
+            wrapper.eq(EartagDataEntity::getBat, dayAge );
+        }
+        if (StringUtilsWork.isNotBlank(dayAge2)){
+            wrapper.eq(EartagDataEntity::getDeviceCode, dayAge2 );
+        }
+        if (StringUtilsWork.isNotBlank(highEartagTemp)& StringUtilsWork.isNotBlank(lowEartagTemp)){
+            wrapper.between(EartagDataEntity::getEarTemp, highEartagTemp, lowEartagTemp);
+        }
+        if (StringUtilsWork.isNotBlank(highEnvTemp)& StringUtilsWork.isNotBlank(lowEnvTemp)){
+            wrapper.between(EartagDataEntity::getEnvTemp, highEnvTemp, lowEnvTemp);
+        }
+
+
+        List<EartagDataEntity> records;
+        IPage<EartagDataEntity>  page;
+        if(StringUtilsWork.isNotBlank(eartagNo)){
+            System.out.println("有耳标号,展示耳标所有数据");
+             page = this.page((new Query<EartagDataEntity>().getPage(params)),wrapper);
+             records = page.getRecords();  //获取信息
+
+        }else{
+            System.out.println("没有耳标号,展示最新");
+            wrapper.groupBy(EartagDataEntity::getEartagNo).orderByDesc( EartagDataEntity::getId );
+             page = baseMapper.page(new Query<EartagDataEntity>().getPage(params), wrapper);
+            records = page.getRecords();  //获取信息
+        }
+
+        //拼接栋舍信息在里面
+        for (EartagDataEntity record : records) {
+            //这一页的数据
+            System.out.println("数据record"+records);
+            LambdaQueryWrapper<MovePigpenEntity> wrapper23 = Wrappers.lambdaQuery();
+            wrapper23.eq(MovePigpenEntity::getEartagNo , record.getEartagNo()).orderByAsc( MovePigpenEntity::getId ).last( "limit 1");
+            MovePigpenEntity movePigpen = movePigpenDao.selectOne(wrapper23);
+            System.out.println("转舍信息"+movePigpen+"转舍耳标号"+record.getEartagNo());
+            //获取注册---注册信息为空
+            LambdaQueryWrapper<CollectorRegisterEntity> wrapper3 = Wrappers.lambdaQuery();
+            wrapper3.eq(CollectorRegisterEntity::getDeviceCode, record.getDeviceCode()  );
+            CollectorRegisterEntity collectorRegisterEntity = collectorRegisterDao.selectOne(wrapper3);
+            System.out.println("注册表信息"+collectorRegisterEntity);
+
+            LambdaQueryWrapper<BasePigpenEntity> wrapper4 = Wrappers.lambdaQuery();
+            wrapper4.eq(BasePigpenEntity::getId, collectorRegisterEntity.getPigpenId() );
+            BasePigpenEntity basePigpenEntity = basePigpenDao.selectOne(wrapper4);
+            System.out.println("栋舍信息"+basePigpenEntity);
+
+            LambdaQueryWrapper<BasePigpenEntity> wrapper5 = Wrappers.lambdaQuery();
+            wrapper5.eq(BasePigpenEntity::getId, collectorRegisterEntity.getUnitId() );
+            BasePigpenEntity basePigpenEntity1 = basePigpenDao.selectOne(wrapper5);
+            record.setVersion(basePigpenEntity.getPigpenName());//这个多余字段存猪舍名字
+            record.setCommand(basePigpenEntity1.getPigpenName());//这个多余字段存单元名字
+            //格式化传入的时---第一条不应该没有----但是新耳标上来没有存信息
+            if (movePigpen!=null) {
+                record.setTail(DateUtilsPublic.dateToString(movePigpen.getMoveDate()));//配标时间
+            }
+        }
+        return  new PageUtils(page);
+    }
+
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<EartagDataEntity> page = this.page(
+                new Query<EartagDataEntity>().getPage(params),
+                new QueryWrapper<EartagDataEntity>()
+        );
+        return new PageUtils(page);
+    }
+
+
+    //杭电展示专用接口--耳标号目前写死  部署在35服务器 数据库为  huimv—eartag-show
+    @Override
+    public   Map  queryEartagDeatils(EartagParamVo eartagParamVo) throws ParseException {
+        String  eartagNo1 ="133021100375854";
+        String  eartagNo2 ="133021100376024";
+
+        LambdaQueryWrapper<EartagDataEntity> wrapper1 = Wrappers.lambdaQuery();
+        wrapper1.eq(EartagDataEntity::getEartagNo, eartagNo1).orderByDesc(EartagDataEntity::getId);
+        if(eartagParamVo.getStarTime()!=null){
+            //传了时间按照时间
+            wrapper1.between(EartagDataEntity::getTime, eartagParamVo.getStarTime(), eartagParamVo.getEndTime());
+        }else {
+            //没有时间返回最近的500条
+            wrapper1.last( "limit 50");
+        }
+        System.out.println("耳标号="+eartagParamVo.getEartagNo());
+        List<EartagDataEntity> eartagDataEntities1 = eartagDataDao.selectList(wrapper1);
+
+
+        LambdaQueryWrapper<EartagDataEntity> wrapper2 = Wrappers.lambdaQuery();
+        wrapper2.eq(EartagDataEntity::getEartagNo,eartagNo2).orderByDesc(EartagDataEntity::getId);
+        if(eartagParamVo.getStarTime()!=null){
+            //传了时间按照时间
+            wrapper2.between(EartagDataEntity::getTime, eartagParamVo.getStarTime(), eartagParamVo.getEndTime());
+        }else {
+            //没有时间返回最近的1000条
+            wrapper2.last( "limit 50");
+        }
+        List<EartagDataEntity> eartagDataEntities2 = eartagDataDao.selectList(wrapper2);
+
+        Map resultMap  = new HashMap();
+        
+        List<String> timeList = new ArrayList<>();
+        List<Double> earTempList = new ArrayList<>();
+        List<Integer> sportsList = new ArrayList<>();
+        List<Integer> electricList = new ArrayList<>();
+        List<Double> environmentTempList = new ArrayList<>();
+        List<Object> averangeTemp = new ArrayList<>();
+        List<Integer> exerciseList = new ArrayList<>();
+        DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        
+
+        for (EartagDataEntity eartagDataEntity : eartagDataEntities1) {
+            timeList.add( fmt.format(eartagDataEntity.getTime() ));
+            earTempList.add( eartagDataEntity.getEarTemp()  );
+            electricList.add(eartagDataEntity.getBat());
+            environmentTempList.add(eartagDataEntity.getEnvTemp());
+            sportsList.add(eartagDataEntity.getSportGap());
+            exerciseList.add(eartagDataEntity.getExercise());
+        }
+
+
+        List<Double> earTempList2 = new ArrayList<>();
+        List<Integer> sportsList2 = new ArrayList<>();
+        List<Integer> electricList2 = new ArrayList<>();
+        List<Double> environmentTempList2 = new ArrayList<>();
+        List<Object> averangeTemp2 = new ArrayList<>();
+        List<Integer> exerciseList2 = new ArrayList<>();
+
+        
+        
+        
+        for (EartagDataEntity eartagDataEntity : eartagDataEntities2) {
+            earTempList2.add( eartagDataEntity.getEarTemp()  );
+            electricList2.add(eartagDataEntity.getBat());
+            environmentTempList2.add(eartagDataEntity.getEnvTemp());
+            sportsList2.add(eartagDataEntity.getSportGap());
+            exerciseList2.add(eartagDataEntity.getExercise());
+        }
+
+      
+        Collections.reverse(earTempList2);
+        Collections.reverse(electricList2);
+        Collections.reverse(environmentTempList2);
+        Collections.reverse(sportsList2);
+        Collections.reverse(exerciseList2);
+
+
+        Collections.reverse(timeList);
+        Collections.reverse(earTempList);
+        Collections.reverse(electricList);
+        Collections.reverse(environmentTempList);
+        Collections.reverse(sportsList);
+        Collections.reverse(exerciseList);
+
+        resultMap.put("timeList1",timeList);
+        resultMap.put("earTempList1",earTempList);
+        resultMap.put("electricList1",electricList);
+        resultMap.put("environmentTempList1",environmentTempList);
+        resultMap.put("sportsList1",sportsList);
+        resultMap.put("exerciseList1",exerciseList);
+        
+
+        resultMap.put("earTempList2",earTempList2);
+        resultMap.put("electricList2",electricList2);
+        resultMap.put("environmentTempList2",environmentTempList2);
+        resultMap.put("sportsList2",sportsList2);
+        resultMap.put("exerciseList2",exerciseList2);
+        
+        return resultMap;
+
+    }
+
+
+
+
+
+
+    //想办法把平均温度计算到表里面去
+    @Override
+    public Map<String, Object> queryDetails(Map<String, Object> params) throws ParseException {
+        System.out.println("id = "+params.get("id"));
+            String id1 = String.valueOf(params.get("id"));
+        String starttime = (String) params.get("startTime");
+        String endtime = (String) params.get("endTime");
+             int id = Integer.parseInt(id1);
+        System.out.println("int id = "+id);
+        //找出对应的ID
+        LambdaQueryWrapper<EartagDataEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(EartagDataEntity::getId, id );
+        EartagDataEntity earTagData = eartagDataDao.selectOne(wrapper);
+        if(earTagData==null){
+            Map map = new HashMap();
+            map.put("error" ,"当前数据不存在");
+            return  map;
+        }
+
+        //对数据进行包装
+        LambdaQueryWrapper<CollectorRegisterEntity> wrapper1 = Wrappers.lambdaQuery();
+        wrapper1.eq(CollectorRegisterEntity::getDeviceCode, earTagData.getDeviceCode() );
+        CollectorRegisterEntity collectorRegisterEntity = collectorRegisterDao.selectOne(wrapper1);
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("Registentity",collectorRegisterEntity);//耳标所在的机器信息
+
+
+
+        Map<String, Object> pen = new HashMap<>();
+
+
+        //倒数yi条
+        LambdaQueryWrapper<MovePigpenEntity> wrapper2 = Wrappers.lambdaQuery();
+        wrapper2.eq(MovePigpenEntity::getEartagNo , earTagData.getEartagNo()).orderByDesc( MovePigpenEntity::getId ).last( "limit 1");
+        List<MovePigpenEntity> movePigpenEntities = movePigpenDao.selectList(wrapper2);
+        //时间最开始的一条
+        LambdaQueryWrapper<MovePigpenEntity> wrapper23 = Wrappers.lambdaQuery();
+        wrapper23.eq(MovePigpenEntity::getEartagNo , earTagData.getEartagNo()).orderByAsc( MovePigpenEntity::getId ).last( "limit 1");
+        MovePigpenEntity movePigpen = movePigpenDao.selectOne(wrapper23);
+
+        movePigpenEntities.add(movePigpen);//加上去l
+
+        System.out.println(movePigpen+"ioioio");//最开始不为空
+
+
+        System.out.println(movePigpenEntities+"opop");
+    if ( movePigpen!=null ) {
+
+        List<Object> movePigpe111 = new ArrayList<>();
+
+        for (MovePigpenEntity movePigpenEntity : movePigpenEntities) {
+            Map<String, Object> c = new HashMap<>();
+
+
+            LambdaQueryWrapper<CollectorRegisterEntity> wrapper3 = Wrappers.lambdaQuery();
+            wrapper3.eq(CollectorRegisterEntity::getDeviceCode, movePigpenEntity.getDeviceCode());
+            CollectorRegisterEntity collectorRegisterEntit = collectorRegisterDao.selectOne(wrapper3);
+            System.out.println();
+
+            LambdaQueryWrapper<BasePigpenEntity> wrapper4 = Wrappers.lambdaQuery();
+            wrapper4.eq(BasePigpenEntity::getId, collectorRegisterEntit.getPigpenId());//栋舍
+            BasePigpenEntity basePigpenEnti = basePigpenDao.selectOne(wrapper4);
+
+            LambdaQueryWrapper<BasePigpenEntity> wrapper5 = Wrappers.lambdaQuery();
+            wrapper5.eq(BasePigpenEntity::getId, collectorRegisterEntit.getUnitId());//单元
+            BasePigpenEntity basePigpenEnt2 = basePigpenDao.selectOne(wrapper4);
+
+            TempMovePenEntity tempMovePenEntity = new TempMovePenEntity();
+            tempMovePenEntity.setDeviceCode(movePigpenEntity.getDeviceCode());
+            tempMovePenEntity.setEartagNo(movePigpenEntity.getEartagNo());
+            tempMovePenEntity.setPenName(basePigpenEnti.getPigpenName());
+            tempMovePenEntity.setUnitname(basePigpenEnt2.getPigpenName());
+            tempMovePenEntity.setMoveDate(movePigpenEntity.getMoveDate());
+            tempMovePenEntity.setId(movePigpenEntity.getId());
+            tempMovePenEntity.setStage(movePigpenEntity.getStage());
+
+            movePigpe111.add(tempMovePenEntity);
+        }
+
+        map1.put("movePigPenData",movePigpe111);
+         }else{
+        map1.put("movePigPenData",null);}
+
+
+        map1.put("eartagdeta",earTagData);  //点击的耳标信息
+
+        //获取运动等信息
+        String eartag = earTagData.getEartagNo();
+        DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        //格式化传入的时间
+        Date startTime = fmt.parse(starttime);
+        Date endTime = fmt.parse(endtime);
+        System.out.println("yangdi"+starttime+endtime);
+
+        LambdaQueryWrapper<EartagDataEntity> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.eq(EartagDataEntity::getEartagNo,eartag);
+        //过滤时间
+        lambdaQuery.between(EartagDataEntity::getTime,startTime, endTime);
+        List<EartagDataEntity> eartagDateEntities = baseMapper.selectList(lambdaQuery);
+         //生成平均温度 -----如果刚刚转舍就没办法操作了---数据不会立马出来需要等
+
+        LambdaQueryWrapper<EartagDataEntity> lambdaQuery1 = Wrappers.lambdaQuery();
+        lambdaQuery1.eq(EartagDataEntity::getDeviceCode,earTagData.getDeviceCode());
+        //过滤时间
+        lambdaQuery1.between(EartagDataEntity::getTime,startTime, endTime);
+        List<EartagDataEntity> eartagDateEntities1 = baseMapper.selectList(lambdaQuery1);
+        Map averange = getAverange(starttime, endtime, eartagDateEntities1);
+
+        //这样,时间轴
+
+        List<String> timeList = new ArrayList<>();
+        List<Double> tempList = new ArrayList<>();
+        List<Integer> sportsList = new ArrayList<>();
+        List<Integer> electricList = new ArrayList<>();
+        List<Double> environmenttempList = new ArrayList<>();
+        List<Object> averangeTemp = new ArrayList<>();
+        for (EartagDataEntity data : eartagDateEntities) {
+            timeList.add(fmt.format(data.getTime()));
+            tempList.add(data.getEarTemp());
+            if (data.getDeviceCode() == null) {
+                sportsList.add(0);
+            } else {
+                sportsList.add(data.getSportGap());
+            }
+            electricList.add(data.getBat());
+            //sleeptime.add(data.getSleepStatus());    用来存睡眠状态了
+            environmenttempList.add(data.getEnvTemp());
+            averangeTemp.add(averange.get(getMonthDayHour(  data.getTime()  ) ) );
+            }
+
+        map1.put("time",timeList);
+        map1.put("temp",tempList);
+        map1.put("sports",sportsList);
+        map1.put("electric",electricList);
+        map1.put("environmenttemp",environmenttempList);
+        map1.put("averangeTemp",averangeTemp);
+
+        System.out.println("changdu"+timeList.size()+"**"+averangeTemp.size()
+        );
+        //对time循环--用contains来处理稍微快一点
+        //map1.put("averangeTemp",averange);
+
+        //关于耳标存在的位置的信息,这里需要做记录,如果发生位置迁移那么需要将位置迁移信息记录到一张表中
+        return map1;
+    }
+
+
+    //想办法把平均温度计算到表里面去
+    @Override
+    public Map<String, Object> queryDetailsByEarTag(Map<String, Object> params) throws ParseException {
+        System.out.println("eartagno = "+params.get("eartagno"));
+        String eartagno1 = String.valueOf(params.get("eartagno"));
+        String starttime = (String) params.get("startTime");
+        String endtime = (String) params.get("endTime");
+
+        //找出对应的ID
+        LambdaQueryWrapper<EartagDataEntity> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(EartagDataEntity::getEartagNo, eartagno1 ).orderByDesc( EartagDataEntity::getId ).last( "limit 1");
+        EartagDataEntity earTagData = eartagDataDao.selectOne(wrapper);
+        if(earTagData==null){
+            Map map = new HashMap();
+            map.put("error" ,"当前数据不存在");
+            return  map;
+        }
+
+        //对数据进行包装
+        LambdaQueryWrapper<CollectorRegisterEntity> wrapper1 = Wrappers.lambdaQuery();
+        wrapper1.eq(CollectorRegisterEntity::getDeviceCode, earTagData.getDeviceCode() );
+        CollectorRegisterEntity collectorRegisterEntity = collectorRegisterDao.selectOne(wrapper1);
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("Registentity",collectorRegisterEntity);//耳标所在的机器信息
+
+        Map<String, Object> pen = new HashMap<>();
+
+
+        //倒数yi条
+        LambdaQueryWrapper<MovePigpenEntity> wrapper2 = Wrappers.lambdaQuery();
+        wrapper2.eq(MovePigpenEntity::getEartagNo , earTagData.getEartagNo()).orderByDesc( MovePigpenEntity::getId ).last( "limit 1");
+        List<MovePigpenEntity> movePigpenEntities = movePigpenDao.selectList(wrapper2);
+        //时间最开始的一条
+        LambdaQueryWrapper<MovePigpenEntity> wrapper23 = Wrappers.lambdaQuery();
+        wrapper23.eq(MovePigpenEntity::getEartagNo , earTagData.getEartagNo()).orderByAsc( MovePigpenEntity::getId ).last( "limit 1");
+        MovePigpenEntity movePigpen = movePigpenDao.selectOne(wrapper23);
+
+        movePigpenEntities.add(movePigpen);//加上去l
+
+        System.out.println(movePigpen+"ioioio");//最开始不为空
+
+
+        System.out.println(movePigpenEntities+"opop");
+        if ( movePigpen!=null ) {
+
+            List<Object> movePigpe111 = new ArrayList<>();
+
+            for (MovePigpenEntity movePigpenEntity : movePigpenEntities) {
+                Map<String, Object> c = new HashMap<>();
+
+
+                LambdaQueryWrapper<CollectorRegisterEntity> wrapper3 = Wrappers.lambdaQuery();
+                wrapper3.eq(CollectorRegisterEntity::getDeviceCode, movePigpenEntity.getDeviceCode());
+                CollectorRegisterEntity collectorRegisterEntit = collectorRegisterDao.selectOne(wrapper3);
+                System.out.println();
+
+                LambdaQueryWrapper<BasePigpenEntity> wrapper4 = Wrappers.lambdaQuery();
+                wrapper4.eq(BasePigpenEntity::getId, collectorRegisterEntit.getPigpenId());//栋舍
+                BasePigpenEntity basePigpenEnti = basePigpenDao.selectOne(wrapper4);
+
+                LambdaQueryWrapper<BasePigpenEntity> wrapper5 = Wrappers.lambdaQuery();
+                wrapper5.eq(BasePigpenEntity::getId, collectorRegisterEntit.getUnitId());//单元
+                BasePigpenEntity basePigpenEnt2 = basePigpenDao.selectOne(wrapper4);
+
+                TempMovePenEntity tempMovePenEntity = new TempMovePenEntity();
+                tempMovePenEntity.setDeviceCode(movePigpenEntity.getDeviceCode());
+                tempMovePenEntity.setEartagNo(movePigpenEntity.getEartagNo());
+                tempMovePenEntity.setPenName(basePigpenEnti.getPigpenName());
+                tempMovePenEntity.setUnitname(basePigpenEnt2.getPigpenName());
+                tempMovePenEntity.setMoveDate(movePigpenEntity.getMoveDate());
+                tempMovePenEntity.setId(movePigpenEntity.getId());
+                tempMovePenEntity.setStage(movePigpenEntity.getStage());
+
+                movePigpe111.add(tempMovePenEntity);
+            }
+
+            map1.put("movePigPenData",movePigpe111);
+        }else{
+            map1.put("movePigPenData",null);}
+
+
+        map1.put("eartagdeta",earTagData);  //点击的耳标信息
+
+        //获取运动等信息
+        String eartag = earTagData.getEartagNo();
+        DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        //格式化传入的时间
+        Date startTime = fmt.parse(starttime);
+        Date endTime = fmt.parse(endtime);
+        System.out.println("yangdi"+starttime+endtime);
+
+        LambdaQueryWrapper<EartagDataEntity> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.eq(EartagDataEntity::getEartagNo,eartag);
+        //过滤时间
+        lambdaQuery.between(EartagDataEntity::getTime,startTime, endTime);
+        List<EartagDataEntity> eartagDateEntities = baseMapper.selectList(lambdaQuery);
+        //生成平均温度 -----如果刚刚转舍就没办法操作了---数据不会立马出来需要等
+
+        LambdaQueryWrapper<EartagDataEntity> lambdaQuery1 = Wrappers.lambdaQuery();
+        lambdaQuery1.eq(EartagDataEntity::getDeviceCode,earTagData.getDeviceCode());
+        //过滤时间
+        lambdaQuery1.between(EartagDataEntity::getTime,startTime, endTime);
+        List<EartagDataEntity> eartagDateEntities1 = baseMapper.selectList(lambdaQuery1);
+        Map averange = getAverange(starttime, endtime, eartagDateEntities1);
+
+        //这样,时间轴
+
+        List<String> timeList = new ArrayList<>();
+        List<Double> tempList = new ArrayList<>();
+        List<Integer> sportsList = new ArrayList<>();
+        List<Integer> electricList = new ArrayList<>();
+        List<Double> environmenttempList = new ArrayList<>();
+        List<Object> averangeTemp = new ArrayList<>();
+        for (EartagDataEntity data : eartagDateEntities) {
+            timeList.add(fmt.format(data.getTime()));
+            tempList.add(data.getEarTemp());
+            if (data.getDeviceCode() == null) {
+                sportsList.add(0);
+            } else {
+                sportsList.add(data.getSportGap());
+            }
+            electricList.add(data.getBat());
+            //sleeptime.add(data.getSleepStatus());    用来存睡眠状态了
+            environmenttempList.add(data.getEnvTemp());
+            averangeTemp.add(averange.get(getMonthDayHour(  data.getTime()  ) ) );
+        }
+
+        map1.put("time",timeList);
+        map1.put("temp",tempList);
+        map1.put("sports",sportsList);
+        map1.put("electric",electricList);
+        map1.put("environmenttemp",environmenttempList);
+        map1.put("averangeTemp",averangeTemp);
+
+        System.out.println("changdu"+timeList.size()+"**"+averangeTemp.size()
+        );
+        //对time循环--用contains来处理稍微快一点
+        //map1.put("averangeTemp",averange);
+
+        //关于耳标存在的位置的信息,这里需要做记录,如果发生位置迁移那么需要将位置迁移信息记录到一张表中
+        return map1;
+    }
+
+
+
+    public String getMonthDayHour(Date date  ){
+
+        String year= String.format("%tY", date);
+        String mon= String.format("%tm", date);
+        String day= String.format("%td", date);
+        String h= String.format("%tH", date);
+        String m= String.format("%tM", date);
+        String s= String.format("%tS", date);
+
+return mon+day+h;
+
+    }
+
+
+       public Map<String, String> getAverange(String starttime , String endtime  , List<EartagDataEntity> entityList     ) throws ParseException {
+            DecimalFormat df = new DecimalFormat("####0.00");
+         DateFormat fmt1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+         //格式化传入的时间
+         Date startTime = fmt1.parse(starttime);
+         Date endTime  =    fmt1.parse(endtime);
+         Map<String, String> map = new HashMap<>();
+         while(startTime.before(endTime)){
+             double totlatemp = 0.0;
+             double avreange = 0.0;
+             System.out.println("开始时间"+startTime+"----"+"结束时间"+endTime);
+             int a =0;
+             for (EartagDataEntity data : entityList) {
+                 //这个操作占用时间太多
+                 if(data.getTime().after(startTime)&data.getTime().before(DateUtilsPublic.addDateHour(startTime,1))){
+                     a++;
+                     totlatemp += data.getEarTemp();
+                     System.out.println(data.getEarTemp());
+                 }
+             }
+
+             System.out.println("结果"+totlatemp+a+totlatemp/a);
+             //直接三元
+             if(totlatemp/a>0.01){
+                 avreange  =  totlatemp/a;
+             }
+             //这个时间有点麻烦,需要对应进去
+               // map.put(format.format(startTime),df.format(avreange));
+                 //时间变为年+天+小时
+                map.put(getMonthDayHour(startTime),df.format(avreange));
+
+             startTime =DateUtilsPublic.addDateHour(startTime,1);
+           }
+
+       return  map;
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+ 35 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/EartagRegisterServiceImpl.java

@@ -0,0 +1,35 @@
+package com.huimv.acquisition.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.acquisition.entity.EartagRegisterEntity;
+import com.huimv.acquisition.mapper.EartagRegisterDao;
+import com.huimv.acquisition.service.EartagRegisterService;
+import com.huimv.acquisition.utils.PageUtils;
+import com.huimv.acquisition.utils.Query;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-29 14:55:44
+ */
+@Service("eartagRegisterService")
+public class EartagRegisterServiceImpl extends ServiceImpl<EartagRegisterDao, EartagRegisterEntity> implements EartagRegisterService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<EartagRegisterEntity> page = this.page(
+                new Query<EartagRegisterEntity>().getPage(params),
+                new QueryWrapper<EartagRegisterEntity>()
+        );
+
+        return new PageUtils(page);
+    }
+
+}

+ 35 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/EartagTempAlamServiceImpl.java

@@ -0,0 +1,35 @@
+package com.huimv.acquisition.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.acquisition.entity.EartagTempAlamEntity;
+import com.huimv.acquisition.mapper.EartagTempAlamDao;
+import com.huimv.acquisition.service.EartagTempAlamService;
+import com.huimv.acquisition.utils.PageUtils;
+import com.huimv.acquisition.utils.Query;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+@Service("eartagTempAlamService")
+public class EartagTempAlamServiceImpl extends ServiceImpl<EartagTempAlamDao, EartagTempAlamEntity> implements EartagTempAlamService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<EartagTempAlamEntity> page = this.page(
+                new Query<EartagTempAlamEntity>().getPage(params),
+                new QueryWrapper<EartagTempAlamEntity>()
+        );
+
+        return new PageUtils(page);
+    }
+
+}

+ 35 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/EnvTempAlarmServiceImpl.java

@@ -0,0 +1,35 @@
+package com.huimv.acquisition.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.acquisition.entity.EnvTempAlarmEntity;
+import com.huimv.acquisition.mapper.EnvTempAlarmDao;
+import com.huimv.acquisition.service.EnvTempAlarmService;
+import com.huimv.acquisition.utils.PageUtils;
+import com.huimv.acquisition.utils.Query;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-05 21:54:09
+ */
+@Service("envTempAlarmService")
+public class EnvTempAlarmServiceImpl extends ServiceImpl<EnvTempAlarmDao, EnvTempAlarmEntity> implements EnvTempAlarmService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<EnvTempAlarmEntity> page = this.page(
+                new Query<EnvTempAlarmEntity>().getPage(params),
+                new QueryWrapper<EnvTempAlarmEntity>()
+        );
+
+        return new PageUtils(page);
+    }
+
+}

+ 38 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/FarmStockServiceImpl.java

@@ -0,0 +1,38 @@
+package com.huimv.acquisition.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.acquisition.entity.FarmStockEntity;
+import com.huimv.acquisition.mapper.FarmStockDao;
+import com.huimv.acquisition.service.FarmStockService;
+import com.huimv.acquisition.utils.PageUtils;
+import com.huimv.acquisition.utils.Query;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-04 14:13:15
+ */
+@Service("farmStockService")
+public class FarmStockServiceImpl extends ServiceImpl<FarmStockDao, FarmStockEntity> implements FarmStockService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<FarmStockEntity> page = this.page(
+                new Query<FarmStockEntity>().getPage(params),
+                new QueryWrapper<FarmStockEntity>()
+        );
+        return new PageUtils(page);
+
+
+
+
+
+    }
+
+}

+ 36 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/HeartBeatRecordServiceImpl.java

@@ -0,0 +1,36 @@
+package com.huimv.acquisition.service.impl;
+
+import com.huimv.acquisition.mapper.HeartBeatRecordDao;
+import com.huimv.acquisition.utils.PageUtils;
+import org.springframework.stereotype.Service;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import com.huimv.acquisition.utils.Query;
+
+import com.huimv.acquisition.entity.HeartBeatRecordEntity;
+import com.huimv.acquisition.service.HeartBeatRecordService;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-11-10 16:19:11
+ */
+@Service("heartBeatRecordService")
+public class HeartBeatRecordServiceImpl extends ServiceImpl<HeartBeatRecordDao, HeartBeatRecordEntity> implements HeartBeatRecordService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<HeartBeatRecordEntity> page = this.page(
+                new Query<HeartBeatRecordEntity>().getPage(params),
+                new QueryWrapper<HeartBeatRecordEntity>()
+        );
+
+        return new PageUtils(page);
+    }
+
+}

+ 36 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/MovePigpenServiceImpl.java

@@ -0,0 +1,36 @@
+package com.huimv.acquisition.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.acquisition.entity.MovePigpenEntity;
+import com.huimv.acquisition.mapper.MovePigpenDao;
+import com.huimv.acquisition.service.MovePigpenService;
+import com.huimv.acquisition.utils.PageUtils;
+import com.huimv.acquisition.utils.Query;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-28 09:57:42
+ */
+@Service("movePigpenService")
+public class MovePigpenServiceImpl extends ServiceImpl<MovePigpenDao, MovePigpenEntity> implements MovePigpenService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<MovePigpenEntity> page = this.page(
+                new Query<MovePigpenEntity>().getPage(params),
+                new QueryWrapper<MovePigpenEntity>()
+        );
+
+        return new PageUtils(page);
+    }
+
+}

+ 36 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/PigBasicInformationServiceImpl.java

@@ -0,0 +1,36 @@
+package com.huimv.acquisition.service.impl;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.acquisition.entity.PigBasicInformationEntity;
+import com.huimv.acquisition.mapper.PigBasicInformationDao;
+import com.huimv.acquisition.service.PigBasicInformationService;
+import com.huimv.acquisition.utils.PageUtils;
+import com.huimv.acquisition.utils.Query;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-11 17:05:02
+ */
+@Service("pigBasicInformationService")
+public class PigBasicInformationServiceImpl extends ServiceImpl<PigBasicInformationDao, PigBasicInformationEntity> implements PigBasicInformationService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<PigBasicInformationEntity> page = this.page(
+                new Query<PigBasicInformationEntity>().getPage(params),
+                new QueryWrapper<PigBasicInformationEntity>()
+        );
+        return new PageUtils(page);
+    }
+
+}

+ 0 - 0
cloud-platform-acquisition/src/main/java/com/huimv/acquisition/service/impl/RawDataServiceImpl.java


Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels