新增羊场接口

huimv-eartag2-api/src/main/java/com/huimv/eartag2/api/service/impl/EartagAbnormalAlarmServiceImpl.java

@@ -24,7 +24,6 @@ import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.*;
 
-import static javafx.scene.input.KeyCode.L;
 
 /**
  * <p>

huimv-eartag2-api/src/main/resources/application-prod.yml

@@ -1,32 +1,83 @@
 server:
-  port: 8099
+  port: 8093
 spring:
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 47.98.40.154:8848
+        ephemeral: false
+      config:
+        server-addr: 47.98.40.154:8848   # Nacos 配置服务地址
+        namespace: public    # Nacos 命名空间
+        group: DEFAULT_GROUP          # Nacos 配置组
+
   application:
     name: huimv-eartag2-manage2
+  autoconfigure:
+    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
+  shardingsphere:
+    datasource:
+      props:
+        sql:
+          show: true
+      names: ds0,ds1,dbm
+      dbm:
+        type: com.zaxxer.hikari.HikariDataSource
+        #        type: com.alibaba.druid.pool.DruidDataSource
+        jdbc-url: jdbc:mysql://115.238.57.190:3306/huimv-demo-eartag-new?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+        username: root
+        password: hm123456
+        driver-class-name: com.mysql.cj.jdbc.Driver
+      ds0:
+        type: com.zaxxer.hikari.HikariDataSource
+        #        type: com.alibaba.druid.pool.DruidDataSource
+        jdbc-url: jdbc:mysql://115.238.57.190:3306/huimv-demo-eartag-new0?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+        username: root
+        password: hm123456
+        driver-class-name: com.mysql.cj.jdbc.Driver
+      #        hikari:
+      #          sqlSessionFactoryRef: mySqlSessionFactory
+      ds1:
+        type: com.zaxxer.hikari.HikariDataSource
+        #        type: com.alibaba.druid.pool.DruidDataSourc
+        jdbc-url: jdbc:mysql://115.238.57.190:3306/huimv-demo-eartag-new1?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+        username: root
+        password: hm123456
+        driver-class-name: com.mysql.cj.jdbc.Driver
+    sharding:
+      tables:
+        eartag_data:
+          actual-data-nodes: ds$->{0..1}.eartag_data$->{0..2}
+          table-strategy:
+            inline:
+              sharding-column: earmark
+              algorithm-expression: eartag_data_$->{earmark.hashCode() % 3}
+          #            complex:
+          #              sharding-column: create_date
+          #              algorithm-expression: base_farm_${date_format(create_date,'yyyyMM')}
+          database-strategy:
+            inline:
+              sharding-column: farm_id
+              algorithm-expression: ds$->{farm_id.hashCode() % 2}
+      default-data-source-name: dbm
 
-  datasource:
-    url: jdbc:mysql://115.238.57.190:3306/huimv-eartag2-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    username: root
-    password: hm123456
-    driver-class-name: com.mysql.cj.jdbc.Driver
+  #  datasource:
+  #    url: jdbc:mysql://115.238.57.190:3306/huimv-demo-eartag20?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+  #    username: root
+  #    password: hm123456
+  #    driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
     show-sql: false
     database: mysql
     hibernate:
-      ddl-auto: update
+      ddl-auto: none
     database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
     open-in-view: true
 
-  #配置rabbitMq 服务器
-#  rabbitmq:
-#    host: 10.0.0.4
-#    port: 5672
-#    username: huimv
-#    password: hm123456
-#    #虚拟host 可以不设置,使用server默认host
-#    virtual-host: /
+
   rabbitmq:
-    host: 192.168.1.170
+    host: 139.9.172.209
+    #    host: 10.0.0.14
     port: 5672
     username: admin
     password: admin
@@ -34,12 +85,13 @@ spring:
     virtual-host: /
     listener:
       simple:
-        acknowledge-mode: none  #消费端不需要确认
+        acknowledge-mode: none
 
   #redis
   redis:
     database: 0
-    host: 192.168.1.68
+    host: 121.36.134.218
+    #    host: 10.0.0.14
     port: 6379
     password: hm123456
     timeout: 5000ms
@@ -50,63 +102,14 @@ spring:
         max-idle: 10
         min-idle: 0
 
-  #redis
-#  redis:
-#    database: 0
-#    host: 192.168.1.68
-#    port: 6379
-#    password: hm123456
-#    timeout: 5000ms
-#    jedis:
-#      pool:
-#        max-active: 20
-#        max-wait: -1
-#        max-idle: 10
-#        min-idle: 0
-#    lettuce:
-#      pool:
-#        max-active: 3
-#        min-idle: 2
-#        max-idle: 3
-#        max-wait: 1
-#      shutdown-timeout: 100
-
-#  data:
-#    redis:
-#      repositories:
-#        enabled: false
 
-  #是否缓存空值
-#  cache:
-#    redis:
-#      cache-null-values: false
-    #server:
-#  port: 9110
-#spring:
-#  application:
-#    name: huimv-hy-autoGetData
-#
-#  datasource:
-##    url: jdbc:mysql://47.98.175.112:3306/huimv_ql_farm_haiyan?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#    #    url: jdbc:mysql://36.22.189.214:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#        url: jdbc:mysql://115.238.57.190:3306/huimv_ql_farm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#    username: root
-#    password: hm123456
-#    driver-class-name: com.mysql.cj.jdbc.Driver
-#  jpa:
-#    properties:
-#      hibernate:
-#        enable_lazy_load_no_trans: true
-#    show-sql: false
-#    database: mysql
-#    hibernate:
-#      ddl-auto: update
-#    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
-#    open-in-view: true
 
 mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
   # mapper.xml文件所存放的位置
   mapper-locations: classpath*:com/huimv/eartag2/manage2/mapper/xml/*.xml  # 不加这一行出错：“org.apache.ibatis.binding.BindingException:  Invalid bound statement (not found)”
-
+management:
+  health:
+    db:
+      enabled: false

huimv-eartag2-api/src/main/resources/application.properties

@@ -1,5 +1,5 @@
 #spring.profiles.active=dev2
-spring.profiles.active=prod2
+spring.profiles.active=prod
 #spring.profiles.active=dev3
 
 # mysql:/cache:

huimv-eartag2-common/src/main/java/com/huimv/eartag2/common/config/InterceptorConfig.java

@@ -26,13 +26,19 @@ public class InterceptorConfig implements WebMvcConfigurer {
                         "/**/eartagData/api/eartagData/*",
                         "/**/eartagData/api/qingshan/*",
                         "/**/eartagRegister/listFarmUnitEartagData",
