Browse Source

修改远程接收

523096025 3 years ago
parent
commit
9ba6a51643
37 changed files with 723 additions and 60 deletions
  1. 15 0
      huimv-farm-admin/pom.xml
  2. 34 0
      huimv-farm-admin/src/main/resources/application-prod.yml
  3. 2 2
      huimv-farm-admin/src/main/resources/application.properties
  4. 1 6
      huimv-farm-environ/pom.xml
  5. 22 11
      huimv-farm-environ/src/main/resources/application-prod.yml
  6. 2 2
      huimv-farm-environ/src/main/resources/application.properties
  7. 6 0
      huimv-farm-gateway/src/main/resources/application-dev.yml
  8. 1 11
      huimv-farm-produce/pom.xml
  9. 34 0
      huimv-farm-produce/src/main/resources/application-prod.yml
  10. 2 2
      huimv-farm-produce/src/main/resources/application.properties
  11. 92 11
      huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/controller/EcoController.java
  12. 48 0
      huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/entity/BaseWarningInfo.java
  13. 12 2
      huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/entity/HumAndTemDto.java
  14. 41 0
      huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/entity/SysDayWater.java
  15. 42 0
      huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/entity/SysFodder.java
  16. 0 1
      huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/entity/SysHumidity.java
  17. 44 0
      huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/entity/SysMonthWater.java
  18. 0 1
      huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/entity/SysTemperature.java
  19. 16 0
      huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/mapper/BaseWarningInfoMapper.java
  20. 20 0
      huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/mapper/SysDayWaterMapper.java
  21. 21 0
      huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/mapper/SysFodderMapper.java
  22. 20 0
      huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/mapper/SysMonthWaterMapper.java
  23. 0 1
      huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/mapper/SysTemperatureMapper.java
  24. 19 0
      huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/service/IBaseWarningInfoService.java
  25. 20 0
      huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/service/ISysDayWaterService.java
  26. 21 0
      huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/service/ISysFodderService.java
  27. 17 0
      huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/service/ISysMonthWaterService.java
  28. 22 0
      huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/service/impl/BaseWarningInfoServiceImpl.java
  29. 24 0
      huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/service/impl/SysDayWaterServiceImpl.java
  30. 28 0
      huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/service/impl/SysFodderServiceImpl.java
  31. 23 0
      huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/service/impl/SysMonthWaterServiceImpl.java
  32. 34 0
      huimv-farm-receiver/src/main/resources/application-prod.yml
  33. 2 2
      huimv-farm-receiver/src/main/resources/application.properties
  34. 1 5
      huimv-farm-video/pom.xml
  35. 1 1
      huimv-farm-video/src/main/java/com/huimv/video/dhicc/ClientController/ClientEventController.java
  36. 34 0
      huimv-farm-video/src/main/resources/application-prod.yml
  37. 2 2
      huimv-farm-video/src/main/resources/application.properties

+ 15 - 0
huimv-farm-admin/pom.xml

@@ -104,4 +104,19 @@
             <version>1.2.28</version>
             <version>1.2.28</version>
         </dependency>
         </dependency>
     </dependencies>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+            </plugin>
+        </plugins>
+    </build>
 </project>
 </project>

+ 34 - 0
huimv-farm-admin/src/main/resources/application-prod.yml

@@ -0,0 +1,34 @@
+server:
+  port: 8090
+spring:
+  application:
+    name: pigfarm-local-device
+  #------DataSource-----
+  datasource:
+    url: jdbc:mysql://47.96.4.54:10052/huimv-farm-center?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: hm123456789
+    driver-class-name: com.mysql.cj.jdbc.Driver
+  jpa:
+    hibernate:
+      ddl-auto: update
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+  redis:
+    host: 122.112.224.199
+    port: 6379
+    password: hm123456
+# Socket配置
+#socket:
+  # 监听端口 9001
+#  listen:
+#    #ip: 192.168.16.3
+#    ip: 192.168.1.49
+#    port: 10020
+  # 线程池 - 保持线程数 20
+  #pool-keep: 20
+  # 线程池 - 核心线程数 10
+  #pool-core: 10
+  # 线程池 - 最大线程数 20
+  #pool-max: 30
+  # 线程队列容量 10
+  #pool-queue-init: 10

+ 2 - 2
huimv-farm-admin/src/main/resources/application.properties

