From 9ffa4aac7e3ae6b268dbc3567a0749a9898c3708 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 11 一月 2024 18:09:09 +0800
Subject: [PATCH] ERP接口
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncOrgUserServiceImpl.java | 336 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 282 insertions(+), 54 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncOrgUserServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncOrgUserServiceImpl.java
index 8635604..916c664 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncOrgUserServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncOrgUserServiceImpl.java
@@ -14,25 +14,24 @@
import com.doumee.core.haikang.model.param.respose.*;
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.ImageBase64Util;
import com.doumee.dao.business.*;
import com.doumee.dao.business.join.CompanyJoinMapper;
+import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.service.business.ERPSyncService;
import com.github.yulichang.query.MPJQueryWrapper;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
-import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
/**
* 娴峰悍缁勭粐浜哄憳閫氳繃姝ervice瀹炵幇
@@ -44,16 +43,21 @@
public class HkSyncOrgUserServiceImpl extends HkSyncBaseServiceImpl {
@Autowired
private CompanyMapper companyMapper;
+
@Autowired
private MemberRoleMapper memberRoleMapper;
@Autowired
- private EmpowerMapper empowerMapper;
- @Autowired
- private MemberMapper memberMapper;
- @Autowired
- private ERPSyncService erpSyncService;
+ private DeviceRoleMapper deviceRoleMapper;
@Autowired
private DeviceMapper deviceMapper;
+ @Autowired
+ private EmpowerMapper empowerMapper;
+ @Autowired
+ private MemberCardMapper memberCardMapper;
+ @Autowired
+ private MemberJoinMapper memberMapper;
+ @Autowired
+ private ERPSyncService erpSyncService;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@@ -70,7 +74,7 @@
//鏌ヨ鎵�鏈夐渶瑕佸悓姝ョ殑浼佷笟鏁版嵁
String rootOrgId = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_ROOTORG_CODE).getCode();
List<Company> list = companyMapper.selectList(new QueryWrapper<Company>()
- .select("*,(select b.hk_id from company b where company.erp_parent_id = b.id limit 1) as hkParentId")
+ .select("*,(select b.hk_id from company b where company.erp_parent_id = b.erp_id limit 1) as hkParentId")
.lambda()
.eq(Company::getHkStatus,Constants.ZERO)
.orderByAsc(Company::getErpDate));
@@ -78,6 +82,7 @@
return;
}
Date date = new Date();
+ List<OrgEditRequest> editHkList = new ArrayList<>();
List<OrgAddRequest> addList = new ArrayList<>();
List<Company> updateList = new ArrayList<>();
List<Integer> delIds = new ArrayList<>();
@@ -104,20 +109,21 @@
c.setHkId(m.getOrgIndexCode());
updateList.add(c);
}else{
- //鍒犻櫎鐨勬暟鎹紝杩涜鍒犻櫎
- delIds.add(c.getId());
- delHKIds.add(c.getHkId());
- //鍒犻櫎娴峰悍鍘熸湁鐨勬暟鎹紝鍐嶆柊澧炵粍缁�
- OrgAddRequest m = getOrgAddModel(c,rootOrgId);
- addList.add(m);
- c.setHkId(m.getOrgIndexCode());
+ if(Constants.equalsInteger(c.getIsdeleted(),Constants.ONE)){
+ //鍒犻櫎鐨勬暟鎹紝杩涜鍒犻櫎
+ delIds.add(c.getId());
+ delHKIds.add(c.getHkId());
+ }else{
+ //濡傛灉鏇存柊
+ editHkList.add(getOrgHkEditModel(c,rootOrgId));
+ }
updateList.add(c);
}
}
//澶勭悊鍒犻櫎鏁版嵁
doHkDeleteOrg(delIds,delHKIds,date);
//澶勭悊鏂板鏁版嵁
- doHkAddOrg(updateList,addList);
+ doHkAddOrg(updateList,addList,editHkList);
}catch (Exception e){
e.printStackTrace();
}finally {
@@ -131,24 +137,51 @@
* @param updateList
* @param addList
*/
- private void doHkAddOrg(List<Company> updateList, List<OrgAddRequest> addList) {
+ private void doHkAddOrg(List<Company> updateList, List<OrgAddRequest> addList, List<OrgEditRequest> editHkList) {
Date date = new Date();
-
- BaseResponse<OrgOrUserAddResponse> result = HKService.addBatchOrg(addList);
- if(StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
- OrgOrUserAddResponse data = result.getData();
- if(data.getSuccesses()!=null && data.getSuccesses().size()>0){
- //澶勭悊鏂板鎴愬姛鐨勬暟鎹紝淇敼娴峰悍鍚屾鐘舵��
- for(OrgOrUserAddSuccessResponse r :data.getSuccesses()){
- Integer index = getCompanyId(updateList,r.getOrgIndexCode());
- if(index!=null){
- companyMapper.update(null,new UpdateWrapper<Company>().lambda()
- .set(Company::getHkStatus,Constants.ONE)
- .set(Company::getHkDate,date)
- .set(Company::getHkId,r.getOrgIndexCode())
- .eq(Company::getId, index) );
- }
- }
+ if(addList!=null &&addList.size()>0){
+ //澶勭悊鏂板
+ BaseResponse<OrgOrUserAddResponse> result = HKService.addBatchOrg(addList);
+ if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
+ OrgOrUserAddResponse data = result.getData();
+ if(data.getSuccesses()!=null && data.getSuccesses().size()>0){
+ //澶勭悊鏂板鎴愬姛鐨勬暟鎹紝淇敼娴峰悍鍚屾鐘舵��
+ for(OrgOrUserAddSuccessResponse r :data.getSuccesses()){
+ Integer index = getCompanyId(updateList,r.getOrgIndexCode());
+ if(index!=null){
+ companyMapper.update(null,new UpdateWrapper<Company>().lambda()
+ .set(Company::getHkStatus,Constants.ONE)
+ .set(Company::getHkDate,date)
+ .set(Company::getHkId,r.getOrgIndexCode())
+ .eq(Company::getId, index) );
+ }
+ }
+ }
+ }
+ }
+ if(editHkList!=null){
+ //鎵ц鏇存柊鎿嶄綔
+ List<String> success = new ArrayList<>();
+ List<String> error = new ArrayList<>();
+ for(OrgEditRequest param : editHkList){
+ BaseResponse result = HKService.editOrg(param);
+ if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
+ success.add(param.getOrgIndexCode());
+ }else{
+ error.add(param.getOrgIndexCode());
+ }
+ }
+ if(success.size()>0){
+ companyMapper.update(null,new UpdateWrapper<Company>().lambda()
+ .set(Company::getHkStatus,Constants.ONE)
+ .set(Company::getHkDate,date)
+ .in(Company::getHkId, success) );
+ }
+ if(error.size()>0){
+ companyMapper.update(null,new UpdateWrapper<Company>().lambda()
+ .set(Company::getHkStatus,Constants.TWO)
+ .set(Company::getHkDate,date)
+ .in(Company::getHkId, error) );
}
}
}
@@ -167,9 +200,16 @@
private OrgAddRequest getOrgAddModel(Company c,String rootOrgId) {
OrgAddRequest model = new OrgAddRequest();
model.setOrgIndexCode(HKConstants.RES_ORG_INDEX+UUID.randomUUID().toString().replace("-",""));
- model.setOrgName(c.getName());
+ model.setOrgName(c.getName()+HKConstants.RES_ORG_NAME_INDEX);
// model.setOrgCode(c.getCode());
model.setParentIndexCode(c.getHkParentId());
+ return model;
+
+ }
+ private OrgEditRequest getOrgHkEditModel(Company c,String rootOrgId) {
+ OrgEditRequest model = new OrgEditRequest();
+ model.setOrgIndexCode(c.getHkId());
+ model.setOrgName(c.getName());
return model;
}
@@ -186,11 +226,11 @@
OrgDelRequest request = new OrgDelRequest();
request.setIndexCodes( delHkIds.toArray(new String[]{}));
BaseResponse<List<OrgUpdateFailureResponse>> result = HKService.delBatchOrg(request);
- if(StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
+ if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
List<String> fIds = new ArrayList<>();
if(result.getData()!=null){
for(OrgUpdateFailureResponse r : result.getData()){
- if(!r.getCode().equals("0x00072001")){
+ if(!r.getCode().equals("0x00052102")){
//涓嶅瓨鍦ㄧ殑涔熺畻鍒犻櫎鎴愬姛
fIds.add(r.getOrgIndexCode());//鍒犻櫎澶辫触鐨勬暟鎹泦鍚�
}
@@ -200,8 +240,14 @@
companyMapper.update(null,new UpdateWrapper<Company>().lambda()
.set(Company::getHkStatus,Constants.ONE)
.set(Company::getHkDate,date)
+ .set(Company::getHkId,null )
.in(Company::getId, delIds)
.notIn(fIds.size()>0,Company::getHkId, fIds));
+ companyMapper.update(null,new UpdateWrapper<Company>().lambda()
+ .set(Company::getHkStatus,Constants.TWO)
+ .set(Company::getHkDate,date)
+ .in(Company::getId, delIds)
+ .in(fIds.size()>0,Company::getHkId, fIds));
}
}
@@ -217,8 +263,11 @@
Constants.DEALING_HK_USER =true;
try {
//鏌ヨ鎵�鏈夐渶瑕佸悓姝ョ殑浼佷笟鏁版嵁
- List<Member> list = memberMapper.selectList(new QueryWrapper<Member>()
- .lambda()
+ List<Member> list = memberMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
+ .selectAll(Member.class )
+ .selectAs(Company::getHkId,Member::getCompanyHkId)
+ .isNotNull(Member::getFaceImg)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
.eq(Member::getHkStatus,Constants.ZERO)
.orderByAsc(Member::getErpDate));
if(list ==null || list.size()==0){
@@ -236,14 +285,43 @@
Constants.DEALING_HK_USER =false;
}
}
-
+ public static List<Integer> getRoleIdByParam( Member member,DeviceRoleMapper deviceRoleMapper) {
+ //鏌ヨ鏁版嵁搴撳瓨鍦ㄧ殑鏉冮檺
+ List<DeviceRole> deviceRoleList= deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
+ .eq(DeviceRole::getType,Constants.TWO)
+ .exists("(select b.id from member_role b where b.ROLE_ID = device_role.ID and b.MEMBER_ID="+member.getId()+")"));
+ if(CollectionUtils.isNotEmpty(deviceRoleList)){
+ List<MemberRole> memberRoleList = new ArrayList<>();
+ String ids = "";
+ List<Integer> r = new ArrayList<>();
+ for (int i = 0; i < deviceRoleList.size(); i++) {
+ DeviceRole deviceRole =deviceRoleList.get(i);
+ if(i>0){
+ ids += ",";
+ }
+ String doorids =deviceRole.getDoorIds();
+ if(StringUtils.isNotBlank(doorids)){
+ String[] ss = doorids.split(",");
+ try {
+ for(String s :ss){
+ r.add(Integer.parseInt(s));
+ }
+ }catch (Exception e){
+ //鑴忔暟鎹笉澶勭悊
+ }
+ }
+ }
+ return r;
+ }
+ return null;
+ }
@Transactional
private boolean dealMemberInfoBiz(Member c, Date date, String path) {
if( c.getCompanyId() == null){
//濡傛灉娌℃湁缁勭粐涓嶅仛澶勭悊
return false;
}
- if(StringUtils.isBlank(c.getHkId())){
+ if(!Constants.equalsInteger(Constants.ONE,c.getIsdeleted()) && StringUtils.isBlank(c.getHkId())){
//濡傛灉鏂板鍚屾鏁告摎
dealUserHkAddBiz(c,date,path);
}else{
@@ -252,6 +330,146 @@
}
return false;
}
+ private void dealMemberRoleEmpower(Member member ) {
+ //澶勭悊鏂板鐨勪汉鍛樺崱鐗囨暟鎹紙涓庢捣搴峰悓姝ワ級
+ List<MemberCard> cards = dealMemberHkCard(member);
+ dealMemberRoleEmpowerDo(cards,member,deviceRoleMapper,empowerMapper,deviceMapper);
+ }
+
+ public static void dealMemberRoleEmpowerDo(List<MemberCard> cards,Member member , DeviceRoleMapper deviceRoleMapper, EmpowerMapper empowerMapper, DeviceMapper deviceMapper) {
+ if(cards == null || cards.size() == 0){
+ return;
+ }
+ List<Integer> doorIds = getRoleIdByParam(member,deviceRoleMapper);
+ if(doorIds==null || doorIds.size() == 0){
+ return;
+ }
+ if(StringUtils.isBlank(member.getFaceImg())){
+ return;
+ }
+
+ List<Integer> deviceIds =new ArrayList<>();//鏂拌澶囩紪鐮侀泦鍚�
+ List<Empower> list = new ArrayList<>();//鏂版巿鏉冭褰曢泦鍚�
+ if(Constants.equalsInteger(member.getIsdeleted(),Constants.ZERO)
+ && Constants.equalsObject(member.getHkStatus(),Constants.ONE)){
+ //濡傛灉鐢ㄦ埛鏄悓姝ユ捣搴锋垚鍔燂紝娣诲姞甯︿笅鍙戞潈闄愶紙鍙鐞嗘柊澧炴垨鑰呯紪杈戠殑锛�
+ 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.setSendInfo("寰呭悓姝ュ畨闃插钩鍙�");
+ model.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
+ model.setStartTime(member.getStartTime());
+ model.setEndTime(member.getEndTime());
+ //榛樿缁欎簬铏氭嫙鍗�
+ model.setCardNos(Constants.VIRTUAL_CARD_INDEX+member.getId());
+ model.setSendType(Constants.ZERO);
+ //鏍囪鏈�鏂扮殑鎺堟潈璁惧缂栫爜闆嗗悎
+ deviceIds.add(deviceRole.getId());
+ list.add(model);
+ }
+
+ }
+ //寰呯Щ闄ゆ潈闄愮殑璁惧鏁版嵁鎺堟潈璁板綍锛堥拡瀵瑰垹闄ゅ拰鏇存柊涓㈠け鐨勬潈闄愶紝闇�瑕佸悓姝ヤ笅鍙戝垹闄ゆ潈闄愶級
+ empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
+ .eq(Empower::getMemberId,member.getId())
+ .set(Empower::getIsdeleted,Constants.ONE)
+ .eq(Empower::getIsdeleted,Constants.ZERO)
+ .notIn(deviceIds.size()>0,Empower::getDeviceId,deviceIds)
+ .set(Empower::getSendStatus,Constants.ZERO));
+ //瀵煎叆鏂板鐨勬巿鏉冧俊鎭�
+ if(list.size()>0){
+ //鐩存帴瑕嗙洊閲嶅鐨勮澶囨潈闄愶紝鐩存帴鍒犻櫎鍗冲彲
+ empowerMapper.delete(new UpdateWrapper<Empower>().lambda()
+ .eq(Empower::getMemberId,member.getId())
+ .eq(Empower::getIsdeleted,Constants.ZERO)
+ .in(Empower::getDeviceId,deviceIds) );
+ empowerMapper.insertBatchSomeColumn(list);
+ }
+ }
+
+ /**
+ * 瀵逛汉鍛樺甫寮�鍗℃暟鎹繘琛岃嚜鍔ㄥ紑鍗℃搷浣�
+ * @param member
+ * @return
+ */
+ 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::getHkStatus,Constants.ZERO) );
+ if(memberCards==null || memberCards.size()==0){
+ //娌℃湁甯﹀鐞嗙殑鏁版嵁锛岀洿鎺ヨ烦杩�
+ return getNormalCardList(member,memberCardMapper);
+ }
+
+ List<Integer> allCodes = new ArrayList<>();
+ List<String> doneCodes = new ArrayList<>();
+ CardBingdingRequest param = new CardBingdingRequest();
+ if(member.getStartTime() !=null && member.getEndTime()!=null){
+ param.setStartDate(DateUtil.getISO8601Timestamp(member.getStartTime()));
+ param.setEndDate(DateUtil.getISO8601Timestamp(member.getEndTime()));
+ }
+ param.setCardList(new ArrayList<>());
+ for(MemberCard m : memberCards){
+ allCodes.add(m.getId());
+ if(StringUtils.isBlank(m.getCode())){
+ continue;
+ }
+ CardInfoRequest cr = new CardInfoRequest();
+ cr.setCardNo(m.getCode());
+ cr.setOrgIndexCode(member.getCompanyHkId());
+ cr.setPersonId(member.getHkId());
+ cr.setCardType(m.getType());
+ param.getCardList().add(cr);
+ }
+
+ //澶勭悊鏂板鏁版嵁
+ BaseResponse<List<CardInfoResponse>> result = HKService.cardBingding(param);
+ if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) ){
+ if(result.getData()!=null ){
+ for(CardInfoResponse r : result.getData()){
+ doneCodes.add(r.getCardNo());
+ }
+ }
+ }
+ if(doneCodes.size()>0){
+ memberCardMapper.update(null,new UpdateWrapper<MemberCard>().lambda()
+ .eq(MemberCard::getMemberId,member.getId())
+ .eq(MemberCard::getHkStatus,Constants.ZERO)
+ .set(MemberCard::getHkStatus,Constants.ONE)
+ .set(MemberCard::getHkDate,new Date())
+ .set(MemberCard::getRemark,"寮�鍗℃垚鍔�")
+ .in(MemberCard::getCode,doneCodes));
+ }
+ memberCardMapper.update(null,new UpdateWrapper<MemberCard>().lambda()
+ .eq(MemberCard::getMemberId,member.getId())
+ .eq(MemberCard::getHkStatus,Constants.ZERO)
+ .set(MemberCard::getHkStatus,Constants.TWO)
+ .set(MemberCard::getRemark,"寮�鍗″け璐�")
+ .set(MemberCard::getHkDate,new Date())
+ .notIn(doneCodes.size()>0,MemberCard::getCode,doneCodes)
+ .in(MemberCard::getId,allCodes));
+
+ return getNormalCardList(member,memberCardMapper);
+ }
+
+ 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::getStatus,Constants.MemberCard.normal)
+ .eq(MemberCard::getHkStatus,Constants.ONE) );
+
+ }
+
/**
* 濡傛灉涔嬪墠宸茬粡鍜屾捣搴峰悓姝ワ紝鍒欐洿鏂扮敤鎴锋暟鎹互鍙婁汉鑴告暟鎹紙鍙兘鏂板浜鸿劯 涔熷彲鑳芥洿鏂颁汉鑴革級
@@ -266,29 +484,33 @@
boolean r = doHkDeleteUser(c.getId(),c.getHkId(),date);
c.setHkStatus(r?Constants.ONE:Constants.TWO);
c.setRemark(r?null:"鍒犻櫎娴峰悍浜哄憳淇℃伅澶辫触锛�");
+ c.setIsdeleted(r? Constants.ONE: Constants.ZERO);//鍒犻櫎澶辫触锛屾仮澶嶆暟鎹�
+ //鍒犻櫎鎵�鏈夌粦瀹氱殑鍗＄墖淇℃伅
+ memberCardMapper.delete(new QueryWrapper<MemberCard>().lambda().eq(MemberCard::getMemberId,c.getId()));
}else{
//澶勭悊淇敼鏁版嵁锛屽苟涓旀洿鏂颁汉鑴�
UserAddRequest addHkModel = getUserAddModel(c,path,1);//淇敼
//澶勭悊鏂板鏁版嵁
BaseResponse result = HKService.editUser(addHkModel);
- if(StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) && result.getData()!=null){
+ if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) ){
if(StringUtils.isNotBlank(c.getFaceImg())){
//濡傛灉鏈変汉鑴哥収鐗囷紝澶勭悊浜鸿劯鐓х墖鍚屾
String faceid = dealMemberFace(c,path);
if(StringUtils.isBlank(faceid)){
noticeErpFail(c,Constants.ZERO,"浜鸿劯淇℃伅鏇存柊澶辫触锛岃妫�鏌ヤ汉鑴哥収鐗囨槸鍚﹀悎娉曪紒");
c.setHkStatus(Constants.TWO);
- c.setRemark("浜鸿劯淇℃伅鏇存柊澶辫触锛岃妫�鏌ヤ汉鑴哥収鐗囨槸鍚﹀悎娉曪紒锛�");
+ c.setRemark("浜鸿劯淇℃伅鏇存柊澶辫触锛岃妫�鏌ヤ汉鑴哥収鐗囨槸鍚﹀悎娉曪紒锛�"+result.getMsg());
}else{
c.setFaceId(faceid);
}
}
}else{
- noticeErpFail(c,Constants.ZERO,"浜哄憳淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃淇鍚庨噸璇曪紒"+result.getCode()+result.getMsg());
+ noticeErpFail(c,Constants.ZERO,"浜哄憳淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃淇鍚庨噸璇曪紒");
c.setHkStatus(Constants.TWO);
- c.setRemark("浜哄憳淇℃伅鍚屾瀹夐槻骞冲彴鏇存柊澶辫触锛岃淇鍚庨噸璇曪紒锛�");
+ c.setRemark("浜哄憳淇℃伅鍚屾瀹夐槻骞冲彴鏇存柊澶辫触锛岃淇鍚庨噸璇曪紒锛�"+(result!=null?result.getCode()+result.getMsg():""));
}
-
+ //閲嶆柊涓嬪彂鏉冮檺鏁版嵁
+ dealMemberRoleEmpower(c);
}
c.setHkDate(date);
memberMapper.updateById(c);
@@ -306,6 +528,8 @@
//鍒犻櫎鐨勭粍缁囷紝涓嶅仛澶勭悊,娴峰悍鐘舵�佹洿鏂颁负涓嶅鐞嗭紝涓嬫涓嶅啀澶勭悊杩欎釜璁板綍
c.setHkStatus(Constants.TWO);
c.setRemark("鏈悓姝ユ暟鎹紝鐩存帴鍒犻櫎");
+ c.setEditDate(date);
+ c.setErpId(c.getErpOrgId()+"_"+UUID.randomUUID().toString());
memberMapper.updateById(c);
return false;
}
@@ -320,16 +544,17 @@
}
//澶勭悊鏂板鏁版嵁
BaseResponse<UserAddResponse> result = HKService.addUser(addHkModel);
- if(StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) && result.getData()!=null){
+ if(result!=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) && result.getData()!=null){
c.setFaceId(result.getData().getFaceId());
c.setHkStatus(Constants.ONE);
c.setHkId(addHkModel.getPersonId());
memberMapper.updateById(c);
+ dealMemberRoleEmpower(c);
return true;
}else{
noticeErpFail(c,Constants.ZERO,"浜哄憳淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃淇鍚庨噸璇曪紒"+result.getCode()+result.getMsg());
c.setHkStatus(Constants.TWO);
- c.setRemark("浜哄憳淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃淇鍚庨噸璇曪紒");
+ c.setRemark("浜哄憳淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃淇鍚庨噸璇曪紒"+(result!=null?result.getMsg():""));
memberMapper.updateById(c);
return false;
}
@@ -344,7 +569,7 @@
private String dealMemberFace(Member c,String path) {
if(StringUtils.isBlank(c.getFaceId())){
BaseResponse<FaceAddOrEditesponse> response = HKService.addFace(getFaceAddModel(c,path));
- if(StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE)&& response.getData()!=null ){
+ if(response !=null && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE)&& response.getData()!=null ){
return response.getData().getFaceId();
}
}else{
@@ -378,12 +603,12 @@
*/
private boolean doHkDeleteUser(Integer id,String delHkIds, Date date ) {
if(StringUtils.isBlank(delHkIds)){
- return false;
+ return true;
}
UserDelRequest request = new UserDelRequest();
request.setPersonIds(new String[]{delHkIds});
BaseResponse<List<UserDelResponse>> result = HKService.delBatchUser(request);
- if(StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
+ if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
List<String> fIds = new ArrayList<>();
//鏍囪鍒犻櫎鎴愬姛鐨勬暟鎹紙娴峰悍瀵规帴鐘舵�佷负宸插悓姝ワ紝锛屽悓姝ュけ璐ョ殑浠嶄负寰呭悓姝ワ紝绛変笅涓�娆＄户缁鐞嗭紝鐭ラ亾鍏ㄩ儴鍒犻櫎瀹屾瘯锛�
if(result.getData()!=null && result.getData().size()>0){
@@ -423,7 +648,10 @@
private UserAddRequest getUserAddModel(Member c,String path,int type) {
UserAddRequest model = new UserAddRequest();
model.setOrgIndexCode(c.getCompanyHkId());
- model.setPersonId(type == 0 ?HKConstants.RES_USER_INDEX+UUID.randomUUID().toString().replace("-", ""):c.getHkId());
+ model.setJobNo(c.getCode());
+ model.setCertificateNo(DESUtil.decrypt(Constants.EDS_PWD, c.getIdcardNo()));
+ model.setCertificateType(HKConstants.CertificateType.SHENFENZHENG.getKey()+"");
+ model.setPersonId(type == 0 ?UUID.randomUUID().toString().replace("-", ""):c.getHkId());
model.setGender(Constants.formatIntegerNum(c.getSex())+"");
model.setPersonName(c.getName());
if(type== 0 && StringUtils.isNotBlank(c.getFaceImg())){
--
Gitblit v1.9.3