From 67dfeea84fcf92e11e07eaf2eb0e235387287813 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 18 三月 2024 11:41:02 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java | 1
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java | 4 +-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 13 ++++--
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java | 39 +++++++++++++++++--
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java | 18 +++++++-
server/dmvisit_service/src/main/java/com/doumee/core/utils/FaceImageCompress.java | 8 ++-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java | 3 +
7 files changed, 69 insertions(+), 17 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/utils/FaceImageCompress.java b/server/dmvisit_service/src/main/java/com/doumee/core/utils/FaceImageCompress.java
index 35aa88a..2d0cb4b 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/utils/FaceImageCompress.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/utils/FaceImageCompress.java
@@ -43,8 +43,8 @@
private SystemDictDataBiz systemDictDataBiz;
public static void main(String[] args) {
- compressAllFiles(new File("/usr/local/ftp/member/20240317"),800);
-// compressAllFiles(new File("D://visit"));
+// compressAllFiles(new File("/usr/local/ftp/member/20240317"),800);
+ compressAllFiles(new File("D://visit"),1100);
}
public static void compressAllFiles(File folder ,int w) {
File[] files = folder.listFiles();
@@ -116,7 +116,7 @@
long originalFileSize = file.length();
BufferedImage originalImage = ImageIO.read(file);
double compressionRatio = (double) originalFileSize / (200 * 1024.0);
- if (compressionRatio > 1 && originalImage.getWidth()>w) {
+ if (compressionRatio >= 1 ) {
System.out.println("==========================="+compressionRatio);
// int compressedWidth = (int) (originalImage.getWidth() / compressionRatio);
// int compressedHeight = (int) (originalImage.getHeight() / compressionRatio);
@@ -138,9 +138,11 @@
ImageIO.write(compressedImage, "jpg", outputfile);
if(outputfile.length()<50 * 1024.0){
resetOldfile(oldFile);
+ System.out.println("================灏忎簬50");
}
} else {
//涓嶅鐞�
+ System.out.println("================鎴愬姛");
}
} catch (Exception e) {
e.printStackTrace();
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java
index 918db83..484a96b 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/ext/HkSyncService.java
@@ -70,6 +70,7 @@
void syncVisitData();
void getOutTimeVisitRecord( );
void syncEmpowerData();
+ void syncEmpowerDataNew(int start,int end);
void syncParkBookData();
void syncParkBookBySingleModel(ParkBook c);
void syncEmpowerResultData();
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
index af7d7cd..31fa2f3 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
@@ -77,8 +77,6 @@
memberCard.setCreateDate(new Date());
memberCard.setStatus(Constants.ONE);
memberCard.setIsdeleted(Constants.ZERO);
- memberCard.setHkStatus(Constants.ZERO);
- memberCardMapper.insert(memberCard);
dealMemberRoleEmpower(memberMapper.selectById(memberCard.getMemberId()));
Member member = memberMapper.selectById(memberCard.getMemberId());
if(Objects.isNull(member)){
@@ -101,6 +99,8 @@
if(response==null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) || response.getData()==null){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),response.getMsg());
}
+ memberCard.setHkStatus(Constants.ONE);
+ memberCardMapper.insert(memberCard);
return memberCard.getId();
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 4ac301f..4d94b81 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -190,9 +190,7 @@
if(!member.getType().equals(Constants.memberType.internal)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲唴閮ㄤ汉鍛樻棤娉曡繘琛岃鎿嶄綔");
}
- memberRoleMapper.selectList(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
-
-
+ List<MemberRole> roleList = memberRoleMapper.selectList(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
}
@@ -393,7 +391,6 @@
@Override
public List<Member> findList(Member member) {
-
MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
queryWrapper.selectAll(Member.class)
@@ -408,7 +405,13 @@
}
queryWrapper.eq(Member::getIsdeleted,Constants.ZERO);
- return memberJoinMapper.selectJoinList(Member.class,queryWrapper);
+ List<Member> list = memberJoinMapper.selectJoinList(Member.class,queryWrapper);
+ if(list!=null){
+ for(Member m : list){
+ m.setName(StringUtils.defaultString(m.getName(),"")+"-"+StringUtils.defaultString(m.getCompanyName(),""));
+ }
+ }
+ return list;
}
@Override
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java
index cbad3b6..6ffb08e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncBaseServiceImpl.java
@@ -118,6 +118,9 @@
public void syncEmpowerData() {
}
@Override
+ public void syncEmpowerDataNew(int start,int end) {
+ }
+ @Override
public void syncParkBookData() {
}
@Override
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
index 5f9f5f4..b503299 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
@@ -22,6 +22,7 @@
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.util.ArrayList;
@@ -326,6 +327,18 @@
Constants.DEALING_HK_EMPOWER =false;
}
}
+ @Override
+ public void syncEmpowerDataNew(int start,int end) {
+ try {
+ //鍏堝垹闄ゆ墍鏈夐渶瑕佸彇娑堟巿鏉冪殑鏁版嵁
+ dealDelListTask(getDealList(Constants.ONE,start,end));
+ //鏌ヨ鎵�鏈夐渶瑕佸悓姝ョ殑鏁版嵁,閲嶆柊涓嬪彂鏈�鏂颁汉鍛樻潈闄愬嵆鍙�
+ dealNewListTask(getDealList(Constants.ZERO,start,end));
+ }catch (Exception e){
+ e.printStackTrace();
+ }finally {
+ }
+ }
/**
* 鍒嗘璇锋眰涓嬪彂鏉冮檺
@@ -507,9 +520,7 @@
return false;
}
}
-
-
- private List<Empower> getDealList(int del ) {
+ private List<Empower> getDealList(int del ) {
MPJLambdaWrapper<Empower> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(Empower.class);
queryWrapper.selectAs(Device::getChannelNo,Empower::getDeviceChannelNo);
@@ -521,7 +532,27 @@
queryWrapper.eq(Empower::getSendStatus,Constants.EmpowerStatus.wait);
queryWrapper.eq( Empower::getIsdeleted,del);
queryWrapper.orderByAsc(Empower::getId );
- queryWrapper.orderByAsc(Empower::getCreateDate );
+// queryWrapper.orderByAsc(Empower::getCreateDate );
+ queryWrapper.last("limit 100");//姣忔闄愬埗涓嬪彂100涓�
+ List<Empower> list = empowerMapper.selectJoinList(Empower.class,queryWrapper);
+ return list;
+ }
+
+ private List<Empower> getDealList(int del ,int start,int end) {
+ MPJLambdaWrapper<Empower> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(Empower.class);
+ queryWrapper.selectAs(Device::getChannelNo,Empower::getDeviceChannelNo);
+ queryWrapper.selectAs(Member::getHkId,Empower::getMemberHkId);
+ queryWrapper.selectAs(Device::getHkId,Empower::getDeviceIndexCode);
+ queryWrapper.selectAs(Device::getResourceType,Empower::getDeviceType);
+ queryWrapper.leftJoin(Device.class,Device::getId,Empower::getDeviceId);
+ queryWrapper.leftJoin(Member.class,Member::getId,Empower::getMemberId);
+ queryWrapper.eq(Empower::getSendStatus,Constants.EmpowerStatus.wait);
+ queryWrapper.eq( Empower::getIsdeleted,del);
+ queryWrapper.gt( Empower::getId,start);
+ queryWrapper.le( Empower::getId,end);
+ queryWrapper.orderByDesc(Empower::getId );
+// queryWrapper.orderByAsc(Empower::getCreateDate );
queryWrapper.last("limit 100");//姣忔闄愬埗涓嬪彂100涓�
List<Empower> list = empowerMapper.selectJoinList(Empower.class,queryWrapper);
return list;
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
index 77d1a3e..572e8ff 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
@@ -20,6 +20,7 @@
import com.doumee.service.business.ext.ERPSyncService;
import com.doumee.service.business.impl.hksync.HkSyncBaseServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import io.swagger.models.auth.In;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -306,7 +307,8 @@
String[] ss = doorids.split(",");
try {
for(String s :ss){
- r.add(Integer.parseInt(s));
+ Integer ts =Integer.parseInt(s);
+ r.add(ts);
}
}catch (Exception e){
//鑴忔暟鎹笉澶勭悊
@@ -317,6 +319,16 @@
}
return null;
}
+
+ private static boolean isNorExistInList(Integer ts, List<Integer> list) {
+ for(Integer r :list){
+ if(Constants.equalsInteger(ts,r)){
+ return true;
+ }
+ }
+ return false;
+ }
+
@Transactional
public boolean dealMemberInfoBiz(Member c, Date date, String path) {
if( c.getCompanyId() == null){
@@ -425,7 +437,7 @@
private List<MemberCard> dealMemberHkCard(Member member) {
List<MemberCard> memberCards = memberCardMapper.selectList(new QueryWrapper<MemberCard>().lambda()
.eq(MemberCard::getMemberId,member.getId())
- .eq(MemberCard::getType,Constants.TWO)
+// .eq(MemberCard::getType,Constants.TWO)
.eq(MemberCard::getHkStatus,Constants.ZERO) );
if(memberCards==null || memberCards.size()==0){
//娌℃湁甯﹀鐞嗙殑鏁版嵁锛岀洿鎺ヨ烦杩�
@@ -486,7 +498,7 @@
public static List<MemberCard> getNormalCardList(Member member,MemberCardMapper memberCardMapper) {
return memberCardMapper.selectList(new QueryWrapper<MemberCard>().lambda()
.eq(MemberCard::getMemberId,member.getId())
- .eq(MemberCard::getType,Constants.TWO)
+// .eq(MemberCard::getType,Constants.TWO)
.eq(MemberCard::getStatus,Constants.MemberCard.normal)
.eq(MemberCard::getHkStatus,Constants.ONE) );
--
Gitblit v1.9.3