From c8bc6fdbdc37f551388b71372c35d4f42f58e571 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 22 五月 2024 18:14:29 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 96 +----------------------------------------------
1 files changed, 3 insertions(+), 93 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
index bf7dfda..7db9c0d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -30,12 +30,14 @@
import com.doumee.core.utils.redis.RedisUtil;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.join.CarEventJoinMapper;
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.ext.ERPSyncService;
import com.doumee.service.business.InterfaceLogService;
+import com.doumee.service.business.impl.MemberServiceImpl;
import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.Synchronized;
@@ -929,98 +931,6 @@
}
}
}
- private Integer getRoleIdByParam(Integer[] param, Member member) {
- //娣诲姞浜哄憳瑙掕壊鍏宠仈鏁版嵁
- member.setRoleId(null);
- List<MemberRole> roleList = memberRoleMapper.selectList( new QueryWrapper<MemberRole>().lambda()
- .eq(MemberRole::getIsdeleted,Constants.ZERO)
- .eq(MemberRole::getMemberId,member.getId()));
- if((param == null || param.length==0 ) &&( roleList==null || roleList.size()==0)){
- //妫�鏌ョ敤鎴锋潈闄愭槸鍚﹀彂鐜板彉鍖�
- return 0;
- }
- if((param == null || param.length==0 ) &&( roleList!=null && roleList.size()>0) ){
- //濡傛灉鍘熸潵鏈夋潈闄愶紝鎺ュ彛杩涜鏉冮檺鍒犻櫎
- memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
- return 1;
- }
- if(!Objects.isNull(param)&¶m.length>Constants.ZERO){
- if(roleList!=null && roleList.size()>0) {
- //鍜屽師鏈夋潈闄愯繘琛屽姣旓紝鐪嬫槸鍚︽潈闄愬彂鐢熷彉鍖�
- boolean ischange1=false;
- for (MemberRole role : roleList) {
- ischange1=false;
- for (int j = 0; j < param.length; j++) {
- if(Constants.equalsInteger(role.getRoleId(),param[j])){
- ischange1=true;
- break;
- }
- }
- if(!ischange1){
- break;
- }
- }
-
- boolean ischange2 =false;
- for (int j = 0; j < param.length; j++) {
- ischange2=false;
- for (MemberRole role : roleList) {
- if(Constants.equalsInteger(role.getRoleId(),param[j])){
- ischange2=true;
- break;
- }
- }
- if(!ischange2){
- break;
- }
- }
- if(ischange2 && ischange1){
- return 0;//鏉冮檺鏈彂鐢熸敼鍙�
- }
- }
- //濡傛灉鍘熸潵鏈夋潈闄愶紝鎺ュ彛杩涜鏉冮檺鍒犻櫎
- memberRoleMapper.delete(new QueryWrapper<MemberRole>().lambda().eq(MemberRole::getMemberId,member.getId()));
- //鏌ヨ鏁版嵁搴撳瓨鍦ㄧ殑鏉冮檺
- List<DeviceRole> deviceRoleList= deviceRoleMapper.selectList(new QueryWrapper<DeviceRole>().lambda()
- .eq(DeviceRole::getType,Constants.TWO)
- .in(DeviceRole::getId,param));
- if(CollectionUtils.isNotEmpty(deviceRoleList)){
- List<MemberRole> memberRoleList = new ArrayList<>();
- String ids = "";
- List<Integer> r = new ArrayList<>();
- for (int i = 0; i < deviceRoleList.size(); i++) {
- DeviceRole deviceRole =deviceRoleList.get(i);
- if(i>0){
- ids += ",";
- }
- Integer id =deviceRole.getId();
- ids += "["+id+"]";
- String doorids =deviceRole.getDoorIds();
- if(StringUtils.isNotBlank(doorids)){
- String[] ss = doorids.split(",");
- try {
- for(String s :ss){
- r.add(Integer.parseInt(s));
- }
- }catch (Exception e){
- //鑴忔暟鎹笉澶勭悊
- }
- }
- MemberRole memberRole = new MemberRole();
- memberRole.setCreateDate(new Date());
- memberRole.setMemberId(member.getId());
- memberRole.setIsdeleted(Constants.ZERO);
- memberRole.setRoleId(deviceRole.getId());
- memberRoleList.add(memberRole);
- }
- member.setRoleId(ids);
- memberRoleMapper.insertBatchSomeColumn(memberRoleList);
- member.setRoleId(ids);
- }
- return 1;
- }
- return 0;
- }
@Override
@@ -1039,7 +949,7 @@
if(Objects.isNull(member)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛淇℃伅涓嶅瓨鍦紒");
}
- Integer ischange = getRoleIdByParam(param.getRoleIds(),member);
+ Integer ischange = MemberServiceImpl.getRoleIdByParam(param.getRoleIds(),member,memberRoleMapper,deviceRoleMapper);
if(ischange == 0){
return;//鏈彂鐜版潈闄愬彉鍖栵紝鐩存帴杩斿洖
}
--
Gitblit v1.9.3