-                        "/manage2/eartagRegister/listFarmUnitEartagData",
+                        "/api/manage2/eartagRegister/listFarmUnitEartagData",
                         "/eartagRegister/listFarmUnitEartagData2/**",
                         "/eartagData/api/getEnvByTime/**",
                         "/manage2/eartagData/getEnvByTime",
                         "/**/eartagData/getEnvByTime",
                         "/**/eartag-hour-act/getAct",
-                        "/manage2/eartag-hour-act/getAct",
-                        "/sendDirectMessage2");
+                        "/api/manage2/eartag-hour-act/getAct",
+                        "/sendDirectMessage2",
+                        "/api/manage2/eartagRegister/listUserEartagData",
+                        "/manage/device/getNowAllStatus",
+                        "/api/manage2/eartagData/getByTimeFilter",
+                        "/api/manage2/config/updateWarning",
+                        "/api/manage2/eartag-hour-act/listActAvg",
+                        "/api/manage2/pig/listWarning");
     }
 }

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/EartagAbnormalAlarmController.java

@@ -112,5 +112,11 @@ public class EartagAbnormalAlarmController {
         return new Result(ResultCode.SUCCESS, baseMapService.list());
     }
 
+
+    //德清羊场大屏预警信息
+    @PostMapping("/listWarning")
+    public Result ListWarning(@RequestBody Map<String,String> map){
+        return eartagAbnormalAlarmService.ListWarning(map);
+    }
 }
 

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/EartagHourActController.java

