洗消

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

@@ -77,7 +77,9 @@ public class CommonConstant {
     //1.1.3熏蒸
     public static final String[] Sg_XunZhengChannle = {"1003444$1$0$0"};
     //1.1.4卖猪
-    public static final String[] Sh_MaiZhuChannle = {"1002873$1$0$0"};
+    public static final String[] Sg_MaiZhuChannle = {"1002873$1$0$0"};
+    //1.1.5洗消通道
+    public static final String[] Sg_XiXiaoChannle = {"1002871$1$0$0", "1002872$1$0$0", "1002873$1$0$0"};
     //档案图片
     public static final String Sg_Document_Oss_Addr = "172.16.3.223:9876";
     //事件图片

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/controller/ClientXunZhengControllerTest.java

@@ -35,9 +35,6 @@ public class ClientXunZhengControllerTest {
             System.out.println("曙光");
             XunZhengRequestSg requestSg = new XunZhengRequestSg(oauthConfigBaseInfo);
             Token token = requestSg.getToken();
-
-            System.out.println(token);
-            System.out.println(token.getAccess_token());
             requestSg.setEventType(xunZhengRequestSg.getEventType());
             requestSg.setPageNum(xunZhengRequestSg.getPageNum());
             requestSg.setPageSize(xunZhengRequestSg.getPageSize());

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/controller/VideoRecorControllerSg.java

@@ -37,11 +37,6 @@ import java.util.Map;
 public class VideoRecorControllerSg {
 
     @Autowired
-    private IIccChannelService iIccChannelService;
-
-    @Autowired
-    private IccChannelMapper iccChannelMapper;
-    @Autowired
     private OauthConfigBaseInfo oauthConfigBaseInfo;
     @Autowired
     private OauthConfigBaseInfo02 oauthConfigBaseInfo02;
@@ -85,7 +80,7 @@ public class VideoRecorControllerSg {
             Object jsonObject1 = requestSg.doAction();
             System.out.println(jsonObject1);
             return R.ok().put("data",jsonObject1);
-        } else if ("2".equals(farmId)) {
+        } else if ("22".equals(farmId)) {
             System.out.println("海宁");
             VideoRecordRequestHn requestHn = new VideoRecordRequestHn(oauthConfigBaseInfo02);
             requestHn.setClientMac("30:9c:23:79:40:08");
@@ -96,7 +91,7 @@ public class VideoRecorControllerSg {
             Object jsonObject1 = requestHn.doAction();
             System.out.println(jsonObject1);
             return R.ok().put("data",jsonObject1);
-        } else {
+        } else if ("21".equals(farmId)){
             System.out.println("苍南");
             VideoRecordRequestCn requestCn = new VideoRecordRequestCn(oauthConfigBaseInfo03);
             requestCn.setClientMac("30:9c:23:79:40:08");
@@ -107,6 +102,8 @@ public class VideoRecorControllerSg {
             Object jsonObject1 = requestCn.doAction();
             System.out.println(jsonObject1);
             return R.ok().put("data",jsonObject1);
+        }else {
+            return R.error();
         }
 
     }

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/XunZhengRequest/Cn/XunZhengCountRequestCn.java

@@ -61,8 +61,10 @@ public class XunZhengCountRequestCn extends BaseRequest03 {
             map.put("nodeCodeList", CommonConstant.Sg_DoorChannle);
         }else if (this.eventType == 3){
             map.put("nodeCodeList", CommonConstant.Sg_XunZhengChannle);
+        }else if (this.eventType == 4){
+            map.put("nodeCodeList", CommonConstant.Sg_MaiZhuChannle);
         }else {
-            map.put("nodeCodeList", CommonConstant.Sh_MaiZhuChannle);
+            map.put("nodeCodeList", CommonConstant.Sg_XiXiaoChannle);
         }
         this.setBody(JSON.toJSONString(map));
 

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/XunZhengRequest/Cn/XunZhengRequestCn.java

@@ -70,8 +70,10 @@ public class XunZhengRequestCn extends BaseRequest03 {
             map.put("nodeCodeList", CommonConstant.Sg_DoorChannle);
         }else if (this.eventType == 3){
             map.put("nodeCodeList", CommonConstant.Sg_XunZhengChannle);
+        }else if (this.eventType == 4){
+            map.put("nodeCodeList", CommonConstant.Sg_MaiZhuChannle);
         }else {
-            map.put("nodeCodeList", CommonConstant.Sh_MaiZhuChannle);
+            map.put("nodeCodeList", CommonConstant.Sg_XiXiaoChannle);
         }
         this.setBody(JSON.toJSONString(map));
 

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/XunZhengRequest/Hn/XunZhengCountRequestHn.java

@@ -61,8 +61,10 @@ public class XunZhengCountRequestHn extends BaseRequest02 {
             map.put("nodeCodeList", CommonConstant.Sg_DoorChannle);
         }else if (this.eventType == 3){
             map.put("nodeCodeList", CommonConstant.Sg_XunZhengChannle);
+        }else if (this.eventType == 4){
+            map.put("nodeCodeList", CommonConstant.Sg_MaiZhuChannle);
         }else {
-            map.put("nodeCodeList", CommonConstant.Sh_MaiZhuChannle);
+            map.put("nodeCodeList", CommonConstant.Sg_XiXiaoChannle);
         }
         this.setBody(JSON.toJSONString(map));
 

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/XunZhengRequest/Hn/XunZhengRequestHn.java

@@ -68,8 +68,10 @@ public class XunZhengRequestHn extends BaseRequest02 {
             map.put("nodeCodeList", CommonConstant.Sg_DoorChannle);
         }else if (this.eventType == 3){
             map.put("nodeCodeList", CommonConstant.Sg_XunZhengChannle);
+        }else if (this.eventType == 4){
+            map.put("nodeCodeList", CommonConstant.Sg_MaiZhuChannle);
         }else {
-            map.put("nodeCodeList", CommonConstant.Sh_MaiZhuChannle);
+            map.put("nodeCodeList", CommonConstant.Sg_XiXiaoChannle);
         }
         this.setBody(JSON.toJSONString(map));
 

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/XunZhengRequest/Sg/XunZhengCountRequestSg.java

@@ -59,8 +59,10 @@ public class XunZhengCountRequestSg extends BaseRequest {
             map.put("nodeCodeList", CommonConstant.Sg_DoorChannle);
         }else if (this.eventType == 3){
             map.put("nodeCodeList", CommonConstant.Sg_XunZhengChannle);
+        }else if (this.eventType == 4){
+            map.put("nodeCodeList", CommonConstant.Sg_MaiZhuChannle);
         }else {
-            map.put("nodeCodeList", CommonConstant.Sh_MaiZhuChannle);
+            map.put("nodeCodeList", CommonConstant.Sg_XiXiaoChannle);
         }
         this.setBody(JSON.toJSONString(map));
 

huimv-farm-video/src/main/java/com/huimv/video/dhicc/test/request/XunZhengRequest/Sg/XunZhengRequestSg.java

@@ -66,8 +66,10 @@ public class XunZhengRequestSg extends BaseRequest {
             map.put("nodeCodeList", CommonConstant.Sg_DoorChannle);
         }else if (this.eventType == 3){
             map.put("nodeCodeList", CommonConstant.Sg_XunZhengChannle);
+        }else if (this.eventType == 4){
+            map.put("nodeCodeList", CommonConstant.Sg_MaiZhuChannle);
         }else {
-            map.put("nodeCodeList", CommonConstant.Sh_MaiZhuChannle);
+            map.put("nodeCodeList", CommonConstant.Sg_XiXiaoChannle);
         }
         this.setBody(JSON.toJSONString(map));