From cc80794e556bbe1e43f9c1369e1dfc9c61318fda Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 07 三月 2024 14:57:10 +0800
Subject: [PATCH] ERP接口
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 131 +++++++++++++++++++++++++++----------------
1 files changed, 82 insertions(+), 49 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 6e63bab..9cce8e3 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;
@@ -524,7 +525,7 @@
for (DeviceRole deviceRole:deviceRoleList) {
RoleListResponse roleListResponse = new RoleListResponse();
BeanUtils.copyProperties(deviceRole,roleListResponse);
- if(deviceRole.getType().equals(Constants.TWO)){
+ if(deviceRole.getType().equals("2")){
roleListResponse.setType(Constants.ONE);
}else{
roleListResponse.setType(Constants.ZERO);
@@ -877,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());
@@ -1008,6 +1010,30 @@
@Override
public void roleUserAuthor(UserAuthorRequest param){
+ try{
+// if(Objects.isNull(param)
+// ||StringUtils.isBlank(param.getUserId())){
+// throw new BusinessException(ResponseStatus.BAD_REQUEST);
+// }
+// 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(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);
+
if(Objects.isNull(param)
||StringUtils.isBlank(param.getUserId())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -1042,61 +1068,68 @@
.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);
+ }
}
@Override
public void parkCarAuthor(CarAuthorRequest param){
- if(Objects.isNull(param)
- ||StringUtils.isBlank(param.getCarCode())){
- 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(),"瀵逛笉璧凤紝鏈夋晥鏈熸椂闂翠笉鍚堟硶锛�");
+ try{
+ if(Objects.isNull(param)
+ ||StringUtils.isBlank(param.getCarCode())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- }
- 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 = new ArrayList<>();
- if(CollectionUtils.isNotEmpty(param.getParkIdList())){
- parksList = parksMapper.selectList(new QueryWrapper<Parks>().lambda()
- .in(Parks::getId,param.getParkIdList())
+ 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)
);
- }else{
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鍋滆溅搴撲俊鎭笉瀛樺湪锛屾巿鏉冨け璐�");
- }
- 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(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);
+ //鏌ヨ杞﹀簱淇℃伅
+ 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(),"瀵逛笉璧凤紝鍋滆溅搴撲俊鎭笉瀛樺湪锛屾巿鏉冨け璐�");
+ }
}
- 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);
}
-
}
@@ -1142,8 +1175,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