@@ -48,5 +48,10 @@ public class EartagHourActController {
         return eartagHourActService.getHourAct(farmCode,startDate,endDate,earmark);
     }
 
+    //德清羊场运动检测
+    @RequestMapping(value = "/listActAvg",method = RequestMethod.POST)
+    public Result listActAvg(@RequestBody Map<String, String> paramsMap) {
+        return eartagHourActService.listActAvg(paramsMap);
+    }
 }
 

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

@@ -1,7 +1,14 @@
 package com.huimv.eartag2.manage2.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.huimv.eartag2.manage2.pojo.EartagHourAct;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.eartag2.manage2.pojo.pojovo.SheepActVo;
+import org.apache.ibatis.annotations.Param;
+
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +20,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface EartagHourActMapper extends BaseMapper<EartagHourAct> {
 
+    //羊群平均运动量
+    List<SheepActVo> listSheepActAvg(@Param(Constants.WRAPPER) QueryWrapper<EartagHourAct> queryWrapper);
 }

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

@@ -17,4 +17,9 @@
         id, earmark, hour, act, add_date, farm_code
     </sql>
 
+    <select id="listSheepActAvg" resultType="com.huimv.eartag2.manage2.pojo.pojovo.SheepActVo">
+        select avg(act) actAvg,add_date addDate from eartag_hour_act
+        ${ew.customSqlSegment}
+        group by add_date
+    </select>
 </mapper>

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/pojo/pojovo/SheepActVo.java

@@ -0,0 +1,11 @@
+package com.huimv.eartag2.manage2.pojo.pojovo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SheepActVo {
+    private Date addDate;
+    private String actAvg;
+}

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/EartagAbnormalAlarmService.java

@@ -28,4 +28,7 @@ public interface EartagAbnormalAlarmService extends IService<EartagAbnormalAlarm
     Result pigMonitor(Map<String, Object> paramsMap);
 
     Result getFarmerAndPig(Map<String, Object> paramsMap);
+
+    //德清羊场预警信息
+    Result ListWarning(Map<String, String> paramsMap);
 }

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/EartagHourActService.java

@@ -5,6 +5,7 @@ import com.huimv.eartag2.common.utils.Result;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.text.ParseException;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,4 +18,6 @@ import java.text.ParseException;
 public interface EartagHourActService extends IService<EartagHourAct> {
 
     Result getHourAct(String farmCode, String startDate,String endDate, String earmark) throws ParseException;
+
+    Result listActAvg(Map<String,String> paramsMap);
 }

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/EartagAbnormalAlarmServiceImpl.java

@@ -181,5 +181,13 @@ public class EartagAbnormalAlarmServiceImpl extends ServiceImpl<EartagAbnormalAl
         return new Result(ResultCode.SUCCESS,endList);
     }
 
+    @Override
+    public Result ListWarning(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        QueryWrapper<EartagAbnormalAlarm> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_code", farmId).orderByDesc("add_time");
+        return new Result(ResultCode.SUCCESS, eartagAbnormalAlarmMapper.selectList(queryWrapper));
+    }
+
 
 }

huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/EartagHourActServiceImpl.java

@@ -61,4 +61,12 @@ public class EartagHourActServiceImpl extends ServiceImpl<EartagHourActMapper, E
         return new Result(ResultCode.SUCCESS,resultList);
     }
 
+    @Override
+    public Result listActAvg(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        QueryWrapper<EartagHourAct> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_code", farmId);
+        return new Result(ResultCode.SUCCESS, eartagHourActMapper.listSheepActAvg(queryWrapper));
+    }
+
 }