Переглянути джерело

将海康相关配置信息提取到配置文件中

dzx 1 рік тому
батько
коміт
d76c8db91c

+ 26 - 0
src/main/java/com/xjrsoft/config/HikvisionConfig.java

@@ -0,0 +1,26 @@
+package com.xjrsoft.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author: dzx
+ * @Date: 2024年5月30日
+ */
+@Data
+@Component
+@ConfigurationProperties("xjrsoft.hikvision")
+public class HikvisionConfig {
+
+    private String host;
+
+    private String appKey;
+
+    private String appSecret;
+
+    private String peopleUrl;
+
+    private String carUrl;
+
+}

+ 0 - 1
src/main/java/com/xjrsoft/module/attendance/controller/TeacherStatisticsController.java

@@ -114,7 +114,6 @@ public class TeacherStatisticsController {
                     }else{
                         record.setStatus("缺勤");
                     }
-
                 }
             }
         }

+ 3 - 1
src/main/java/com/xjrsoft/module/hikvision/util/EventController.java

@@ -7,6 +7,7 @@ import com.google.gson.JsonObject;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.DatasourceUtil;
+import com.xjrsoft.config.HikvisionConfig;
 import com.xjrsoft.module.system.controller.AuthorizeController;
 import com.xjrsoft.module.teacher.mapper.FaceImportMapper;
 import io.swagger.annotations.Api;
@@ -35,6 +36,7 @@ public class EventController {
     DataSource datasource = DatasourceUtil.getDataSource(GlobalConstant.DEFAULT_DATASOURCE_KEY);
     private final Db use = Db.use(datasource);
     private final FaceImportMapper faceImportMapper;
+    private final HikvisionConfig hikvisionConfig;
 
     @PostMapping("/receiveCar")
     @ApiOperation(value = "接收车辆事件")
@@ -78,7 +80,7 @@ public class EventController {
         eventList.add(196893); //人脸匹配
 //        eventList.add(771760131); //正常过车
 //        eventList.add(771760134);
-        paramJson.addProperty("eventDest", "http://ff.cf.yingcaibx.com/event/receivePeople");
+        paramJson.addProperty("eventDest", hikvisionConfig.getPeopleUrl());
 //******************************************************************
         paramJson.add("eventTypes", eventList);
 

+ 6 - 0
src/main/resources/application-dev.yml

@@ -141,6 +141,12 @@ xjrsoft:
   ureport:
     account: xjrsoft
     password: 123456
+  hikvision:
+    host: 219.153.208.43:30443
+    appKey: 21350095
+    appSecret: LXi9rE2fm8IfRoLnTA2G
+    people-url: http://ff.cf.yingcaibx.com/event/receivePeople
+    car-url: http://ff.cf.yingcaibx.com/event/receive
   keycloak:
     url: http://192.168.0.221:12829/auth/
     realm: test

+ 6 - 0
src/main/resources/application-pre.yml

@@ -125,6 +125,12 @@ xjrsoft:
   ureport:
     account: xjrsoft
     password: 123456
+  hikvision:
+    host: 219.153.208.43:30443
+    appKey: 21350095
+    appSecret: LXi9rE2fm8IfRoLnTA2G
+    people-url: http://ff.cf.yingcaibx.com/event/receivePeople
+    car-url: http://ff.cf.yingcaibx.com/event/receive
   keycloak:
     url: http://192.168.0.221:12829/auth/
     realm: test

+ 6 - 0
src/main/resources/application-prod.yml

@@ -121,6 +121,12 @@ xjrsoft:
   ureport:
     account: xjrsoft
     password: 123456
+  hikvision:
+    host: 219.153.208.43:30443
+    appKey: 21350095
+    appSecret: LXi9rE2fm8IfRoLnTA2G
+    people-url: https://zhxy.cqtlzjzx.com/event/receivePeople
+    car-url: https://zhxy.cqtlzjzx.com/event/receive
   keycloak:
     url: http://192.168.0.221:12829/auth/
     realm: test