大门事件

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/HuimvProduceWarningApplication.java

@@ -15,7 +15,6 @@ public class HuimvProduceWarningApplication {
 
     public static void main(String[] args) {
       SpringApplication.run(HuimvProduceWarningApplication.class, args);
-//        applicationContext.getBean(SocketServer.class).startSocketServer();
     }
 
 }

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/dhicc/screen/ScreenCarController.java

@@ -16,39 +16,9 @@ import com.huimv.produce.dhicc.result.R;
 @RestController
 @RequestMapping("/screen/car")
 
-//没有连接ICC的数据库  所以操作比较麻烦
+//没有连接ICC的数据库 所以操作比较麻烦
 public class ScreenCarController {
 
-/*
-    @RequestMapping("/CountCarPassNumber")
-    public  R  ddgetCarRecord(HttpServletRequest request ) throws ClientException {
-        GetResponse getResponse = new GetResponse();
-        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_OF_DAY, 0);
-        c.set(Calendar.MINUTE, 0);
-        c.set(Calendar.SECOND, 0);
-
-        c.add(Calendar.DATE, +1);
-
-
-
-
-
-
-
-
-        Collections.reverse(result);
-        return  R.ok("请求成功").put("data", result );
-
-    }*/
-
-
-
-
-
 
     //过车的数据//这个是车辆闸机的过车数据
     /**

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/dhicc/screen/ScreenIndexDataController.java

@@ -0,0 +1,64 @@
+package com.huimv.produce.dhicc.screen;
+
+
+import com.dahuatech.icc.exception.ClientException;
+import com.huimv.produce.dhicc.result.R;
+import com.huimv.produce.dhicc.util.GetResponse;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+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("/screen/index")
+public class ScreenIndexDataController {
+
+ //返回大屏首页的数据
+    @RequestMapping("/dataList")
+    public R  indexDataList(HttpServletRequest request ) throws ClientException, ParseException {
+        GetResponse getResponse = new GetResponse();
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+         Map map  = new HashMap<>();
+             Calendar c = Calendar.getInstance();
+             Date date = new Date();
+             c.setTime(date);
+             c.set(Calendar.HOUR_OF_DAY, 0);
+             c.set(Calendar.MINUTE, 0);
+             c.set(Calendar.SECOND, 0);
+
+             c.add(Calendar.DATE, +1);
+             Date A = c.getTime();
+             String formatA = format.format(A);
+
+             c.add(Calendar.DATE, -1);
+             Date B = c.getTime();
+             String formatB = format.format(B);
+
+             c.add(Calendar.DATE, -6);
+             Date C = c.getTime();
+             String formatC = format.format(C);
+
+             System.out.println(formatA+formatB);
+             map.put("personPassSuccess",getResponse.SendMassageGetPagePerson( formatB , formatA ));
+             map.put("personPassFail",getResponse.SendMassageGetPagePersonAlarm( formatB , formatA));
+             map.put("carPassOut",getResponse.SendMassageCarOut( formatB , formatA));
+             map.put("carPassIn",getResponse.SendMassageCarIn( formatB , formatA));
+             map.put("tadaySiZhu",getResponse.SendCountSiZhu( formatB , formatA));
+             map.put("SevenDaySiZhu",getResponse.SendCountSiZhu( formatC , formatA));
+             map.put("tadayXiXiao",getResponse.SendMassageXixiaoPerson(formatB , formatA));
+             map.put("SevenDayXIxiao",getResponse.SendMassageXixiaoPerson(formatC , formatA));
+             map.put("SevenDayGate",getResponse.SendMassageGateCount(formatC , formatA));
+             map.put("tadayGate",getResponse.SendMassageGateCount(formatB, formatA));
+
+         //车分一下  进和出
+        return  R.ok("请求成功").put("data", map );
+
+    }
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/dhicc/screen/ScreenPersonController.java

@@ -16,7 +16,6 @@ import com.huimv.produce.dhicc.result.R;
 
 @RestController
 @RequestMapping("/screen/person")
-
 public class ScreenPersonController {
 
     @RequestMapping("/count_person_record")
@@ -106,6 +105,7 @@ public class ScreenPersonController {
     }
 
 
+     //人员正常通行与异常通行的数据
     @RequestMapping("/count_person_record_fail_success")
     public  R  count_person_record_fail_success(HttpServletRequest request ) throws ClientException, ParseException {
         GetResponse getResponse = new GetResponse();
@@ -127,8 +127,6 @@ public class ScreenPersonController {
 
         System.out.println(formatA+formatB);
 
-
-
         Map map1  = new HashMap();
         map1.put("value1",getResponse.SendMassageGetPagePerson( formatB , formatA ));
         map1.put("value2",getResponse.SendMassageGetPagePersonAlarm( formatB , formatA));

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/dhicc/screen/ScreenSiZhuController.java

@@ -60,19 +60,6 @@ public class ScreenSiZhuController {
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
          //过去七天的值
         public String getPastSevenDay(  ) throws ClientException {
             GetResponse getResponse = new GetResponse();
@@ -92,9 +79,9 @@ public class ScreenSiZhuController {
             return  getResponse.SendMassageXixiaoPerson(formatB, formatA);
         }
 
+
          //今天的数据
          public String getDay() throws ClientException {
-
              GetResponse getResponse = new GetResponse();
              SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
              Calendar c = Calendar.getInstance();
@@ -111,6 +98,8 @@ public class ScreenSiZhuController {
              String formatB = format.format(B);
              return  getResponse.SendMassageXixiaoPerson(formatB, formatA);
          }
+
+
              //最新一条的数据
              public String getLatestOne( ) throws ClientException {
                  SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -216,7 +205,7 @@ public class ScreenSiZhuController {
 
 
 
-    //最新一条的数据
+    //返回所有的死猪事件
     public GeneralResponse getSiZhuList( ) throws ClientException {
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Calendar c = Calendar.getInstance();

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/dhicc/util/GetResponse.java

@@ -9,6 +9,9 @@ import com.dahuatech.icc.oauth.model.v202010.GeneralRequest;
 import com.dahuatech.icc.oauth.model.v202010.GeneralResponse;
 import net.sf.json.JSONObject;
 import com.huimv.produce.dhicc.result.R;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -16,8 +19,10 @@ import java.util.Map;
 public class GetResponse {
 
 
+
+
     /**
-     *  //查车辆过去七天的接口
+     *  //查车辆通行数量的接口**不分进出
      * @param begin  开始时间
      * @param end  结束时间
      * @return
@@ -41,6 +46,61 @@ public class GetResponse {
 
     }
 
+    /**
+     *  //查车辆通行数量的接口**出去记录
+     * @param begin  开始时间
+     * @param end  结束时间
+     * @return
+     * @throws ClientException
+     */
+    public String SendMassageCarOut(String begin, String end  ) throws ClientException {
+        String param = "queryTimeBegin=" + begin + "&queryTimeEnd=" + end+"&carDirect=9";
+        String Url = "/evo-apigw/ipms/carcapture/find/conditions?";
+        IClient iClient = new DefaultClient();
+        System.out.println("开始执行");
+        String newUrl = Url + param;
+        System.out.println(newUrl);
+        GeneralRequest generalRequest = new GeneralRequest(newUrl, Method.GET);
+        GeneralResponse generalResponse = iClient.doAction(generalRequest, generalRequest.getResponseClass());
+        System.out.println("执行结束");
+        JSONObject jsonObject = JSONObject.fromObject(generalResponse.getResult());
+        Object data = jsonObject.get("data");
+        JSONObject   bject = JSONObject.fromObject(data);
+        Object data1 = bject.get("totalRows"); //打印 2390
+        return data1.toString();
+
+    }
+
+
+
+    /**
+     *  //查车辆通行数量的接口**进入的记录
+     * @param begin  开始时间
+     * @param end  结束时间
+     * @return
+     * @throws ClientException
+     */
+    public String SendMassageCarIn(String begin, String end  ) throws ClientException {
+        String param = "queryTimeBegin=" + begin + "&queryTimeEnd=" + end+"&carDirect=8";
+        String Url = "/evo-apigw/ipms/carcapture/find/conditions?";
+        IClient iClient = new DefaultClient();
+        System.out.println("开始执行");
+        String newUrl = Url + param;
+        System.out.println(newUrl);
+        GeneralRequest generalRequest = new GeneralRequest(newUrl, Method.GET);
+        GeneralResponse generalResponse = iClient.doAction(generalRequest, generalRequest.getResponseClass());
+        System.out.println("执行结束");
+        JSONObject jsonObject = JSONObject.fromObject(generalResponse.getResult());
+        Object data = jsonObject.get("data");
+        JSONObject   bject = JSONObject.fromObject(data);
+        Object data1 = bject.get("totalRows"); //打印 2390
+        return data1.toString();
+
+    }
+
+
+
+
 
 
 
@@ -124,7 +184,7 @@ public class GetResponse {
 
 
     /**
-     *  //查洗消时间次数的接口-----
+     *  //查洗消 ---时间次数的接口-----
      * @param begin   开始时间
      * @param end     结束时间
      * @return
@@ -141,7 +201,45 @@ public class GetResponse {
         nodeCodeList[0]=     "1002871$1$0$0"    ;
         nodeCodeList[1]=   "1002872$1$0$0"      ;
         nodeCodeList[2]=    "1002873$1$0$0"     ;
+        params.put("nodeCodeList",nodeCodeList);
+        String URL = "/evo-apigw/evo-event/1.0.0/alarm-record/count-num";  //获取事件URL    post请求
+        IClient iClient = new DefaultClient();
+        String NewUrl = URL ;
+        System.out.println("开始执行");
+        //这种已经在配置文件里面安排了账号ip以及密码
+        GeneralRequest generalRequest = new GeneralRequest(NewUrl, Method.POST);
+        System.out.println(NewUrl);
+        generalRequest.header("Content-Type", " application/json");
+        System.out.println(JSON.toJSONString(params));
+        //里面是
+        generalRequest.body(JSON.toJSONString(params));
+        //发起请求处理应答
+        GeneralResponse generalResponse = iClient.doAction(generalRequest, generalRequest.getResponseClass());
+        System.out.println("执行结束");
+        JSONObject jsonObject = JSONObject.fromObject(generalResponse.getResult());
+        Object data = jsonObject.get("data");
+        JSONObject jsonObject1 = JSONObject.fromObject(data);
+        System.out.println(jsonObject1);
+        return jsonObject1.get("value").toString();
+    }
+
 
+    /**
+     *  //查大门 ---时间次数的接口-----
+     * @param begin   开始时间
+     * @param end     结束时间
+     * @return
+     * @throws ClientException
+     */
+    public String SendMassageGateCount(String begin, String end  ) throws ClientException {
+        Map<String, Object> params = new HashMap<>();
+        params.put("alarmStartDateString",begin);
+        params.put("alarmEndDateString",end);
+        params.put("alarmType",303);
+        params.put("dbType",0);
+        params.put("deviceCategory",1);
+        String[]  nodeCodeList=  new String[1];
+        nodeCodeList[0]="1003442$1$0$0";
         params.put("nodeCodeList",nodeCodeList);
         String URL = "/evo-apigw/evo-event/1.0.0/alarm-record/count-num";  //获取事件URL    post请求
         IClient iClient = new DefaultClient();
@@ -168,6 +266,131 @@ public class GetResponse {
 
 
     /**
+     *  //查死猪 ---时间次数的接口-----
+     * @param begin   开始时间
+     * @param end     结束时间
+     * @return
+     * @throws ClientException
+     */
+    public String SendCountSiZhu(String begin, String end  ) throws ClientException {
+        Map<String, Object> params = new HashMap<>();
+        params.put("alarmStartDateString",begin);
+        params.put("alarmEndDateString",end);
+        params.put("alarmType",303);
+        params.put("dbType",0);
+        params.put("deviceCategory",1);
+        String[]  nodeCodeList=  new String[64];
+        nodeCodeList[0]="1002874$1$0$0"    ;
+        nodeCodeList[1]="1002875$1$0$0"      ;
+        nodeCodeList[0]="1002876$1$0$0"     ;
+        nodeCodeList[0]="1002877$1$0$0"       ;
+        nodeCodeList[0]="1002878$1$0$0"      ;
+        nodeCodeList[0]="1002879$1$0$0"     ;
+        nodeCodeList[0]="1002880$1$0$0"      ;
+        nodeCodeList[0]="1002881$1$0$0"      ;
+        nodeCodeList[0]="1002882$1$0$0"     ;
+        nodeCodeList[0]="1002883$1$0$0"    ;
+        nodeCodeList[10]="1002884$1$0$0"   ;
+        nodeCodeList[11]="1002885$1$0$0"   ;
+        nodeCodeList[12]="1002886$1$0$0"      ;
+        nodeCodeList[13]="1002887$1$0$0"     ;
+        nodeCodeList[14]="1002888$1$0$0"     ;
+        nodeCodeList[15]="1002889$1$0$0"   ;
+        nodeCodeList[16]="1002890$1$0$0"   ;
+        nodeCodeList[17]="1002891$1$0$0"   ;
+        nodeCodeList[18]="1002892$1$0$0"   ;
+        nodeCodeList[19]="1002893$1$0$0"     ;
+        nodeCodeList[20]="1002894$1$0$0"     ;
+        nodeCodeList[21]="1002895$1$0$0"    ;
+        nodeCodeList[22]="1002896$1$0$0"      ;
+        nodeCodeList[23]="1002897$1$0$0"      ;
+        nodeCodeList[24]="1002898$1$0$0"   ;
+        nodeCodeList[25]="1002899$1$0$0"     ;
+        nodeCodeList[26]="1002900$1$0$0"      ;
+        nodeCodeList[27]= "1002901$1$0$0"     ;
+        nodeCodeList[28]="1002902$1$0$0"       ;
+        nodeCodeList[29]="1002903$1$0$0"     ;
+        nodeCodeList[30]="1002904$1$0$0"     ;
+        nodeCodeList[31]="1002905$1$0$0"    ;
+        nodeCodeList[32]="1002906$1$0$0"     ;
+        nodeCodeList[33]="1002907$1$0$0"     ;
+        nodeCodeList[34]="1002908$1$0$0"     ;
+        nodeCodeList[35]="1002909$1$0$0"    ;
+        nodeCodeList[36]="1002910$1$0$0"     ;
+        nodeCodeList[37]="1002911$1$0$0"    ;
+        nodeCodeList[38]="1002912$1$0$0"    ;
+        nodeCodeList[39]="1002913$1$0$0"    ;
+        nodeCodeList[40]="1002939$1$0$0"     ;
+        nodeCodeList[41]="1002939$1$0$1"   ;
+        nodeCodeList[42]="1002939$1$0$2"   ;
+        nodeCodeList[43]="1002939$1$0$3"    ;
+        nodeCodeList[44]="1002939$1$0$4"    ;
+        nodeCodeList[45]="1002939$1$0$5"     ;
+        nodeCodeList[46]="1002939$1$0$6"      ;
+        nodeCodeList[47]="1002939$1$0$7"   ;
+        nodeCodeList[48]="1002939$1$0$8"   ;
+        nodeCodeList[49]="1002939$1$0$9"    ;
+        nodeCodeList[50]="1002940$1$0$0"     ;
+        nodeCodeList[51]="1002940$1$0$1"   ;
+        nodeCodeList[52]="1002940$1$0$2";
+        nodeCodeList[53]="1002940$1$0$3";
+        nodeCodeList[54]="1002940$1$0$4";
+        nodeCodeList[55]="1002940$1$0$5";
+        nodeCodeList[56]="1002940$1$0$6";
+        nodeCodeList[57]="1002940$1$0$7";
+        nodeCodeList[58]="1002939$1$0$10";
+        nodeCodeList[59]="1002939$1$0$11";
+        nodeCodeList[60]="1002939$1$0$12";
+        nodeCodeList[61]="1002939$1$0$13";
+        nodeCodeList[62]="1002939$1$0$14";
+        nodeCodeList[63]="1002939$1$0$15";
+
+        params.put("nodeCodeList",nodeCodeList);
+        String URL = "/evo-apigw/evo-event/1.0.0/alarm-record/count-num";  //获取事件URL    post请求
+        IClient iClient = new DefaultClient();
+        String NewUrl = URL ;
+        System.out.println("开始执行");
+        //这种已经在配置文件里面安排了账号ip以及密码
+        GeneralRequest generalRequest = new GeneralRequest(NewUrl, Method.POST);
+        System.out.println(NewUrl);
+        generalRequest.header("Content-Type", " application/json");
+        System.out.println(JSON.toJSONString(params));
+        //里面是
+        generalRequest.body(JSON.toJSONString(params));
+        //发起请求处理应答
+        GeneralResponse generalResponse = iClient.doAction(generalRequest, generalRequest.getResponseClass());
+        System.out.println("执行结束");
+        JSONObject jsonObject = JSONObject.fromObject(generalResponse.getResult());
+        Object data = jsonObject.get("data");
+        JSONObject jsonObject1 = JSONObject.fromObject(data);
+        System.out.println(jsonObject1);
+        return jsonObject1.get("value").toString();
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    /**
      *  //查洗消时间次数的接口-----
      * @param begin   开始时间
      * @param end     结束时间

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/FBoxSignalRConnection.java

@@ -9,12 +9,12 @@ import com.huimv.produce.sgd.fbox.Logger;
 import com.huimv.produce.sgd.fbox.LoggerFactory;
 import com.huimv.produce.sgd.fbox.TokenManager;
 import com.huimv.produce.sgd.fbox.signalr.SignalRConnectionBase;
-
 import java.net.Proxy;
 import java.text.SimpleDateFormat;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.LongAdder;
 
+
 public class FBoxSignalRConnection extends SignalRConnectionBase {
     private final Gson gson;
     private final Logger logger;

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/timer/SgdTimer.java

@@ -121,8 +121,6 @@ public class SgdTimer {
         }
 
     }*//*
-
-
     //更新环境数据
     @Scheduled(cron = "0 0/30 * * * ?")
 //    @Scheduled(cron = "0 * * * * ?")
@@ -500,10 +498,7 @@ public class SgdTimer {
         ServerCaller apiBaseServer = new ServerCaller(tokenManager, Global.apiBaserUrl, Global.signalrClientId, loggerFactory);
         Global.apiBaseServer = apiBaseServer;
         DecimalFormat df = new DecimalFormat("#.00");
-
-
         try {
-
             List<BaseBox> boxes = baseBoxService.list();
             for (BaseBox box : boxes) {
                 String uid = box.getUid();
@@ -519,8 +514,6 @@ public class SgdTimer {
                         }
                     }
                 }
-
-
                 if (ObjectUtil.isNotEmpty(names)) {
                     MonitoryValue[] monitoryValues = apiBaseServer.executePost("/v2/box/" +uid + "/dmon/value/get", new MonitoryGetArgs(names, null, new ArrayList()), MonitoryValue[].class);
                     List<SysMonthWater> dayWatersList = new ArrayList();

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/timer/SysTelcomEnentTimmer.java

@@ -38,7 +38,7 @@ public class SysTelcomEnentTimmer {
            for (String deviceId : collect) {
                Calendar TimeDeviceId = Calendar.getInstance();
                TimeDeviceId.setTime(new Date());
-               TimeDeviceId.add(Calendar.HOUR, -20);
+               TimeDeviceId.add(Calendar.HOUR, -3);
                Date began1time = TimeDeviceId.getTime();
                String startTime1 = format.format(began1time);
                String endTime1 = format.format(new Date());