Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
hongawen
2023-07-31 16:40:05 +08:00
parent f5de42b2aa 242e01532d
commit 8764f05ea4
4 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pqs-system/system-boot/src/main/java/com/njcn/system/controller/UserLogController.java
View File

@@ -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;
/**
* <p>
@@ -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<List<UserLog>> addUserLog() {
String methodDescribe = getMethodDescribe("addUserLog");
List<UserLog> list = userLogService.lambdaQuery().eq(UserLog::getUserName, RequestUtil.getUsername()).list();
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
}

10
pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java
View File

@@ -381,5 +381,15 @@ public class UserController extends BaseController {
List<User> users = userService.listByIds(ids);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, users, methodDescribe);
}
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/getMarketList")
@ApiOperation("获取营销用户列表")
public HttpResult<List<User>> getMarketList() {
String methodDescribe = getMethodDescribe("getMarketList");
List<User> users = userService.getMarketList();
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, users, methodDescribe);
}
}

1
pqs-user/user-boot/src/main/java/com/njcn/user/service/IUserService.java
View File

@@ -170,4 +170,5 @@ public interface IUserService extends IService<User> {
boolean activateUser(String id);
List<User> getMarketList();
}

16
pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
View File

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