From 8f2ad5eb040a2f3f1cae62a9c099c8f5f66750e1 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 09 十月 2024 16:18:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncImgServiceImpl.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
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 302bf9b..d37efcd 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
@@ -8,6 +8,7 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.FtpUtil;
+import com.doumee.core.utils.HttpsUtil;
import com.doumee.dao.business.*;
import com.doumee.dao.business.model.*;
import lombok.extern.slf4j.Slf4j;
@@ -34,6 +35,8 @@
@Autowired
private MemberMapper memberMapper;
@Autowired
+ private PlatformEventMapper platformEventMapper;
+ @Autowired
private DeviceEventMapper deviceEventMapper;
@Autowired
private VisitEventMapper visitEventMapper;
@@ -54,6 +57,8 @@
startDealDeviceImg();
//鏌ヨ鎵�鏈変汉鍛樹汉鑴哥収鐗�
startDealMemberImg();
+ //鏌ヨ鎵�鏈夋湀鍙颁簨浠朵腑鎶撴媿鍥剧収鐗�
+ startDealPlatformEventImg();
}catch (Exception e){
e.printStackTrace();
}finally {
@@ -87,6 +92,33 @@
}
}
memberMapper.updateById(event);
+ }
+ }
+
+ }
+ private void startDealPlatformEventImg() {
+ List<PlatformEvent> list = platformEventMapper.selectList(new QueryWrapper<PlatformEvent>().lambda()
+ .eq(PlatformEvent::getIsdeleted,Constants.ZERO)
+ .isNotNull(PlatformEvent::getBackgroundImageContent)
+ .notLikeRight(PlatformEvent::getBackgroundImageContent, HKConstants.IMG_INDEX_ERROR)
+ .isNull(PlatformEvent::getBackgroundImageDown));
+ Date date= new Date();
+ if(list !=null && list.size()>0){
+ for(PlatformEvent model:list){
+ String rs1 = null;
+ PlatformEvent event = new PlatformEvent();
+ event.setId(model.getId());
+ event.setEditDate(date);
+ if(StringUtils.isNotBlank(model.getBackgroundImageContent())){
+ String img1 = model.getBackgroundImageContent();
+ rs1 = downHkImgToFtp(img1,"",Constants.PLATFORM_EVENT_IMG);
+ if(StringUtils.isNotBlank(rs1)){
+ event.setBackgroundImageDown(rs1);
+ }else{
+ event.setBackgroundImageContent(HKConstants.IMG_INDEX_ERROR+model.getBackgroundImageContent());
+ }
+ }
+ platformEventMapper.updateById(event);
}
}
@@ -251,11 +283,13 @@
param.setPicUri(img1.replace(HKConstants.IMG_INDEX_ERROR,"").replace(HKConstants.IMG_INDEX,""));
param.setServerIndexCode(serverIndex);
is = HKService.getFaceInputStream(param);
+ }else if(StringUtils.equals(folder_code,Constants.PLATFORM_EVENT_IMG)){
+ //鏈堝彴浜嬩欢鍥剧墖
+ is = HttpsUtil.connectionInputsteam(img1,"GET",null,null);
}
if(is ==null){
return null;
}
-
try {
if(ftp == null){
ftp = new FtpUtil(systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_HOST).getCode(),
--
Gitblit v1.9.3