Merge remote-tracking branch 'origin/master'

huimv-farm-gateway/src/main/resources/application-qingshan.yml

@@ -1,11 +1,17 @@
 server:
   port: 10060
+  tomcat:
+    accesslog:
+      condition-unless: 100ms
 
 spring:
   application:
     name: env-gateway
   cloud:
     gateway:
+      httpclient:
+        pool:
+          max-idle-time: 60000ms
       enabled: true
       routes:
         - id: admin

huimv-farm-gateway/src/main/resources/application.properties

@@ -1,4 +1,4 @@
 #spring.profiles.active=dev
-spring.profiles.active=lishui
-#spring.profiles.active=qingshan
+#spring.profiles.active=lishui
+spring.profiles.active=qingshan
 #spring.profiles.active=qingshan_1

huimv-farm-video/pom.xml

@@ -27,6 +27,8 @@
 			<version>1.0.8</version>
 			<scope>compile</scope>
 		</dependency>
+
+
 		<dependency>
 			<groupId>com.dahuatech.icc</groupId>
 			<artifactId>java-sdk-oauth</artifactId>

huimv-farm-video/src/main/java/com/huimv/video/HuimvVideoApplication.java

@@ -19,7 +19,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableScheduling
 @SpringBootApplication
 @MapperScan("com.huimv.video.*.mapper")
-@Import(InterceptorConfig.class)
+//@Import(InterceptorConfig.class)
 public class HuimvVideoApplication {
     public static void main(String[] args) {
         SpringApplication.run(HuimvVideoApplication.class, args);

huimv-farm-video/src/main/java/com/huimv/video/dhicc/controller/ClientController/ClientPersonManageController.java

@@ -233,7 +233,6 @@ public class ClientPersonManageController {
             return null;
         }
 
-
         IClient iClient = new DefaultClient();
         GeneralRequest generalRequest = new GeneralRequest("/evo-apigw/evo-brm/1.2.0/person/page", Method.POST);
         generalRequest.header("Content-Type", " application/json");

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

@@ -78,6 +78,19 @@ public class ClientXunZhengController {
         generalRequest.body(JSON.toJSONString(params));
         GeneralResponse generalResponse = iClient.doAction(generalRequest, generalRequest.getResponseClass());
         return generalResponse;
+
+        //# host
+        //icc.sdk.host=122.225.64.254:447
+        //# 客户端模式
+        //icc.sdk.clientId=huimv
+        //icc.sdk.clientSecret=xxx
+        //# 密码校验模式
+        //icc.sdk.pwdClientId=xxx
+        //icc.sdk.pwdClientSecret=xxx
+        //icc.sdk.username=
+        //icc.sdk.password=
+        //# 使用授权类型password
+        //icc.sdk.grantType=password
     }
 
 

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

@@ -66,22 +66,4 @@ public class CommonConstant {
     public static final Integer PAGE_SIZE = 20;
     public static final String PAGE_SIZE_STR = "20";
 
-
-    public static void main(String[] args) {
-
-        List<String> list = Arrays.asList(AllChannle);
-        ArrayList<String> strings = new ArrayList<>(list);
-        System.out.println(list.toString());
-
-
-        strings.removeAll(new ArrayList<>( Arrays.asList(XixiaoChannle)));
-        strings.removeAll( new ArrayList<>(Arrays.asList(DoorChannle)));
-        strings.removeAll( new ArrayList<>(Arrays.asList(XunZhengChannle)));
-        strings.removeAll( new ArrayList<>(Arrays.asList(SIZhuChannle)));
-        System.out.println(strings.toString());
-    }
-
-
-
-
 }

huimv-farm-video/src/main/java/com/huimv/video/video/controller/CameraController.java

@@ -112,5 +112,11 @@ public class CameraController {
         return cameraService.screenCamera(farmId);
     }
 
+    @GetMapping("/saveCamera")
+    private Result saveCamera(@RequestParam(name = "farmId") Integer farmId) {
+
+        return cameraService.saveCamera(farmId);
+    }
+
 
 }

huimv-farm-video/src/main/java/com/huimv/video/video/service/ICameraService.java

@@ -40,4 +40,6 @@ public interface ICameraService extends IService<Camera> {
     Result screenCamera(Integer farmId);
 
     List getCameraDetails2(CameraListsVo cameraListsVo);
+
+    Result saveCamera(Integer farmId);
 }

huimv-farm-video/src/main/java/com/huimv/video/video/service/impl/CameraServiceImpl.java

@@ -3,6 +3,8 @@ package com.huimv.video.video.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.poi.excel.ExcelReader;
+import cn.hutool.poi.excel.ExcelUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -408,6 +410,22 @@ public class CameraServiceImpl extends ServiceImpl<CameraMapper, Camera> impleme
         return cameraDetailsList;
     }
 
+    @Override
+    public Result saveCamera(Integer farmId) {
+        ExcelReader reader = ExcelUtil.getReader("G:/test/test1.xlsx");
+        List<Camera> all = reader.readAll(Camera.class);
+        for (Camera camera : all) {
+           camera.setAccount("admin");
+           camera.setPassword("hmkj6688");
+           camera.setBrandName("大华");
+           camera.setBrandId(18);
+           camera.setAttention(0);
+           camera.setFarmId(22);
+           this.save(camera);
+            System.out.println(camera.getCameraIp());
+        }
+        return null;
+    }
 
 
     @Override

huimv-farm-video/src/main/resources/config/iccSdk.properties

@@ -27,4 +27,6 @@ icc.sdk.pwdClientSecret=1653d6c9-c611-4827-ac87-0bfd48deadd4
 icc.sdk.username=system
 icc.sdk.password=admin123.
 # ʹÓÃÊÚȨÀàÐÍpassword,client_credentials
-icc.sdk.grantType=password
+icc.sdk.grantType=password
+
+#º£Äþ