@@ -1,5 +1,5 @@
-spring.profiles.active=dev
-#spring.profiles.active=prod
+#spring.profiles.active=dev
+spring.profiles.active=prod
 
 
 #ʱ¼ä¸ñʽÅäÖÃ
 #ʱ¼ä¸ñʽÅäÖÃ
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

+ 1 - 6
huimv-farm-environ/pom.xml

@@ -44,12 +44,7 @@
             <classifier>jdk15</classifier>
             <classifier>jdk15</classifier>
             <!-- jdk版本 -->
             <!-- jdk版本 -->
         </dependency>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>huimv-farm-admin</artifactId>
-            <version>2.6.1</version>
-            <scope>compile</scope>
-        </dependency>
+
     </dependencies>
     </dependencies>
 
 
     <build>
     <build>

+ 22 - 11
huimv-farm-environ/src/main/resources/application-prod.yml

@@ -1,14 +1,11 @@
 server:
 server:
   port: 8092
   port: 8092
-
 spring:
 spring:
   application:
   application:
-    name: huimv-farm-environ
+    name: pigfarm-local-device
+  #------DataSource-----
   datasource:
   datasource:
-    #    url: jdbc:mysql://47.96.4.54:10052/huimv_farm_v2?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    #    username: root
-    #    password: hm123456789
-    url: jdbc:mysql://192.168.1.68:3308/huimv-farm-center?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://47.96.4.54:10052/huimv-farm-center?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     username: root
     password: hm123456789
     password: hm123456789
     driver-class-name: com.mysql.cj.jdbc.Driver
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -16,8 +13,22 @@ spring:
     hibernate:
     hibernate:
       ddl-auto: update
       ddl-auto: update
     database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
     database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
-    show-sql: true
-#  redis:
-#    host: 122.112.224.199
-#    port: 6379
-#    password: hm123456
+  redis:
+    host: 122.112.224.199
+    port: 6379
+    password: hm123456
+# Socket配置
+#socket:
+  # 监听端口 9001
+#  listen:
+#    #ip: 192.168.16.3
+#    ip: 192.168.1.49
+#    port: 10020
+  # 线程池 - 保持线程数 20
+  #pool-keep: 20
+  # 线程池 - 核心线程数 10
+  #pool-core: 10
+  # 线程池 - 最大线程数 20
+  #pool-max: 30
+  # 线程队列容量 10
+  #pool-queue-init: 10

+ 2 - 2
huimv-farm-environ/src/main/resources/application.properties

@@ -1,3 +1,3 @@
-spring.profiles.active=dev
-#spring.profiles.active=prod
+#spring.profiles.active=dev
+spring.profiles.active=prod
 
 

+ 6 - 0
huimv-farm-gateway/src/main/resources/application-dev.yml

