From e13352d3329406a9b2e8e12b2077ee275aa4c280 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 07 三月 2024 09:55:37 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 201 ++++++++++++++++++++++++++++++++------------------
1 files changed, 128 insertions(+), 73 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 bbbb7b3..8f9722f 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
@@ -41,6 +41,7 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -84,6 +85,8 @@
@Autowired
private DeviceEventJoinMapper deviceEventJoinMapper;
+ @Value("${debug_model}")
+ private Boolean isDebug;
@Autowired
private CarEventJoinMapper carEventJoinMapper;
@@ -337,9 +340,11 @@
Date date = new Date();
int num =0;
for(ErpUserListResponse response : list){
- response.setPhone("1534569100"+num);
- response.setFaceImg("20223402/DM1005.png");
- response.setIdNo("34112219880427200"+num);
+// if(isDebug){
+// response.setPhone("1534569100"+num);
+// response.setFaceImg("20223402/DM1005.png");
+// response.setIdNo("34112219880427200"+num);
+// }
num++;
Company company = new Company();
if(StringUtils.isNotBlank(response.getOrgId())){
@@ -382,12 +387,14 @@
Member member = new Member();
BeanUtils.copyProperties(param,member);
member.setCreateDate(date);
- if(StringUtils.isBlank(param.getFaceImg())){
+ /*if(StringUtils.isBlank(param.getFaceImg())){
member.setHkStatus(Constants.THREE);
}else{
member.setHkStatus(Constants.ZERO);
member.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
- }
+ }*/
+ member.setHkStatus(Constants.ZERO);
+ member.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
member.setErpStatus(Constants.ONE);
member.setErpDate(date);
member.setErpId(param.getId());
@@ -401,8 +408,9 @@
member.setRoleIds(param.getRoleIds());
member.setCompanyId(Objects.isNull(company)?null:company.getId());
member.setErpOrgId(param.getOrgId());
- member.setStartTime(request.getStartTime());
- member.setEndTime(request.getEndTime());
+ member.setCanVisit(Constants.ONE);
+// member.setStartTime(request.getStartTime());
+// member.setEndTime(request.getEndTime());
return member;
}
@@ -418,8 +426,8 @@
member.setHkStatus(Constants.ZERO);
member.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
member.setRoleIds(param.getRoleIds());
- member.setStartTime(request.getStartTime());
- member.setEndTime(request.getEndTime());
+// member.setStartTime(request.getStartTime());
+// member.setEndTime(request.getEndTime());
member.setCompanyId(Objects.isNull(company)?null:company.getId());
member.setErpOrgId(param.getOrgId());
return member;
@@ -516,6 +524,11 @@
for (DeviceRole deviceRole:deviceRoleList) {
RoleListResponse roleListResponse = new RoleListResponse();
BeanUtils.copyProperties(deviceRole,roleListResponse);
+ if(deviceRole.getType().equals(Constants.TWO)){
+ roleListResponse.setType(Constants.ONE);
+ }else{
+ roleListResponse.setType(Constants.ZERO);
+ }
if(StringUtils.isNotBlank(deviceRole.getDoorIds())){
List<DeviceListResponse> DeviceListResponseList = new ArrayList<>();
List<String> doorList = Arrays.asList(deviceRole.getDoorIds().split(","));
@@ -819,66 +832,80 @@
@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())//鎵�灞炵粍缁囩紪鐮�
+ if(param.getIsdeleted() == 1){
+ if( Objects.isNull(param.getId()) ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ memberMapper.update(null,new UpdateWrapper<Member>().lambda()
+ .eq(Member::getErpId,param.getId())
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ .set(Member::getIsdeleted,Constants.ONE)
+ .set(Member::getHkStatus,Constants.ZERO)
+ .set(Member::getEditDate,new Date())
+ .set(Member::getRemark,"寰呭悓姝ュ畨闃插钩鍙�")
+ );
+ }else {
+ 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.isBlank(param.getFaceImg())//浜鸿劯鐓х墖
- ||StringUtils.isBlank(param.getCode())//宸ュ彿
- ||StringUtils.isBlank(param.getPhone())//鎵嬫満鍙�
- ){
- throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ ||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();
+ BeanUtils.copyProperties(param,member);
+ member.setId(null);
+ member.setCreateDate(new Date());
+ member.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
+ member.setHkStatus(Constants.ZERO);
+ member.setErpStatus(Constants.ONE);
+ member.setErpDate(new Date());
+ member.setErpId(param.getId());
+ member.setFsStatus(Constants.ZERO);
+ member.setCompanyId(company.getId());
+ member.setType(Constants.memberType.internal);
+ String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
+ member.setIdcardNo(encryptIdNo);
+ member.setStartTime(param.getValidStartTime());
+ member.setRoleId(param.getRoleIds()!=null?JSONObject.toJSONString(param.getRoleIds()):null);
+ member.setEndTime(param.getValidEndTime());
+ member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
+ member.setErpOrgId(param.getOrgId());
+ memberMapper.insert(member);
+ }else{
+ Integer id = member.getId();
+ BeanUtils.copyProperties(param,member);
+ member.setId(id);
+ member.setCompanyId(company.getId());
+ String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
+ member.setIdcardNo(encryptIdNo);
+ member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
+ member.setErpOrgId(param.getOrgId());
+ member.setEditDate(new Date());
+ member.setErpDate(new Date());
+ member.setHkStatus(Constants.ZERO);
+ member.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
+ member.setStartTime(param.getValidStartTime());
+ member.setEndTime(param.getValidEndTime());
+ memberMapper.updateById(member);
+ }
+ //娣诲姞浜哄憳鍗＄墖鏁版嵁
+ getRoleIdByParam(param.getRoleIds(),member);
+ dealMemberCard(member,param);
}
- 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();
- BeanUtils.copyProperties(param,member);
- member.setId(null);
- member.setCreateDate(new Date());
- member.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
- member.setHkStatus(Constants.ZERO);
- member.setErpStatus(Constants.ONE);
- member.setErpDate(new Date());
- member.setErpId(param.getId());
- member.setFsStatus(Constants.ZERO);
- member.setCompanyId(company.getId());
- member.setType(Constants.memberType.internal);
- String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
- member.setIdcardNo(encryptIdNo);
- member.setStartTime(param.getValidStartTime());
- member.setRoleId(param.getRoleIds()!=null?JSONObject.toJSONString(param.getRoleIds()):null);
- member.setEndTime(param.getValidEndTime());
- member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
- member.setErpOrgId(param.getOrgId());
- memberMapper.insert(member);
- }else{
- Integer id = member.getId();
- BeanUtils.copyProperties(param,member);
- member.setId(id);
- member.setCompanyId(company.getId());
- String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
- member.setIdcardNo(encryptIdNo);
- member.setIdcardDecode(Constants.getTuominStr(param.getIdNo()));
- member.setErpOrgId(param.getOrgId());
- member.setEditDate(new Date());
- member.setErpDate(new Date());
- member.setHkStatus(Constants.ZERO);
- member.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
- member.setStartTime(param.getValidStartTime());
- member.setEndTime(param.getValidEndTime());
- memberMapper.updateById(member);
- }
- //娣诲姞浜哄憳鍗＄墖鏁版嵁
- getRoleIdByParam(param.getRoleIds(),member);
- dealMemberCard(member,param);
}catch (BusinessException e){
throw e;
}finally {
@@ -978,26 +1005,43 @@
return null;
}
+
@Override
public void roleUserAuthor(UserAuthorRequest param){
if(Objects.isNull(param)
||StringUtils.isBlank(param.getUserId())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ if(Objects.nonNull(param.getValidStartTime())&&Objects.nonNull(param.getValidEndTime())){
+ if(param.getValidStartTime().getTime()> param.getValidEndTime().getTime()){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鏈夋晥鏈熸椂闂翠笉鍚堟硶锛�");
+ }
+ }
Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getUserId()).last("limit 1"));
if(Objects.isNull(member)){
- return;
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛淇℃伅涓嶅瓨鍦紒");
}
List<Integer> doorIds = getRoleIdByParam(param.getRoleIds(),member);
+ if(param.getRoleIds()!=null && param.getRoleIds().length>0 && StringUtils.isBlank(member.getRoleId())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鏈煡璇㈠埌鏈夋晥闂ㄧ缁勬暟鎹�");
+ }
//鏇存柊鎺堟潈鏈夋晥鏈�
Member update = new Member();
update.setId(member.getId());
update.setEditDate(new Date());
update.setStartTime(param.getValidStartTime());
update.setEndTime(param.getValidEndTime());
+ update.setRoleId(StringUtils.isNotBlank(member.getRoleId())?member.getRoleId():null);
update.setHkStatus(Constants.ZERO);//鍋氫竴閬嶆洿鏂伴�昏緫
update.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
- memberMapper.updateById(update);
+ memberMapper.update(null,new UpdateWrapper<Member>().lambda()
+ .eq(Member::getId,member.getId())
+ .set(Member::getRoleId,member.getRoleId())
+ .set(Member::getRemark,"寰呭悓姝ュ畨闃插钩鍙�")
+ .set(Member::getStartTime,param.getValidStartTime())
+ .set(Member::getEndTime,param.getValidEndTime())
+ .set(Member::getEditDate,new Date())
+ .set(Member::getHkStatus,Constants.ZERO ));
}
@@ -1007,8 +1051,10 @@
||StringUtils.isBlank(param.getCarCode())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- if(param.getValidStartTime()!=null && param.getValidEndTime()!=null&¶m.getValidStartTime().getTime()> param.getValidEndTime().getTime()){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鏈夋晥鏈熸椂闂翠笉鍚堟硶锛�");
+ if(Objects.nonNull(param.getValidStartTime())&&Objects.nonNull(param.getValidEndTime())){
+ if(param.getValidStartTime().getTime()> param.getValidEndTime().getTime()){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鏈夋晥鏈熸椂闂翠笉鍚堟硶锛�");
+ }
}
Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getUserId()).last("limit 1"));
if(Objects.isNull(member)){
@@ -1020,8 +1066,13 @@
.set(ParkBook::getIsdeleted,Constants.ONE)
.set(ParkBook::getHkStatus,Constants.ZERO)
);
+ List<Parks> parksList = new ArrayList<>();
+ if(CollectionUtils.isNotEmpty(param.getParkIdList())){
+ parksList = parksMapper.selectList(new QueryWrapper<Parks>().lambda()
+ .in(Parks::getId,param.getParkIdList())
+ );
+ }
//鏌ヨ杞﹀簱淇℃伅
- 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) {
@@ -1032,7 +1083,7 @@
parkBook.setParkId(parks.getId());
parkBook.setOrigin(Constants.ZERO);
parkBook.setStartTime(Objects.isNull(param.getValidStartTime())?new Date():param.getValidStartTime());
- parkBook.setEndTime(param.getValidEndTime());
+ parkBook.setEndTime(Objects.isNull(param.getValidEndTime())?null:param.getValidEndTime());
parkBook.setTimeType(Objects.isNull(param.getValidEndTime())?Constants.ZERO:Constants.ONE);
parkBook.setMemberId(member.getId());
parkBook.setHkStatus(Constants.ZERO);
@@ -1050,6 +1101,10 @@
@Override
public void approveApply(ApproveNoticeRequest param){
try{
+ if(!Objects.isNull(param)
+ ){
+
+ }
if(Objects.isNull(param)
||Objects.isNull(param.getId())
||Objects.isNull(param.getStatus())){
--
Gitblit v1.9.3