修改token验证

lidongdong

2022-10-09 ca26988c6efb1e61afddb2fcb12141a2dfdbba5b

修改token验证

 flower_city/src/main/java/com/dg/core/controller/OrganizationController.java

@@ -89,7 +89,10 @@
    {
        Assert.notNull(Id, "Id 不能为空");
        OrganizationChartEntity entity=iOrganizationChartService.selectConfigById(Id);
        if(!StringUtils.isEmpty(entity.getParentId()))

        List<OrganizationChartEntity> list=iOrganizationChartService.selectConfigList(entity.getId()+"","");

        if(list.size()>0)
        {
            return ResultData.error("该机构下存在其他部门！请先删除子部门");
        }
@@ -138,7 +141,7 @@
     */
    @ApiOperation(value = "通过父级id查询对应机构下的全部部门",response = OrganizationChartEntity.class)
    @GetMapping("/getdepartment")
    public TableDataInfo getIds(@RequestParam(value = "department",required = false) String departmentId)
    public TableDataInfo getOrganizations(@RequestParam(value = "department",required = false) String departmentId)
    {
        List<OrganizationChartEntity> ids=new ArrayList<>();
        List<OrganizationChartEntity> lists = iOrganizationChartService.selectConfigList(departmentId,"");
@@ -146,18 +149,17 @@
        {
            lists.add(iOrganizationChartService.selectConfigById(departmentId));
        }
        ids=disposestreetId(lists);
        ids=disposestreet(lists);
        if(ids.size()<1)
        {
            return null;
        }
//        ids.add(streetId);
        ids.add(iOrganizationChartService.selectConfigById(departmentId));
        return getDataTable(ids);
    }

    //递归取id
    private List<OrganizationChartEntity> disposestreetId(List<OrganizationChartEntity> lists)
    private List<OrganizationChartEntity> disposestreet(List<OrganizationChartEntity> lists)
    {
        List<OrganizationChartEntity> ids=new ArrayList<>();
        for (OrganizationChartEntity sysStreet:lists)
@@ -165,7 +167,7 @@
            ids.add(sysStreet);
            if(sysStreet.getChild()!=null && sysStreet.getChild().size()>0)
            {
                ids.addAll(disposestreetId(sysStreet.getChild()));
                ids.addAll(disposestreet(sysStreet.getChild()));
            }
            else
            {

 flower_city/src/main/java/com/dg/core/controller/UserController.java

@@ -50,7 +50,7 @@

        SysUser user=null;
        //管理员登录
        if(StringUtils.equals("zigonggaoadmin",account))
        if(!StringUtils.isEmpty(account))
        {
            user= IUserService.getUserByAccount(account);


 flower_city/src/main/java/com/dg/core/manager/RedisTokenManager.java

@@ -2,6 +2,7 @@

import com.dg.core.Constant;
import io.jsonwebtoken.Claims;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.data.redis.core.RedisTemplate;
@@ -41,7 +42,7 @@
    }

    public boolean checkToken(String token) {
        if (token == null) {
        if (StringUtils.isEmpty(token)) {
            return false;
        }
        String userId = redis.boundValueOps(token).get();
@@ -61,7 +62,7 @@
     */
    @Override
    public boolean checkHCToken(String token) {
        if (token == null) {
        if (StringUtils.isEmpty(token)) {
            return false;
        }
        // token解析

 flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java

@@ -54,4 +54,13 @@
     */
    int countList(String organizationName);

    /**
     * 获取部门下子部门的全部id
     * @param id
     * @return
     */
    List<String> getIds(String id);



}

 flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java

@@ -8,6 +8,7 @@
import com.dg.core.service.IOrganizationChartService;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;

@Service
@@ -87,4 +88,49 @@
    public int countList(String organizationName) {
        return baseMapper.countList(organizationName);
    }

    /**
     * 递归获取id  内部使用
     * @param departmentId
     * @return
     */

    @Override
    public List<String> getIds(String id)
    {
        List<String> ids=new ArrayList<>();
        List<OrganizationChartEntity> lists = baseMapper.selectConfigList(id,"");
        if(lists.size()<1)
        {
            lists.add(baseMapper.selectConfigById(id));
        }
        ids=disposestreetId(lists);
        if(ids.size()<1)
        {
            return null;
        }
        ids.add(id);
        return ids;
    }

    //递归取id
    private List<String> disposestreetId(List<OrganizationChartEntity> lists)
    {
        List<String> ids=new ArrayList<>();
        for (OrganizationChartEntity sysStreet:lists)
        {
            ids.add(sysStreet.getId()+"");
            if(sysStreet.getChild()!=null && sysStreet.getChild().size()>0)
            {
                ids.addAll(disposestreetId(sysStreet.getChild()));
            }
            else
            {
                ids.add(sysStreet.getId()+"");
            }
        }
        return ids;
    }


}