From 2e7ba2bc0fbefa6ee0b44eaf1990a493795efe4a Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 16:33:36 +0800
Subject: [PATCH] 导出字段对接调整提交
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 151 ++++++++++++++++++++++++++++----------------------
1 files changed, 85 insertions(+), 66 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 bfd400e..8d5026f 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
@@ -12,20 +12,15 @@
import com.doumee.core.erp.ErpConstants;
import com.doumee.core.erp.ErpTool;
import com.doumee.core.erp.model.openapi.request.erp.*;
-import com.doumee.core.erp.model.openapi.response.erp.ApproveInfoResponse;
import com.doumee.core.erp.model.openapi.response.erp.ERPApiResponse;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
-import com.doumee.core.haikang.model.param.BaseResponse;
-import com.doumee.core.haikang.model.param.request.OrgAddRequest;
-import com.doumee.core.haikang.model.param.request.OrgDelRequest;
-import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.erp.model.openapi.request.*;
import com.doumee.core.erp.model.openapi.response.*;
-import com.doumee.core.erp.model.openapi.response.erp.OrgListRespone;
-import com.doumee.core.erp.model.openapi.response.erp.UserListRespone;
+import com.doumee.core.erp.model.openapi.response.erp.ErpOrgListResponse;
+import com.doumee.core.erp.model.openapi.response.erp.ErpUserListResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
@@ -39,11 +34,8 @@
import com.doumee.service.business.ERPSyncService;
import com.doumee.service.business.InterfaceLogService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.hikvision.artemis.sdk.config.ArtemisConfig;
-import io.swagger.models.auth.In;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
-import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
@@ -118,7 +110,7 @@
public int initHkConfig(){
ErpConstants.approveUrl=systemDictDataBiz.queryByCode(Constants.ERP,Constants.ERP_APPROVE_URL).getCode();
ErpConstants.orgListUrl=systemDictDataBiz.queryByCode(Constants.ERP,Constants.ERP_ORGLIST_URL).getCode();
- ErpConstants.userListUrl=systemDictDataBiz.queryByCode(Constants.ERP,Constants.ERP_USERSTATUS_RL).getCode();
+ ErpConstants.userListUrl=systemDictDataBiz.queryByCode(Constants.ERP,Constants.ERP_USERLIST_URL).getCode();
ErpConstants.userStatusUrl=systemDictDataBiz.queryByCode(Constants.ERP,Constants.ERP_USERSTATUS_RL).getCode();
return 0;
}
@@ -131,7 +123,7 @@
@Transactional
public String syncCompany(OrgListRequest param){
//鑾峰彇ERP缁勭粐淇℃伅锛堝叏閲忓悓姝ワ級
- List<OrgListRespone> list = ErpTool.getErpOrgList(ErpConstants.orgListUrl,param);
+ List<ErpOrgListResponse> list = ErpTool.getErpOrgList(ErpConstants.orgListUrl,param);
if(list !=null && list.size()>0){
List<Company> addList = new ArrayList<>();
List<Company> updateList = new ArrayList<>();
@@ -167,9 +159,9 @@
* @param delIds
* @param allList
*/
- private void dealCompanyChangeList(List<OrgListRespone> list, List<Company> addList, List<Company> updateList, List<Integer> delIds, List<Company> allList) {
+ private void dealCompanyChangeList(List<ErpOrgListResponse> list, List<Company> addList, List<Company> updateList, List<Integer> delIds, List<Company> allList) {
Date date = new Date();
- for(OrgListRespone respone : list){
+ for(ErpOrgListResponse respone : list){
//鏍规嵁erpid鏌ヨ浼佷笟淇℃伅锛屽垽鏂槸鏂板杩樻槸鏇存柊
Company company = findCompanyByERPId(allList,respone.getId());
if(company == null){
@@ -185,13 +177,15 @@
//濡傛灉宸插垹闄わ紝鍔犲叆鍒犻櫎闆嗗悎涓�
delIds.add(company.getId());
continue;
+ }else{
+ company.setIsdeleted(Constants.ZERO);
}
updateList.add(addUpdateCompanyModel(respone,company,date));
}
}
if(allList!=null && allList.size()>0){
for(Company c : allList){
- if(isCompanyDeleted(c,list)){
+ if(!isCompanyDeleted(c,list)){
delIds.add(c.getId());
}
}
@@ -206,7 +200,7 @@
* @param date
* @return
*/
- private Company addUpdateCompanyModel(OrgListRespone respone,Company company,Date date) {
+ private Company addUpdateCompanyModel(ErpOrgListResponse respone, Company company, Date date) {
company.setName(respone.getName());
company.setErpId(respone.getId());
company.setEditDate(date);
@@ -223,12 +217,13 @@
* @param date
* @return
*/
- private Company getAddCompanyModel(OrgListRespone respone, Date date) {
+ private Company getAddCompanyModel(ErpOrgListResponse respone, Date date) {
Company company = new Company();
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());
company.setErpDate(date);
@@ -236,8 +231,8 @@
return company;
}
- private boolean isCompanyDeleted(Company c, List<OrgListRespone> list) {
- for(OrgListRespone m : list){
+ private boolean isCompanyDeleted(Company c, List<ErpOrgListResponse> list) {
+ for(ErpOrgListResponse m : list){
if(StringUtils.equals(c.getErpId(),m.getId())){
return true;
}
@@ -265,8 +260,9 @@
* @return
*/
@Override
+ @Transactional
public String syncUsers(UserListRequest param){
- List<UserListRespone> list = ErpTool.getErpUserList(ErpConstants.userListUrl,param);
+ List<ErpUserListResponse> list = ErpTool.getErpUserList(ErpConstants.userListUrl,param);
if(list !=null && list.size()>0) {
List<Member> addList = new ArrayList<>();
List<Member> updateList = new ArrayList<>();
@@ -285,6 +281,7 @@
if(updateList.size()>0){
for(Member c : updateList){
dealRoleEmpower(c,param.getStartTime(), param.getEndTime());
+ c.setHkStatus(Constants.ZERO);
memberMapper.updateById(c);
}
}
@@ -293,13 +290,15 @@
dealRoleEmpower(member,param.getStartTime(), param.getEndTime());
}
delIds = delList.stream().map(m->m.getId()).collect(Collectors.toList());
- memberMapper.update(null,new UpdateWrapper<Member>().lambda().set(Member::getHkStatus,Constants.ZERO)
+ memberMapper.update(null,new UpdateWrapper<Member>().lambda()
+ .set(Member::getHkStatus,Constants.ZERO)
.set(Member::getIsdeleted, Constants.ONE).in(Member::getId,delIds));
}
+ return "鍚屾鏁版嵁锛氭柊澧炪��"+addList.size()+"銆戞潯锛屾洿鏂般��"+updateList.size()+"銆戞潯锛屽垹闄ゃ��"+delIds.size()+"銆戞潯";
}else{
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鍚屾ERP鏁版嵁涓虹┖锛�");
}
- return null;
+
}
public void dealRoleEmpower(Member member,Date startTime , Date endTime){
@@ -310,9 +309,16 @@
}
- private void dealUserChangeList(List<UserListRespone> list, List<Member> addList, List<Member> updateList,List<Member> delList, List<Member> allList) {
+ private void dealUserChangeList(List<ErpUserListResponse> list, List<Member> addList, List<Member> updateList, List<Member> delList, List<Member> allList) {
Date date = new Date();
- for(UserListRespone response : list){
+ for(ErpUserListResponse response : list){
+ Company company = new Company();
+ if(StringUtils.isNotBlank(response.getOrgId())){
+ 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());
if(member == null){
@@ -321,7 +327,7 @@
continue;
}
//灏佽鏂板缁勭粐瀵硅薄鏁版嵁
- addList.add(getAddMemberModel(response,date));
+ addList.add(getAddMemberModel(response,date,company));
}else{
//濡傛灉鏄洿鏂�
if(Constants.formatIntegerNum(response.getIsdeleted()) == Constants.ONE){
@@ -329,23 +335,21 @@
member.setRoleIds(response.getRoleIds());
delList.add(member);
// delIds.add(member.getId());
-
continue;
}
- updateList.add(addUpdateMemberModel(response,member,date));
+ updateList.add(addUpdateMemberModel(response,member,date,company));
}
}
if(allList!=null && allList.size()>0){
for(Member c : allList){
- if(isUserDeleted(c,list)){
+ if(!Constants.equalsInteger(c.getIsdeleted(),Constants.ONE) && !isUserDeleted(c,list)){
delList.add(c);
-// delIds.add(c.getId());
}
}
}
}
- private Member getAddMemberModel(UserListRespone param, Date date) {
+ private Member getAddMemberModel(ErpUserListResponse param, Date date,Company company) {
Member member = new Member();
BeanUtils.copyProperties(param,member);
member.setCreateDate(new Date());
@@ -354,31 +358,36 @@
member.setErpDate(new Date());
member.setErpId(param.getId());
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.setCompanyId(param.getOrgId());
member.setHkStatus(Constants.ZERO);
member.setRoleIds(param.getRoleIds());
+ member.setCompanyId(Objects.isNull(company)?null:company.getId());
+ member.setErpOrgId(param.getOrgId());
return member;
}
- private Member addUpdateMemberModel(UserListRespone param,Member member,Date date) {
+ private Member addUpdateMemberModel(ErpUserListResponse param, Member member, Date date,Company company) {
BeanUtils.copyProperties(param,member);
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());
+ member.setStatus(param.getStatus());
member.setErpDate(new Date());
member.setHkStatus(Constants.ZERO);
member.setRoleIds(param.getRoleIds());
+ member.setCompanyId(Objects.isNull(company)?null:company.getId());
+ member.setErpOrgId(param.getOrgId());
return member;
}
- private boolean isUserDeleted(Member c, List<UserListRespone> list) {
- for(UserListRespone m : list){
+ private boolean isUserDeleted(Member c, List<ErpUserListResponse> list) {
+ for(ErpUserListResponse m : list){
if(StringUtils.equals(c.getErpId(),m.getId().toString())){
c.setRoleIds(m.getRoleIds());
return true;
@@ -429,8 +438,8 @@
result.setToken(token);
result.setExpireTime(Constants.RedisKeys.EXPIRE_TIME);
return result;
- }catch (BusinessException e ){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),e.getMessage());
+ }catch (BusinessException e){
+ throw e;
}finally {
Map<String,String> param = new HashMap<>();
param.put("accessKey",accessKey);
@@ -483,8 +492,8 @@
}
}
}
- }catch (Exception e){
- e.printStackTrace();
+ }catch (BusinessException e){
+ throw e;
}finally {
saveInterfaceLog(param,"/visitBiz/resource/role/list",JSONObject.toJSONString(result),Constants.ZERO);
}
@@ -515,8 +524,8 @@
result.add(parkListResponse);
}
}
- }catch (Exception e){
- e.printStackTrace();
+ }catch (BusinessException e){
+ throw e;
}finally {
saveInterfaceLog(param,"/visitBiz/resource/park/list",JSONObject.toJSONString(result),Constants.ZERO);
}
@@ -570,8 +579,8 @@
}
IPage<VisitEventListResponse> pageData = visitEventJoinMapper.selectJoinPage(page, VisitEventListResponse.class,queryWrapper);
result = PageData.from(pageData);
- }catch (Exception e){
- e.printStackTrace();
+ }catch (BusinessException e){
+ throw e;
}finally {
saveInterfaceLog(param,"/visitBiz/resource/visit/list",JSONObject.toJSONString(result),Constants.ZERO);
}
@@ -624,8 +633,8 @@
IPage<DoorEventListResponse> pageData = deviceEventJoinMapper.selectJoinPage(page, DoorEventListResponse.class,queryWrapper);
result = PageData.from(pageData);
- }catch (Exception e){
- e.printStackTrace();
+ }catch (BusinessException e){
+ throw e;
}finally {
saveInterfaceLog(param,"/visitBiz/resource/doorEvent/list",JSONObject.toJSONString(result),Constants.ZERO);
}
@@ -688,8 +697,8 @@
i.setVehiclePicUrl(null);
}
});
- }catch (Exception e){
- e.printStackTrace();
+ }catch (BusinessException e){
+ throw e;
}finally {
saveInterfaceLog(param,"/visitBiz/resource/carEventList",JSONObject.toJSONString(result),Constants.ZERO);
}
@@ -713,9 +722,15 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
Company company = companyMapper.selectOne(new QueryWrapper<Company>().lambda().eq(Company::getErpId,param.getId()).last("limit 1"));
+ Company parentCompany = new Company();
+ if(StringUtils.isNotBlank(param.getParentId())){
+ parentCompany = companyMapper.selectOne(new QueryWrapper<Company>().lambda().eq(Company::getErpId,param.getParentId()).last("limit 1"));
+ if(Objects.isNull(parentCompany)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌涓婄骇缁勭粐鏁版嵁");
+ }
+ }
if(Objects.isNull(company)){
company = new Company();
-// BeanUtils.copyProperties(param,company);
company.setId(null);
company.setCreateDate(new Date());
company.setHkStatus(Constants.ZERO);
@@ -723,6 +738,7 @@
company.setErpDate(new Date());
company.setErpId(param.getId());
company.setErpParentId(param.getParentId());
+ company.setParentId(Objects.isNull(parentCompany)?null:parentCompany.getId());
company.setFsStatus(Constants.ZERO);
company.setType(Constants.ONE);
company.setLinkName(param.getLinkName());
@@ -736,13 +752,14 @@
company.setHkStatus(Constants.ZERO);
company.setErpDate(new Date());
company.setErpParentId(param.getParentId());
+ company.setParentId(Objects.isNull(parentCompany)?null:parentCompany.getId());
company.setLinkName(param.getLinkName());
company.setLinkPhone(param.getLinkPhone());
companyMapper.updateById(company);
//TODO 娴峰悍鏁版嵁鏇存柊
}
- }catch (Exception e){
- e.printStackTrace();
+ }catch (BusinessException e){
+ throw e;
}finally {
saveInterfaceLog(param,"/visitBiz/resource/orgUpdate",null,Constants.ZERO);
}
@@ -763,11 +780,14 @@
||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"));
+ Company company = companyMapper.selectOne(new QueryWrapper<Company>().lambda().eq(Company::getErpId,param.getOrgId()).last("limit 1"));
+ if(Objects.isNull(company)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌缁勭粐淇℃伅");
+ }
List<Integer> doorIds = null;
if(Objects.isNull(member)){
member = new Member();
@@ -783,10 +803,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);
@@ -794,7 +814,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());
@@ -808,8 +828,8 @@
dealMemberRoleEmpower(member,doorIds,param.getValidStartTime(),param.getValidEndTime());
//娣诲姞浜哄憳鍗＄墖鏁版嵁
dealMemberCard(member,param);
- }catch (Exception e){
- e.printStackTrace();
+ }catch (BusinessException e){
+ throw e;
}finally {
saveInterfaceLog(param,"/visitBiz/resource/userUpdate",null,Constants.ZERO);
}
@@ -843,14 +863,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;
}
@@ -1000,8 +1019,8 @@
visitsMapper.updateById(i);
});
}
- }catch (Exception e){
- e.printStackTrace();
+ }catch (BusinessException e){
+ throw e;
}finally {
saveInterfaceLog(param,"/visitBiz/resource/approveApply",null,Constants.ZERO);
}
--
Gitblit v1.9.3