From bdbb62001dc4c3c63198270269795e54235c0e40 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 21 十二月 2023 15:34:14 +0800
Subject: [PATCH] 海康接口对接开发
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
index 9e8b703..659322e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -265,6 +265,7 @@
* @return
*/
@Override
+ @Transactional
public String syncUsers(UserListRequest param){
List<UserListRespone> list = ErpTool.getErpUserList(ErpConstants.userListUrl,param);
if(list !=null && list.size()>0) {
@@ -756,8 +757,7 @@
||StringUtils.isNotBlank(param.getFaceImg())
||StringUtils.isNotBlank(param.getCode())
||StringUtils.isNotBlank(param.getPhone())
- ||Objects.isNull(param.getEditDate())
- ){
+ ||Objects.isNull(param.getEditDate())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getId()).last("limit 1"));
@@ -776,10 +776,10 @@
String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
member.setIdcardNo(encryptIdNo);
member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
- member.setCompanyId(param.getOrgId());
+ member.setErpOrgId(param.getOrgId());
doorIds = getRoleIdByParam(param.getRoleIds(),member);
memberMapper.insert(member);
- //TODO 娴峰悍鏁版嵁鍒涘缓
+ //TODO 娴峰悍鏁版嵁鍒涘缓-------------淇敼-------------------
}else{
Integer id = member.getId();
BeanUtils.copyProperties(param,member);
@@ -787,7 +787,7 @@
String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
member.setIdcardNo(encryptIdNo);
member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
- member.setCompanyId(param.getOrgId());
+ member.setErpOrgId(param.getOrgId());
member.setEditDate(new Date());
doorIds = getRoleIdByParam(param.getRoleIds(),member);
member.setErpDate(new Date());
@@ -836,14 +836,13 @@
*/
private void dealMemberRoleEmpower(Member member, List<Integer> doorIds,Date startTime,Date endTime ) {
//鍒犻櫎鎵�鏈夎�佺殑鎺堟潈淇℃伅
-// empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
-// .eq(Empower::getMemberId,member.getId())
-// .set(Empower::getIsdeleted,Constants.ONE)
-// .set(Empower::getSendStatus,Constants.ZERO)
-// );
- empowerMapper.delete(new UpdateWrapper<Empower>().lambda()
+ empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
.eq(Empower::getMemberId,member.getId())
- );
+ .set(Empower::getIsdeleted,Constants.ONE)
+ .set(Empower::getSendStatus,Constants.ZERO));
+// empowerMapper.delete(new UpdateWrapper<Empower>().lambda()
+// .eq(Empower::getMemberId,member.getId())
+// );
if(doorIds==null || doorIds.size() == 0){
return;
}
--
Gitblit v1.9.3