咳嗽管家

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

@@ -41,6 +41,7 @@ public class SysTelecomController {
         Integer STC = payload.get("STC");
         Integer HUMI = payload.get("HUMI");
         Integer TEMP = payload.get("TEMP");
+        TEMP +=80;
         telecom.setRssi(rssi);
         telecom.setStc(STC);
 

huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/impl/EcoDeviceFlowServiceImpl.java

@@ -25,6 +25,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.*;
 
@@ -89,7 +90,12 @@ public class EcoDeviceFlowServiceImpl extends ServiceImpl<EcoDeviceFlowMapper, E
         if (StringUtils.isBlank(id1Value)) {
             id1Value = "0";
         }
-        ecoDeviceFlow.setId1Value(id1Value);
+        System.out.println(dataJo.getString("deviceKey") +"____________>");
+        if ("880601000003".equals(dataJo.getString("deviceKey"))){
+            ecoDeviceFlow.setId1Value((new BigDecimal(id1Value).add(new BigDecimal(40))).toString());
+        }else {
+            ecoDeviceFlow.setId1Value(id1Value);
+        }
         ecoDeviceFlow.setId1AlarmStatus(id1Jo.getBoolean("isAlarm"));
         ecoDeviceFlow.setId1AlarmMsg(id1Jo.getString("alarmMsg"));
         JSONObject id2Jo = realTimeDataJa.getJSONObject(1);

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

@@ -1,9 +1,9 @@
 #spring.profiles.active=dev
 #spring.profiles.active=prod3
 #spring.profiles.active=demo
-#spring.profiles.active=prod
+spring.profiles.active=prod
 #spring.profiles.active=prod2
-spring.profiles.active=lishui
+#spring.profiles.active=lishui
 
 #
 url.environ.device.service=http://www.0531yun.com/app/GetDeviceData

huimv-farm-video/src/main/java/com/huimv/video/dhicc/controller/BaseController/SysTelecomController.java

@@ -42,6 +42,7 @@ public class SysTelecomController {
         Integer STC = payload.get("STC");
         Integer HUMI = payload.get("HUMI");
         Integer TEMP = payload.get("TEMP");
+        TEMP +=80;
         telecom.setRssi(rssi);
         telecom.setStc(STC);
 

huimv-farm-video/src/main/java/com/huimv/video/video/controller/CameraAreaController.java

@@ -95,11 +95,13 @@ public class CameraAreaController {
         if (0 == farmId){
             cameraArea.setId(67);
             cameraAreaService.updateById(cameraArea);
+        }else if (10000 == farmId){
+            cameraArea.setId(87);
+            cameraAreaService.updateById(cameraArea);
         }else {
-            cameraAreaService.update(cameraArea, new QueryWrapper<CameraArea>().eq("farm_id", farmId));
+            cameraAreaService.update(cameraArea, new QueryWrapper<CameraArea>().eq("farm_id", farmId).ne("id",87));
         }
 
-
         return "成功";
 
     }

huimv-farm-video/src/main/java/com/huimv/video/video/controller/CameraFunctionController.java

@@ -96,5 +96,4 @@ public class CameraFunctionController {
 
 
 
-
 }

huimv-farm-video/src/main/java/com/huimv/video/video/entity/Camera.java

@@ -82,14 +82,13 @@ public class Camera extends Model {
      */
     private Integer sort;
 
-
     private Integer farmId;
 
-
     private Integer roomId;
     //icc通道
     private String iccChannel;
-    private Integer functionId;
 
+    private Integer functionId;
 
+    private Integer isOnline;
 }

huimv-farm-video/src/main/java/com/huimv/video/video/entity/vo/CameraListVo.java

@@ -12,4 +12,5 @@ public class CameraListVo {
     private Integer brandId;
     private Integer sort;
     private Integer farmId;
+    private Integer isOnline;
 }

huimv-farm-video/src/main/java/com/huimv/video/video/service/impl/CameraServiceImpl.java

@@ -60,11 +60,12 @@ public class CameraServiceImpl extends ServiceImpl<CameraMapper, Camera> impleme
         Integer brandId = cameraListVo.getBrandId();
         Integer sort = cameraListVo.getSort();
         Integer farmId = cameraListVo.getFarmId();
+        Integer isOnline = cameraListVo.getIsOnline();
 
         QueryWrapper<Camera> wrapper = new QueryWrapper<>();
         if (StringUtils.isNotBlank(strchStr)) {
-            wrapper.like("camera_name", strchStr)
-                    .or().like("camera_ip", strchStr);
+            wrapper.and(i -> i.like("camera_name", strchStr)
+                    .or().like("camera_ip", strchStr));
         }
 
         if (farmId != null) {
@@ -79,7 +80,9 @@ public class CameraServiceImpl extends ServiceImpl<CameraMapper, Camera> impleme
             wrapper.eq("brand_id", brandId);
         }
 
-
+        if (isOnline != null) {
+            wrapper.eq("is_online", isOnline);
+        }
 
         if (sort == null) {
             wrapper.orderByDesc("id");
@@ -88,10 +91,7 @@ public class CameraServiceImpl extends ServiceImpl<CameraMapper, Camera> impleme
         } else {
             wrapper.orderByAsc("sort");
         }
-
         wrapper.orderByDesc("id");
-
-
         return new Result(ResultCode.SUCCESS, page(new Page<>(current, size), wrapper));
     }
 

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

@@ -1,7 +1,7 @@
 #spring.profiles.active=dev
 #spring.profiles.active=prod3
 #spring.profiles.active=demo
-#spring.profiles.active=prod
+spring.profiles.active=prod
 #spring.profiles.active=prod2e
 #spring.profiles.active=lishui
-spring.profiles.active=qingshan
+#spring.profiles.active=qingshan