Browse Source

新增大屏人员异常正常接口

yang 3 years ago
parent
commit
b70e464f1e

+ 0 - 1
huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/dhicc/newcontroller/CarManageController.java

@@ -35,7 +35,6 @@ public class CarManageController {
             System.out.println(newUrl);
             //这种已经在配置文件里面安排了账号ip以及密码    现在变了
             GeneralRequest generalRequest = new GeneralRequest(newUrl, Method.GET);
-            //generalRequest.header("Content-Type", " application/json");
             GeneralResponse generalResponse = iClient.doAction(generalRequest, generalRequest.getResponseClass());
             System.out.println("执行结束");
             return generalResponse;

+ 0 - 22
huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/dhicc/screen/ScreenHongGnaController.java

@@ -1,22 +0,0 @@
-package com.huimv.produce.dhicc.screen;
-
-
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/screen/car")
-@CrossOrigin
-public class ScreenHongGnaController {
-
-
-
-
-
-
-
-
-
-
-}

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

@@ -106,6 +106,40 @@ public class ScreenPersonController {
         return  R.ok("请求成功").put("data", result );
     }
 
+
+    @RequestMapping("/count_person_record_fail_success")
+    public  R  count_person_record_fail_success(HttpServletRequest request ) throws ClientException, ParseException {
+        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);
+        Date A = c.getTime();
+        String formatA = format.format(A);
+
+        c.add(Calendar.DATE, -1);
+        Date B = c.getTime();
+        String formatB = format.format(B);
+
+        System.out.println(formatA+formatB);
+
+
+
+        Map map1  = new HashMap();
+        map1.put("value1",getResponse.SendMassageGetPagePerson( formatB , formatA ));
+        map1.put("value2",getResponse.SendMassageGetPagePersonAlarm( formatB , formatA));
+
+        System.out.println();
+        return  R.ok("请求成功").put("data", map1 );
+
+    }
+
+
     public String splitTimeByHoure(Date date) throws ParseException {
         SimpleDateFormat df = new SimpleDateFormat("HH:mm");//设置日期格式,这里只取出小时和分钟
         String format = df.format(date);