天气接口

huimv-admin/pom.xml

@@ -136,6 +136,7 @@
             <artifactId>httpclient</artifactId>
             <version>4.5.14</version>
         </dependency>
+
         <dependency>
             <groupId>com.hkvs</groupId>
             <artifactId>HttpClientSSLUtils</artifactId>

huimv-admin/src/main/java/com/huimv/admin/config/InterceptorConfig.java

@@ -21,6 +21,7 @@ public class InterceptorConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(jwtInterceptor()).
-                excludePathPatterns("/huatongApi/admin/my/*");
+                excludePathPatterns("/huatongApi/admin/my/*")
+                .excludePathPatterns("/huatongApi/receive/feed");
     }
 }

huimv-admin/src/main/java/com/huimv/admin/controller/CameraHKVSSync.java

@@ -271,13 +271,13 @@ public class CameraHKVSSync {
         String callPostApiGetCameras = callPostApiGetCameras();
 //        System.out.println(callPostApiGetCameras);
         HkvsNewCameraDto hkvsNewCameraDto = JSONUtil.toBean(callPostApiGetCameras, HkvsNewCameraDto.class);
-        if (ObjectUtil.isNotEmpty(hkvsNewCameraDto) && "0".equals(hkvsNewCameraDto.getCode())) {
-            List<NewCameraDto> hkvsNewCameraDtoData = hkvsNewCameraDto.getData();
-            for (NewCameraDto hkvsNewCameraDtoDatum : hkvsNewCameraDtoData) {
-                List<CameraDetailDto> hkvsNewCameraDtoDatumList = hkvsNewCameraDtoDatum.getList();
-                System.out.println(hkvsNewCameraDtoDatumList);
-            }
-        }
+//        if (ObjectUtil.isNotEmpty(hkvsNewCameraDto) && "0".equals(hkvsNewCameraDto.getCode())) {
+//            List<NewCameraDto> hkvsNewCameraDtoData = hkvsNewCameraDto.getData();
+//            for (NewCameraDto hkvsNewCameraDtoDatum : hkvsNewCameraDtoData) {
+//                List<CameraDetailDto> hkvsNewCameraDtoDatumList = hkvsNewCameraDtoDatum.getList();
+//                System.out.println(hkvsNewCameraDtoDatumList);
+//            }
+//        }
     }
 
     /**

huimv-admin/src/main/java/com/huimv/admin/controller/ReceiveController.java

@@ -0,0 +1,50 @@
+package com.huimv.admin.controller;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.controller.feedVo.FeedVo;
+import org.springframework.util.DigestUtils;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/receive")
+@CrossOrigin
+public class ReceiveController {
+
+    @RequestMapping("/feed")
+    public Result list(HttpServletRequest httpServletRequest, @RequestBody FeedVo feedVo) {
+        try {
+            if (ObjectUtil.isEmpty(feedVo)){
+                return new Result(10002,"数据格式不正确",false);
+            }
+            StringBuilder stringBuilder = new StringBuilder();
+            stringBuilder.append(feedVo.getDateTime())
+                    .append(feedVo.getFarmName())
+                    .append(feedVo.getFarmId())
+                    .append(feedVo.getPigStyName())
+                    .append(feedVo.getPigStyId())
+                    .append(feedVo.getFloorName())
+                    .append(feedVo.getFloorId())
+                    .append(feedVo.getFeedName())
+                    .append(feedVo.getWeight());
+            String mac = feedVo.getMac();
+            String s = DigestUtils.md5DigestAsHex(stringBuilder.toString().getBytes()).toLowerCase();
+            System.out.println(s);
+            if (!s.equals(mac)){
+                return new Result(10001,"序列校验不通过",false);
+            }
+            System.out.println(feedVo.toString());
+            return new Result(10000,"操作成功",true);
+        }catch (Exception e){
+            System.out.println(e);
+            return new Result(10003,"其它错误",false);
+        }
+
+    }
+}

huimv-admin/src/main/java/com/huimv/admin/controller/feedVo/FeedVo.java

@@ -0,0 +1,18 @@
+package com.huimv.admin.controller.feedVo;
+
+import lombok.Data;
+
+@Data
+public class FeedVo {
+
+    private String  dateTime;
+    private String  farmName;
+    private String  farmId;
+    private String  pigStyName;
+    private String  pigStyId;
+    private String  floorName;
+    private String  floorId;
+    private String  feedName;
+    private String  weight;
+    private String  mac;
+}

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

@@ -90,7 +90,6 @@ public class CameraAreaServiceImpl extends ServiceImpl<CameraAreaMapper, CameraA
     @Override
     public void sync(Map<String, Integer> params,List<UnitDto1> unitDto1) {
         Integer farmId = params.get("farmId");
-        //同步，先删除
         QueryWrapper<CameraArea> wrapper = new QueryWrapper<>();
         //TODO 正康猪业 先这样做
         wrapper.eq("farm_id",farmId);
@@ -98,6 +97,7 @@ public class CameraAreaServiceImpl extends ServiceImpl<CameraAreaMapper, CameraA
         List<String> haikangAreaId = unitDto1.stream().map(UnitDto1::getRegionUuid).collect(Collectors.toList());
         List<String> huatongAreaId = huatong.stream().map(CameraArea::getRegionUuid).collect(Collectors.toList());
         CopyOnWriteArrayList<String> haikangDeviceIdCopy = ListUtil.toCopyOnWriteArrayList(haikangAreaId);
+
         CopyOnWriteArrayList<String> huatongDeviceIdCopy = ListUtil.toCopyOnWriteArrayList(huatongAreaId);
         //新增的设备
         haikangDeviceIdCopy.removeAll(huatongAreaId);
@@ -118,7 +118,7 @@ public class CameraAreaServiceImpl extends ServiceImpl<CameraAreaMapper, CameraA
             }
         }
         //需要删除的设备
-        huatongDeviceIdCopy.removeAll(haikangDeviceIdCopy);
+        huatongDeviceIdCopy.removeAll(haikangAreaId);
         if (huatongDeviceIdCopy.size() >0){
             this.remove(new QueryWrapper<CameraArea>().in("region_uuid",huatongDeviceIdCopy));
         }