@@ -32,6 +32,12 @@ spring:
             - Path=/env/**
             - Path=/env/**
           filters:
           filters:
             - StripPrefix=1
             - StripPrefix=1
+        - id: receiver
+          uri: http://127.0.0.1:8098
+          predicates:
+            - Path=/receiver/**
+          filters:
+            - StripPrefix=1
 
 
 
 
 logging:
 logging:

+ 1 - 11
huimv-farm-produce/pom.xml

@@ -18,17 +18,7 @@
             <artifactId>spring-boot-starter-data-jpa</artifactId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
         </dependency>
 
 
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>5.7.11</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>huimv-farm-admin</artifactId>
-            <version>2.6.1</version>
-            <scope>compile</scope>
-        </dependency>
+
     </dependencies>
     </dependencies>
 
 
 </project>
 </project>

+ 34 - 0
huimv-farm-produce/src/main/resources/application-prod.yml

@@ -0,0 +1,34 @@
+server:
+  port: 8094
+spring:
+  application:
+    name: pigfarm-local-device
+  #------DataSource-----
+  datasource:
+    url: jdbc:mysql://47.96.4.54:10052/huimv-farm-center?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: hm123456789
+    driver-class-name: com.mysql.cj.jdbc.Driver
+  jpa:
+    hibernate:
+      ddl-auto: update
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+  redis:
+    host: 122.112.224.199
+    port: 6379
+    password: hm123456
+# Socket配置
+#socket:
+  # 监听端口 9001
+#  listen:
+#    #ip: 192.168.16.3
+#    ip: 192.168.1.49
+#    port: 10020
+  # 线程池 - 保持线程数 20
+  #pool-keep: 20
+  # 线程池 - 核心线程数 10
+  #pool-core: 10
+  # 线程池 - 最大线程数 20
+  #pool-max: 30
+  # 线程队列容量 10
+  #pool-queue-init: 10

+ 2 - 2
huimv-farm-produce/src/main/resources/application.properties

@@ -1,5 +1,5 @@
-spring.profiles.active=dev
-#spring.profiles.active=prod
+#spring.profiles.active=dev
+spring.profiles.active=prod
 
 
 #ʱ¼ä¸ñʽÅäÖÃ
 #ʱ¼ä¸ñʽÅäÖÃ
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

+ 92 - 11
huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/controller/EcoController.java

@@ -1,15 +1,17 @@
 package com.huimv.receiver.eco.controller;
 package com.huimv.receiver.eco.controller;
 
 
+import cn.hutool.core.util.ObjectUtil;
 import com.huimv.receiver.cloud.service.IWarningInfo;
 import com.huimv.receiver.cloud.service.IWarningInfo;
-import com.huimv.receiver.eco.entity.HumAndTemDto;
-import com.huimv.receiver.eco.service.ISysHumidityService;
-import com.huimv.receiver.eco.service.ISysTemperatureService;
+import com.huimv.receiver.eco.entity.*;
+import com.huimv.receiver.eco.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
+import java.util.List;
+
 
 
 //接收温湿度数据
 //接收温湿度数据
 @RestController
 @RestController
@@ -21,25 +23,104 @@ public class EcoController {
     @Autowired
     @Autowired
     private ISysTemperatureService sysTemperatureService;
     private ISysTemperatureService sysTemperatureService;
 
 
+    @Autowired
+    private IBaseWarningInfoService baseWarningInfoService;
+
+    @Autowired
+    private ISysFodderService fodderService;
+
+    @Autowired
+    private ISysMonthWaterService monthWaterService;
+
+    @Autowired
+    private ISysDayWaterService dayWaterService;
 
 
 
 
 
 
     @PostMapping(value = "/save")
     @PostMapping(value = "/save")
     public String save(@RequestBody HumAndTemDto humAndTemDto){
     public String save(@RequestBody HumAndTemDto humAndTemDto){
         System.out.println("开始");
         System.out.println("开始");
-        try {
-            sysHumidityService.save(humAndTemDto.getHumidity());
-        }catch (Exception e){
-            System.out.println("湿度存储失败");
+
+        if (ObjectUtil.isEmpty(humAndTemDto)){
+            return "数据为空";
+        }
+
+
+        List<SysHumidity> humidity = humAndTemDto.getHumidity();
+        if (ObjectUtil.isNotEmpty(humidity)){
+            try {
+                sysHumidityService.saveBatch(humidity);
+            }catch (Exception e){
+                System.out.println("湿度存储失败");
+            }
+        }else {
+            System.out.println("湿度数据为空");
+        }
+
+
+        List<SysTemperature> temperature = humAndTemDto.getTemperature();
+        if (ObjectUtil.isNotEmpty(temperature)){
+            try {
+                sysTemperatureService.saveBatch(temperature);
+            }catch (Exception e){
+                System.out.println("温度存储失败");
+            }
+
+        }else {
+            System.out.println("温度数据为空");
+        }
+
+
+        List<BaseWarningInfo> warningInfos = humAndTemDto.getWarningInfos();
+        if (ObjectUtil.isNotEmpty(warningInfos)){
+            try {
+                baseWarningInfoService.saveBatch(warningInfos);
+            }catch (Exception e){
+                System.out.println("报警存储失败");
+            }
+
+        }else {
+            System.out.println("报警数据为空");
+        }
+
+
+        List<SysFodder> fodders = humAndTemDto.getFodders();
+        if (ObjectUtil.isNotEmpty(fodders)){
+            try {
+                fodderService.saveBatch(fodders);
+            }catch (Exception e){
+                System.out.println("用料存储失败");
+            }
+
+        }else {
+            System.out.println("用料数据为空");
         }
         }
 
 
-        try {
-            sysTemperatureService.save(humAndTemDto.getTemperature());
-        }catch (Exception e){
-            System.out.println("温度存储失败");
+
+        List<SysMonthWater> monthWaters = humAndTemDto.getMonthWaters();
+        if (ObjectUtil.isNotEmpty(monthWaters)){
+            try {
+                monthWaterService.saveBatch(monthWaters);
+            }catch (Exception e){
+                System.out.println("月用水存储失败");
+            }
+
+        }else {
+            System.out.println("月用水数据为空");
         }
         }
 
 
 
 
+        List<SysDayWater> dayWaters = humAndTemDto.getDayWaters();
+        if (ObjectUtil.isNotEmpty(dayWaters)){
+            try {
+                dayWaterService.saveBatch(dayWaters);
+            }catch (Exception e){
+                System.out.println("日用水存储失败");
+            }
+        }else {
+            System.out.println("日用水数据为空");
+        }
+
 
 
 
 
         System.out.println("结束");
         System.out.println("结束");

+ 48 - 0
huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/entity/BaseWarningInfo.java

@@ -0,0 +1,48 @@
+package com.huimv.receiver.eco.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-12-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class BaseWarningInfo extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private Integer farmId;
+
+    private Integer level;
+
+    private String msg;
+
+    private String levelName;
+
+    private String warningName;
+
+    @JsonFormat(pattern = "MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    private Date warningTime;
+
+    @JsonFormat(pattern = "MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    private Date uploadTime;
+
+    private Integer alarmType;
+}

+ 12 - 2
huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/entity/HumAndTemDto.java

@@ -2,11 +2,21 @@ package com.huimv.receiver.eco.entity;
 
 
 import lombok.Data;
 import lombok.Data;
 
 
+import java.util.List;
+
 @Data
 @Data
 public class HumAndTemDto {
 public class HumAndTemDto {
 
 
-    private SysHumidity humidity;
+    private  List<SysHumidity> humidity;
+
+    private List<SysTemperature> temperature;
+
+    private List<BaseWarningInfo> warningInfos;
+
+    private List<SysFodder> fodders;
+
+    private List<SysDayWater> dayWaters;
 
 
-    private  SysTemperature temperature;
+    private List<SysMonthWater> monthWaters;
 
 
 }
 }

+ 41 - 0
huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/entity/SysDayWater.java

@@ -0,0 +1,41 @@
+package com.huimv.receiver.eco.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class SysDayWater extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    private String value;
+
+    private Date createTime;
+
+    private Integer roomId;
+
+    @TableId(value = "day_water_id", type = IdType.AUTO)
+    private Integer dayWaterId;
+
+    private Integer farmId;
+
+}

+ 42 - 0
huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/entity/SysFodder.java

@@ -0,0 +1,42 @@
+package com.huimv.receiver.eco.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class SysFodder extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    private Double value;
+
+    private Date createTime;
+
+    private Integer floorId;
+
+    @TableId(value = "fodder_id", type = IdType.AUTO)
+    private Integer fodderId;
+
+    private Integer farmId;
+
+
+}

+ 0 - 1
huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/entity/SysHumidity.java

@@ -32,7 +32,6 @@ public class SysHumidity extends Model {
 
 
     private Double value;
     private Double value;
 
 
-    @JsonFormat(pattern = "HH:mm",timezone = "GMT+8")
     private Date createTime;
     private Date createTime;
 
 
     private Integer roomId;
     private Integer roomId;

+ 44 - 0
huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/entity/SysMonthWater.java

@@ -0,0 +1,44 @@
+package com.huimv.receiver.eco.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class SysMonthWater extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    private String value;
+
+    private Date createTime;
+
+    private Integer roomId;
+
+    @TableId(value = "month_water_id", type = IdType.AUTO)
+    private Integer monthWaterId;
+
+    private String increaseValue;
+
+    private Integer farmId;
+
+
+}

+ 0 - 1
huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/entity/SysTemperature.java

@@ -32,7 +32,6 @@ public class SysTemperature extends Model {
 
 
     private Double value;
     private Double value;
 
 
-    @JsonFormat(pattern = "HH:mm",timezone = "GMT+8")
     private Date createTime;
     private Date createTime;
 
 
     private Integer roomId;
     private Integer roomId;

+ 16 - 0
huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/mapper/BaseWarningInfoMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.receiver.eco.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.receiver.eco.entity.BaseWarningInfo;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-12-02
+ */
+public interface BaseWarningInfoMapper extends BaseMapper<BaseWarningInfo> {
+
+}

