From b89c0df6f99cff6a852306da467b053aa4f90df8 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 09 一月 2024 13:47:23 +0800
Subject: [PATCH] ERP接口
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 146 +++++++++++++++++++++++++++++++-----------------
1 files changed, 94 insertions(+), 52 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 8d5026f..ce6f23e 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
@@ -122,6 +122,9 @@
@Override
@Transactional
public String syncCompany(OrgListRequest param){
+ if(!StringUtils.equals(Constants.ONE+"", systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ORG_USER_ORIGIN).getCode())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝褰撳墠涓嶆敮鎸佺粍缁囧悓姝ユ搷浣渵");
+ }
//鑾峰彇ERP缁勭粐淇℃伅锛堝叏閲忓悓姝ワ級
List<ErpOrgListResponse> list = ErpTool.getErpOrgList(ErpConstants.orgListUrl,param);
if(list !=null && list.size()>0){
@@ -206,7 +209,9 @@
company.setEditDate(date);
company.setStatus(respone.getStatus());
company.setCode(respone.getCode());
- company.setErpParentId(respone.getParentOrgId());
+ if(StringUtils.isNotBlank(respone.getParentOrgId())&&!respone.getParentOrgId().equals("orgRoot")){
+ company.setErpParentId(respone.getParentOrgId());
+ }
company.setErpDate(date);
company.setHkStatus(Constants.ZERO);
return company;
@@ -219,13 +224,16 @@
*/
private Company getAddCompanyModel(ErpOrgListResponse respone, Date date) {
Company company = new Company();
+ company.setStatus(respone.getStatus());
company.setIsdeleted(Constants.ZERO);
company.setName(respone.getName());
company.setErpId(respone.getId());
company.setCreateDate(date);
company.setType(Constants.ONE);
company.setCode(respone.getCode());
- company.setErpParentId(respone.getParentOrgId());
+ if(StringUtils.isNotBlank(respone.getParentOrgId())&&!respone.getParentOrgId().equals("orgRoot")){
+ company.setErpParentId(respone.getParentOrgId());
+ }
company.setErpDate(date);
company.setHkStatus(Constants.ZERO);
return company;
@@ -262,6 +270,9 @@
@Override
@Transactional
public String syncUsers(UserListRequest param){
+ if(!StringUtils.equals(Constants.ONE+"", systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ORG_USER_ORIGIN).getCode())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝褰撳墠涓嶆敮鎸佷汉鍛樺悓姝ユ搷浣渵");
+ }
List<ErpUserListResponse> list = ErpTool.getErpUserList(ErpConstants.userListUrl,param);
if(list !=null && list.size()>0) {
List<Member> addList = new ArrayList<>();
@@ -273,14 +284,14 @@
.eq(Member::getType, Constants.memberType.internal));
dealUserChangeList(list,addList,updateList,delList,allList);
if(addList.size()>0){
+ memberMapper.insertBatchSomeColumn(addList);
for (Member member:addList) {
dealRoleEmpower(member,param.getStartTime(), param.getEndTime());
}
- memberMapper.insertBatchSomeColumn(addList);
}
if(updateList.size()>0){
for(Member c : updateList){
- dealRoleEmpower(c,param.getStartTime(), param.getEndTime());
+ dealRoleEmpower(c,param.getStartTime(), param.getEndTime());
c.setHkStatus(Constants.ZERO);
memberMapper.updateById(c);
}
@@ -298,7 +309,6 @@
}else{
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鍚屾ERP鏁版嵁涓虹┖锛�");
}
-
}
public void dealRoleEmpower(Member member,Date startTime , Date endTime){
@@ -317,7 +327,7 @@
company = companyMapper.selectOne(new QueryWrapper<Company>().lambda().eq(Company::getErpId,response.getOrgId()).last("limit 1"));
if(Objects.isNull(company)){
continue;
- }
+ }
}
//鏍规嵁 erpId 鏌ヨ鐢ㄦ埛淇℃伅锛屽垽鏂槸鏂板杩樻槸鏇存柊
Member member = findUserByERPId(allList,response.getId());
@@ -353,17 +363,21 @@
Member member = new Member();
BeanUtils.copyProperties(param,member);
member.setCreateDate(new Date());
- member.setHkStatus(Constants.ZERO);
+ if(StringUtils.isBlank(param.getFaceImg())){
+ member.setHkStatus(Constants.THREE);
+ }else{
+ member.setHkStatus(Constants.ZERO);
+ }
member.setErpStatus(Constants.ONE);
member.setErpDate(new Date());
member.setErpId(param.getId());
+ member.setIdcardType(param.getIdType());
member.setFsStatus(Constants.ZERO);
member.setStatus(param.getStatus());
member.setType(Constants.memberType.internal);
String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
member.setIdcardNo(encryptIdNo);
member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
- member.setHkStatus(Constants.ZERO);
member.setRoleIds(param.getRoleIds());
member.setCompanyId(Objects.isNull(company)?null:company.getId());
member.setErpOrgId(param.getOrgId());
@@ -606,10 +620,10 @@
queryWrapper.selectAs(DeviceEvent::getUserType,DoorEventListResponse::getType);
queryWrapper.selectAs(DeviceEvent::getExtEventInOut,DoorEventListResponse::getEventInOut);
queryWrapper.selectAs(DeviceEvent::getExtAccessChannel,DoorEventListResponse::getExtAccessChannel);
- queryWrapper.selectAs(DeviceEvent::getCreateDate,DoorEventListResponse::getCreateTime);
+ queryWrapper.selectAs(DeviceEvent::getHappenTime,DoorEventListResponse::getCreateTime);
queryWrapper.selectAs(Member::getPhone,DoorEventListResponse::getPhone);
queryWrapper.selectAs(Member::getErpId,DoorEventListResponse::getUserId);
- queryWrapper.selectAs(Member::getCompanyId,DoorEventListResponse::getOrgId);
+ queryWrapper.selectAs(Member::getErpOrgId,DoorEventListResponse::getOrgId);
queryWrapper.leftJoin(Member.class,Member::getHkId,DeviceEvent::getExtEventPersonNo);
if(!Objects.isNull(doorEventListRequest)){
@@ -715,9 +729,9 @@
if(Objects.isNull(param)
||Objects.isNull(param.getId())
||StringUtils.isBlank(param.getName())
- ||StringUtils.isBlank(param.getLinkName())
- ||StringUtils.isBlank(param.getLinkPhone())
- ||Objects.isNull(param.getEditDate())
+// ||StringUtils.isBlank(param.getLinkName())
+// ||StringUtils.isBlank(param.getLinkPhone())
+// ||Objects.isNull(param.getEditDate())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
@@ -729,6 +743,7 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌涓婄骇缁勭粐鏁版嵁");
}
}
+ String rootOrgId = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_ROOTORG_CODE).getCode();
if(Objects.isNull(company)){
company = new Company();
company.setId(null);
@@ -736,9 +751,14 @@
company.setHkStatus(Constants.ZERO);
company.setErpStatus(Constants.ONE);
company.setErpDate(new Date());
+ company.setName(param.getName());
+ /* if(StringUtils.isNotBlank(param.getParentId())){
+ company.setHkId(rootOrgId);
+ }*/
company.setErpId(param.getId());
company.setErpParentId(param.getParentId());
company.setParentId(Objects.isNull(parentCompany)?null:parentCompany.getId());
+ company.setErpParentId(param.getParentId());
company.setFsStatus(Constants.ZERO);
company.setType(Constants.ONE);
company.setLinkName(param.getLinkName());
@@ -749,8 +769,12 @@
// BeanUtils.copyProperties(param,company);
company.setEditDate(new Date());
company.setErpId(param.getId());
+ /* if(StringUtils.isNotBlank(param.getParentId())){
+ company.setHkId(rootOrgId);
+ }*/
company.setHkStatus(Constants.ZERO);
company.setErpDate(new Date());
+ company.setName(param.getName());
company.setErpParentId(param.getParentId());
company.setParentId(Objects.isNull(parentCompany)?null:parentCompany.getId());
company.setLinkName(param.getLinkName());
@@ -765,22 +789,20 @@
}
}
-
-
@Override
public void userUpdate(UserUpdateRequest param){
try{
if(Objects.isNull(param)
- ||Objects.isNull(param.getId())
- ||StringUtils.isBlank(param.getName())
- ||StringUtils.isBlank(param.getIdNo())
- ||Objects.isNull(param.getIdType())
- ||Objects.isNull(param.getSex())
- ||Objects.isNull(param.getOrgId())
- ||StringUtils.isNotBlank(param.getFaceImg())
- ||StringUtils.isNotBlank(param.getCode())
- ||StringUtils.isNotBlank(param.getPhone())
- ||Objects.isNull(param.getEditDate())){
+ ||Objects.isNull(param.getId())//缂栫爜
+ ||StringUtils.isBlank(param.getName())//鍚嶇О
+ ||StringUtils.isBlank(param.getIdNo())//璇佷欢鍙�
+ ||Objects.isNull(param.getIdType())//璇佷欢绫诲瀷
+ ||Objects.isNull(param.getSex())//鎬у埆
+ ||Objects.isNull(param.getOrgId())//鎵�灞炵粍缁囩紪鐮�
+// ||StringUtils.isBlank(param.getFaceImg())//浜鸿劯鐓х墖
+ ||StringUtils.isBlank(param.getCode())//宸ュ彿
+ ||StringUtils.isBlank(param.getPhone())//鎵嬫満鍙�
+ ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getId()).last("limit 1"));
@@ -802,11 +824,12 @@
member.setType(Constants.memberType.internal);
String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
member.setIdcardNo(encryptIdNo);
+ member.setStartTime(param.getValidStartTime());
+ member.setEndTime(param.getValidEndTime());
member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
member.setErpOrgId(param.getOrgId());
doorIds = getRoleIdByParam(param.getRoleIds(),member);
memberMapper.insert(member);
- //TODO 娴峰悍鏁版嵁鍒涘缓-------------淇敼-------------------
}else{
Integer id = member.getId();
BeanUtils.copyProperties(param,member);
@@ -819,10 +842,11 @@
doorIds = getRoleIdByParam(param.getRoleIds(),member);
member.setErpDate(new Date());
member.setHkStatus(Constants.ZERO);
+ member.setStartTime(param.getValidStartTime());
+ member.setEndTime(param.getValidEndTime());
memberMapper.updateById(member);
//鍒犻櫎鐢ㄦ埛鍗＄墖鏁版嵁 浜哄憳瑙掕壊鍏宠仈
memberCardMapper.delete(new QueryWrapper<MemberCard>().lambda().eq(MemberCard::getMemberId,member.getId()));
- //TODO 娴峰悍鏁版嵁鏇存柊
}
//濡傛灉鏈夋巿鏉冮棬绂佹暟鎹紝杩涜鐢ㄦ埛鎺堟潈鏁版嵁涓嬪彂浠诲姟鍒涘缓
dealMemberRoleEmpower(member,doorIds,param.getValidStartTime(),param.getValidEndTime());
@@ -856,47 +880,59 @@
}
}
}
-
/**
* //濡傛灉鏈夋巿鏉冮棬绂佹暟鎹紝杩涜鐢ㄦ埛鎺堟潈鏁版嵁涓嬪彂浠诲姟鍒涘缓
* @param member
*/
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));
+ if(!Objects.isNull(member)&&!Objects.isNull(member.getId())){
+ 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;
}
- List<Empower> list = new ArrayList<>();
- List<Device> deviceList = deviceMapper.selectList(new QueryWrapper<Device>().lambda().in(Device::getId,doorIds));
- if(deviceList == null || deviceList.size() == 0){
- return;
+ if(StringUtils.isBlank(member.getFaceImg())){
+ return;
}
- for (Device deviceRole:deviceList) {
- Empower model = new Empower();
- model.setCreateDate(new Date());
- model.setMemberId(member.getId());
- model.setIsdeleted(Constants.ZERO);
- model.setDeviceId(deviceRole.getId());
- model.setSendStatus(Constants.ZERO);
- model.setStartTime(startTime);
- model.setEndTime(endTime);
- model.setSendType(Constants.ZERO);
- list.add(model);
+ if(Constants.equalsObject(member.getHkStatus(),Constants.ONE)){
+ //濡傛灉鐢ㄦ埛鏄悓姝ユ捣搴锋垚鍔燂紝娣诲姞甯︿笅鍙戞潈闄�
+ List<Empower> list = new ArrayList<>();
+ List<Device> deviceList = deviceMapper.selectList(new QueryWrapper<Device>().lambda().in(Device::getId,doorIds));
+ if(deviceList == null || deviceList.size() == 0){
+ return;
+ }
+ for (Device deviceRole:deviceList) {
+ Empower model = new Empower();
+ model.setCreateDate(new Date());
+ model.setMemberId(member.getId());
+ model.setIsdeleted(Constants.ZERO);
+ model.setDeviceId(deviceRole.getId());
+ model.setSendStatus(Constants.ZERO);
+ model.setStartTime(startTime);
+ model.setEndTime(endTime);
+ //榛樿缁欎簬铏氭嫙鍗�
+ model.setCardNos(Constants.VIRTUAL_CARD_INDEX+member.getId());
+ model.setSendType(Constants.ZERO);
+ list.add(model);
+ }
+ //瀵煎叆鏂板鐨勬巿鏉冧俊鎭�
+ empowerMapper.insertBatchSomeColumn(list);
}
- //瀵煎叆鏂板鐨勬巿鏉冧俊鎭�
- empowerMapper.insertBatchSomeColumn(list);
}
private List<Integer> getRoleIdByParam(Integer[] param, Member member) {
//娣诲姞浜哄憳瑙掕壊鍏宠仈鏁版嵁
- memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
+ if(!Objects.isNull(member)&&!Objects.isNull(member.getId())){
+ memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
+ }
if(!Objects.isNull(param)&¶m.length>Constants.ZERO){
//鏌ヨ鏁版嵁搴撳瓨鍦ㄧ殑鏉冮檺
List<DeviceRole> deviceRoleList= deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
@@ -933,7 +969,6 @@
}
memberRoleMapper.insertBatchSomeColumn(memberRoleList);
member.setRoleId(ids);
-
return r;
}
}
@@ -951,6 +986,13 @@
return;
}
List<Integer> doorIds = getRoleIdByParam(param.getRoleIds(),member);
+ //鏇存柊鎺堟潈鏈夋晥鏈�
+ Member update = new Member();
+ update.setId(member.getId());
+ update.setEditDate(new Date());
+ update.setStartTime(param.getValidStartTime());
+ update.setEndTime(param.getValidEndTime());
+ memberMapper.updateById(update);
//濡傛灉鏈夋巿鏉冮棬绂佹暟鎹紝杩涜鐢ㄦ埛鎺堟潈鏁版嵁涓嬪彂浠诲姟鍒涘缓
dealMemberRoleEmpower(member,doorIds,param.getValidStartTime(),param.getValidEndTime());
@@ -972,7 +1014,7 @@
.set(ParkBook::getHkStatus,Constants.ZERO)
);
//鏌ヨ杞﹀簱淇℃伅
- List<Parks> parksList = parksMapper.selectList(new QueryWrapper<Parks>().lambda().in(Parks::getId,param.getPartIdList()));
+ List<Parks> parksList = parksMapper.selectList(new QueryWrapper<Parks>().lambda().in(Parks::getId,param.getParkIdList()));
if(CollectionUtils.isNotEmpty(parksList)){
List<ParkBook> parkBookList = new ArrayList<>();
for (Parks parks:parksList) {
--
Gitblit v1.9.3