diff --git a/hzims-biz-common/src/main/java/com/hnac/hzims/common/utils/HiKUtil.java b/hzims-biz-common/src/main/java/com/hnac/hzims/common/utils/HiKUtil.java index 89bad9c..926993b 100644 --- a/hzims-biz-common/src/main/java/com/hnac/hzims/common/utils/HiKUtil.java +++ b/hzims-biz-common/src/main/java/com/hnac/hzims/common/utils/HiKUtil.java @@ -1,39 +1,18 @@ -/* package com.hnac.hzims.common.utils; -import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.fasterxml.jackson.databind.JsonNode; import com.hikvision.artemis.sdk.ArtemisHttpUtil; import com.hikvision.artemis.sdk.config.ArtemisConfig; -import okhttp3.MediaType; -import okhttp3.MultipartBody; -import okhttp3.RequestBody; -import org.springblade.core.log.exception.ServiceException; -import org.springblade.core.log.logger.BladeLogger; import org.springblade.core.tool.jackson.JsonUtil; -import org.springblade.core.tool.utils.DateUtil; -import org.springblade.core.tool.utils.Func; -import org.springblade.server.domain.Sys; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.util.Assert; -import java.text.DateFormat; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.time.ZoneOffset; -import java.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.Map; -import java.util.Optional; -*/ /** * @Author: huangxing * @Date: 2024/1/10 14:40 - *//* - + */ public class HiKUtil { public static String APP_KEY = "26486442"; @@ -73,4 +52,3 @@ public class HiKUtil { } } -*/ diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationVideoTypeServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationVideoTypeServiceImpl.java index ceeeb0d..f3500bb 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationVideoTypeServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationVideoTypeServiceImpl.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -//import com.hnac.hzims.common.utils.HiKUtil; +import com.hnac.hzims.common.utils.HiKUtil; import com.hnac.hzims.operational.config.HikPathConfiguration; import com.hnac.hzims.operational.station.StationConstants; import com.hnac.hzims.operational.station.dto.StationVideoTypeDTO; @@ -213,7 +213,7 @@ public class StationVideoTypeServiceImpl extends BaseServiceImpl { param.put("cameraIndexCode",pointCode); - /*try{ + try{ String data = HiKUtil.send("/api/video/v2/cameras/previewURLs", param, finalHost, finalAppKey, finalAppSecret); if(StringUtil.isNotBlank(data)) { Map url = new HashMap() {{ @@ -224,7 +224,7 @@ public class StationVideoTypeServiceImpl extends BaseServiceImpl