From 242e01532d33e37c042d9fefeadfc40392e20c03 Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Mon, 31 Jul 2023 15:46:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/UserLogController.java | 14 +++++++++++++- .../com/njcn/user/controller/UserController.java | 10 ++++++++++ .../java/com/njcn/user/service/IUserService.java | 1 + .../njcn/user/service/impl/UserServiceImpl.java | 16 ++++++++++++---- 4 files changed, 36 insertions(+), 5 deletions(-) diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/UserLogController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/UserLogController.java index 383f5364d..946f43b3d 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/UserLogController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/UserLogController.java @@ -8,8 +8,10 @@ import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; +import com.njcn.system.pojo.po.UserLog; import com.njcn.system.service.IUserLogService; import com.njcn.web.controller.BaseController; +import com.njcn.web.utils.RequestUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -21,6 +23,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** *

@@ -53,6 +57,14 @@ public class UserLogController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } - + @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.QUERY) + @PostMapping("/query") + @ApiOperation("查询审计日志") + @ApiImplicitParam(name = "logInfoDTO", value = "插入日志参数", required = true) + public HttpResult> addUserLog() { + String methodDescribe = getMethodDescribe("addUserLog"); + List list = userLogService.lambdaQuery().eq(UserLog::getUserName, RequestUtil.getUsername()).list(); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } } diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java index 0c0046f98..eb316229b 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java @@ -381,5 +381,15 @@ public class UserController extends BaseController { List users = userService.listByIds(ids); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, users, methodDescribe); } + + @OperateInfo(info = LogEnum.SYSTEM_COMMON) + @PostMapping("/getMarketList") + @ApiOperation("获取营销用户列表") + public HttpResult> getMarketList() { + String methodDescribe = getMethodDescribe("getMarketList"); + + List users = userService.getMarketList(); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, users, methodDescribe); + } } diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/IUserService.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/IUserService.java index 23b31f091..2b985da7d 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/IUserService.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/IUserService.java @@ -170,4 +170,5 @@ public interface IUserService extends IService { boolean activateUser(String id); + List getMarketList(); } diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java index e0073881e..4c93c4051 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java @@ -27,6 +27,7 @@ import com.njcn.system.api.AreaFeignClient; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataEnum; import com.njcn.system.pojo.po.DictData; +import com.njcn.user.enums.AppRoleEnum; import com.njcn.user.enums.UserResponseEnum; import com.njcn.user.enums.UserStatusEnum; import com.njcn.user.mapper.UserMapper; @@ -36,10 +37,7 @@ import com.njcn.user.pojo.constant.UserType; import com.njcn.user.pojo.dto.UserDTO; import com.njcn.user.pojo.dto.excel.UserExcel; import com.njcn.user.pojo.param.UserParam; -import com.njcn.user.pojo.po.Dept; -import com.njcn.user.pojo.po.User; -import com.njcn.user.pojo.po.UserSet; -import com.njcn.user.pojo.po.UserStrategy; +import com.njcn.user.pojo.po.*; import com.njcn.user.pojo.vo.UserVO; import com.njcn.user.service.*; import com.njcn.web.factory.PageFactory; @@ -54,6 +52,7 @@ import java.io.File; import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; +import java.util.stream.Stream; /** *

@@ -462,6 +461,15 @@ public class UserServiceImpl extends ServiceImpl implements IU return this.updateById(user); } + @Override + public List getMarketList() { + Role roleByCode = roleService.getRoleByCode(AppRoleEnum.MARKET_USER.getCode()); + List userRoles = userRoleMapper.selectUserRole(Stream.of(roleByCode.getId()).collect(Collectors.toList())); + List collect = userRoles.stream().map(UserRole::getUserId).collect(Collectors.toList()); + List users = this.listByIds(collect); + return users; + } + /** * 根据登录名查询用户 *