彭伟代码恢复

定时任务日志过滤器

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java

@@ -23,89 +23,12 @@ public interface ISysMenuService extends ICacheCrudService<SysMenu> {
     @ApiOperation(value = "更新内存语言缓存",notes = "更新内存语言缓存")
     void refreshMemSysMenuLanguage();
 
+    @ApiOperation(value = "刷新权限关系",notes = "刷新角色权限关系SoftType 字段")
+    void refreshRefSysMenuBySoftType();
+
     @ApiOperation(value = "国际化功能权限",notes = "国际化功能权限")
     List<SysMenu> setLanguageSysMenuName(String languageCode, List<SysMenu> menuList);
 
-//    /**
-//     * 修改数据
-//     *
-//     * @param sysMenu
-//     */
-//    @ApiOperation(value = "更新菜单信息")
-//    void updateSysMenu(SysMenu sysMenu);
-//
-//    /**
-//     * 修改权限状态
-//     * @param id        修改权限状态
-//     * @param status    状态
-//     * @param user      当前会话用户
-//     * @return
-//     */
-//    @ApiOperation(value = "更新菜单信息",notes = "根据ID 更新菜单状态信息")
-//    void updateSysMenuStatus(Long id, int status, SessionUser user);
-//
-//    /**
-//     * 批量修改状态
-//     * @param ids
-//     * @param status
-//     * @param user
-//     */
-//    @ApiOperation(value = "更新菜单信息",notes = "根据ID 批量更新菜单状态信息")
-//    void updateSysMenuStatusByIds(Long[] ids, int status, SessionUser user);
-//
-//    @ApiOperation(value = "更新菜单信息",notes = "更新子节点冗余信息")
-//    void updateSysMenuChildRdd(SysMenu sysMenu);
-//
-//    /**
-//     * 根据Key 删除数据
-//     * @param id
-//     * @return
-//     */
-//    @ApiOperation(value = "删除菜单信息",notes = "根据ID 删除菜单信息")
-//    void deleteSysMenuById(Long id);
-//
-//    /**
-//     * 根据id批量删除
-//     * @param ids id数组
-//     * @return
-//     */
-//    @ApiOperation(value = "删除菜单信息",notes = "根据ID 批量删除菜单信息")
-//    void deleteSysMenuByIds(Long[] ids);
-//
-//    /**
-//     * 新增数据
-//     *
-//     * @param sysMenu
-//     * @return
-//     */
-//    @ApiOperation(value = "新增菜单信息")
-//    SysMenu insertSysMenu(SysMenu sysMenu);
-//
-//    @ApiOperation(value = "新增菜单信息")
-//    List<SysMenu> refreshSysMenu(List<SysMenu> list);
-//
-//
-//    /**
-//     * 根据id 数据
-//     *
-//     * @param id
-//     * @return
-//     */
-//    @ApiOperation(value = "查询菜单信息",notes = "根据ID查询菜单信息")
-//    SysMenu getSysMenuById(Long id);
-//
-//    @ApiOperation(value = "查询菜单信息",notes = "查询所有菜单信息")
-//    List<SysMenu> findSysMenuAll();
-//
-//    @ApiOperation(value = "查询菜单信息",notes = "查询所有菜单信息")
-//    List<SysMenu> findSysMenuByMenuAndInId(SysMenu menu,List<Long> idList);
-//
-//    @ApiOperation(value = "查询菜单信息",notes = "查询所有带国际化菜单信息")
-//    List<SysMenu> findLanguageMenuByMenuAndInId(SysMenu menu,List<Long> idList);
-//
-//    @ApiOperation(value = "查询菜单信息",notes = "查询菜单信息(分页、组合)")
-//    ListPager<SysMenu> querySysMenu(SysMenu menu,List<Long> idList, Pager pager);
-//
     @ApiOperation(value = "根据菜单代码查询菜单信息")
     SysMenu getSysMenuByCode(String code);
 

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java

@@ -19,132 +19,30 @@ import java.util.List;
  * @Modify      :
  **/
 public interface ISysRoleService extends ICacheCrudService<SysRole> {
-//
+
-//    /**
-//     * 修改数据
-//     *
-//     * @param sysRole
-//     */
-//    @ApiOperation(value = "更新角色信息",notes = "更新角色信息")
-//    void updateSysRole(SysRole sysRole);
-//
-//    /**
-//     * 修改权限状态
-//     * @param id        修改权限状态
-//     * @param status    状态
-//     * @param user      当前用户会话
-//     * @return
-//     */
-//    @ApiOperation(value = "更新角色信息",notes = "更新角色状态信息")
-//    void updateSysRoleStatus(Long id, int status, SessionUser user);
-//
-//    /**
-//     * 批量修改状态
-//     * @param ids
-//     * @param status
-//     * @param user
-//     */
     @ApiOperation(value = "更新角色信息",notes = "根据ID 批量更新角色状态信息")
     void updateSysRoleStatusByIds(Long[] ids, int status, SessionUser user);
-//
+
-//    /**
-//     * 根据Key 删除数据
-//     * @param id
-//     */
-//    @ApiOperation(value = "删除角色信息",notes = "根据ID 删除角色信息")
-//    void deleteSysRoleById(Long id);
-//
-//    /**
-//     * 根据id批量删除
-//     * @param ids id数组
-//     * @return
-//     */
-//    @ApiOperation(value = "删除角色信息",notes = "根据ID 批量删除角色信息")
-//    void deleteSysRoleByIds(Long[] ids);
-//
-//    /**
-//     * 新增数据
-//     *
-//     * @param sysRole
-//     * @return
-//     */
-//    @ApiOperation(value = "新增角色信息")
-//    SysRole insertSysRole(SysRole sysRole);
-//
-//    /**
-//     * 刷新角色权限
-//     * @param roleId
-//     * @param ids
-//     */
     @ApiOperation(value = "刷新角色菜单关系",notes = "刷新 角色 菜单关系信息")
     void refreshSysRoleRef(Long roleId,Long[] ids,String userName);
-//
+
-//    /**
-//     * 刷新角色权限
-//     * @param roleIds
-//     * @param ids
-//     */
     @ApiOperation(value = "刷新角色菜单关系",notes = "批量刷新 角色 菜单关系信息")
     void refreshBatchSysRoleRef(Long[] roleIds,Long[] ids,String userName);
-//
+
-//    /**
+    void refreshSysRoleRef(Long roleId,Integer softType,List<Long> idList,String userName);
-//     *
+
-//     * @param roleId
-//     * @return
-//     */
     @ApiOperation(value = "查信角色菜单关系",notes = "查询 ID 查询角色菜单关系")
     List<SysRefRoleMenu> findSysRefRoleMenuByRoleId(Long roleId);
-//
+
-//    /**
+    @ApiOperation(value = "查信角色菜单关系",notes = "查询 ID 查询角色菜单关系")
-//     * 查询所有数据
+    List<SysRefRoleMenu> findSysRefRoleMenuByRoleId(Long roleId,Integer softType);
-//     *
+
-//     * @return
-//     */
-//    @ApiOperation(value = "查信角色信息",notes = "查询所有角色信息")
-//    List<SysRole> findSysRoleAll();
-//
-//    /**
-//     * 根据ID集合查询角色信息
-//     * @param ids ID集合
-//     * @return 角色集合
-//     */
-//    @ApiOperation(value = "查信角色信息",notes = "查询指定角色信息")
-//    List<SysRole> findSysRoleByInId(Long[] ids);
-//
-//    /**
-//     * 查询角色信息
-//     * @param ids 角色ID 集合
-//     * @param status 角色 状态
-//     * @return 角色集合
-//     */
     @ApiOperation(value = "查信角色信息",notes = "根据ID + 角色状态查询角色信息")
     List<SysRole> findSysRoleByInIdAndStatus(Long[] ids,Integer status);
-//
+
-//    /**
-//     * 获取用户的角色信息
-//     * @param user  账号信息
-//     * @return 角色集合
-//     */
     @ApiOperation(value = "查信用户的所有角色信息",notes = "查信用户的所有角色信息")
     List<SysRole> findSysRoleByUser(SysUser user);
-//
+
-//    /**
-//     * 根据id 数据
-//     * @param id
-//     * @return
-//     */
-//    @ApiOperation(value = "查信角色信息",notes = "根据 ID 查询角色信息")
-//    SysRole getSysRoleById(Long id);
-//
-//    /**
-//     * 复杂查询
-//     * @param role
-//     * @param pager
-//     * @return
-//     */
-//    @ApiOperation(value = "查信角色信息",notes = "查询角色信息(分页/组合)")
-//    ListPager<SysRole> querySysRole(SysRole role, Pager pager);
-//
     @ApiOperation(value = "查信角色信息",notes = "查询角色信息(分页/组合)")
     ListPager<SysRole> querySysRole(SysRole role, List<Long> idList, Pager pager);
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/auth/realm/AdminAuthRealm.java

@@ -42,9 +42,17 @@ public class AdminAuthRealm extends AuthorizingRealm {
     //令牌确认
     @Override
     protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authenticationToken) throws AuthenticationException {
+        try {
             //管理员令牌
             SessionUser sessionUser = systemLoginService.queryCheckAdminLogin(( AdminToken ) authenticationToken);
             LOGGER.info("管理员令牌验证：{}", sessionUser);
             return new SimpleAuthenticationInfo(sessionUser, (( AdminToken ) authenticationToken).getLoginPwd(), this.getName());
+//        }catch (ImppBusiException e){
+//            e.printStackTrace();
+//            throw new AuthenticationException();
+        }catch (Exception e){
+            e.printStackTrace();
+            throw new AuthenticationException();
+        }
     }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BackstageController.java

@@ -149,6 +149,7 @@ public class BackstageController extends CoreBaseController {
                 menuService.saveBatch(new ArrayList<>(menuMap.values()));
             }
 
+            menuService.refreshRefSysMenuBySoftType();
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
@@ -157,7 +158,4 @@ public class BackstageController extends CoreBaseController {
         }
     }
 
-
-
-
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java

@@ -7,7 +7,6 @@ import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
-import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
@@ -26,13 +25,8 @@ import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.GetMapping;
+
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 
 /**
@@ -153,6 +147,39 @@ public class SysConfigController extends CoreBaseController {
         }
     }
 
+
+    /**
+     * 系统参数
+     * @param bean 系统参数
+     * @return 处理结果
+     */
+    @PutMapping(value = "/update-value")
+    @ApiOperation(value = "修改系统参数内容",notes = "修改系统参数内容")
+    public ResultBean updateSysConfigValue(SysConfig bean){
+        try {
+            // 条件验证
+            ValidatorBean.beginValid(bean)
+                    .notNull("configCode",bean.getConfigCode())
+                    .notNull("configValue",bean.getConfigValue());
+
+            SysConfig config = sysConfigService.getSysConfigByCode(bean.getConfigCode());
+            ValidatorBean.checkNotNull(config,"不存在的配置信息");
+
+            config.setConfigValue(bean.getConfigValue());
+            ConvertBean.modelUpdate(config,getSessionUser());
+
+            sysConfigService.updateSysConfig(config);
+            systemInitService.putAndLoadSysConfig();
+            return  ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+
+
     /**
      * 查询全部系统参数
      * @return 处理结果
@@ -263,10 +290,13 @@ public class SysConfigController extends CoreBaseController {
 
     /**
      * 根据系统代码修改系统配置值
+     * wei.peng :
+     *      该方法已过期 推荐使用 SysConfigController.updateSysConfigValue()
      * @param code 系统代码
      * @param value 系统配置值
      * @return 处理结果
      */
+    @Deprecated
     @PostMapping("/update-code/{code}/{value}")
     @ApiOperation(value = "根据code修改系统配置")
     public ResultBean updateSysConfigByCode(@PathVariable("code") String code,@PathVariable("value") String value){

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java

@@ -354,7 +354,7 @@ public class SysLocaleResourceController extends CoreBaseController {
             List<SysLocaleResource> list = sysLocaleResourceService.listSysLocaleResource();
 
             File file = new File(fileName);
-            if (file.createNewFile()) {
+            if (!file.createNewFile()) {
                 throw ImppExceptionBuilder.newInstance()
                         .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
                         .setErrorCode(ImppExceptionEnum.IO_EXCEPTION_FILE.getCode())

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java

@@ -92,7 +92,6 @@ public class SysRoleController extends CrudBaseController<SysRole> {
 
     /**
      * 查询所有角色
-     *
      * @param ids 角色id数组
      * @return 处理结果
      */
@@ -111,7 +110,6 @@ public class SysRoleController extends CrudBaseController<SysRole> {
 
     /**
      * 查询角色的所有角色权限关系
-     *
      * @param roleId 角色id
      * @return 处理结果
      */
@@ -159,7 +157,6 @@ public class SysRoleController extends CrudBaseController<SysRole> {
 
     /**
      * 修改角色状态
-     *
      * @param id 角色id
      * @param status 状态
      * @return 处理结果
@@ -188,7 +185,6 @@ public class SysRoleController extends CrudBaseController<SysRole> {
 
     /**
      * 批量修改系统角色状态
-     *
      * @param ids 系统角色ids数组
      * @param status 状态
      * @return 处理结果
@@ -239,9 +235,53 @@ public class SysRoleController extends CrudBaseController<SysRole> {
         }
     }
 
+
+    @PostMapping(value = "/ref-menu/save")
+    @ApiOperation(value = "保存角色权限关系", notes = "? 权限列表没有数据时清理角色的产品")
+    public ResultBean saveRefMenuBySoftType(@RequestBody SysRefRoleMenu refRoleMenu) {
+        try {
+            // 数据校验
+            ValidatorBean.beginValid(refRoleMenu)
+                    .notNull("roleId",refRoleMenu.getRoleId())
+                    .notNull("softType",refRoleMenu.getSoftType());
+
+            sysRoleService.refreshSysRoleRef(refRoleMenu.getRoleId(),refRoleMenu.getSoftType(),refRoleMenu.getMenuIdList()
+                    ,AuthUtil.getSessionUser().getUserName());
+
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        } catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+
+    /**
+     * 新增角色权限关系
+     * @param roleId 角色id
+     * @param softType 产品类型ID
+     * @return 处理结果
+     */
+    @GetMapping(value = "/ref-menu/{roleId}/{softType}/list")
+    @ApiOperation(value = "查询角色权限关系", notes = "根据软件类型查询角色权限关系")
+    public ResultBean findRefMenuBySoftType(@PathVariable("roleId") Long roleId, @PathVariable("softType") Integer softType) {
+        try {
+            // 数据校验
+            ValidatorBean.checkNotNull(roleId, "角色roleId 不能为空");
+            ValidatorBean.checkNotNull(softType, "产品类型 不能为空");
+
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
+                    .setResultList(sysRoleService.findSysRefRoleMenuByRoleId(roleId,softType));
+        } catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
     /**
      * 批量新增角色权限关系
-     *
      * @param roleIds 角色id 集合
      * @param menuIds 功能id
      * @return 处理结果

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/cloud/ReportPojoCloudController.java

@@ -9,6 +9,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.model.common.ClassModel;
 import cn.estsh.i3plus.pojo.model.report.BrDataSourceModel;
 import cn.estsh.i3plus.pojo.model.report.TemplateModel;
+import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.util.ResultBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -35,7 +36,7 @@ import java.util.List;
 @RestController
 @Api(tags = "Cloud 报表服务")
 @RequestMapping(CommonConstWords.BASE_URL_CORE + "/cloud/report-pojo")
-public class ReportPojoCloudController {
+public class ReportPojoCloudController extends CoreBaseController {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ReportPojoCloudController.class);
 
@@ -78,7 +79,7 @@ public class ReportPojoCloudController {
     @PostMapping(value = "/query")
     @ApiOperation(value = "查询管理后台所有类", notes = "根据核心包路径列出所有类")
     public BaseResultBean runHql(@RequestBody TemplateModel model) {
-        LOGGER.info("【执行 HQL】TemplateModel：{}", model);
+//        LOGGER.info("【执行 HQL】TemplateModel：{}", model);
         try {
             List result = reportService.selectTemplateModel(model);
             return ResultBean.success("操作成功")

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/ReportService.java

@@ -36,7 +36,7 @@ public class ReportService implements IReportService {
 
     @Override
     public List selectTemplateModel(TemplateModel model) throws Exception{
-        LOGGER.info("报表执行 model :{}",model);
+//        LOGGER.info("报表执行 model :{}",model);
         return reportDao.findByHqlObjects(model.getQuerySql(), model.getFindParam());
     }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java

@@ -2,37 +2,29 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleResourceService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService;
-import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService;
+import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
 import cn.estsh.i3plus.platform.common.tool.SerializeTool;
 import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
-import cn.estsh.i3plus.pojo.base.bean.ListPager;
-import cn.estsh.i3plus.pojo.base.common.Pager;
-import cn.estsh.i3plus.pojo.base.common.PagerHelper;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.base.tool.HqlPack;
+import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource;
-import cn.estsh.i3plus.pojo.platform.bean.*;
+import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
 import cn.estsh.i3plus.pojo.platform.repository.SysMenuRepository;
 import cn.estsh.i3plus.pojo.platform.repository.SysRefRoleMenuRepository;
 import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
 import cn.estsh.impp.framework.base.service.CacheCrudService;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
-import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
-import cn.estsh.impp.framework.boot.util.ValidatorBean;
-import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
 
 import static cn.estsh.i3plus.platform.common.util.CommonConstWords.RESOURCE_PREFIX_MENU;
 
@@ -113,6 +105,33 @@ public class SysMenuService extends CacheCrudService<SysMenu> implements ISysMen
     }
 
     @Override
+    public void refreshRefSysMenuBySoftType() {
+        List<SysMenu> list = findAll();
+        if(CollectionUtils.isNotEmpty(list)){
+            Map<Integer, List<Long>> refMap = new HashMap<>();
+            for (SysMenu menu : list) {
+                if(Objects.nonNull(menu.getSoftType())){
+                    List<Long> ids = refMap.get(menu.getSoftType());
+                    if(CollectionUtils.isEmpty(ids)){
+                        ids = new ArrayList<>();
+                    }
+                    ids.add(menu.getId());
+                    refMap.put(menu.getSoftType(),ids);
+                }
+            }
+
+            if(MapUtils.isNotEmpty(refMap)){
+                DdlPackBean packBean = null;
+                for (Integer softType : refMap.keySet()) {
+                    packBean = DdlPackBean.getDdlPackBean();
+                    DdlPreparedPack.getInPackList(refMap.get(softType),"menuId",packBean);
+                    refRoleMenuRDao.updateByProperties("softType",softType,packBean);
+                }
+            }
+        }
+    }
+
+    @Override
     public List<SysMenu> setLanguageSysMenuName(String languageCode, List<SysMenu> menuList) {
         if (menuList != null) {
             languageCode = StringUtils.isNotBlank(languageCode) ? languageCode : CommonConstWords.DEFAULT_LANGUAGE;

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java

@@ -2,10 +2,10 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService;
+import cn.estsh.i3plus.core.api.iservice.busi.ISysPositionService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService;
 import cn.estsh.i3plus.core.apiservice.dao.IUserPermissionDao;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
-import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
@@ -14,6 +14,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.platform.bean.*;
+import cn.estsh.i3plus.pojo.platform.repository.SysMenuRepository;
 import cn.estsh.i3plus.pojo.platform.repository.SysRefRoleMenuRepository;
 import cn.estsh.i3plus.pojo.platform.repository.SysRefUserRoleRepository;
 import cn.estsh.i3plus.pojo.platform.repository.SysRoleRepository;
@@ -21,9 +22,12 @@ import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
 import cn.estsh.impp.framework.base.service.CacheCrudService;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
+import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections4.ListUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -79,31 +83,6 @@ public class SysRoleService extends CacheCrudService<SysRole> implements ISysRol
         return CoreHqlPack.packDdlBeanSysRole(bean);
     }
 
-    //    @Override
-//    @ApiOperation(value = "更新角色信息",notes = "更新角色信息")
-//    public void updateSysRole(SysRole sysRole) {
-//        LOGGER.info("系统角色 SYS_ROLE :{}", sysRole);
-//
-//        // 更新角色信息
-//        roleRDao.update(sysRole);
-//        // 更新账号角色关系冗余信息
-//        refUserRoleRDao.updateByProperties(new String[]{"roleId"}, new Object[]{sysRole.getId()},
-//                new String[]{"roleNameRdd"}, new Object[]{sysRole.getName()});
-//        // 更新角色
-//        refRoleMenuRDao.updateByProperties(new String[]{"roleId"}, new Object[]{sysRole.getId()},
-//                new String[]{"roleNameRdd"}, new Object[]{sysRole.getName()});
-//    }
-//
-//    @Override
-//    @ApiOperation(value = "更新角色信息",notes = "更新角色状态信息")
-//    public void updateSysRoleStatus(Long id, int status, SessionUser user) {
-//        LOGGER.info("系统角色 SYS_MENU  id:{} status:{} user:{}", id,status,user);
-//        SysRole role = roleRDao.getById(id);
-//        role.setRoleStatus(status);
-//        role.setModifyUser(user.getUserName());
-//        roleRDao.update(role);
-//    }
-//
     @Override
     @ApiOperation(value = "更新角色信息",notes = "根据ID 批量更新角色状态信息")
     public void updateSysRoleStatusByIds(Long[] ids, int status, SessionUser user) {
@@ -113,30 +92,7 @@ public class SysRoleService extends CacheCrudService<SysRole> implements ISysRol
         HqlPack.getInPack(StringUtils.join( ids,","), "id", where);
         roleRDao.updateByHqlWhere(where.toString(), "roleStatus", status);
     }
-//
+
-//    @Override
-//    @ApiOperation(value = "删除角色信息",notes = "根据ID 删除角色信息")
-//    public void deleteSysRoleById(Long id) {
-//        LOGGER.info("系统角色 SYS_ROLE Key:{}", id);
-//        refRoleMenuRDao.deleteByProperty("roleId",id);
-//        roleRDao.deleteById(id);
-//    }
-//
-//    @Override
-//    @ApiOperation(value = "删除角色信息",notes = "根据ID 批量删除角色信息")
-//    public void deleteSysRoleByIds(Long[] ids) {
-//        LOGGER.info("系统角色 SYS_ROLE ids :{}", ids);
-//        refRoleMenuRDao.deleteByPropertyIn("roleId",ids);
-//        roleRDao.deleteByIds(ids);
-//    }
-//
-//    @Override
-//    @ApiOperation(value = "新增角色信息")
-//    public SysRole insertSysRole(SysRole sysRole) {
-//        LOGGER.info("系统角色 SYS_ROLE :{}", sysRole);
-//        return roleRDao.insert(sysRole);
-//    }
-//
     @Override
     @ApiOperation(value = "刷新角色菜单关系",notes = "刷新 角色 菜单关系信息")
     public void refreshSysRoleRef(Long roleId,Long[] ids,String userName) {
@@ -181,6 +137,7 @@ public class SysRoleService extends CacheCrudService<SysRole> implements ISysRol
                             ref.setRoleNameRdd(role.getName());
                             ref.setMenuNameRdd(menu.getName());
                             ref.setMenuId(menu.getId());
+                            ref.setSoftType(menu.getSoftType());
                             ref.setMenuTypeRdd(menu.getMenuType());
                             ConvertBean.serviceModelInitialize(ref, AuthUtil.getSessionUser());
 
@@ -216,6 +173,47 @@ public class SysRoleService extends CacheCrudService<SysRole> implements ISysRol
     }
 
     @Override
+    public void refreshSysRoleRef(Long roleId, Integer softType, List<Long> idList, String userName) {
+        SysRole role = roleRDao.getById(roleId);
+        ValidatorBean.checkNotNull(role,"不存在的角色信息");
+        ValidatorBean.checkNotNull(softType,"不存在的产品信息");
+
+        SysMenu menu = new SysMenu();
+        menu.setSoftType(softType);
+        List<SysMenu> menuList = menuService.findAllByBean(menu);
+
+        refRoleMenuRDao.deleteByProperties(new String[]{"roleId","softType"},new Object[]{roleId,softType});
+        if(CollectionUtils.isNotEmpty(idList)){
+            List<SysRefRoleMenu> refs = new ArrayList<>();
+            SysRefRoleMenu ref = null;
+
+            for (Long id : idList) {
+                if(CollectionUtils.isNotEmpty(menuList)){
+                    for (SysMenu sysMenu : menuList) {
+                        if(sysMenu.getId().equals(id)){
+                            ref = new SysRefRoleMenu();
+                            ref.setRoleId(role.getId());
+                            ref.setRoleNameRdd(role.getName());
+                            ref.setSoftType(sysMenu.getSoftType());
+                            ref.setMenuNameRdd(sysMenu.getName());
+                            ref.setMenuId(sysMenu.getId());
+                            ref.setMenuTypeRdd(sysMenu.getMenuType());
+                            ConvertBean.serviceModelInitialize(ref, AuthUtil.getSessionUser());
+
+                            refs.add(ref);
+                            break;
+                        }
+                    }
+                }
+            }
+
+            if(CollectionUtils.isNotEmpty(refs)){
+                refRoleMenuRDao.saveAll(refs);
+            }
+        }
+    }
+
+    @Override
     @ApiOperation(value = "查信角色菜单关系",notes = "查询 ID 查询角色菜单关系")
     public List<SysRefRoleMenu> findSysRefRoleMenuByRoleId(Long roleId) {
         LOGGER.info("系统角色权限关系 RefRoleMenu find By RoleId");
@@ -224,15 +222,17 @@ public class SysRoleService extends CacheCrudService<SysRole> implements ISysRol
                 new Object[]{roleId,CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()}
                 );
     }
-//
+
-//    @Override
+    @Override
-//    @ApiOperation(value = "查信角色信息",notes = "查询所有角色信息")
+    public List<SysRefRoleMenu> findSysRefRoleMenuByRoleId(Long roleId, Integer softType) {
-//    public List<SysRole> findSysRoleAll() {
+        LOGGER.info("系统角色权限关系 RefRoleMenu find By RoleId");
-//        LOGGER.info("系统角色 SYS_ROLE find All");
+        return refRoleMenuRDao.findByProperty(
-//        return roleRDao.findByProperty(new String[]{"roleStatus"},new Object[]{CommonEnumUtil.DATA_STATUS.ENABLE.getValue()});
+                new String[]{"roleId","softType","isValid"},
-//    }
+                new Object[]{roleId,softType,
-//
+                        CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()}
-//
+        );
+    }
+
     @Override
     public List<SysRole> findSysRoleByInIdAndStatus(Long[] ids, Integer status) {
         LOGGER.info("系统角色 SYS_ROLE findSysRoleByInIdAndStatus ids:{} , status:{}",ids,status);

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/thread/Demo.java

@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.core.apiservice.thread;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-07-03 10:56
+ * @Modify:
+ **/
+public class Demo {
+    /*定义一个全局变量 来存放线程需要的变量*/
+    public static ThreadLocal<Integer> ti = new ThreadLocal<Integer>();
+    public static void main(String[] args) {
+        System.out.println("主线程：" + Thread.currentThread().getName());
+        /*创建两个线程*/
+        for(int i=0; i<2;i++){
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    Double d = Math.random()*10;
+                    /*存入当前线程独有的值*/
+//                    ti.set(d.intValue());
+                    new A().get();
+                    new B().get();
+                }
+            }).start();
+        }
+    }
+    static class A{
+        public void get(){
+            /*取得当前线程所需要的值*/
+            System.out.println(this.getClass()+ "---"+ Thread.currentThread().getName()+"-------"+ti.get());
+        }
+    }
+    static class B{
+        public void get(){
+            /*取得当前线程所需要的值*/
+            System.out.println(this.getClass()+ "---"+ Thread.currentThread().getName()+"-------"+ti.get());
+        }
+    }
+}

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/SysUserPasswordUtil.java

@@ -347,21 +347,28 @@ public class SysUserPasswordUtil {
             String activeDirectoryUrl = RedisCacheTool.getSysConfigStrVal(CommonConstWords.CONFIG_PWD_ACTIVE_DIRECTORY_URL);
 
             if (StringUtils.isNotBlank(activeDirectoryUrl)) {
+                try {
                     LdapContext context = ImppLdapUtils.getLdapContext(activeDirectoryUrl, user.getUserLoginName(), user.getUserLoginPassword());
-                if(Objects.isNull(context)){
+                    // 释放链接资源
+                    context.close();
+                } catch (ImppBusiException e) {
+                    throw e;
+                } catch (NamingException e) {
+                    e.printStackTrace();
                     throw ImppExceptionBuilder.newInstance()
                             .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
                             .setErrorCode(ImppExceptionEnum.NOT_CONFIG_EXCEPTION.getCode())
                             .setErrorDetail("ActiveDirectory 登录失败请重新登录")
                             .setErrorSolution("请重新操作")
                             .build();
-                }
+                } catch (Exception e) {
-
-                try {
-                    // 释放链接资源
-                    context.close();
-                } catch (NamingException e) {
                     e.printStackTrace();
+                    throw ImppExceptionBuilder.newInstance()
+                            .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                            .setErrorCode(ImppExceptionEnum.NOT_CONFIG_EXCEPTION.getCode())
+                            .setErrorDetail("ActiveDirectory 登录失败请重新登录")
+                            .setErrorSolution("请重新操作")
+                            .build();
                 }
             }else{
                 throw ImppExceptionBuilder.newInstance()