+ 20 - 0
huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/mapper/SysDayWaterMapper.java

@@ -0,0 +1,20 @@
+package com.huimv.receiver.eco.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.receiver.eco.entity.SysDayWater;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-12
+ */
+@Repository
+public interface SysDayWaterMapper extends BaseMapper<SysDayWater> {
+
+}

+ 21 - 0
huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/mapper/SysFodderMapper.java

@@ -0,0 +1,21 @@
+package com.huimv.receiver.eco.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.receiver.eco.entity.SysFodder;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-15
+ */
+@Repository
+public interface SysFodderMapper extends BaseMapper<SysFodder> {
+
+
+}

+ 20 - 0
huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/mapper/SysMonthWaterMapper.java

@@ -0,0 +1,20 @@
+package com.huimv.receiver.eco.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.receiver.eco.entity.SysMonthWater;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-12
+ */
+@Repository
+public interface SysMonthWaterMapper extends BaseMapper<SysMonthWater> {
+
+}

+ 0 - 1
huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/mapper/SysTemperatureMapper.java

@@ -20,5 +20,4 @@ import java.util.List;
 @Repository
 @Repository
 public interface SysTemperatureMapper extends BaseMapper<SysTemperature> {
 public interface SysTemperatureMapper extends BaseMapper<SysTemperature> {
 
 
-    List<SysTemperature> listDay(@Param(Constants.WRAPPER) QueryWrapper<SysTemperature> temperatureWrapper);
 }
 }

