1、修改gateway映射配置；

2、增加eartag配置文件prod；

huimv-farm-eartag/pom.xml

@@ -87,7 +87,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
         <!-- 添加 Undertow 容器 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -141,6 +140,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>com.huimv</groupId>
+            <artifactId>huimv-common</artifactId>
+            <version>0.0.6-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 </project>

huimv-farm-eartag/src/main/java/com/huimv/eartag/controller/TestController.java

@@ -49,7 +49,7 @@ public class TestController {
     //
     @PostMapping("/testRemoteProcessFarmAllStatus")
     public void testRemoteProcessFarmAllStatus() throws ParseException {
-        deviceService.remoteProcessFarmAllStatus("101");
+//        deviceService.remoteProcessFarmAllStatus("101");
     }
 
     @PostMapping("/testSendMq")

huimv-farm-eartag/src/main/java/com/huimv/eartag/service/IDeviceManageService.java

@@ -35,9 +35,9 @@ public interface IDeviceManageService {
     //查询设备关联的在线耳标统计
     Result listDeviceEartagOnlineCountByDeviceCode(String deviceCode) throws ParseException;
 
-    void remoteProcessFarmAllStatus(String farmId) throws ParseException;
+//    void remoteProcessFarmAllStatus(String farmId) throws ParseException;
 
-    void remoteProcessFarmAllStatus2(String farmId) throws ParseException;
+//    void remoteProcessFarmAllStatus2(String farmId) throws ParseException;
 
     //查询在线设备
     Result listOnlineDevice(String farmId, String deviceCode, String alias, String addDate, Integer pageNo, Integer pageSize) throws ParseException;
@@ -64,7 +64,7 @@ public interface IDeviceManageService {
     void countEffectiveDeviceTotal(JSONObject deviceRegister);
 
     //计算总状态信息
-    void countFarmAllStatus(JSONObject deviceRegisterJo) throws ParseException;
+//    void countFarmAllStatus(JSONObject deviceRegisterJo) throws ParseException;
 
     //
     Result listDeviceEartagOnlineStatusByDeviceCodeAndDate(String deviceCode, String earmark, String addDate);

huimv-farm-eartag/src/main/java/com/huimv/eartag/service/impl/DeviceManageServiceImpl.java

@@ -440,12 +440,12 @@ public class DeviceManageServiceImpl implements IDeviceManageService {
         cacheService.putDeviceTotal_(effectiveDeviceTotal,farmId);
     }
 
-    @Override
-    public void countFarmAllStatus(JSONObject deviceRegisterJo) throws ParseException {
-        String farmId = deviceRegisterJo.getString("farmId");
-        //{}
-        remoteProcessFarmAllStatus(farmId);
-    }
+//    @Override
+//    public void countFarmAllStatus(JSONObject deviceRegisterJo) throws ParseException {
+//        String farmId = deviceRegisterJo.getString("farmId");
+//        //{}
+//        remoteProcessFarmAllStatus(farmId);
+//    }
 
     @Override
     public Result listDeviceEartagOnlineStatusByDeviceCodeAndDate(String deviceCode, String earmark, String addDate) {
@@ -489,43 +489,43 @@ public class DeviceManageServiceImpl implements IDeviceManageService {
         return new Result(ResultCode.SUCCESS, dataJa);
     }
 
-    @Override
-    public void remoteProcessFarmAllStatus(String farmId) throws ParseException {
-        String todayDateText = new com.huimv.eartag.utils.DateUtil().getTodayDateText();
-        java.sql.Date todayDate = new java.sql.Date(new java.util.Date().getTime());
-        Timestamp nowTimestamp = new Timestamp(new java.util.Date().getTime());
-
-        RestTemplate restTemplate = new RestTemplate();
-
-        String url = "http://" + serviceFarmAllStatusHost + ":" + serviceFarmAllStatusIp + serviceFarmAllStatusUrl;
-        System.out.println("## url>>"+url);
-
-        FarmAllStatusVo farmAllStatusVo = new FarmAllStatusVo();
-        farmAllStatusVo.setFarmId(farmId);
-        farmAllStatusVo.setTodayDateText(todayDateText);
-        farmAllStatusVo.setTodayDate(todayDate);
-        farmAllStatusVo.setNowTimestamp(nowTimestamp);
-        //{}
-        String result = restTemplate.postForObject(url,farmAllStatusVo,String.class);
-        System.out.println("result>>"+result);
-    }
-
-    @Override
-    public void remoteProcessFarmAllStatus2(String farmId) throws ParseException {
-        String todayDateText = new com.huimv.eartag.utils.DateUtil().getTodayDateText();
-        java.sql.Date todayDate = new java.sql.Date(new java.util.Date().getTime());
-        Timestamp nowTimestamp = new Timestamp(new java.util.Date().getTime());
-
-        RestTemplate restTemplate = new RestTemplate();
-        String host = "192.168.1.30";
-        String port = "8092";
-        String service = "/deviceController/updateFarmAllStatus";
-        String url = "http://" + host + ":" + port + service+"?farmId="+farmId+"&todayDateText="+todayDateText+"&todayDate="+todayDate+"&nowTimestamp="+nowTimestamp;
-        System.out.println("## url>>"+url);
-        //{}
-        String result = restTemplate.getForObject(url,String.class);
-        System.out.println("result>>"+result);
-    }
+//    @Override
+//    public void remoteProcessFarmAllStatus(String farmId) throws ParseException {
+//        String todayDateText = new com.huimv.eartag.utils.DateUtil().getTodayDateText();
+//        java.sql.Date todayDate = new java.sql.Date(new java.util.Date().getTime());
+//        Timestamp nowTimestamp = new Timestamp(new java.util.Date().getTime());
+//
+//        RestTemplate restTemplate = new RestTemplate();
+//
+//        String url = "http://" + serviceFarmAllStatusHost + ":" + serviceFarmAllStatusIp + serviceFarmAllStatusUrl;
+//        System.out.println("## url>>"+url);
+//
+//        FarmAllStatusVo farmAllStatusVo = new FarmAllStatusVo();
+//        farmAllStatusVo.setFarmId(farmId);
+//        farmAllStatusVo.setTodayDateText(todayDateText);
+//        farmAllStatusVo.setTodayDate(todayDate);
+//        farmAllStatusVo.setNowTimestamp(nowTimestamp);
+//        //{}
+//        String result = restTemplate.postForObject(url,farmAllStatusVo,String.class);
+//        System.out.println("result>>"+result);
+//    }
+
+//    @Override
+//    public void remoteProcessFarmAllStatus2(String farmId) throws ParseException {
+//        String todayDateText = new com.huimv.eartag.utils.DateUtil().getTodayDateText();
+//        java.sql.Date todayDate = new java.sql.Date(new java.util.Date().getTime());
+//        Timestamp nowTimestamp = new Timestamp(new java.util.Date().getTime());
+//
+//        RestTemplate restTemplate = new RestTemplate();
+//        String host = "192.168.1.30";
+//        String port = "8092";
+//        String service = "/deviceController/updateFarmAllStatus";
+//        String url = "http://" + host + ":" + port + service+"?farmId="+farmId+"&todayDateText="+todayDateText+"&todayDate="+todayDate+"&nowTimestamp="+nowTimestamp;
+//        System.out.println("## url>>"+url);
+//        //{}
+//        String result = restTemplate.getForObject(url,String.class);
+//        System.out.println("result>>"+result);
+//    }
 
     public Integer getEffectiveDeviceSum(String farmId){
         List<Object[]> deviceRegisterList = deviceRegisterRepo.getDeviceCountByFarmId(farmId);

huimv-farm-eartag/src/main/java/com/huimv/eartag/service/impl/DeviceServiceImpl.java

@@ -55,8 +55,8 @@ public class DeviceServiceImpl implements IDeviceService {
     private EartagEartagRegisterRepo eartagRegisterRepo;
     @Autowired
     private EartagConfigPropertiesRepo configPropertiesRepo;
-    @Value("${service.farmAllStatus.host}")
-    private String serviceFarmAllStatusHost;
+//    @Value("${service.farmAllStatus.host}")
+//    private String serviceFarmAllStatusHost;
     @Value("${service.farmAllStatus.ip}")
     private String serviceFarmAllStatusIp;
     @Value("${service.farmAllStatus.url}")

huimv-farm-eartag/src/main/java/com/huimv/eartag/service/impl/FeedFowlRecordServiceImpl.java

@@ -29,9 +29,6 @@ import java.util.Map;
  */
 @Service
 public class FeedFowlRecordServiceImpl extends ServiceImpl<FeedFowlRecordMapper, FeedFowlRecord> implements IFeedFowlRecordService {
-
-
-
     @Autowired
     private FeedBuildCountMapper feedBuildCountMapper;
 
@@ -43,14 +40,12 @@ public class FeedFowlRecordServiceImpl extends ServiceImpl<FeedFowlRecordMapper,
         if (StringUtils.isBlank(bulidCode)){
             bulidCode="D001";
         }
-
         wrapper.eq("build_code",bulidCode);
         endMap.put("list",this.list(wrapper));
         QueryWrapper<FeedBuildCount> countQueryWrapper = new QueryWrapper<>();
         countQueryWrapper.orderByDesc("update_date").eq("build_code",bulidCode).last("limit 1");
         FeedBuildCount feedBuildCount = feedBuildCountMapper.selectOne(countQueryWrapper);
         endMap.put("bulidCount",feedBuildCount);
-
         return endMap;
     }
 

huimv-farm-eartag/src/main/resources/application-dev.yml

@@ -1,12 +1,11 @@
 server:
-  port: 8093
-
+  port: 8099
 spring:
   application:
-    name: huimv-farm-eartag-input
+    name: huimv-eartag2-process
 
   datasource:
-    url: jdbc:mysql://115.238.57.190:3306/huimv_farm_eartag?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://192.168.1.7:3306/huimv_farm_eartag?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -35,13 +34,7 @@ spring:
     virtual-host: /
     listener:
       simple:
-        acknowledge-mode: none
-
-    #确认消息已发送到交换机(Exchange)
-#    publisher-confirms: true #(过时、弃用)
-    publisher-confirm-type: correlated
-    #确认消息已发送到队列(Queue)
-    publisher-returns: true
+        acknowledge-mode: none  #消费端不需要确认
 
   #redis
   redis:
@@ -56,26 +49,37 @@ spring:
         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
 
+  #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:
@@ -99,9 +103,5 @@ spring:
 #      ddl-auto: update
 #    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
 #    open-in-view: true
-management:
-  endpoints:
-    web:
-      exposure:
-        include: "*"   # * 在yaml 文件属于关键字，所以需要加引号
+
 

huimv-farm-eartag/src/main/resources/application-prod.yml

@@ -1,11 +1,12 @@
 server:
-  port: 8092
+  port: 8099
+
 spring:
   application:
-    name: huimv-eartag2-process
+    name: huimv-farm-eartag
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv_farm_eartag?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://122.112.224.199:3306/huimv_farm_eartag?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -26,7 +27,7 @@ spring:
 #    #虚拟host 可以不设置,使用server默认host
 #    virtual-host: /
   rabbitmq:
-    host: 192.168.1.170
+    host: 121.36.134.218
     port: 5672
     username: admin
     password: admin
@@ -34,12 +35,18 @@ spring:
     virtual-host: /
     listener:
       simple:
-        acknowledge-mode: none  #消费端不需要确认
+        acknowledge-mode: none
+
+    #确认消息已发送到交换机(Exchange)
+#    publisher-confirms: true #(过时、弃用)
+    publisher-confirm-type: correlated
+    #确认消息已发送到队列(Queue)
+    publisher-returns: true
 
   #redis
   redis:
     database: 0
-    host: 192.168.1.68
+    host: 121.36.134.218
     port: 6379
     password: hm123456
     timeout: 5000ms
@@ -49,37 +56,26 @@ spring:
         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
 
-  #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
+  data:
+    redis:
+      repositories:
+        enabled: false
 
   #是否缓存空值
-#  cache:
-#    redis:
-#      cache-null-values: false
+  cache:
+    redis:
+      cache-null-values: false
+
+
+
     #server:
 #  port: 9110
 #spring:
@@ -103,5 +99,9 @@ spring:
 #      ddl-auto: update
 #    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
 #    open-in-view: true
-
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"   # * 在yaml 文件属于关键字，所以需要加引号
 

huimv-farm-eartag/src/main/resources/application.properties

@@ -1,5 +1,5 @@
 # ÊôÐÔÅäÖÃ
-spring.profiles.active=dev
+spring.profiles.active=prod
 
 # ¿ªÆô½¡¿µ¼à¿Ø
 management.endpoints.web.exposure.include=*

huimv-farm-environ/pom.xml

@@ -41,7 +41,7 @@
         <dependency>
             <groupId>com.huimv</groupId>
             <artifactId>huimv-common</artifactId>
-            <version>0.0.1</version>
+            <version>0.0.6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.dahuatech.icc</groupId>

huimv-farm-environ/src/main/java/com/huimv/environ/eco/controller/WeatherController.java

@@ -68,9 +68,10 @@ public class WeatherController {
 
         String result = HttpUtil.urlWithForm(url, param, Charset.defaultCharset(), true);
 
-//        System.out.println(result);
+        System.out.println("1 >>"+result);
 
         String s = HttpUtil.get(result);
+        System.out.println("2 >>"+s);
 
         //对S进行解析，首先获取当天24小时的温度情况
 

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

@@ -39,7 +39,7 @@ spring:
           filters:
             - StripPrefix=1
         - id: eartag
-          uri: http://127.0.0.1:8093
+          uri: http://127.0.0.1:8099
           predicates:
             - Path=/eartag/**
           filters:

huimv-farm-produce/pom.xml

@@ -15,7 +15,7 @@
         <dependency>
             <groupId>com.huimv</groupId>
             <artifactId>huimv-common</artifactId>
-            <version>0.0.1</version>
+            <version>0.0.6-SNAPSHOT</version>
         </dependency>
 <!--        <dependency>-->
 <!--            <groupId>org.springframework.boot</groupId>-->