From fc53c7d4544c00ce884392ae1ebc497cfdfe1d64 Mon Sep 17 00:00:00 2001 From: "frin.fei" <123456> Date: Tue, 13 Nov 2018 20:35:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.properties | 4 ++-- pom.xml | 10 +--------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/resources/application.properties b/modules/i3plus-core-apiservice/src/main/resources/application.properties index e351311..58de670 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application.properties @@ -5,8 +5,8 @@ spring.application.name=${project.name} spring.profiles.active=dev ######### 自定义参数 ######### -#项目描述信息（swagger中显式） -desc.application.name=impp管理 +#项目描述信息（swagger中显式），中文使用uncode转码 +desc.application.name=\u6838\u5fc3\u7ba1\u7406\u540e\u53f0 #当前项目版本 version=${project.version} #解决程序读配置文件乱码问题 diff --git a/pom.xml b/pom.xml index 015ddda..fb6a0f1 100644 --- a/pom.xml +++ b/pom.xml @@ -173,9 +173,6 @@ - - - @@ -184,8 +181,6 @@ - - @@ -200,9 +195,6 @@ - - - @@ -236,7 +228,7 @@ prod true - http://git.evun.cn/GCDC-MES-SERVICE/PLATFORM_PROD_EXEC.git + http://git.estsh.com/i3-IMPP/i3plus-core.git v@{project.version} From b3264ae909538057d3be19450f5e9e21dfeb4ad7 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Tue, 13 Nov 2018 20:40:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8B=86=E5=88=86=20=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties index 29454af..6eb145e 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties @@ -1,5 +1,5 @@ #项目端口 -server.port=8081 +server.port=8080 #用户登陆路径 filter.shiro.user.loginuri = /login From 3bce009cfcb8a92888fd083d4bf7907c615e8856 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Tue, 13 Nov 2018 22:31:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/api/iservice/busi/ISysMenuService.java | 2 +- .../i3plus/core/api/iservice/busi/ISysUserService.java | 7 +++++++ .../core/apiservice/controller/DemoAuthController.java | 1 + .../apiservice/controller/busi/SysMenuController.java | 15 ++++++++------- .../apiservice/serviceimpl/busi/SysMenuService.java | 8 ++++---- .../apiservice/serviceimpl/busi/SysUserService.java | 18 ++++++++++++++++-- 6 files changed, 37 insertions(+), 14 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java index d592364..2f1b057 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java +++ b/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批量删除 diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java index 425febc..83d9de6 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java +++ b/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 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java index f24a71d..e865e49 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java +++ b/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; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java index 64dc0f7..24e491f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java +++ b/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){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java index a9aaf9c..9f7ebc6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java +++ b/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); - sysMenuRDao.deleteById(Long.parseLong(id)); + refRoleMenuRDao.deleteById(id); + sysMenuRDao.deleteById(id); } @Override diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java index 3ad8e85..5ba931b 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java +++ b/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 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);