账号管理功能优化

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

@@ -47,7 +47,7 @@ public interface ISysMenuService {
      * @param id
      * @return
      */
-    void deleteSysMenuById(String id);
+    void deleteSysMenuById(Long id);
 
     /**
      * 根据id批量删除

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

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.api.iservice.busi;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.platform.bean.*;
+import sun.rmi.runtime.Log;
 
 import java.util.List;
 
@@ -56,6 +57,12 @@ public interface ISysUserService {
     void updateSysUserPassword(String userIdStr,String password,String newPwd)  throws Exception;
 
     /**
+     * 修改用户最后登录时间
+     * @param userId
+     */
+    void updateUserLoginLastDateTime(Long userId);
+
+    /**
      * 新增用户信息
      * @param sysUser 新增用户
      * @return

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

@@ -33,6 +33,7 @@ import java.util.Map;
 @Api(description="登陆授权demo")
 public class DemoAuthController extends CoreBaseController {
     public static final Logger LOGGER = LoggerFactory.getLogger(DemoAuthController.class);
+
     @Autowired
     private ISystemLoginService systemLoginService;
 

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

@@ -8,6 +8,7 @@
  import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
  import cn.estsh.i3plus.pojo.platform.bean.Organize;
  import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
+ import cn.estsh.impp.framework.base.controller.BaseController;
  import cn.estsh.impp.framework.boot.auth.AuthUtil;
  import cn.estsh.impp.framework.boot.exception.ImppBusiException;
  import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@@ -33,7 +34,7 @@
 @RestController
 @RequestMapping("/sys-menu")
 @Api(description = "系统功能服务")
-public class SysMenuController {
+public class SysMenuController extends BaseController {
 
     public static final Logger LOGGER = LoggerFactory.getLogger(SysMenuController.class);
 
@@ -51,7 +52,7 @@ public class SysMenuController {
                     .notNull("menuTypeId", menu.getMenuTypeId());
 
             //新增初始化
-            ConvertBean.modelInitialize(menu, AuthUtil.getSessionUser());
+            ConvertBean.modelInitialize(menu, getSessionUser());
             if(menu.getParentId() == null || menu.getParentId().intValue() == 0){
                 menu.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue());
             }
@@ -78,7 +79,7 @@ public class SysMenuController {
                     .notNull("menuCode", sysMenu.getMenuCode())
                     .notNull("name", sysMenu.getName());
 
-            ConvertBean.modelUpdate(sysMenu, AuthUtil.getSessionUser());
+            ConvertBean.modelUpdate(sysMenu, getSessionUser());
 
             sysMenuService.updateSysMenu(sysMenu);
             return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
@@ -95,9 +96,9 @@ public class SysMenuController {
     public ResultBean deleteSysMenu(@PathVariable("id") String id) {
         try {
             // 数据校验
-            ValidatorBean.checkNotNull(id, "系统功能id 不能为空");
+            ValidatorBean.checkIsNumber(id, "系统功能id 不能为空");
 
-            sysMenuService.deleteSysMenuById(id);
+            sysMenuService.deleteSysMenuById(Long.parseLong(id));
             return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException busExcep) {
             LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
@@ -172,7 +173,7 @@ public class SysMenuController {
             ValidatorBean.checkNotNull(id, "功能id 不能为空");
             ValidatorBean.checkNotZero(status, "功能状态不能为空");
 
-            sysMenuService.updateSysMenuStatus(id,status,AuthUtil.getSessionUser());
+            sysMenuService.updateSysMenuStatus(id,status,getSessionUser());
             return new ResultBean(true);
         } catch(ImppBusiException busExcep){
             LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
@@ -192,7 +193,7 @@ public class SysMenuController {
             ValidatorBean.checkNotNull(ids, "功能id 不能为空");
             ValidatorBean.checkNotZero(status, "功能状态不能为空");
 
-            sysMenuService.updateSysMenuStatusByIds(ids,status,AuthUtil.getSessionUser());
+            sysMenuService.updateSysMenuStatusByIds(ids,status,getSessionUser());
 
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch(ImppBusiException busExcep){

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

@@ -103,9 +103,9 @@ public class SysMenuService implements ISysMenuService {
     }
 
     @Override
-    public void deleteSysMenuById(String id) {
+    public void deleteSysMenuById(Long id) {
         LOGGER.info("系统功能 SYS_MENU Key:{}", id);
-        long count = sysMenuRDao.findByPropertyCount("parentId",Long.parseLong(id));
+        long count = sysMenuRDao.findByPropertyCount("parentId",id);
         if(count >= 1){
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
@@ -116,8 +116,8 @@ public class SysMenuService implements ISysMenuService {
 
         }
 
-        refRoleMenuRDao.deleteByProperty("menuId",id);
+        refRoleMenuRDao.deleteById(id);
-        sysMenuRDao.deleteById(Long.parseLong(id));
+        sysMenuRDao.deleteById(id);
     }
 
     @Override

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

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService;
 import cn.estsh.i3plus.core.apiservice.dao.IUserPermissionDao;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.tool.EncryptTool;
+import cn.estsh.i3plus.platform.common.tool.TimeTool;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.common.PagerHelper;
@@ -100,6 +101,7 @@ public class SysUserService implements ISysUserService {
 
         packSessionUser(sessionUser, user, user.getUserTypeId(), languageCode);
         AuthUtil.setSessionUser(sessionUser);
+        updateUserLoginLastDateTime(user.getId());
         return sessionUser;
     }
 
@@ -107,7 +109,7 @@ public class SysUserService implements ISysUserService {
     public void updateSysUserStatus(String id, int status, SessionUser user) {
         LOGGER.debug("平台用户 SYS_USER id:{} status:{} modifyUser:{}", id, status, user.getUserName());
         SysUser sysUser = sysUserRDao.getById(Long.parseLong(id));
-//        sysUser.setUserStatusId(status);
+        sysUser.setUserStatus(status);
         sysUser.setModifyUser(user.getUserName());
         sysUserRDao.update(sysUser);
     }
@@ -120,7 +122,7 @@ public class SysUserService implements ISysUserService {
         List<SysUser> list = sysUserRDao.findByHqlWhere(where);
         if(null != list && list.size() > 0){
             for (SysUser sysUser : list) {
-//                sysUser.setUserStatusId(status);
+                sysUser.setUserStatus(status);
                 sysUser.setIsValid(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
                 ConvertBean.modelUpdate(sysUser,user);
             }
@@ -182,6 +184,18 @@ public class SysUserService implements ISysUserService {
     }
 
     @Override
+    public void updateUserLoginLastDateTime(Long userId) {
+        SysUser user = sysUserRDao.getById(userId);
+        SysUserInfo userInfo = sysUserInfoRDao.getById(user.getUserInfoId());
+
+        user.setUserLoginLastDateTime(TimeTool.getNowTime(true));
+        userInfo.setUserLoginLastDateTime(TimeTool.getNowTime(true));
+
+        sysUserInfoRDao.save(userInfo);
+        sysUserRDao.save(user);
+    }
+
+    @Override
     public SysUser insertSysUser(SysUser sysUser)throws Exception {
         LOGGER.debug("平台用户 SYS_USER SysUser:{}", sysUser);