服务端增加接收处理分钟数据功能接口

huimv-farm-admin/src/main/java/com/huimv/admin/device/service/impl/DeviceImpl.java

@@ -3,7 +3,9 @@ package com.huimv.admin.device.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.huimv.admin.device.dao.entity.FarmDeviceEntity;
+import com.huimv.admin.device.dao.entity.SysCameraAreaEntity;
 import com.huimv.admin.device.dao.repo.FarmDeviceRepo;
+import com.huimv.admin.device.dao.repo.SysCameraAreaEntityRepo;
 import com.huimv.admin.device.service.IDevice;
 import com.huimv.admin.device.utils.*;
 import com.huimv.common.utils.Result;
@@ -54,6 +56,12 @@ public class DeviceImpl implements IDevice {
     private String deviceEditService;
     @Value("${farm.device.removeService}")
     private String deviceRemoveService;
+    @Value("farm.env-service.port")
+    private String envServicePort;
+    @Value("farm.env-service.name")
+    private String envServiceName;
+    @Autowired
+    private SysCameraAreaEntityRepo sysCameraAreaEntityRepo;
 
     /**
      * @Method : newDevice
@@ -101,6 +109,16 @@ public class DeviceImpl implements IDevice {
 
     //获取牧场
     private String _getFarmIP(Integer farmId){
+        // 读取牧场公网IP
+        SysCameraAreaEntity sysCameraAreaEntity = sysCameraAreaEntityRepo.getCameraIP(farmId);
+        if(sysCameraAreaEntity == null){
+            return null;
+        }else{
+            String publicUrl = sysCameraAreaEntity.getPublicUrl();
+            String[] urlArray =  publicUrl.split(":");
+            String farmIP = urlArray[0];
+            //farmEnvService = farmIP+":"+envServicePort+"/"+envServiceName;
+        }
         return  "http://192.168.1.49:8091";
     }
 
@@ -286,6 +304,7 @@ public class DeviceImpl implements IDevice {
         List<Object[]> objList = deviceRepo.findDeviceTotal(farmId);
         Object[] totalObj = (Object[]) objList.get(0);
         int total = Integer.parseInt(totalObj[0].toString());
+        System.out.println("total="+total);
         //获取有故障设备数
         Integer failureState = 2;
         List<Object[]> failureList = deviceRepo.findFailureDeviceTotal(farmId, failureState);

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

@@ -1,7 +1,8 @@
 #spring.profiles.active=dev
 #spring.profiles.active=prod3
-#spring.profiles.active=prod
-spring.profiles.active=demo
+spring.profiles.active=prod
+#spring.profiles.active=dem
+# o
 #spring.profiles.active=yv
 
 #时间格式配置
@@ -26,4 +27,8 @@ weight.batchCode.spacemark=-
 farm.device.sync=true
 farm.device.addService=/farm/device/syncAddFarmDevice
 farm.device.editService=/farm/device/syncEditFarmDevice
-farm.device.removeService=/farm/device/syncRemoveFarmDevice
+farm.device.removeService=/farm/device/syncRemoveFarmDevice
+
+#牧场环境服务接口
+farm.env-service.port=10010
+farm.env-service.name=updateEnvThreshold

huimv-farm-receiver/src/main/java/com/huimv/receiver/cloud/controller/EnvironController.java

@@ -33,4 +33,12 @@ public class EnvironController {
     public void receiveRealTimeEnviron(@RequestParam(value = "data",required = true) String data){
         System.out.println("处理实时环保数据："+data);
     }
+
+    //接收分钟环保数据
+    @RequestMapping(value = "/putMinuteEnviron",method = RequestMethod.POST)
+    public void putMinuteEnviron(@RequestParam(value = "data",required = true) String data){
+        System.out.println("接收并处理分钟环保数据："+data);
+        //
+        environ.handleMinuteJSONObject(data);
+    }
 }

huimv-farm-receiver/src/main/java/com/huimv/receiver/cloud/service/IEnviron.java

@@ -10,4 +10,6 @@ public interface IEnviron {
     void handleEnvironJSONObject(String data) throws ParseException;
 
     void countDayAvgEnviron(Integer farmId, String todayDateText) throws ParseException;
+
+    void handleMinuteJSONObject(String data);
 }

huimv-farm-receiver/src/main/java/com/huimv/receiver/cloud/service/impl/EnvironImpl.java

@@ -199,6 +199,21 @@ public class EnvironImpl implements IEnviron {
         }
     }
 
+    @Override
+    public void handleMinuteJSONObject(String data) {
+        System.out.println("data>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"+data);
+//        JSONObject deviceJo = JSON.parseObject(data);
+//        EnvHourEntity envHourEntity = JSON.parseObject(data, EnvHourEntity.class);
+//        envHourRepo.save(envHourEntity);
+
+//        Integer farmId = envHourEntity.getFarmId();
+//        String todayDateText = dateUtil.formatTimestampToDate(envHourEntity.getDatetime());
+//        System.out.println(">>>>>>>>>>> 采样日期 todayDateText>>"+todayDateText);
+
+        //计算每天平均数据
+//        countDayAvgEnviron2(farmId, todayDateText);
+    }
+
     public void countDayAvgEnviron_old1(Integer farmId, String todayDateText) {
         System.out.println("farmId=" + farmId);
         System.out.println("todayDateText=" + todayDateText);

huimv-farm-receiver/src/main/java/com/huimv/receiver/farm/controller/AlarmController.java

@@ -24,7 +24,6 @@ public class AlarmController {
     //发送环境警报信息
     @RequestMapping(value = "/environ/putEnvironAlarm",method = RequestMethod.POST)
     public void putEnvironAlarm(@RequestParam(value = "data",required = true) String alarmInfo){
-//        System.out.println(">>>>>>>>>>>>>>> 接收"+alarmInfo);
         //处理环境警报
         iAlarm.handleEnvironAlarm(alarmInfo);
     }