jiangping
2024-10-09 bfd87d12adb1d511334cd91cf6c7ff3608fae8b9
最新版本
已修改13个文件
123 ■■■■■ 文件已修改
admin/src/views/business/platformEvent.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_gateway/src/main/resources/bootstrap.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/system_timer/src/main/resources/bootstrap.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/admin_timer/src/main/resources/bootstrap.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InitServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncImgServiceImpl.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncInitConfigServiceImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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">
server/system_gateway/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
  profiles:
    active: dev
    active: pro
  application:
    name: system_gateway
  # 安全配置
server/system_timer/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
  profiles:
    active: dev
    active: pro
  application:
    name: systemTimer
    # 安全配置
server/visits/admin_timer/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
  profiles:
    active: dev
    active: pro
  application:
    name: visitsTimer
    # 安全配置
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("【海康】测试LED显示屏")
@@ -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
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;
    }
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);// 根据现场环境部署确认是http还是https
            }
        {
            put(HKConstants.https, getCamsApi);// 根据现场环境部署确认是http还是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;
    }
    /**
     * 获取访客记录中的图片
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");
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);
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;
    }
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
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;
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;
    }