+ 19 - 0
huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/service/IBaseWarningInfoService.java

@@ -0,0 +1,19 @@
+package com.huimv.receiver.eco.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.common.utils.Result;
+import com.huimv.receiver.eco.entity.BaseWarningInfo;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-12-02
+ */
+public interface IBaseWarningInfoService extends IService<BaseWarningInfo> {
+
+}

+ 20 - 0
huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/service/ISysDayWaterService.java

@@ -0,0 +1,20 @@
+package com.huimv.receiver.eco.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.common.utils.Result;
+import com.huimv.receiver.eco.entity.SysDayWater;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-12
+ */
+public interface ISysDayWaterService extends IService<SysDayWater> {
+
+
+}

+ 21 - 0
huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/service/ISysFodderService.java

@@ -0,0 +1,21 @@
+package com.huimv.receiver.eco.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.common.utils.Result;
+import com.huimv.receiver.eco.entity.SysFodder;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-15
+ */
+public interface ISysFodderService extends IService<SysFodder> {
+
+
+
+}

+ 17 - 0
huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/service/ISysMonthWaterService.java

@@ -0,0 +1,17 @@
+package com.huimv.receiver.eco.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.common.utils.Result;
+import com.huimv.receiver.eco.entity.SysMonthWater;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-12
+ */
+public interface ISysMonthWaterService extends IService<SysMonthWater> {
+
+}

+ 22 - 0
huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/service/impl/BaseWarningInfoServiceImpl.java

@@ -0,0 +1,22 @@
+package com.huimv.receiver.eco.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.receiver.eco.entity.BaseWarningInfo;
+import com.huimv.receiver.eco.mapper.BaseWarningInfoMapper;
+import com.huimv.receiver.eco.service.IBaseWarningInfoService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-12-02
+ */
+@Service
+public class BaseWarningInfoServiceImpl extends ServiceImpl<BaseWarningInfoMapper, BaseWarningInfo> implements IBaseWarningInfoService {
+
+
+}

+ 24 - 0
huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/service/impl/SysDayWaterServiceImpl.java

@@ -0,0 +1,24 @@
+package com.huimv.receiver.eco.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.receiver.eco.entity.SysDayWater;
+import com.huimv.receiver.eco.mapper.SysDayWaterMapper;
+import com.huimv.receiver.eco.service.ISysDayWaterService;
+import org.springframework.stereotype.Service;
+
+import java.text.DecimalFormat;
+import java.util.*;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-12
+ */
+@Service
+public class SysDayWaterServiceImpl extends ServiceImpl<SysDayWaterMapper, SysDayWater> implements ISysDayWaterService {
+
+
+}

+ 28 - 0
huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/service/impl/SysFodderServiceImpl.java

@@ -0,0 +1,28 @@
+package com.huimv.receiver.eco.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.receiver.eco.entity.SysFodder;
+import com.huimv.receiver.eco.mapper.SysFodderMapper;
+import com.huimv.receiver.eco.service.ISysFodderService;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-15
+ */
+@Service
+public class SysFodderServiceImpl extends ServiceImpl<SysFodderMapper, SysFodder> implements ISysFodderService {
+
+
+
+
+}

