From c0782b348ad023abd9ad5e96aa3ec99d602f0bda Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 07 三月 2024 18:28:06 +0800
Subject: [PATCH] ERP接口
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 174 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 107 insertions(+), 67 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 b56629f..786268c 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
@@ -44,6 +44,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.PostConstruct;
@@ -331,7 +332,7 @@
}
public void dealRoleEmpower(Member member ){
- List<Integer> doorIds = getRoleIdByParam(member.getRoleIds(),member);
+// List<Integer> doorIds = getRoleIdByParam(member.getRoleIds(),member);
//娣诲姞浜哄憳鍗＄墖鏁版嵁
dealMemberCard(member,new UserUpdateRequest());
}
@@ -340,11 +341,11 @@
Date date = new Date();
int num =0;
for(ErpUserListResponse response : list){
- if(isDebug){
- 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())){
@@ -387,12 +388,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());
@@ -406,6 +409,7 @@
member.setRoleIds(param.getRoleIds());
member.setCompanyId(Objects.isNull(company)?null:company.getId());
member.setErpOrgId(param.getOrgId());
+ member.setCanVisit(Constants.ONE);
// member.setStartTime(request.getStartTime());
// member.setEndTime(request.getEndTime());
return member;
@@ -521,6 +525,11 @@
for (DeviceRole deviceRole:deviceRoleList) {
RoleListResponse roleListResponse = new RoleListResponse();
BeanUtils.copyProperties(deviceRole,roleListResponse);
+ if(deviceRole.getType().equals("2")){
+ 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(","));
@@ -869,6 +878,7 @@
member.setFsStatus(Constants.ZERO);
member.setCompanyId(company.getId());
member.setType(Constants.memberType.internal);
+ member.setCanVisit(Constants.ONE);
String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,param.getIdNo());
member.setIdcardNo(encryptIdNo);
member.setStartTime(param.getValidStartTime());
@@ -894,8 +904,9 @@
member.setEndTime(param.getValidEndTime());
memberMapper.updateById(member);
}
+ //2024骞�3鏈�7鏃�17:49:33 鍙栨秷姝や笟鍔″鐞嗕汉鍛橀棬绂佹潈闄�
+// getRoleIdByParam(param.getRoleIds(),member);
//娣诲姞浜哄憳鍗＄墖鏁版嵁
- getRoleIdByParam(param.getRoleIds(),member);
dealMemberCard(member,param);
}
}catch (BusinessException e){
@@ -997,78 +1008,107 @@
return null;
}
+
@Override
public void roleUserAuthor(UserAuthorRequest param){
- if(Objects.isNull(param)
- ||StringUtils.isBlank(param.getUserId())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ try{
+ 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)){
+ 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(),"瀵逛笉璧凤紝鏈煡璇㈠埌鏈夋晥闂ㄧ缁勬暟鎹�");
+ }
+ 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 ));
+ }catch (BusinessException e){
+ throw e;
+ }finally {
+ saveInterfaceLog(param,"/event/role/userAuthor",null,Constants.ZERO);
}
- Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getUserId()).last("limit 1"));
- if(Objects.isNull(member)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛淇℃伅涓嶅瓨鍦紒");
- }
- 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());
- update.setHkStatus(Constants.ZERO);//鍋氫竴閬嶆洿鏂伴�昏緫
- update.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
- memberMapper.updateById(update);
}
@Override
public void parkCarAuthor(CarAuthorRequest param){
- if(Objects.isNull(param)
- ||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(),"瀵逛笉璧凤紝鏈夋晥鏈熸椂闂翠笉鍚堟硶锛�");
- }
- Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getUserId()).last("limit 1"));
- if(Objects.isNull(member)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛淇℃伅涓嶅瓨鍦紒");
- }
- //鍒犻櫎杞﹂噺搴撹褰曟暟鎹�
- parkBookMapper.update(null,new UpdateWrapper<ParkBook>().lambda()
- .eq(ParkBook::getCarCode,param.getCarCode())
- .set(ParkBook::getIsdeleted,Constants.ONE)
- .set(ParkBook::getHkStatus,Constants.ZERO)
- );
- //鏌ヨ杞﹀簱淇℃伅
- 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) {
- ParkBook parkBook = new ParkBook();
- parkBook.setIsdeleted(Constants.ZERO);
- parkBook.setCreateDate(new Date());
- parkBook.setCarCode(param.getCarCode());
- parkBook.setParkId(parks.getId());
- parkBook.setOrigin(Constants.ZERO);
- parkBook.setStartTime(Objects.isNull(param.getValidStartTime())?new Date():param.getValidStartTime());
- parkBook.setEndTime(param.getValidEndTime());
- parkBook.setTimeType(Objects.isNull(param.getValidEndTime())?Constants.ZERO:Constants.ONE);
- parkBook.setMemberId(member.getId());
- parkBook.setHkStatus(Constants.ZERO);
- parkBook.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
- parkBookList.add(parkBook);
+ try{
+ if(Objects.isNull(param)
+ ||StringUtils.isBlank(param.getCarCode())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- parkBookMapper.insertBatchSomeColumn(parkBookList);
- }else{
- throw new BusinessException(ResponseStatus.DATA_EMPTY.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)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛淇℃伅涓嶅瓨鍦紒");
+ }
+ //鍒犻櫎杞﹂噺搴撹褰曟暟鎹�
+ parkBookMapper.update(null,new UpdateWrapper<ParkBook>().lambda()
+ .eq(ParkBook::getCarCode,param.getCarCode())
+ .set(ParkBook::getIsdeleted,Constants.ONE)
+ .set(ParkBook::getHkStatus,Constants.ZERO)
+ );
+ //鏌ヨ杞﹀簱淇℃伅
+ if(CollectionUtils.isNotEmpty(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) {
+ ParkBook parkBook = new ParkBook();
+ parkBook.setIsdeleted(Constants.ZERO);
+ parkBook.setCreateDate(new Date());
+ parkBook.setCarCode(param.getCarCode());
+ parkBook.setParkId(parks.getId());
+ parkBook.setOrigin(Constants.ZERO);
+ parkBook.setStartTime(Objects.isNull(param.getValidStartTime())?null:param.getValidStartTime());
+ 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);
+ parkBook.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
+ parkBookList.add(parkBook);
+ }
+ parkBookMapper.insertBatchSomeColumn(parkBookList);
+ }else{
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鍋滆溅搴撲俊鎭笉瀛樺湪锛屾巿鏉冨け璐�");
+ }
+ }
+ }catch (BusinessException e){
+ throw e;
+ }finally {
+ saveInterfaceLog(param,"/event/park/carAuthor",null,Constants.ZERO);
}
-
}
@Override
public void approveApply(ApproveNoticeRequest param){
try{
+ if(!Objects.isNull(param)
+ ){
+
+ }
if(Objects.isNull(param)
||Objects.isNull(param.getId())
||Objects.isNull(param.getStatus())){
@@ -1104,8 +1144,8 @@
}
-
- private void saveInterfaceLog(Object param, String path,String result,Integer type) {
+ @Transactional(propagation = Propagation.NOT_SUPPORTED)
+ public void saveInterfaceLog(Object param, String path, String result, Integer type) {
InterfaceLog interfaceLog=new InterfaceLog();
interfaceLog.setType(type);
interfaceLog.setCreateDate(new Date());
--
Gitblit v1.9.3