From feaad36aa5c0484cf98925ca4166c7b325cbce52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <8153694@qq.com>
Date: Thu, 30 Nov 2023 15:26:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=85=E9=83=A8=E7=B3=BB?=
=?UTF-8?q?=E7=BB=9F=E8=AE=BF=E9=97=AE=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/views/monitor/alarm/record/list.vue | 16 +++++++++++++++-
.../interceptor/AuthTokenServiceImpl.java | 8 ++++++--
.../event/service/impl/BlackPlanRecoginze.java | 13 +++++++++++++
3 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/refined-manager-ui/admin/src/views/monitor/alarm/record/list.vue b/refined-manager-ui/admin/src/views/monitor/alarm/record/list.vue
index 649a62e..0254f8c 100644
--- a/refined-manager-ui/admin/src/views/monitor/alarm/record/list.vue
+++ b/refined-manager-ui/admin/src/views/monitor/alarm/record/list.vue
@@ -56,7 +56,21 @@
{label: "绛惧埌鏂瑰紡", prop: "checkInMethod",formatter: this.formatter},
- {label: "鐩戞祴鍑瘉", prop: "monitorCertificate"},
+ {
+ label: "鐩戞祴鍑瘉",
+ prop: "monitorCertificate",
+ formatter: (row) => {
+ return row.monitorCertificate != "" ? (
+ <el-image
+ style="width: 70px; height: 70px"
+ src={row.monitorCertificate}
+ preview-src-list={[row.monitorCertificate]}
+ ></el-image>
+ ) : (
+ "--"
+ );
+ },
+ },
{
label: "鎿嶄綔",
width: 240,
diff --git a/refined-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java b/refined-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java
index 2f3bace..6a1a8c4 100644
--- a/refined-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java
+++ b/refined-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java
@@ -15,6 +15,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.annotation.Order;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
@@ -87,10 +88,13 @@ public class AuthTokenServiceImpl implements IAuthTokenService {
String userKey = getTokenKey(uuid);
// Rest<String> rest = userFeign.getToken(userKey);
// String userStr = rest.getData();
- cacheService.select(portalDb);
+/* cacheService.select(portalDb);
String userStr = cacheService.get(userKey);
- cacheService.select(db);
+ cacheService.select(db);*/
+
+ RedisTemplate<String, String> redisTemplate = cacheService.selectDbRedisTemplate(portalDb);
+ String userStr =redisTemplate.opsForValue().get(userKey);
if (StringUtils.isNotEmpty(userStr)) {
UserEntity userEntity = JSONObject.parseObject(userStr, UserEntity.class);
userEntity.setToken(token);
diff --git a/refined-manager/src/main/java/com/mortals/xhx/module/hik/event/service/impl/BlackPlanRecoginze.java b/refined-manager/src/main/java/com/mortals/xhx/module/hik/event/service/impl/BlackPlanRecoginze.java
index 1b2d03e..448fa3a 100644
--- a/refined-manager/src/main/java/com/mortals/xhx/module/hik/event/service/impl/BlackPlanRecoginze.java
+++ b/refined-manager/src/main/java/com/mortals/xhx/module/hik/event/service/impl/BlackPlanRecoginze.java
@@ -202,6 +202,19 @@ public class BlackPlanRecoginze extends EventTypeAbstract {
monitorAlarmRecordEntity.setMonitorDevice(eventData.getResInfo().stream().map(i -> i.getIndexCode()).collect(Collectors.joining(",")));
monitorAlarmRecordEntity.setCheckInMethod(CheckInMethodEnum.鑷姩绛惧埌.getValue());
monitorAlarmRecordEntity.setPicUri(faceMatch.getFacePicUrl());
+ //淇濆瓨faceurl
+ ImgReq imgReq = new ImgReq();
+ imgReq.setUrl(faceMatch.getFacePicUrl());
+ Rest<String> rest = faceService.downloadPicture(imgReq);
+ if (YesNoEnum.YES.getValue() == rest.getCode()) {
+ byte[] bytes = Base64.decode(rest.getData());
+ if (!org.springframework.util.ObjectUtils.isEmpty(bytes)) {
+ InputStream inputStream = new ByteArrayInputStream(bytes);
+ MultipartFile file = ServletUtils.getMultipartFile(inputStream, "snap.jpg");
+ String filePath = uploadService.saveFileUpload(file, "file/fileupload/snap/" + DateUtil.today(), null);
+ monitorAlarmRecordEntity.setMonitorCertificate(filePath);
+ }
+ }
monitorAlarmRecordEntity.setCreateTime(new Date());
monitorAlarmRecordEntity.setCreateUserName("system");
monitorAlarmRecordEntity.setCreateUserId(1L);
--
2.24.3