Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

张天森

2022-10-09 c01bcaf0b60fd5c57786ba31f3d6e9d411e0c5ed

Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

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

@@ -84,12 +84,13 @@
     */
    @ApiOperation("删除机构")
    @DeleteMapping("/delete")
    @Authorization
//    @Authorization
    public ResultData deleteConfigById(@RequestParam(value = "Id",required = false)  String Id)
    {
        Assert.notNull(Id, "Id 不能为空");
        OrganizationChartEntity entity=iOrganizationChartService.selectConfigById(Id);
        if(!StringUtils.isEmpty(entity.getParentId()))
        List<OrganizationChartEntity> list=iOrganizationChartService.selectParentList(Id,"");

        if(list!=null && list.size()>0)
        {
            return ResultData.error("该机构下存在其他部门！请先删除子部门");
        }
@@ -138,26 +139,25 @@
     */
    @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,"");
        List<OrganizationChartEntity> lists = iOrganizationChartService.selectParentList(departmentId,"");
        if(lists.size()<1)
        {
            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 +165,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

@@ -109,7 +109,6 @@
        }

        String token = tokenManager.getTokenByUserId(user.getUserId());
//        String token = tokenManager.createToken(user.getUserId(), user.getRoleId());
        System.out.println("token "+token);
        if (token == null) {
            //生成一个token，保存用户登录状态

 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/resolvers/CurrentUserMethodArgumentResolver.java

@@ -41,6 +41,7 @@
            //从数据库中查询并返回
            return userService.selectData(currentUserId+"");
        }
        throw new MissingServletRequestPartException(Constant.CURRENT_USER_ID);
        return null;
//        throw new MissingServletRequestPartException(Constant.CURRENT_USER_ID);
    }
}

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

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

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


    /**
     * 根据id  查询是否有子部门
     * @param parentId
     * @param grade
     * @return
     */
    public List<OrganizationChartEntity> selectParentList(String parentId,String grade);

}

 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,54 @@
    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;
    }

    @Override
    public List<OrganizationChartEntity> selectParentList(String parentId, String grade) {
        return baseMapper.selectConfigList(parentId,grade);
    }

    //递归取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;
    }


}