+ 23 - 0
huimv-farm-receiver/src/main/java/com/huimv/receiver/eco/service/impl/SysMonthWaterServiceImpl.java

@@ -0,0 +1,23 @@
+package com.huimv.receiver.eco.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.receiver.eco.entity.SysMonthWater;
+import com.huimv.receiver.eco.mapper.SysMonthWaterMapper;
+import com.huimv.receiver.eco.service.ISysMonthWaterService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author astupidcoder
+ * @since 2021-11-12
+ */
+@Service
+public class SysMonthWaterServiceImpl extends ServiceImpl<SysMonthWaterMapper, SysMonthWater> implements ISysMonthWaterService {
+
+
+}

+ 34 - 0
huimv-farm-receiver/src/main/resources/application-prod.yml

@@ -0,0 +1,34 @@
+server:
+  port: 8098
+spring:
+  application:
+    name: pigfarm-local-device
+  #------DataSource-----
+  datasource:
+    url: jdbc:mysql://47.96.4.54:10052/huimv-farm-center?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: hm123456789
+    driver-class-name: com.mysql.cj.jdbc.Driver
+  jpa:
+    hibernate:
+      ddl-auto: update
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+  redis:
+    host: 122.112.224.199
+    port: 6379
+    password: hm123456
+# Socket配置
+#socket:
+  # 监听端口 9001
+#  listen:
+#    #ip: 192.168.16.3
+#    ip: 192.168.1.49
+#    port: 10020
+  # 线程池 - 保持线程数 20
+  #pool-keep: 20
+  # 线程池 - 核心线程数 10
+  #pool-core: 10
+  # 线程池 - 最大线程数 20
+  #pool-max: 30
+  # 线程队列容量 10
+  #pool-queue-init: 10

+ 2 - 2
huimv-farm-receiver/src/main/resources/application.properties

@@ -1,5 +1,5 @@
-spring.profiles.active=dev
-#spring.profiles.active=prod
+#spring.profiles.active=dev
+spring.profiles.active=prod
 
 
 #ʱ¼ä¸ñʽÅäÖÃ
 #ʱ¼ä¸ñʽÅäÖÃ
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

+ 1 - 5
huimv-farm-video/pom.xml

@@ -20,11 +20,7 @@
     </dependency>
     </dependency>
 
 
 
 
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpmime</artifactId>
-            <version>4.5</version>
-        </dependency>
+
 
 
         <dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <groupId>org.apache.httpcomponents</groupId>

+ 1 - 1
huimv-farm-video/src/main/java/com/huimv/video/dhicc/ClientController/ClientEventController.java

@@ -26,7 +26,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map;
 
 
-@CrossOrigin
+
 @RestController
 @RestController
 @RequestMapping("/client/event")
 @RequestMapping("/client/event")
 public class ClientEventController {
 public class ClientEventController {

+ 34 - 0
huimv-farm-video/src/main/resources/application-prod.yml

@@ -0,0 +1,34 @@
+server:
+  port: 8096
+spring:
+  application:
+    name: pigfarm-local-device
+  #------DataSource-----
+  datasource:
+    url: jdbc:mysql://47.96.4.54:10052/huimv-farm-center?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: hm123456789
+    driver-class-name: com.mysql.cj.jdbc.Driver
+  jpa:
+    hibernate:
+      ddl-auto: update
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+  redis:
+    host: 122.112.224.199
+    port: 6379
+    password: hm123456
+# Socket配置
+#socket:
+  # 监听端口 9001
+#  listen:
+#    #ip: 192.168.16.3
+#    ip: 192.168.1.49
+#    port: 10020
+  # 线程池 - 保持线程数 20
+  #pool-keep: 20
+  # 线程池 - 核心线程数 10
+  #pool-core: 10
+  # 线程池 - 最大线程数 20
+  #pool-max: 30
+  # 线程队列容量 10
+  #pool-queue-init: 10

+ 2 - 2
huimv-farm-video/src/main/resources/application.properties

@@ -1,5 +1,5 @@
-spring.profiles.active=dev
-#spring.profiles.active=prod
+#spring.profiles.active=dev
+spring.profiles.active=prod
 
 
 #ʱ¼ä¸ñʽÅäÖÃ
 #ʱ¼ä¸ñʽÅäÖÃ
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss