From 39739e34af928aae204c55db7974213c9b938c5a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 21 二月 2024 18:33:14 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncImgServiceImpl.java | 53 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 9 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncImgServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncImgServiceImpl.java
index ba0a311..00fbb5a 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncImgServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncImgServiceImpl.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.config.DataSyncConfig;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
@@ -15,19 +16,14 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.FtpUtil;
import com.doumee.dao.business.*;
-import com.doumee.dao.business.model.CarEvent;
-import com.doumee.dao.business.model.Device;
-import com.doumee.dao.business.model.DeviceEvent;
-import com.doumee.dao.business.model.VisitEvent;
+import com.doumee.dao.business.model.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -44,6 +40,8 @@
@Autowired
private CarEventMapper carEventMapper;
+ @Autowired
+ private MemberMapper memberMapper;
@Autowired
private DeviceEventMapper deviceEventMapper;
@Autowired
@@ -63,6 +61,8 @@
startDealCarImg();
//鏌ヨ鎵�鏈夐棬绂佷簨浠惰褰曚腑鎵�鏈変笅杞界殑娴峰悍绔� 鎶撴媿鐓х墖 鍜� 韬唤璇佸浘鐗嘦RL
startDealDeviceImg();
+ //鏌ヨ鎵�鏈変汉鍛樹汉鑴哥収鐗�
+ startDealMemberImg();
}catch (Exception e){
e.printStackTrace();
}finally {
@@ -71,6 +71,35 @@
return null;
}
+ private void startDealMemberImg() {
+ List<Member> list = memberMapper.selectList(new QueryWrapper<Member>().lambda()
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ .likeRight(Member::getFaceImg,HKConstants.IMG_INDEX));
+ Date date= new Date();
+ if(list !=null && list.size()>0){
+ for(Member model:list){
+ String serverIndex = model.getFaceServerIndexCode();//鏈嶅姟鍣ㄧ紪鐮�
+ if(StringUtils.isBlank(serverIndex)){
+ continue;
+ }
+ String rs1 = null;
+ Member event = new Member();
+ event.setId(model.getId());
+ event.setEditDate(date);
+ if(StringUtils.isNotBlank(model.getFaceImg())){
+ String img1 = model.getFaceImg().replace(HKConstants.IMG_INDEX_ERROR, "").replace(HKConstants.IMG_INDEX, "");
+ rs1 = downHkImgToFtp(img1,serverIndex,Constants.MEMBER_IMG);
+ if(StringUtils.isNotBlank(rs1)){
+ event.setFaceImg(rs1);
+ }else{
+ event.setFaceImg(model.getFaceImg().replace(HKConstants.IMG_INDEX, HKConstants.IMG_INDEX_ERROR));
+ }
+ }
+ memberMapper.updateById(event);
+ }
+ }
+
+ }
private void startDealDeviceImg() {
List<DeviceEvent> deviceEventList = deviceEventMapper.selectList(new QueryWrapper<DeviceEvent>().lambda()
.eq(DeviceEvent::getIsdeleted,Constants.ZERO)
@@ -225,11 +254,17 @@
param.setPicUri(img1.replace(HKConstants.IMG_INDEX_ERROR,"").replace(HKConstants.IMG_INDEX,""));
param.setSvrIndexCode(serverIndex);
is = HKService.getVisitPicture(param);
+ }else if(StringUtils.equals(folder_code,Constants.MEMBER_IMG)){
+ //璁垮浜嬩欢鍥剧墖
+ FacePictureRequest param = new FacePictureRequest();
+ param.setPicUri(img1.replace(HKConstants.IMG_INDEX_ERROR,"").replace(HKConstants.IMG_INDEX,""));
+ param.setServerIndexCode(serverIndex);
+ is = HKService.getFaceInputStream(param);
}
if(is ==null){
return null;
}
- //TODO------jiangping---------
+
try {
if(ftp == null){
ftp = new FtpUtil(systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_HOST).getCode(),
@@ -240,7 +275,7 @@
ftp.connect();
}
String date = DateUtil.getNowShortDate();
- String fName = date+"/"+ UUID.randomUUID().toString()+".jpg";
+ String fName = date+"/"+ UUID.randomUUID().toString()+".png";
String fileName = folder+fName;
boolean r = ftp.uploadInputstream(is,fileName);//涓婁紶
if(r){
--
Gitblit v1.9.3