yang пре 3 година
родитељ
комит
3ca6b5ea83

+ 5 - 13
huimv-farm-video/src/main/java/com/huimv/video/dhicc/controller/ClientController/ClientCarManageController.java

@@ -1,26 +1,18 @@
 package com.huimv.video.dhicc.controller.ClientController;
 
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dahuatech.hutool.http.Method;
 import com.dahuatech.icc.exception.ClientException;
 import com.dahuatech.icc.oauth.http.DefaultClient;
 import com.dahuatech.icc.oauth.http.IClient;
 import com.dahuatech.icc.oauth.model.v202010.GeneralRequest;
 import com.dahuatech.icc.oauth.model.v202010.GeneralResponse;
-import com.huimv.video.dhicc.entity.IccChannel;
-import com.huimv.video.dhicc.result.R;
-import com.sun.java.swing.plaf.windows.WindowsTextAreaUI;
-import net.sf.json.JSONObject;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import com.huimv.common.utils.Result;
+
 import javax.servlet.http.HttpServletRequest;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 
@@ -30,7 +22,7 @@ public class ClientCarManageController {
 
   //列表车辆
     @RequestMapping("/geCarList")
-    public GeneralResponse geCarList (HttpServletRequest request ,@RequestParam(name = "farmId") Integer farmId,
+    public GeneralResponse geCarList (@RequestParam(name = "farmId") Integer farmId,
             @RequestParam(name = "pageNum") Integer pageNum,
             @RequestParam(name = "pageSize") Integer pageSize
                                       ) throws ClientException {
@@ -53,9 +45,9 @@ public class ClientCarManageController {
 
    //添加基础车辆
     @RequestMapping("/addCarBase")
-    public GeneralResponse addCarBase (HttpServletRequest request ,@RequestParam(name = "farmId") Integer farmId,
-                                     // @RequestParam(name = "carCode") String carCode,//车辆编号
-                                      @RequestParam(name = "carNum")  String carNum //车牌号
+    public GeneralResponse addCarBase (HttpServletRequest request , @RequestParam(name = "farmId") Integer farmId,
+                                       // @RequestParam(name = "carCode") String carCode,//车辆编号
+                                       @RequestParam(name = "carNum")  String carNum //车牌号
     ) throws ClientException {
         if(farmId!=1){
             return null ;

+ 116 - 0
huimv-farm-video/src/main/java/com/huimv/video/dhicc/controller/ClientController/ClientXunZhengController.java

@@ -0,0 +1,116 @@
+package com.huimv.video.dhicc.controller.ClientController;
+
+import com.alibaba.fastjson.JSON;
+import com.dahuatech.hutool.http.Method;
+import com.dahuatech.icc.exception.ClientException;
+import com.dahuatech.icc.oauth.http.DefaultClient;
+import com.dahuatech.icc.oauth.http.IClient;
+import com.dahuatech.icc.oauth.model.v202010.GeneralRequest;
+import com.dahuatech.icc.oauth.model.v202010.GeneralResponse;
+import com.huimv.common.utils.StringUtilsWork;
+import com.huimv.video.dhicc.icc.CommonConstant;
+import com.huimv.video.dhicc.result.R;
+import com.huimv.video.dhicc.service.ISysTelecomEventService;
+import net.sf.json.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+@RestController
+@RequestMapping("/client/event")
+public class ClientXunZhengController {
+
+
+    @Autowired
+    private ISysTelecomEventService sysTelecomEventService;
+    //所有的事件接口
+    @RequestMapping("/xunZhengEvent")
+    public R SiZhuList(@RequestBody Map<String, Object> params1) throws ClientException, ParseException {
+        Integer farmId= (int) params1.get("farmId");
+        if(farmId!=1){
+            return R.ok("当前牧场无设备").put("data",null  );
+        }
+        return R.ok("请求成功").put("data", getEventList( params1  )).put("total" , CountTimes(params1));
+    }
+
+
+    //熏蒸事件
+    public GeneralResponse getEventList(Map<String, Object> params1) throws ClientException {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Calendar c = Calendar.getInstance();
+        Date date = new Date();
+        c.setTime(date);
+        c.set(Calendar.HOUR, 0);
+        c.set(Calendar.MINUTE, 0);
+        c.set(Calendar.SECOND, 0);
+        Date A = c.getTime();
+        String formatA = format.format(A);
+        c.set(Calendar.HOUR, +24);
+        Date d = c.getTime();
+        String formatD = format.format(d);
+        Map<String, Object> params = new HashMap<>();
+        params.put("alarmStartDateString",formatA);
+        params.put("alarmEndDateString",formatD);
+        if (StringUtilsWork.isNotEmpty( (String) params1.get("alarmStartDateString"))){
+            params.put("alarmStartDateString",(String) params1.get("alarmStartDateString"));
+            params.put("alarmEndDateString",(String) params1.get("alarmEndDateString"));
+        }
+        params.put("pageNum",(Integer)params1.get("pageNum"));
+        params.put("pageSize",(Integer)params1.get("pageSize"));
+        params.put("alarmType",303);
+        params.put("dbType",0);
+        params.put("deviceCategory",1);
+        String[]  nodeCodeList= CommonConstant.XunZhengChannle;
+        params.put("nodeCodeList",nodeCodeList);
+        String URL = "/evo-apigw/evo-event/1.2.0/alarm-record/page";  //获取事件URL    post请求
+        IClient iClient = new DefaultClient();
+        GeneralRequest generalRequest = new GeneralRequest(URL, Method.POST);
+        generalRequest.header("Content-Type", " application/json");
+        generalRequest.body(JSON.toJSONString(params));
+        GeneralResponse generalResponse = iClient.doAction(generalRequest, generalRequest.getResponseClass());
+        return    generalResponse;
+    }
+
+
+    public String CountTimes(Map<String, Object> params1 ) throws ClientException {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Calendar c = Calendar.getInstance();
+        Date date = new Date();
+        c.setTime(date);
+        c.set(Calendar.HOUR, 0);
+        c.set(Calendar.MINUTE, 0);
+        c.set(Calendar.SECOND, 0);
+        Date A = c.getTime();
+        String formatA = format.format(A);
+        c.set(Calendar.HOUR, +24);
+        Date d = c.getTime();
+        String formatD = format.format(d);
+        Map<String, Object> params = new HashMap<>();
+        params.put("alarmStartDateString",formatA);
+        params.put("alarmEndDateString",formatD);
+        if (StringUtilsWork.isNotEmpty( (String) params1.get("alarmStartDateString"))){
+            params.put("alarmStartDateString", params1.get("alarmStartDateString"));
+            params.put("alarmEndDateString", params1.get("alarmEndDateString"));
+        }
+        params.put("alarmType",303);
+        params.put("dbType",0);
+        params.put("deviceCategory",1);
+        String[]  nodeCodeList= CommonConstant.XunZhengChannle;
+        params.put("nodeCodeList",nodeCodeList);
+        String URL = "/evo-apigw/evo-event/1.0.0/alarm-record/count-num";  //获取事件URL    post请求
+        IClient iClient = new DefaultClient();
+        GeneralRequest generalRequest = new GeneralRequest(URL, Method.POST);
+        generalRequest.header("Content-Type", " application/json");
+        generalRequest.body(JSON.toJSONString(params));
+        JSONObject jsonObject = JSONObject.fromObject(JSONObject.fromObject(iClient.doAction(generalRequest, generalRequest.getResponseClass()).getResult()).get("data"));
+        return jsonObject.get("value").toString();
+    }
+}
+

+ 3 - 0
huimv-farm-video/src/main/java/com/huimv/video/dhicc/icc/CommonConstant.java

@@ -9,6 +9,9 @@ public class CommonConstant {
     //大门的通道
     public static final String[] DoorChannle =  {"1003442$1$0$0"};
 
+    //熏蒸
+    public static final String[] XunZhengChannle =  {"1003444$1$0$0"};
+
 
     //洗消通道
     public static final String[] XixiaoChannle =  {"1002871$1$0$0","1002872$1$0$0","1002873$1$0$0"};

+ 0 - 1
huimv-farm-video/src/main/java/com/huimv/video/dhicc/timmer/SysTelcomEnentTimmer.java

@@ -9,7 +9,6 @@ import com.huimv.video.dhicc.mapper.SysTelecomEventMapper;
 import com.huimv.video.dhicc.mapper.SysTelecomMapper;
 import com.huimv.video.dhicc.mapper.SysThresholdMapper;
 import com.huimv.video.dhicc.service.ISysTelecomEventService;
-import jdk.jfr.Threshold;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;