From 50cafce55546fac0928614e56d43845e2b6e0ca0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 11 六月 2024 15:46:08 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 83 +++++++++++++++++++++++++++++------------
1 files changed, 58 insertions(+), 25 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 463e277..a4a88cb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -52,6 +52,8 @@
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.impl.hksync.HkSyncEmpowerServiceImpl;
import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl;
+import com.doumee.service.system.SystemLoginService;
+import com.doumee.service.system.SystemUserService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.RandomStringUtils;
@@ -167,6 +169,7 @@
user.setSalt(salt);
// 鍒涘缓鐢ㄦ埛璁板綍
user.setType(insert.getType());
+ user.setAvatar(insert.getFaceImg());
user.setUsername(insert.getPhone());
user.setEmpNo(insert.getCode());
user.setRealname(insert.getName());
@@ -444,11 +447,15 @@
member.setHkOrgId(company.getHkId());
isNeedUpdateUser = true;
}
+ if(StringUtils.isNotBlank(model.getFaceImg())){
+ isNeedUpdateUser=true;
+ }
if(isNeedUpdateUser){
//鏇存柊绯荤粺鐢ㄦ埛璐﹀彿淇℃伅
systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda()
.set(SystemUser::getUpdateUser,member.getLoginUserInfo().getId())
.set(SystemUser::getUpdateTime,new Date())
+ .set(StringUtils.isNotBlank(model.getFaceImg()),SystemUser::getAvatar,member.getFaceImg())
.set(StringUtils.isNotBlank(model.getPhone()),SystemUser::getMobile,member.getPhone())
.set(StringUtils.isNotBlank(model.getName()),SystemUser::getRealname,member.getName())
.set(model.getCompanyId() !=null,SystemUser::getCompanyId,member.getCompanyId())
@@ -589,7 +596,7 @@
//濡傛灉鍛樺伐淇℃伅涓嶅悎娉曠洿鎺ヨ烦杩�
continue;
}
- if(StringUtils.isNotBlank(member.getFaceId()) || !Constants.equalsInteger(member.getFaceStatus(),Constants.ONE)){
+ if(StringUtils.isBlank(member.getFaceId()) || !Constants.equalsInteger(member.getFaceStatus(),Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛銆�"+member.getName()+"銆戠殑浜鸿劯淇℃伅涓嶆弧瓒虫巿鏉冩潯浠讹紝璇疯繑鍥炲畬鍠勫悗鍐嶈繘琛岃鎿嶄綔锛�");
}
member.setStartTime(memberRole.getStartTime());
@@ -1079,6 +1086,33 @@
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
queryWrapper.selectAll(Member.class)
.selectAs(Company::getName,Member::getCompanyName) ;
+ if(StringUtils.isNotBlank(member.getName())){
+ queryWrapper.like(Member::getName,member.getName());
+ }
+
+ if(null != member.getType()) {
+ queryWrapper.eq(Member::getType,member.getType());
+ }
+ if(null != member.getCompanyId()) {
+ queryWrapper.eq(Member::getCompanyId,member.getCompanyId());
+ }
+ queryWrapper.eq(Member::getIsdeleted,Constants.ZERO);
+ 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
+ public List<Member> findDriveList(Member member) {
+ MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
+ queryWrapper.selectAll(Member.class)
+ .selectAs(Company::getName,Member::getCompanyName)
+ .eq(Member::getType,Constants.TWO)
+ .exists("select b.id from car_driver b where b.isdeleted=0 and b.member_id=t.id");
if(null != member.getType()) {
queryWrapper.eq(Member::getType,member.getType());
@@ -1584,6 +1618,7 @@
if(!Objects.isNull(tokenJson.get("access_token"))){
openId = tokenJson.getString("openid");
}
+// String openId = "12345";
WxAuthorizeVO wxAuthorizeVO = new WxAuthorizeVO();
wxAuthorizeVO.setOpenid(openId);
//鏍规嵁openId 鏌ヨ鐢ㄦ埛淇℃伅
@@ -1610,11 +1645,11 @@
String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
member.setPrefixUrl(prefixUrl);
- JwtPayLoad payLoad = new JwtPayLoad(Integer.toString(member.getId()));
- String token = JwtTokenUtil.generateToken(payLoad);
- //瀛樺偍token鑷硆edis
- RedisUtil.addObject(redisTemplate,Constants.RedisKeys.INTERNAL_TOKEN+"_"+member.getId(),token,Constants.RedisKeys.EXPIRE_TIME);
- wxAuthorizeVO.setToken(token);
+// JwtPayLoad payLoad = new JwtPayLoad(Integer.toString(member.getId()));
+// String token = JwtTokenUtil.generateToken(payLoad);
+// //瀛樺偍token鑷硆edis
+// RedisUtil.addObject(redisTemplate,Constants.RedisKeys.INTERNAL_TOKEN+"_"+member.getId(),token,Constants.RedisKeys.EXPIRE_TIME);
+// wxAuthorizeVO.setToken(token);
wxAuthorizeVO.setMember(member);
}
return wxAuthorizeVO;
@@ -1624,30 +1659,27 @@
@Override
- public MemberVO getVisitedMember(CheckVisitedDTO checkVisitedDTO){
- Integer validType = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.BEVISITED_USER_VALID).getCode());
- if(Objects.isNull(checkVisitedDTO)||StringUtils.isBlank(checkVisitedDTO.getMobile())||(validType.equals(Constants.ONE)&&StringUtils.isBlank(checkVisitedDTO.getName()))){
- throw new BusinessException(ResponseStatus.BAD_REQUEST);
- }
- Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
- .eq(Member::getPhone,checkVisitedDTO.getMobile())
- .eq(validType.equals(Constants.ONE),Member::getName,checkVisitedDTO.getName())
+ public List<MemberVO> getVisitedMember(CheckVisitedDTO checkVisitedDTO){
+ List<Member> memberList = memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
+ .selectAll(Member.class)
+ .selectAs(Company::getName,Member::getCompanyName)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
+ .eq(StringUtils.isNotBlank(checkVisitedDTO.getMobile()),Member::getPhone,checkVisitedDTO.getMobile())
+ .eq(StringUtils.isNotBlank(checkVisitedDTO.getName()),Member::getName,checkVisitedDTO.getName())
.eq(Member::getIsdeleted,Constants.ZERO)
-// .eq(Member::getStatus,Constants.ZERO)
+ .eq(Member::getStatus,Constants.ZERO)
.eq(Member::getCanVisit,Constants.ONE)
- .eq(Member::getType,Constants.memberType.internal)
- .last(" limit 1 ")
+ .eq(Member::getType,Constants.memberType.internal)
);
- MemberVO memberVO = new MemberVO();
- if(!Objects.isNull(member)){
- if(!member.getStatus().equals(Constants.ZERO)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"琚浜鸿处鍙峰紓甯革紝璇风‘璁ゅ悗鍐嶈瘯");
+ List<MemberVO> memberVOList = new ArrayList<>();
+ if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)) {
+ for (Member member:memberList) {
+ MemberVO memberVO = new MemberVO();
+ BeanUtils.copyProperties(member,memberVO);
+ memberVOList.add(memberVO);
}
- BeanUtils.copyProperties(member,memberVO);
- }else{
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"璇锋牳瀹炶璁夸汉淇℃伅!");
}
- return memberVO;
+ return memberVOList;
}
@@ -1691,6 +1723,7 @@
@Override
public WxAuthorizeVO accountLogin(AccountLoginDTO accountLoginDTO){
+ System.out.println(DESUtil.decrypt(Constants.EDS_PWD,"eIaPD5AR5DBuTBE9MW14QRG07IDKXCdh"));
if(accountLoginDTO.getAccount().length()!=18
//&&!IdcardUtil.isValidCard(accountLoginDTO.getAccount())
){
--
Gitblit v1.9.3