From 2c4cfb7ed1ece6c3b80f7d551a267e9367ddb12b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 05 一月 2024 10:31:31 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 211 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 128 insertions(+), 83 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 659322e..5675fc4 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;
}
@@ -130,8 +122,11 @@
@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<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 +162,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 +180,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 +203,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,21 +220,25 @@
* @param date
* @return
*/
- private Company getAddCompanyModel(OrgListRespone respone, Date date) {
+ 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;
}
- 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;
}
@@ -267,7 +268,10 @@
@Override
@Transactional
public String syncUsers(UserListRequest param){
- List<UserListRespone> list = ErpTool.getErpUserList(ErpConstants.userListUrl,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<>();
List<Member> updateList = new ArrayList<>();
@@ -286,6 +290,7 @@
if(updateList.size()>0){
for(Member c : updateList){
dealRoleEmpower(c,param.getStartTime(), param.getEndTime());
+ c.setHkStatus(Constants.ZERO);
memberMapper.updateById(c);
}
}
@@ -294,13 +299,14 @@
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){
@@ -311,9 +317,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){
@@ -322,7 +335,7 @@
continue;
}
//灏佽鏂板缁勭粐瀵硅薄鏁版嵁
- addList.add(getAddMemberModel(response,date));
+ addList.add(getAddMemberModel(response,date,company));
}else{
//濡傛灉鏄洿鏂�
if(Constants.formatIntegerNum(response.getIsdeleted()) == Constants.ONE){
@@ -330,23 +343,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());
@@ -355,31 +366,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;
@@ -421,7 +437,7 @@
try{
String erpAccessKey = systemDictDataBiz.queryByCode(Constants.ERP_CONFIG,Constants.ERP_ACCESS_KEY).getCode();
String erpAccessSecret = systemDictDataBiz.queryByCode(Constants.ERP_CONFIG,Constants.ERP_ACCESS_SECRET).getCode();
- if(!accessKey.equals(erpAccessKey)||!erpAccessSecret.equals(accessSecret)){
+ if(!(accessKey.equals(erpAccessKey)&&erpAccessSecret.equals(accessSecret))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"绉橀挜鍖归厤澶辫触");
}
JwtPayLoad payLoad = new JwtPayLoad(erpAccessKey+"-"+erpAccessSecret);
@@ -429,8 +445,9 @@
RedisUtil.addObject(redisTemplate,Constants.RedisKeys.ERP_TOKEN,token,Constants.RedisKeys.EXPIRE_TIME);
result.setToken(token);
result.setExpireTime(Constants.RedisKeys.EXPIRE_TIME);
- }catch (Exception e){
-
+ return result;
+ }catch (BusinessException e){
+ throw e;
}finally {
Map<String,String> param = new HashMap<>();
param.put("accessKey",accessKey);
@@ -438,8 +455,6 @@
saveInterfaceLog(param,"/visitBiz/accesstoken",JSONObject.toJSONString(result),Constants.ZERO);
}
-
- return result;
}
/**
@@ -485,8 +500,8 @@
}
}
}
- }catch (Exception e){
- e.printStackTrace();
+ }catch (BusinessException e){
+ throw e;
}finally {
saveInterfaceLog(param,"/visitBiz/resource/role/list",JSONObject.toJSONString(result),Constants.ZERO);
}
@@ -517,8 +532,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);
}
@@ -541,12 +556,19 @@
queryWrapper.selectAll(VisitEvent.class);
queryWrapper.selectAs(Visits::getName, VisitEventListResponse::getVisitorName);
+ queryWrapper.selectAs(VisitEvent::getBeVisitedPersonName, VisitEventListResponse::getBeVisitedUserName);
+ queryWrapper.selectAs(VisitEvent::getBeVisitedPersonOrg, VisitEventListResponse::getBeVisitedUserOrg);
+ queryWrapper.selectAs(VisitEvent::getSex, VisitEventListResponse::getVisitorSex);
+ queryWrapper.selectAs(VisitEvent::getVisitorWorkUint, VisitEventListResponse::getVisitorWorkUint);
+
queryWrapper.leftJoin(Visits.class,Visits::getId,VisitEvent::getVisitorId);
if(!Objects.isNull(visitListRequest)){
queryWrapper.eq(!Objects.isNull(visitListRequest.getEventId()),VisitEvent::getEventId, visitListRequest.getEventId());
queryWrapper.like(StringUtils.isNotBlank(visitListRequest.getVisitorName()),Visits::getName, visitListRequest.getVisitorName());
- queryWrapper.eq(StringUtils.isNotBlank(visitListRequest.getIdNo()),VisitEvent::getIdNo, visitListRequest.getIdNo());
+
+ queryWrapper.eq(StringUtils.isNotBlank(visitListRequest.getIdNo()),Visits::getIdcardNo, DESUtil.encrypt(Constants.EDS_PWD, visitListRequest.getIdNo()) );
+
queryWrapper.eq(StringUtils.isNotBlank(visitListRequest.getBeVisitedPersonId()),VisitEvent::getBeVisitedPersonId, visitListRequest.getBeVisitedPersonId());
queryWrapper.eq(StringUtils.isNotBlank(visitListRequest.getBeVisitedPersonOrgId()),VisitEvent::getBeVisitedPersonOrgId, visitListRequest.getBeVisitedPersonOrgId());
queryWrapper.like(StringUtils.isNotBlank(visitListRequest.getVisitorWorkUint()),VisitEvent::getVisitorWorkUint, visitListRequest.getVisitorWorkUint());
@@ -565,8 +587,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);
}
@@ -584,11 +606,11 @@
Utils.MP.blankToNull(doorEventListRequest);
queryWrapper.selectAs(DeviceEvent::getEventId,DoorEventListResponse::getEventId);
queryWrapper.selectAs(DeviceEvent::getEventType,DoorEventListResponse::getEventType);
- queryWrapper.selectAs(DeviceEvent::getSex,DoorEventListResponse::getSex);
+ queryWrapper.selectAs(Member::getSex,DoorEventListResponse::getSex);
queryWrapper.selectAs(DeviceEvent::getSrcName,DoorEventListResponse::getSrcName);
queryWrapper.selectAs(DeviceEvent::getSrcType,DoorEventListResponse::getSrcType);
- queryWrapper.selectAs(DeviceEvent::getIdcardDecode,DoorEventListResponse::getIdcardNo);
- queryWrapper.selectAs(DeviceEvent::getName,DoorEventListResponse::getName);
+ queryWrapper.selectAs(Member::getIdcardDecode,DoorEventListResponse::getIdcardNo);
+ queryWrapper.selectAs(Member::getName,DoorEventListResponse::getName);
queryWrapper.selectAs(DeviceEvent::getUserType,DoorEventListResponse::getType);
queryWrapper.selectAs(DeviceEvent::getExtEventInOut,DoorEventListResponse::getEventInOut);
queryWrapper.selectAs(DeviceEvent::getExtAccessChannel,DoorEventListResponse::getExtAccessChannel);
@@ -600,14 +622,14 @@
if(!Objects.isNull(doorEventListRequest)){
queryWrapper.eq(!Objects.isNull(doorEventListRequest.getEventId()),DeviceEvent::getEventId, doorEventListRequest.getEventId());
- queryWrapper.like(StringUtils.isNotBlank(doorEventListRequest.getName()),DeviceEvent::getName, doorEventListRequest.getName());
+ queryWrapper.like(StringUtils.isNotBlank(doorEventListRequest.getName()),Member::getName, doorEventListRequest.getName());
if(StringUtils.isNotBlank(doorEventListRequest.getIdNo())){
//杩涜鍔犲瘑
String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,doorEventListRequest.getIdNo());
- queryWrapper.eq(DeviceEvent::getIdNum, encryptIdNo);
+ queryWrapper.eq(Member::getIdcardNo, encryptIdNo);
}
- queryWrapper.ge(StringUtils.isNotBlank(doorEventListRequest.getStartTime()),DeviceEvent::getHappenTime, doorEventListRequest.getStartTime());
- queryWrapper.le(StringUtils.isNotBlank(doorEventListRequest.getEndTime()),DeviceEvent::getHappenTime, doorEventListRequest.getEndTime());
+ queryWrapper.ge(StringUtils.isNotBlank(doorEventListRequest.getStartTime()),DeviceEvent::getCreateDate, doorEventListRequest.getStartTime());
+ queryWrapper.le(StringUtils.isNotBlank(doorEventListRequest.getEndTime()),DeviceEvent::getCreateDate, doorEventListRequest.getEndTime());
for(PageWrap.SortData sortData: param.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
@@ -619,8 +641,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);
}
@@ -638,7 +660,8 @@
Utils.MP.blankToNull(carEventListRequest);
queryWrapper.selectAs(CarEvent::getEventId,CarEventListResponse::getEventId);
queryWrapper.selectAs(CarEvent::getEventType,CarEventListResponse::getEventType);
- queryWrapper.selectAs(CarEvent::getInoutType,CarEventListResponse::getEventType);
+ queryWrapper.selectAs(CarEvent::getCreateDate,CarEventListResponse::getCreateTime);
+ queryWrapper.selectAs(CarEvent::getInoutType,CarEventListResponse::getInoutType);
queryWrapper.selectAs(CarEvent::getAlarmCar,CarEventListResponse::getAlarmCar);
queryWrapper.selectAs(CarEvent::getCarAttributeName,CarEventListResponse::getCarAttributeName);
queryWrapper.selectAs(CarEvent::getCardNo,CarEventListResponse::getCardNo);
@@ -662,8 +685,8 @@
queryWrapper.eq(StringUtils.isNotBlank(carEventListRequest.getParkId()),CarEvent::getParkIndex, carEventListRequest.getParkId());
queryWrapper.like(StringUtils.isNotBlank(carEventListRequest.getParkName()),CarEvent::getParkName, carEventListRequest.getParkName());
queryWrapper.eq(StringUtils.isNotBlank(carEventListRequest.getPlateNo()),CarEvent::getPlateNos, carEventListRequest.getPlateNo());
- queryWrapper.ge(StringUtils.isNotBlank(carEventListRequest.getStartTime()),CarEvent::getHappenTime, carEventListRequest.getStartTime());
- queryWrapper.le(StringUtils.isNotBlank(carEventListRequest.getEndTime()),CarEvent::getHappenTime, carEventListRequest.getEndTime());
+ queryWrapper.ge(StringUtils.isNotBlank(carEventListRequest.getStartTime()),CarEvent::getCreateDate, carEventListRequest.getStartTime());
+ queryWrapper.le(StringUtils.isNotBlank(carEventListRequest.getEndTime()),CarEvent::getCreateDate, carEventListRequest.getEndTime());
for(PageWrap.SortData sortData: param.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
@@ -682,8 +705,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);
}
@@ -700,22 +723,35 @@
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);
}
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(),"鏈煡璇㈠埌涓婄骇缁勭粐鏁版嵁");
+ }
+ }
+ String rootOrgId = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_ROOTORG_CODE).getCode();
if(Objects.isNull(company)){
company = new Company();
-// BeanUtils.copyProperties(param,company);
company.setId(null);
company.setCreateDate(new Date());
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);
@@ -727,16 +763,21 @@
// 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());
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);
}
@@ -748,19 +789,23 @@
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"));
+ 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();
@@ -801,8 +846,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);
}
@@ -945,7 +990,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) {
@@ -992,8 +1037,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