From cd9cbc46c0774c01674be435bcc86d4a03ada687 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 27 二月 2024 14:18:13 +0800 Subject: [PATCH] 整理 --- server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 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 58d3b84..bbbb7b3 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 @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.doumee.biz.system.SystemDictDataBiz; +import com.doumee.config.DataSyncConfig; import com.doumee.config.Jwt.JwtPayLoad; import com.doumee.config.Jwt.JwtTokenUtil; import com.doumee.core.constants.ResponseStatus; @@ -32,7 +33,7 @@ import com.doumee.dao.business.join.DeviceEventJoinMapper; import com.doumee.dao.business.join.VisitEventJoinMapper; import com.doumee.dao.business.model.*; -import com.doumee.service.business.ERPSyncService; +import com.doumee.service.business.ext.ERPSyncService; import com.doumee.service.business.InterfaceLogService; import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.Synchronized; @@ -59,6 +60,8 @@ @Autowired private SystemDictDataBiz systemDictDataBiz; + @Autowired + private DataSyncConfig dataSyncConfig; @Autowired private RedisTemplate<String, Object> redisTemplate; @@ -131,7 +134,7 @@ @Transactional @Synchronized public String syncCompany(OrgListRequest param){ - if(!StringUtils.equals(Constants.ONE+"", systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ORG_USER_ORIGIN).getCode())){ + if( Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) != DataSyncConfig.origin.erp){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝褰撳墠涓嶆敮鎸佺粍缁囧悓姝ユ搷浣渵"); } //鑾峰彇ERP缁勭粐淇℃伅锛堝叏閲忓悓姝ワ級 @@ -282,8 +285,8 @@ @Transactional @Synchronized public String syncUsers(UserListRequest param){ - if(!StringUtils.equals(Constants.ONE+"", systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ORG_USER_ORIGIN).getCode())){ - throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝褰撳墠涓嶆敮鎸佷汉鍛樺悓姝ユ搷浣渵"); + if( Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) != DataSyncConfig.origin.erp){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝褰撳墠涓嶆敮鎸佺粍缁囧悓姝ユ搷浣渵"); } List<ErpUserListResponse> list = erpTool.getErpUserList(ErpConstants.userListUrl,param); if(list !=null && list.size()>0) { @@ -1004,9 +1007,12 @@ ||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)){ - return; + throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛淇℃伅涓嶅瓨鍦紒"); } //鍒犻櫎杞﹂噺搴撹褰曟暟鎹� parkBookMapper.update(null,new UpdateWrapper<ParkBook>().lambda() @@ -1034,6 +1040,8 @@ parkBookList.add(parkBook); } parkBookMapper.insertBatchSomeColumn(parkBookList); + }else{ + throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鍋滆溅搴撲俊鎭笉瀛樺湪锛屾巿鏉冨け璐�"); } } -- Gitblit v1.9.3