接收服务

huimv-admin/src/main/java/com/huimv/admin/service/impl/CameraBaseServiceImpl.java

@@ -2,9 +2,7 @@ package com.huimv.admin.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.RandomUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.admin.common.utils.Result;

huimv-admin/src/main/java/com/huimv/admin/service/impl/CameraFunctionAreaServiceImpl.java

@@ -39,7 +39,7 @@ public class CameraFunctionAreaServiceImpl extends ServiceImpl<CameraFunctionAre
         Integer current = (Integer) params.get("current");
         Integer size = (Integer) params.get("size");
         String functionaName = (String) params.get("functionaName");
-        Integer farmId = (Integer) params.get("farmId");
+        String farmId = (String) params.get("farmId");
 
         IPage<CameraFunctionArea> list = page(new Page<>(current, size), new QueryWrapper<CameraFunctionArea>().like(StringUtils.isNotBlank(functionaName), "area_name", functionaName).eq("farm_id", farmId));
         return new Result(ResultCode.SUCCESS, list);

huimv-admin/src/main/java/com/huimv/admin/timer/CarmeraTimer.java

@@ -103,7 +103,7 @@ public class CarmeraTimer {
     String passwordMD5 = "21218cca77804d2ba1922c33e0151105";
     String baseurl ="https://yzwlw.loongk.com/";
 
-    @Scheduled(cron = "0 0/11 * * * ?  ")
+    @Scheduled(cron = "0 0/11 * * * ? ")
     @Transactional
     private void getHuanKong() throws Exception {
         //目前是这家
@@ -147,7 +147,7 @@ public class CarmeraTimer {
                 envData.setDeviceId(envDevice.getDeviceCode());
                 envData.setFarmId(farmId);
                 envData.setUnitId(envDevice.getUnitId());
-//                envDataService.save(envData);
+                envDataService.save(envData);
             }
         }
     }
@@ -166,7 +166,7 @@ public class CarmeraTimer {
             }else {
                 minHum =envWarningThreshold.getMinHum();
             }
-            if (Double.parseDouble(maxHum) > Double.parseDouble(val)){
+            if (Double.parseDouble(maxHum) < Double.parseDouble(val)){
                 EnvWarningInfo envWarningInfo = new EnvWarningInfo();
                 envWarningInfo.setBuildLocation(envDevice.getUnitName());
                 envWarningInfo.setDate(new Date());
@@ -177,8 +177,9 @@ public class CarmeraTimer {
                 envWarningInfo.setUserIds(envWarningThreshold.getUserIds());
                 envWarningInfo.setWarningContent("当前湿度为"+val+"%超过阈值,请及时检查");
                 envWarningInfo.setWarningType(2);
+                envWarningInfoService.save(envWarningInfo);
             }
-            if (Double.parseDouble(minHum) <Double.parseDouble(val)){
+            if (Double.parseDouble(minHum) >Double.parseDouble(val)){
                 EnvWarningInfo envWarningInfo = new EnvWarningInfo();
                 envWarningInfo.setBuildLocation(envDevice.getUnitName());
                 envWarningInfo.setDate(new Date());
@@ -189,7 +190,7 @@ public class CarmeraTimer {
                 envWarningInfo.setUserIds(envWarningThreshold.getUserIds());
                 envWarningInfo.setWarningContent("当前湿度为"+val+"%低于阈值,请及时检查");
                 envWarningInfo.setWarningType(2);
-
+                envWarningInfoService.save(envWarningInfo);
             }
         }
     }