修改用户列表同步

bill-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

@@ -4,21 +4,17 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.mortals.framework.ap.CookieService;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.model.PageInfo;
-import com.mortals.framework.model.Result;
 import com.mortals.framework.service.IAuthTokenService;
 import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.service.IUser;
-import com.mortals.framework.util.StringUtils;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.menu.model.MenuEntity;
 import com.mortals.xhx.base.system.menu.service.MenuService;
 import com.mortals.xhx.base.system.resource.service.ResourceService;
 import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.base.system.user.service.UserService;
-import com.mortals.xhx.base.system.valid.service.ValidCodeService;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.key.RedisKey;
 import com.mortals.xhx.common.pdu.user.UserPdu;
@@ -32,7 +28,6 @@ import com.mortals.xhx.module.access.service.AccessService;
 import com.mortals.xhx.module.ph.model.PhQueueStatEntity;
 import com.mortals.xhx.module.ph.model.PhQueueStatQuery;
 import com.mortals.xhx.module.ph.service.PhQueueStatService;
-import com.mortals.xhx.module.pj.model.PjEvaluateEntity;
 import com.mortals.xhx.module.pj.model.PjEvaluateStatEntity;
 import com.mortals.xhx.module.pj.model.PjEvaluateStatQuery;
 import com.mortals.xhx.module.pj.service.PjEvaluateStatService;
@@ -42,7 +37,6 @@ import com.mortals.xhx.module.stat.service.StatService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -78,8 +72,8 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
     private PhQueueStatService phQueueStatService;
     @Autowired
     private PjEvaluateStatService pjEvaluateStatService;
-
-
+    @Autowired
+    private ISiteFeign siteFeign;
     @Autowired
     private AccessService accessService;
 
@@ -135,9 +129,12 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         //todo  首页统计报表
         //    int totalAccessSite = 0;
         List<AccessEntity> accessEntities = new ArrayList<>();
-        RedisTemplate<String, String> baseRedisTemplate = cacheService.selectDbRedisTemplate(1);
+
+
+        String siteTreeStr = siteFeign.siteTree(token);
+       // RedisTemplate<String, String> baseRedisTemplate = cacheService.selectDbRedisTemplate(1);
         //com:mortals:xhx:module:site:model:SiteEntity  redis调用
-        String siteTreeStr = (String) baseRedisTemplate.opsForHash().get("user:site:tree", String.valueOf(user.getId()));
+        //String siteTreeStr = (String) baseRedisTemplate.opsForHash().get("user:site:tree", String.valueOf(user.getId()));
         if (!ObjectUtils.isEmpty(siteTreeStr)) {
             log.info("siteTreeStr:{}", siteTreeStr);
             //获取当前用户所拥有的站点列表
@@ -146,9 +143,11 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
             accessEntities = accessService.find(accessQuery).stream().filter(item -> {
                 List<AccessSystemEntity> accessSystemList = item.getAccessSystemList();
                 //判断排队机或者评价系统是否开通
-                if(ObjectUtils.isEmpty(accessSystemList))return false;
+                if (ObjectUtils.isEmpty(accessSystemList)) return false;
                 List<AccessSystemEntity> collect = accessSystemList.stream().filter(f -> f.getEnabled() == YesNoEnum.YES.getValue()).collect(Collectors.toList());
-                if(ObjectUtils.isEmpty(collect)){return false;}
+                if (ObjectUtils.isEmpty(collect)) {
+                    return false;
+                }
                 return true;
             }).collect(Collectors.toList());