diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java index 83f4827..de7897c 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java @@ -57,6 +57,13 @@ public interface ISysUserInfoService { void refreshRefUserOrganize(Long userInfoId, Long organizeId, String userName); /** + * 刷新用户账号信息 + * @param userInfoId + */ + @ApiOperation(value = "刷新用户账号信息",notes = "根据UserInfoId 刷新用户账号信息") + void refreshUserInfoUserNum(Long userInfoId); + + /** * 根据Key 删除数据 * @param id */ 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 30c3295..e275354 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 @@ -46,9 +46,9 @@ public class DemoAuthController extends CoreBaseController { LOGGER.info("用户登陆：{},{},{}",loginName,loginPwd,languageCode); try { SessionUser sUser = systemLoginService.queryUserLogin(loginName,loginPwd,languageCode); - LOGGER.info("会员登陆：{}",sUser); + LOGGER.info("sid:{}, 会员登陆：{}",AuthUtil.getSession().getId(),sUser); AuthUtil.setSessionObject("languageCode",languageCode); - return new ResultBean(true,""); + return new ResultBean(true,AuthUtil.getSession().getId()); } catch (ImppBusiException e) { return new ResultBean(false,e.getErrorDetail() + ",so:" + e.getErrorSolution()); } @@ -75,7 +75,7 @@ public class DemoAuthController extends CoreBaseController { * @return */ @GetMapping(value="/get-user-info") - @ApiOperation(value="登出",notes="登出") + @ApiOperation(value="获取用户信息",notes="获取用户信息") public ResultBean getUserInfo(HttpServletRequest request){ LOGGER.info("获取用户信息...lang:{}",AuthUtil.getSessionAttribute("languageCode")); try { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java index 4c88219..445c068 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java @@ -75,7 +75,7 @@ public class AuthController extends CoreBaseController { LOGGER.info("会员登陆：{}",user); AuthUtil.setSessionObject("languageCode",languageCode); - result = new ResultBean(true, "", AuthUtil.getSessionUser()); + result = new ResultBean(true, AuthUtil.getSession().getId().toString(), AuthUtil.getSessionUser()); result.setUrl("/"); } catch (IncorrectCredentialsException e) { // 密码错误 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java index abe288a..4314738 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java @@ -103,6 +103,7 @@ public class SysUserController extends CoreBaseController{ // 更新用户关系 sysUserService.refreshSysRefUserRole(user,StringTool.getArrayLong(roleIds),getSessionUser().getUserName()); + sysUserInfoService.refreshUserInfoUserNum(userInfo.getId()); return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) @@ -290,6 +291,7 @@ public class SysUserController extends CoreBaseController{ ValidatorBean.checkNotNull(id, "用户id 不能为空"); sysUserService.deleteSysUserById(Long.parseLong(id)); + sysUserInfoService.refreshUserInfoUserNum(Long.parseLong(id)); return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java index 7757d84..6f4d7de 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java @@ -3,7 +3,6 @@ package cn.estsh.i3plus.core.apiservice.mq; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.amqp.core.Queue; -import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -33,6 +32,7 @@ public class I3CoreQueueConfig { /*********** 队列demo ***********/ public static final String DEMO_STR_QUEUE = "demo_str_queue"; + @Bean public Queue getStrQueue() { //LOGGER.info("【DEMO_STR_QUEUE队列】"); @@ -40,6 +40,7 @@ public class I3CoreQueueConfig { } public static final String DEMO_OBJ_QUEUE = "demo_obj_queue"; + @Bean public Queue getObjQueue() throws Exception { //LOGGER.info("【DEMO_OBJ_QUEUE队列】"); @@ -47,6 +48,7 @@ public class I3CoreQueueConfig { } public static final String DEMO_HANDLE_QUEUE = "demo_handle_queue"; + @Bean public Queue getHandleQueue() throws Exception { //LOGGER.info("【DEMO_HANDLE_QUEUE队列】"); @@ -54,6 +56,7 @@ public class I3CoreQueueConfig { } public static final String DEMO_ACK_QUEUE = "ack_queue"; + @Bean public Queue getAckQueue() throws Exception { //LOGGER.info("【DEMO_ACK_QUEUE队列】"); @@ -61,6 +64,7 @@ public class I3CoreQueueConfig { } public static final String DEMO_RETURN_QUEUE = "return_queue"; + @Bean public Queue getReturnQueue() throws Exception { //LOGGER.info("【DEMO_RETURN_QUEUE队列】"); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java index f39319d..2c7e08c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java @@ -195,6 +195,19 @@ public class SysUserInfoService implements ISysUserInfoService { } @Override + @ApiOperation(value = "刷新用户账号信息",notes = "根据UserInfoId 刷新用户账号信息") + public void refreshUserInfoUserNum(Long userInfoId) { + LOGGER.info("用户信息 SysUserInfo userInfoId:{}",userInfoId); + SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId); + if(userInfo != null){ + int count = sysUserRepository.findByPropertyCount("userInfoId", userInfo.getId()); + userInfo.setUserNum(count); + sysUserInfoRDao.save(userInfo); + + } + } + + @Override public void deleteSysUserInfoById(Long id) { LOGGER.info("用户信息 SysUserInfo id:{}",id); sysUserInfoRDao.deleteById(id); 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 9b3a663..31a6c6e 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 @@ -1,5 +1,6 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; +import cn.estsh.i3plus.core.api.iservice.busi.ISysUserInfoService; 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; @@ -76,6 +77,9 @@ public class SysUserService implements ISysUserService { @Autowired private SysPositionRepository sysPositionRDao; + @Autowired + private ISysUserInfoService sysUserInfoService; + @Override @ApiOperation(value = "用户登录", notes = "用户登录功能实现") public SessionUser queryUserLogin(String loginName, String password, String languageCode) throws AuthenticationException { @@ -260,6 +264,7 @@ public class SysUserService implements ISysUserService { if(null != list && list.size() > 0){ for (SysUser sysUser : list) { sysUser.setIsValid(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + sysUserInfoService.refreshUserInfoUserNum(sysUser.getUserInfoId()); } sysUserRDao.saveAll(list); diff --git a/modules/i3plus-core-apiservice/src/main/resources/application.properties b/modules/i3plus-core-apiservice/src/main/resources/application.properties index 2fdf9a3..cb7f6cd 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application.properties @@ -29,4 +29,12 @@ server.tomcat.uri-encoding=UTF-8 spring.mvc.view.prefix=/upload_demo spring.mvc.view.suffix=.jsp #静态文件访问配置 -spring.resources.static-locations=/static/**,/** \ No newline at end of file +spring.resources.static-locations=/static/**,/** + +########扫包路径######## +#基础包路径 +impp.app.base-packages=cn.estsh.i3plus.core +#对象包路径，可以多个包，逗号分隔 +impp.app.base-pojo=cn.estsh.i3plus.pojo.base,cn.estsh.i3plus.pojo.platform +#微服包路径 +impp.app.icloud-package=cn.estsh.i3plus.icloud \ No newline at end of file