ceshi

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java

@@ -15,7 +15,6 @@ import com.google.common.collect.Lists;
 import com.xxfc.platform.im.utils.BeanUtil;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
-import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java

@@ -2,15 +2,12 @@ package com.github.wxiaoqi.security.admin.biz;
 
 import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
-import com.github.wxiaoqi.security.admin.bo.InviteMemberBO;
-import com.github.wxiaoqi.security.admin.bo.UserBo;
 import com.github.wxiaoqi.security.admin.dto.UserRelationDTO;
 import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
-import com.github.wxiaoqi.security.admin.mapper.AppUserRelationMapper;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
+import com.github.wxiaoqi.security.admin.bo.InviteMemberBO;
 import com.github.wxiaoqi.security.admin.vo.InviteMemberVo;
-import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
@@ -23,11 +20,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import com.github.wxiaoqi.security.admin.mapper.AppUserRelationMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
 
-import java.time.Instant;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -66,7 +60,6 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper, AppUserRe
     @Autowired
     private  AppStaffUserBiz staffUserBiz;
 
-
     private static final HashMap<Integer, Boolean> map =  new HashMap<>();
     private static final HashMap<Integer, Boolean> parentMap =  new HashMap<>();
     private static final Object obj = new Object();
@@ -122,7 +115,6 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper, AppUserRe
             }
 
        /* AppUserVo appUserVo=userDetailBiz.getUserInfoById(userId);
-
         if (appUserVo==null){
             log.info("----userId==="+userId+"----parentId===="+parentId+"----该用户不存在");
             return;
@@ -132,44 +124,43 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper, AppUserRe
                 log.info("----userId==="+userId+"----parentId===="+parentId+"----该上线用户不存在");
                 return;
             }
-            AppUserRelation relation=getMyBiz().getRelationByUserId(parentId);
-            Long time=System.currentTimeMillis();
-            if(relation==null){
-                relation=new AppUserRelation();
-                relation.setUserId(parentId);
-                relation.setBindType(type);
-                insertSelective(relation);
-            }
-            Long bindTime=time-validTime;
-            //判断用户是否有有效的下线
-            if (getCountByParentId(userId,bindTime)==0L){
-                relation=getMyBiz().getRelationByUserId(userId);
-                if(relation==null){
-                    relation=new AppUserRelation();
-                    relation.setUserId(userId);
-                    relation.setParentId(parentId);
-                    relation.setBindType(type);
-                    relation.setBindTime(time);
-                    insertSelective(relation);
-                }else {
-                    //判断用户是否有有效的上线
-                    log.info("----userId==="+userId+"----bindTime===="+bindTime+"----relation.getBindTime()==="+relation.getBindTime());
-                    if(relation.getParentId()==null||relation.getParentId()==0||(relation.getIsForever()!=1&&validTime>0&&relation.getBindTime()<bindTime)){
+            if (lock(userId)) {
+                AppUserRelation relation = getMyBiz().getRelationByUserId(parentId);
+                Long time = System.currentTimeMillis();
+                if (relation == null) {
+                    insertLock(parentId, type);
+                }
+                Long bindTime = time - validTime;
+                //判断用户是否有有效的下线
+                if (getCountByParentId(userId, bindTime) == 0L) {
+                    relation = getMyBiz().getRelationByUserId(userId);
+                    if (relation == null) {
+                        relation = new AppUserRelation();
+                        relation.setUserId(userId);
                         relation.setParentId(parentId);
                         relation.setBindType(type);
                         relation.setBindTime(time);
-                        getMyBiz().updRelation(relation);
+                        insertSelective(relation);
+                        AppStaffUserDTO staffUserDTO = new AppStaffUserDTO();
+                        staffUserDTO.setSuId(relation.getParentId());
+                        staffUserDTO.setUid(relation.getUserId());
+                        staffUserBiz.addAppStaffUser(staffUserDTO);
+                    } else {
+                        //判断用户是否有有效的上线
+                        log.info("----userId===" + userId + "----bindTime====" + bindTime + "----relation.getBindTime()===" + relation.getBindTime());
+                        if (relation.getParentId() == null || relation.getParentId() == 0 || (relation.getIsForever() != 1 && validTime > 0 && relation.getBindTime() < bindTime)) {
+                            relation.setParentId(parentId);
+                            relation.setBindType(type);
+                            relation.setBindTime(time);
+                            getMyBiz().updRelation(relation);
+                        }
                     }
                 }
-                if (relation != null){
-                    AppStaffUserDTO staffUserDTO=new AppStaffUserDTO();
-                    staffUserDTO.setSuId(relation.getParentId());
-                    staffUserDTO.setUid(relation.getUserId());
-                    staffUserBiz.addAppStaffUser(staffUserDTO);
-                }
             }
         }catch (Exception e){
             log.info("网络异常===" + e.getMessage());
+        }finally {
+            unLock(userId);
         }
 
     }
@@ -191,7 +182,7 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper, AppUserRe
             unParentLock(userId);
         }
     }
-    
+
     //首页关系绑定
     public ObjectRestResponse appBindRelation(Integer userId, String code) {
         Integer parentId = 0;
@@ -295,9 +286,9 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper, AppUserRe
         relationTemp.setIsValid(0);
         relationTemp.setType(1);
         relationTemp.setIsDel(0);
-        relationTemp = relationTempBiz.selectOne(relationTemp);
-        if (relationTemp == null) {
-            return;
+        relationTemp=relationTempBiz.selectOne(relationTemp);
+        if(relationTemp==null){
+           return;
         }
         Integer parentId = relationTemp.getUserId();
         bindRelation(platform_userid, parentId, 2);
@@ -476,14 +467,5 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper, AppUserRe
         }
 
     }
-
-    public List<UserBo>  findAllRelations(){
-        List<UserBo> userBoList = mapper.findAllRelations();
-        return CollectionUtils.isEmpty(userBoList)?Collections.emptyList():userBoList;
-    }
-
-    public void updateParentIdByUserId(Integer leaderId, Integer userId) {
-        mapper.updateParentIdByUserId(leaderId,userId, Instant.now().toEpochMilli());
-    }
 }
 

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopularizeBiz.java

@@ -205,7 +205,7 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper, Act
 								}
 							}
 						} else {
-							
+
 							// 获取锁失败
 							log.info("tryLock fail, key = [{}]", lockKey);
 						}