From bfd87d12adb1d511334cd91cf6c7ff3608fae8b9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 09 十月 2024 16:30:38 +0800
Subject: [PATCH] 最新版本
---
server/visits/admin_timer/src/main/resources/bootstrap.yml | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncInitConfigServiceImpl.java | 6 -
server/system_gateway/src/main/resources/bootstrap.yml | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncImgServiceImpl.java | 13 +++-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InitServiceImpl.java | 2
server/system_timer/src/main/resources/bootstrap.yml | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java | 13 +---
admin/src/views/business/platformEvent.vue | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 3 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java | 8 ++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 52 +++++++++-------
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java | 16 +++++
13 files changed, 77 insertions(+), 46 deletions(-)
diff --git a/admin/src/views/business/platformEvent.vue b/admin/src/views/business/platformEvent.vue
index d0b6bc8..2d61009 100644
--- a/admin/src/views/business/platformEvent.vue
+++ b/admin/src/views/business/platformEvent.vue
@@ -1,5 +1,5 @@
<template>
- <TableLayout :permissions="['business:interfacelog:query']">
+ <TableLayout :permissions="['business:platformevent:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
<el-form-item label="" prop="platformName">
diff --git a/server/system_gateway/src/main/resources/bootstrap.yml b/server/system_gateway/src/main/resources/bootstrap.yml
index 8ecd0a5..099da4a 100644
--- a/server/system_gateway/src/main/resources/bootstrap.yml
+++ b/server/system_gateway/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: dev
+ active: pro
application:
name: system_gateway
# 瀹夊叏閰嶇疆
diff --git a/server/system_timer/src/main/resources/bootstrap.yml b/server/system_timer/src/main/resources/bootstrap.yml
index 107b53b..05a83ce 100644
--- a/server/system_timer/src/main/resources/bootstrap.yml
+++ b/server/system_timer/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: dev
+ active: pro
application:
name: systemTimer
# 瀹夊叏閰嶇疆
diff --git a/server/visits/admin_timer/src/main/resources/bootstrap.yml b/server/visits/admin_timer/src/main/resources/bootstrap.yml
index efae338..b5b65b7 100644
--- a/server/visits/admin_timer/src/main/resources/bootstrap.yml
+++ b/server/visits/admin_timer/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: dev
+ active: pro
application:
name: visitsTimer
# 瀹夊叏閰嶇疆
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java
index 9b9ea96..d76042c 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java
@@ -50,6 +50,8 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@Autowired
+ private HkSyncImgServiceImpl hkSyncImgService;
+ @Autowired
private DeviceService deviceService;
@ApiOperation("銆愭捣搴枫�戞祴璇昄ED鏄剧ず灞�")
@@ -98,6 +100,20 @@
public ApiResponse<BaseResponse> testBroadcast(@RequestBody CustomBroadcastRequest request, HttpServletResponse response) {
return ApiResponse.success( HKService.customBroadcast(request));
}
+ @ApiOperation("銆愭捣搴枫�戞祴璇曚汉鑴稿浘鐗囦笅杞�")
+ @PostMapping("/testDonwLoadMemberImg")
+ @LoginNoRequired
+ public ApiResponse<BaseResponse> testDonwLoadMemberImg() {
+ hkSyncImgService.startDealMemberImg();
+ return ApiResponse.success( null);
+ }
+ @ApiOperation("銆愭捣搴枫�戞祴璇曟湀鍙颁簨浠跺浘鐗囦笅杞�")
+ @PostMapping("/testDonwLoadPlatformImg")
+ @LoginNoRequired
+ public ApiResponse<BaseResponse> testDonwLoadPlatformImg() {
+ hkSyncImgService.startDealPlatformEventImg();
+ return ApiResponse.success( null);
+ }
@ApiOperation("銆愭捣搴枫�戞祴璇曡幏鍙栧井淇″叕浼楀彿")
@GetMapping("/testWxToken")
@LoginNoRequired
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java
index d436b0a..0a46fbe 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java
@@ -43,15 +43,10 @@
}
public int initHkParamConfig(){
- if(StringUtils.isBlank(ArtemisConfig.appKey )
- ||StringUtils.isBlank(ArtemisConfig.host )
- ||StringUtils.isBlank(ArtemisConfig.appSecret )
- ){
- ArtemisConfig.host = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_HOST).getCode();
- ArtemisConfig.appKey = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_APPKEY).getCode();
- ArtemisConfig.appSecret = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_APPSECRET).getCode();
- HKConstants.https = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_HTTPS).getCode();
- }
+ ArtemisConfig.host = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_HOST).getCode();
+ ArtemisConfig.appKey = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_APPKEY).getCode();
+ ArtemisConfig.appSecret = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_APPSECRET).getCode();
+ HKConstants.https = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_HTTPS).getCode();
HKTools.interfaceLogService=interfaceLogService;
return 0;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
index 37d4740..0d7e426 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
@@ -1,10 +1,8 @@
package com.doumee.core.haikang.model;
import com.alibaba.fastjson.JSONObject;
-import com.doumee.config.SpringContextUtil;
import com.doumee.core.haikang.model.param.request.CarPictureRequest;
import com.doumee.core.haikang.service.HKService;
-import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.InterfaceLog;
import com.doumee.service.business.InterfaceLogService;
import com.hikvision.artemis.sdk.ArtemisHttpUtil;
@@ -13,18 +11,14 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
-import org.apache.tomcat.util.bcel.Const;
-import org.yaml.snakeyaml.scanner.Constant;
-import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
-import java.net.URL;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
@Slf4j
@@ -79,9 +73,9 @@
private static Map<String, String> getPath(String str) {
final String getCamsApi = HKConstants.ARTEMIS_PATH + str;
Map<String, String> path = new HashMap<String, String>(2) {
- {
- put(HKConstants.https, getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
+ {
+ put(HKConstants.https, getCamsApi);// 鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
+ }
};
return path;
}
@@ -240,14 +234,26 @@
Map<String, String> path = getPath(HKConstants.InterfacePath.facePicture[0]);
//鍙傛暟鏍规嵁鎺ュ彛瀹為檯鎯呭喌璁剧疆
- HttpResponse resp = ArtemisHttpUtil.doPostStringImgArtemis( path, body, null, null,"application/json",null);
- if (200==resp.getStatusLine().getStatusCode()) {
- HttpEntity entity = resp.getEntity();
- InputStream in = entity.getContent();
- return in;
- }else{
- throw new Exception("浜鸿劯涓嬭浇鍑洪敊");
+ log.error("=========================ArtemisConfig.host***********************************"+ ArtemisConfig.host);
+ log.error("=========================ArtemisConfig.key********************************"+ArtemisConfig.appKey);
+ try {
+ log.error("-------------------------ArtemisConfig.host***********************************"+ ArtemisConfig.host);
+ log.error("-------------------------ArtemisConfig.key********************************"+ArtemisConfig.appKey);
+ HttpResponse resp = ArtemisHttpUtil.doPostStringImgArtemis( path, body, null, null,"application/json",null);
+ if (200==resp.getStatusLine().getStatusCode()) {
+ HttpEntity entity = resp.getEntity();
+ InputStream in = entity.getContent();
+ return in;
+ }else{
+ log.error("浜鸿劯涓嬭浇鍑洪敊");
+ throw new Exception("浜鸿劯涓嬭浇鍑洪敊");
+ }
+ }catch (Exception e){
+ e.printStackTrace();
}
+ log.error("+++++++++++++++++++++++++ArtemisConfig.host***********************************"+ ArtemisConfig.host);
+ log.error("+++++++++++++++++++++++++ArtemisConfig.key********************************"+ArtemisConfig.appKey);
+ return null;
}
/**
* 鑾峰彇璁垮璁板綍涓殑鍥剧墖
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
index b1ec748..470fd3e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -10,6 +10,7 @@
import com.doumee.core.haikang.model.param.request.*;
import com.doumee.core.haikang.model.param.respose.*;
import com.doumee.core.utils.Constants;
+import com.hikvision.artemis.sdk.config.ArtemisConfig;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -230,6 +231,8 @@
*/
public static InputStream getFaceInputStream(FacePictureRequest param) {
log.info("銆愭捣搴蜂汉鑴歌闂浘鐗囨祦銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ log.error("********************ArtemisConfig.host***********************************"+ ArtemisConfig.host);
+ log.error("********************ArtemisConfig.key********************************"+ArtemisConfig.appKey);
try {
InputStream res = HKTools.getFaceInputStream(JSONObject.toJSONString(param));
log.error("銆愭捣搴蜂汉鑴歌闂浘鐗囨祦銆�================鎴愬姛====\n");
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java
index 1bbc12c..b091b73 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java
@@ -56,6 +56,8 @@
String dealParkEvent(EventParkRequest param, HttpServletResponse response);
String downHKImgs(int type);
+ void startDealPlatformEventImg();
+ void startDealMemberImg();
void cancelEventSub();
void syncOrgData(LoginUserInfo user);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InitServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InitServiceImpl.java
index f50a942..918b813 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InitServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InitServiceImpl.java
@@ -28,12 +28,10 @@
@PostConstruct
public int initHkConfig(){
- if(StringUtils.isBlank( ArtemisConfig.host )){
ArtemisConfig.host = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_HOST).getCode();
ArtemisConfig.appKey = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_APPKEY).getCode();
ArtemisConfig.appSecret = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_APPSECRET).getCode();
HKConstants.https = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_HTTPS).getCode();
- }
HKTools.interfaceLogService=interfaceLogService;
return 0;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java
index f3fb6ea..183e2e4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java
@@ -116,6 +116,14 @@
return null;
}
@Override
+ public void startDealPlatformEventImg(){
+
+ }
+ @Override
+ public void startDealMemberImg(){
+
+ }
+ @Override
public void syncUserData(LoginUserInfo user){
}
@Override
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncImgServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncImgServiceImpl.java
index d37efcd..f0a2b4e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncImgServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncImgServiceImpl.java
@@ -17,6 +17,7 @@
import org.springframework.stereotype.Service;
import java.io.*;
+import java.net.URL;
import java.util.Date;
import java.util.List;
import java.util.UUID;
@@ -67,7 +68,8 @@
return null;
}
- private void startDealMemberImg() {
+ @Override
+ public void startDealMemberImg() {
List<Member> list = memberMapper.selectList(new QueryWrapper<Member>().lambda()
.eq(Member::getIsdeleted,Constants.ZERO)
.likeRight(Member::getFaceImg, HKConstants.IMG_INDEX));
@@ -96,7 +98,8 @@
}
}
- private void startDealPlatformEventImg() {
+ @Override
+ public void startDealPlatformEventImg() {
List<PlatformEvent> list = platformEventMapper.selectList(new QueryWrapper<PlatformEvent>().lambda()
.eq(PlatformEvent::getIsdeleted,Constants.ZERO)
.isNotNull(PlatformEvent::getBackgroundImageContent)
@@ -285,7 +288,11 @@
is = HKService.getFaceInputStream(param);
}else if(StringUtils.equals(folder_code,Constants.PLATFORM_EVENT_IMG)){
//鏈堝彴浜嬩欢鍥剧墖
- is = HttpsUtil.connectionInputsteam(img1,"GET",null,null);
+ try {
+ is = new URL(img1).openStream();
+ }catch (Exception e){
+ log.error("鏈堝彴鍥剧墖涓嬭浇澶辫触锛�=========================="+img1);
+ }
}
if(is ==null){
return null;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncInitConfigServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncInitConfigServiceImpl.java
index 72d3e88..4167d3c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncInitConfigServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncInitConfigServiceImpl.java
@@ -28,15 +28,11 @@
@PostConstruct
public int initHkConfig(){
- if(StringUtils.isBlank(ArtemisConfig.appKey )
- ||StringUtils.isBlank(ArtemisConfig.host )
- ||StringUtils.isBlank(ArtemisConfig.appSecret )
- ){
+
ArtemisConfig.host = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_HOST).getCode();
ArtemisConfig.appKey = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_APPKEY).getCode();
ArtemisConfig.appSecret = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_APPSECRET).getCode();
HKConstants.https = systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_HTTPS).getCode();
- }
HKTools.interfaceLogService=interfaceLogService;
return 0;
}
--
Gitblit v1.9.3