Skip to content

Administrator / framework-tools

Go to a project
Commit ca8bb87c by renrui
Options

[add]代码修改

1 parent 633883d7
Inline Side-by-side
Showing with 314 additions and 200 deletions
system-manage/src/main/java/org/arch/manage/conterller/MenuController.java
......@@ -14,6 +14,9 @@ import org.arch.common.modules.sysmange.dto.RoleSmallDto;
import org.arch.common.modules.sysmange.dto.UserDto;
import org.arch.common.modules.sysmange.entity.*;
import org.arch.common.redis.RedisService;
import org.arch.log.annotation.OperLog;
import org.arch.log.logenum.LogOperTypeEnum;
import org.arch.log.logenum.LogTypeEnum;
import org.arch.manage.converter.MenuConverter;
import org.arch.manage.service.*;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -24,6 +27,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.Size;
import java.util.*;
import org.arch.manage.conterller.BaseController;
import org.arch.manage.util.UserUtil;
......@@ -43,57 +47,64 @@ public class MenuController extends BaseController {
private RedisService redisService;
@ApiOperation(value = "功能管理树形接口", notes = "与添加所需树形结构通用")
@GetMapping("/list")
public Result<List<MenuDto>> list(
@PostMapping("/list")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "功能管理-功能管理树形接口", moduleName = "功能管理")
/* public Result<List<MenuDto>> list(
@ApiParam(value = "类型",required = false)
@RequestParam(required = false) Integer category,
@ApiParam(value = "名称",required = false)
@RequestParam(required = false) @Size(max=30,message="名称长度小于30") String name) {
@RequestParam(required = false) @Size(max=30,message="名称长度小于30") String name) {*/
public Result<List<MenuDto>> list(
@RequestBody Map<String, String> map) {
String category = map.get("category");
String name = map.get("name");
QueryWrapper<Menu> wrapper = new QueryWrapper<>();
if (Optional.ofNullable(name).isPresent()){
if (Optional.ofNullable(name).isPresent()) {
String trim = name.trim();
if (!trim.isEmpty()){
if (!trim.isEmpty()) {
wrapper.like("name", trim);
}
}
wrapper.eq(Optional.ofNullable(category).isPresent(),"category", category);
wrapper.eq(Optional.ofNullable(category).isPresent(), "category", category);
wrapper.select("id", "name", "path", "type", "hidden", "icon", "pid");
wrapper.orderByAsc("sort");
List<Menu> list = menuService.list(wrapper);
List<MenuDto> menuDtos = menuConverter.men2Dto_list(list);
if (menuDtos.size() > 1){
if (menuDtos.size() > 1) {
List<MenuDto> dtoTree = new ArrayList<>();
for (MenuDto menuDto : menuDtos) {
if ("0".equals(menuDto.getPid())){
if ("0".equals(menuDto.getPid())) {
dtoTree.add(findChild(menuDto, menuDtos));
}
}
return Result.success(dtoTree);
}else {
} else {
return Result.success(menuDtos);
}
}
@ApiOperation(value = "菜单权限", notes = "菜单权限")
@GetMapping("/isclist")
public Result<List<MenuDto>> isclist(
@PostMapping("/isclist")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "功能管理-菜单权限", moduleName = "功能管理")
/* public Result<List<MenuDto>> isclist(
@ApiParam(value = "类型",required = false)
@RequestParam(required = false) Integer category) throws Exception {
@RequestParam(required = false) Integer category) throws Exception {*/
public Result<List<MenuDto>> isclist(
@RequestBody Map<String, String> map1) throws Exception {
QueryWrapper<Menu> wrapper = new QueryWrapper<>();
String iscuserId= getUserIscId();
String iscuserId = getUserIscId();
// String iscuserId="1BE8B302ADC401CEE0530A8A018B01CE";
String token=null;
String tkval=redisService.get("isc_token:");
if(tkval!=null){
token=tkval;
}else{
UserDto userDto= getUserDto();
token=userDto.getToken();//获取token//获取token
String token = null;
String tkval = redisService.get("isc_token:");
if (tkval != null) {
token = tkval;
} else {
UserDto userDto = getUserDto();
token = userDto.getToken();//获取token//获取token
}
// List<iscMenu> li=IscUtil.userResource(iscuserId,token);
......@@ -102,14 +113,14 @@ public class MenuController extends BaseController {
wrapper.orderByAsc("sort");
List<Menu> mlist = menuService.list(wrapper);
Map<String,String> map=new HashMap();
for(Menu m:mlist){
if(!map.containsKey(m.getName())){
Map<String, String> map = new HashMap();
for (Menu m : mlist) {
if (!map.containsKey(m.getName())) {
map.put(m.getName(), m.getIcon());
}
}
List<String> iscids=new ArrayList();
List<String> iscids = new ArrayList();
List<Menu> list = new ArrayList();
/* Long i=0l;
for(iscMenu m :li){
......@@ -139,23 +150,23 @@ public class MenuController extends BaseController {
}*/
Collections.sort(list);
List<MenuDto> menuDtos = menuConverter.men2Dto_list(list);
if (menuDtos.size() > 1){
if (menuDtos.size() > 1) {
List<MenuDto> dtoTree = new ArrayList<>();
for (MenuDto menuDto : menuDtos) {
if ("0".equals(menuDto.getPid())){
if ("0".equals(menuDto.getPid())) {
dtoTree.add(findChildIsc(menuDto, menuDtos));
}
}
return Result.success(dtoTree);
}else {
} else {
return Result.success(menuDtos);
}
}
MenuDto findChild(MenuDto menuDto, List<MenuDto> menuDtos){
MenuDto findChild(MenuDto menuDto, List<MenuDto> menuDtos) {
for (MenuDto dto : menuDtos) {
if (Objects.equals(menuDto.getId().toString(), dto.getPid())){
if (CollectionUtils.isEmpty(menuDto.getChildren())){
if (Objects.equals(menuDto.getId().toString(), dto.getPid())) {
if (CollectionUtils.isEmpty(menuDto.getChildren())) {
menuDto.setChildren(new ArrayList<>());
}
menuDto.getChildren().add(findChild(dto, menuDtos));
......@@ -164,10 +175,10 @@ public class MenuController extends BaseController {
return menuDto;
}
MenuDto findChildIsc(MenuDto menuDto, List<MenuDto> menuDtos){
MenuDto findChildIsc(MenuDto menuDto, List<MenuDto> menuDtos) {
for (MenuDto dto : menuDtos) {
if (Objects.equals(menuDto.getIscId(), dto.getPid())){
if (CollectionUtils.isEmpty(menuDto.getChildren())){
if (Objects.equals(menuDto.getIscId(), dto.getPid())) {
if (CollectionUtils.isEmpty(menuDto.getChildren())) {
menuDto.setChildren(new ArrayList<>());
}
menuDto.getChildren().add(findChildIsc(dto, menuDtos));
......@@ -175,6 +186,7 @@ public class MenuController extends BaseController {
}
return menuDto;
}
/**
* 添加
*
......@@ -183,18 +195,19 @@ public class MenuController extends BaseController {
*/
@ApiOperation(value = "添加", notes = "添加新功能")
@PostMapping("/add")
@ApiOperationSupport(ignoreParameters = {"iFrame", "id", "pids","permission", "component",
@ApiOperationSupport(ignoreParameters = {"iFrame", "id", "pids", "permission", "component",
"cache", "componentName", "children", "createTime", "category"})
@OperLog(value = LogOperTypeEnum.ADD, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "功能管理-添加新功能", moduleName = "功能管理")
public Result add(@RequestBody MenuDto menuDto) {
String pid = menuDto.getPid();
if (Optional.ofNullable(pid).isPresent() &&!"0".equals(pid)) {
if (Optional.ofNullable(pid).isPresent() && !"0".equals(pid)) {
Menu parentMenu = menuService.getById(pid);
if (!Optional.ofNullable(parentMenu).isPresent()) {
return Result.error("上级功能不存在");
}
menuDto.setPids(parentMenu.getPids()+parentMenu.getId()+",");
menuDto.setPids(parentMenu.getPids() + parentMenu.getId() + ",");
} else {
menuDto.setPid("0");
menuDto.setPids("0,");
......@@ -208,17 +221,19 @@ public class MenuController extends BaseController {
return save == true ? Result.success() : Result.error();
}
@GetMapping(value = "/checkName")
@PostMapping(value = "/checkName")
@ApiOperation(value = "名称检查", notes = "名称检查")
@ApiImplicitParams({
/* @ApiImplicitParams({
@ApiImplicitParam(name = "name", value = "菜单名称", required = true, dataType = "String", paramType = "query")
})
public Result<Object> checkName(String name){
})*/
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "功能管理-名称检查", moduleName = "功能管理")
// public Result<Object> checkName(String name){
public Result<Object> checkName(@RequestBody String name) {
QueryWrapper<Menu> queryWrapper = Wrappers.query();
queryWrapper.eq("name", name);
List<Menu> list= menuService.list(queryWrapper);
if(list.size()>0){
List<Menu> list = menuService.list(queryWrapper);
if (list.size() > 0) {
return Result.success(false);
}
return Result.success(true);
......@@ -233,6 +248,7 @@ public class MenuController extends BaseController {
*/
@ApiOperation(value = "单条信息", notes = "单条信息")
@PostMapping("/get")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "功能管理-单条信息", moduleName = "功能管理")
public Result<MenuDto> 单条信息(@RequestBody String id) {
JSONObject jsonObject = JSONObject.parseObject(id);
id = jsonObject.getString("id");
......@@ -251,8 +267,9 @@ public class MenuController extends BaseController {
*/
@ApiOperation("修改")
@PostMapping("/upd")
@ApiOperationSupport(ignoreParameters = {"iFrame","pids","permission", "component",
@ApiOperationSupport(ignoreParameters = {"iFrame", "pids", "permission", "component",
"cache", "componentName", "children", "createTime", "category"})
@OperLog(value = LogOperTypeEnum.UPDATE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "功能管理-修改", moduleName = "功能管理")
public Result upd(@RequestBody MenuDto menuDto) {
Long id = menuDto.getId();
......@@ -273,19 +290,19 @@ public class MenuController extends BaseController {
// if(!byId.getPid().equals(pid)){
// return Result.error("存在子集，上级功能不可修改");
// }
if (Optional.ofNullable(pid).isPresent() &&!"0".equals(pid)) {
if (Optional.ofNullable(pid).isPresent() && !"0".equals(pid)) {
Menu parent = menuService.getById(pid);
if (!Optional.ofNullable(parent).isPresent()) {
return Result.error("上级功能不存在");
}
menuDto.setPids(parent.getPids()+parent.getId()+",");
menuDto.setPids(parent.getPids() + parent.getId() + ",");
} else {
menuDto.setPid("0");
menuDto.setPids("0,");
}
try {
boolean b = menuService.updateById(menuConverter.dto2Menu(menuDto));
}catch (Exception e){
} catch (Exception e) {
return Result.error();
}
return Result.success();
......@@ -299,6 +316,7 @@ public class MenuController extends BaseController {
*/
@ApiOperation("删除")
@PostMapping("/del")
@OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "功能管理-删除", moduleName = "功能管理")
public Result del(@RequestBody String id) {
JSONObject jsonObject = JSONObject.parseObject(id);
id = jsonObject.getString("id");
......@@ -320,6 +338,7 @@ public class MenuController extends BaseController {
*/
@ApiOperation("批量删除")
@PostMapping("/delArray")
@OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "功能管理-批量删除", moduleName = "功能管理")
public Result delArray(@ApiParam(value = "主键id集合", required = true) @RequestBody List<Long> ids) {
QueryWrapper<Menu> pid = new QueryWrapper<Menu>().in("pid", ids);
......@@ -382,11 +401,13 @@ public class MenuController extends BaseController {
@Autowired
private AdsProjectService adsProjectService;
/**
* 获取用户基础信息
*
* @return
*/
public User getUser(){
public User getUser() {
return userUtil.getUser();
// return new User();
}
......@@ -394,138 +415,146 @@ public class MenuController extends BaseController {
/**
* 获取用户详细信息
* 包括用户组织机构、部门、权限等信息
*
* @return
*/
public UserDto getUserDto(){
public UserDto getUserDto() {
return userUtil.getUserDto();
}
/**
* 获取用户id
*
* @return 用户id
*/
public Long getUserId(){
public Long getUserId() {
return userUtil.getUserId();
}
/**
* 获取用户名称
*
* @return 用户名称
*/
public String getUserName(){
public String getUserName() {
return userUtil.getUserDto().getName();
}
/**
* 获取ISC用户名称
*
* @return 用户名称
*/
public String getUserIscId(){
public String getUserIscId() {
return userUtil.getUserDto().getIscUserId();
}
/**
* 获取ISC用户名称
*
* @return 用户名称
*/
public String getUserDataPermission(){
public String getUserDataPermission() {
return userUtil.getUserDto().getDataPermission();
}
/**
* 添加查询数据权限
*
* @param queryWrapper queryWrapper声明对象
* @param mainTableAlias 主表别名
* @param datatype 文档类别（fsr可研，ads概设）
* @param isAudit 是否审核页面
*/
public <T> void queryAddDataPermission(QueryWrapper<T> queryWrapper,String mainTableAlias,String datatype,boolean isAudit){
public <T> void queryAddDataPermission(QueryWrapper<T> queryWrapper, String mainTableAlias, String datatype, boolean isAudit) {
// Class c=t.getClass()
UserDto user=getUserDto();
UserDto user = getUserDto();
List<RoleSmallDto> roles=user.getRoles();
List<RoleSmallDto> roles = user.getRoles();
//如果有管理员权限不做数据权限控制
boolean bs=roles.stream().anyMatch(RoleSmallDto -> RoleSmallDto.getRoleSign().equals("admin"));
if(bs)return;
boolean bc=roles.stream().anyMatch(RoleSmallDto -> RoleSmallDto.getRoleSign().contains("controuser"));// .equals("contro_user")
boolean bs = roles.stream().anyMatch(RoleSmallDto -> RoleSmallDto.getRoleSign().equals("admin"));
if (bs) return;
boolean bc = roles.stream().anyMatch(RoleSmallDto -> RoleSmallDto.getRoleSign().contains("controuser"));// .equals("contro_user")
/**
* 数据权限控制
* 1获取用户的dataPermission
*/
if (!isAudit){
if (!isAudit) {
//非审核页面查询
if(mainTableAlias==null){
if (mainTableAlias == null) {
queryWrapper.eq("creater_id", user.getIscUserId());
if(StringUtils.isNotBlank(user.getDataPermission())){
if (StringUtils.isNotBlank(user.getDataPermission())) {
queryWrapper.or()
.likeRight("org_num", user.getDataPermission());
}
}else{
} else {
//如果多表关联查询，主表有别名，加别名查询
queryWrapper.eq(mainTableAlias+".creater_id", user.getIscUserId());
if(StringUtils.isNotBlank(user.getDataPermission())){
queryWrapper.eq(mainTableAlias + ".creater_id", user.getIscUserId());
if (StringUtils.isNotBlank(user.getDataPermission())) {
queryWrapper.or()
.likeRight(mainTableAlias+".org_num", user.getDataPermission());
.likeRight(mainTableAlias + ".org_num", user.getDataPermission());
}
}
}else{
} else {
//审核页面查询
// queryWrapper.ge("state", 1);
//可研或者概设审核且为专家
if(!bc&&datatype!=null){
if (!bc && datatype != null) {
// queryWrapper.eq("state", 3);
queryWrapper.or();
queryWrapper.inSql(datatype+"_id", "select id from com_review_report where creater_id='"+user.getIscUserId()+"'");
queryWrapper.inSql(datatype + "_id", "select id from com_review_report where creater_id='" + user.getIscUserId() + "'");
}
}
}
//待办处理rid--文档ID、 type--类型(0审核待办，1专家待办) docType--类型(0规划，1可研 2概设)flag(0驳回，1通过)
public void addBackLog(String rid,String type,String docType,String flag,String state){
String docName="";
String doc="";
String accepterId="";
if("0".equals(docType)){
public void addBackLog(String rid, String type, String docType, String flag, String state) {
String docName = "";
String doc = "";
String accepterId = "";
if ("0".equals(docType)) {
QueryWrapper<PsrPlan> wrapper = Wrappers.query();
wrapper.eq("id", rid);
PsrPlan p=psrPlanService.getOne(wrapper);
docName=p.getName();
doc="规划审核";
if("0".equals(flag)){
accepterId=p.getCreaterId();
doc="规划驳回";
}
}else if("1".equals(docType)){
PsrPlan p = psrPlanService.getOne(wrapper);
docName = p.getName();
doc = "规划审核";
if ("0".equals(flag)) {
accepterId = p.getCreaterId();
doc = "规划驳回";
}
} else if ("1".equals(docType)) {
QueryWrapper<Project> wrapper = Wrappers.query();
wrapper.eq("fsr_id", rid);
Project p=projectService.getOne(wrapper);
docName=p.getPrjName();
doc="可研审核";
if("0".equals(flag)){
accepterId=p.getCreaterId();
doc="可研驳回";
}
}else if("2".equals(docType)){
Project p = projectService.getOne(wrapper);
docName = p.getPrjName();
doc = "可研审核";
if ("0".equals(flag)) {
accepterId = p.getCreaterId();
doc = "可研驳回";
}
} else if ("2".equals(docType)) {
QueryWrapper<AdsProject> wrapper = Wrappers.query();
wrapper.eq("ads_id", rid);
AdsProject p=adsProjectService.getOne(wrapper);
docName=p.getAdsName();
doc="概设审核";
if("0".equals(flag)){
accepterId=p.getCreaterId();
doc="概设驳回";
AdsProject p = adsProjectService.getOne(wrapper);
docName = p.getAdsName();
doc = "概设审核";
if ("0".equals(flag)) {
accepterId = p.getCreaterId();
doc = "概设驳回";
}
}
BackLog bl=new BackLog();
BackLog bl = new BackLog();
bl.setBId(UUID.randomUUID().toString());
bl.setRId(rid);
bl.setResult("0");
bl.setName(doc+"_"+docName);
bl.setName(doc + "_" + docName);
bl.setType(docType);
bl.setStepType(doc);
bl.setSubmitterId(getUserIscId()+"");
bl.setSubmitterId(getUserIscId() + "");
bl.setAccepterId(accepterId);
bl.setSubmitTime(new Date());
bl.setState(state);
......@@ -534,21 +563,21 @@ public class MenuController extends BaseController {
}
//待办处理rid--文档ID、 type--类型(0审核代办，1专家代办)
public void updateBackLog(String rid,String type,String docType){
public void updateBackLog(String rid, String type, String docType) {
QueryWrapper<BackLog> bWrapper = Wrappers.query();
bWrapper.eq("r_id", rid);
bWrapper.eq("result", "0");
if("1".equals(type)){
if ("1".equals(type)) {
bWrapper.eq("accepter_id", getUserIscId());
}
List<BackLog> list=backlogservice.list(bWrapper);
for(BackLog bl:list){
List<BackLog> list = backlogservice.list(bWrapper);
for (BackLog bl : list) {
bl.setResult("1");
bl.setApprovalTime(new Date());
//bl.setType(docType);
bl.setApprover(getUserName());
bl.setApproverId(getUserIscId()+"");
bl.setApproverId(getUserIscId() + "");
QueryWrapper<BackLog> updateWrapper = Wrappers.query();
updateWrapper.eq("b_id", bl.getBId());
backlogservice.update(bl, updateWrapper);
......@@ -557,38 +586,38 @@ public class MenuController extends BaseController {
}
//待办处理rid--文档ID、 type--类型(0规划，1可研，2概设)
public void addBackLogbyExpert(String rid,String eid,String type,String state){
String docName="";
String doc="";
if("0".equals(type)){
public void addBackLogbyExpert(String rid, String eid, String type, String state) {
String docName = "";
String doc = "";
if ("0".equals(type)) {
QueryWrapper<PsrPlan> wrapper = Wrappers.query();
wrapper.eq("id", rid);
PsrPlan p=psrPlanService.getOne(wrapper);
docName=p.getName();
doc="规划审核";
}else if("1".equals(type)){
PsrPlan p = psrPlanService.getOne(wrapper);
docName = p.getName();
doc = "规划审核";
} else if ("1".equals(type)) {
QueryWrapper<Project> wrapper = Wrappers.query();
wrapper.eq("fsr_id", rid);
Project p=projectService.getOne(wrapper);
docName=p.getPrjName();
doc="可研专家报告";
}else if("2".equals(type)){
Project p = projectService.getOne(wrapper);
docName = p.getPrjName();
doc = "可研专家报告";
} else if ("2".equals(type)) {
QueryWrapper<AdsProject> wrapper = Wrappers.query();
wrapper.eq("ads_id", rid);
AdsProject p=adsProjectService.getOne(wrapper);
docName=p.getAdsName();
doc="概设专家报告";
AdsProject p = adsProjectService.getOne(wrapper);
docName = p.getAdsName();
doc = "概设专家报告";
}
BackLog bl=new BackLog();
BackLog bl = new BackLog();
bl.setBId(UUID.randomUUID().toString());
bl.setRId(rid);
bl.setResult("0");
bl.setName(doc+"_"+docName);
bl.setName(doc + "_" + docName);
bl.setType(type);
bl.setStepType(doc);
bl.setSubmitterId(getUserIscId()+"");
bl.setSubmitterId(getUserIscId() + "");
bl.setAccepterId(eid);
bl.setSubmitTime(new Date());
bl.setState(state);
......
system-manage/src/main/java/org/arch/manage/conterller/OrgController.java
......@@ -11,12 +11,16 @@ import lombok.extern.java.Log;
import org.arch.base.Result;
import org.arch.base.exception.BaseException;
import org.arch.common.modules.sysmange.entity.Org;
import org.arch.log.annotation.OperLog;
import org.arch.log.logenum.LogOperTypeEnum;
import org.arch.log.logenum.LogTypeEnum;
import org.arch.manage.service.OrgService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* <p>
......@@ -36,16 +40,21 @@ public class OrgController extends MenuController.BaseController {
@Autowired
private OrgService orgService;
@GetMapping(value = "/")
@PostMapping(value = "/")
@ApiOperation(value = "列表查询接口", notes = "多条件产讯组织结构列表")
@ApiImplicitParams({
@ApiImplicitParam(name = "current", value = "当前页数",required = true, defaultValue = "1", dataType = "int", paramType = "query"),
/* @ApiImplicitParams({
@ApiImplicitParam(name = "current", value = "当前页数", required = true, defaultValue = "1", dataType = "int", paramType = "query"),
@ApiImplicitParam(name = "pageSize", value = "页面显示数量", required = true, defaultValue = "10", dataType = "int", paramType = "query"),
@ApiImplicitParam(name = "orgName", value = "组织名称", required = false, dataType = "string", paramType = "query"),
})
public Result<Page<Org>> list(@RequestParam(required = true, defaultValue = "1", name = "current") Integer current,
})*/
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "组织机构管理-列表查询接口", moduleName = "组织机构管理")
/*public Result<Page<Org>> list(@RequestParam(required = true, defaultValue = "1", name = "current") Integer current,
@RequestParam(required = true, defaultValue = "10", name = "pageSize") Integer pageSize,
Org org) {
Org org) {*/
public Result<Page<Org>> list(@RequestBody Map<String, Object> map) {
Integer current = (Integer) map.get("current");
Integer pageSize = (Integer) map.get("pageSize");
Org org = (Org) map.get("org");
if (current == null) {
current = 1;
}
......@@ -53,8 +62,9 @@ public class OrgController extends MenuController.BaseController {
pageSize = 10;
}
QueryWrapper<Org> queryWrapper = new QueryWrapper<>();
if(ObjectUtil.isNotNull(org))queryWrapper.like(StrUtil.isNotBlank(org.getOrgName()), "a.org_name", org.getOrgName());
if(ObjectUtil.isNotNull(org) && ObjectUtil.isNotNull(org.getParentOrgId())){
if (ObjectUtil.isNotNull(org))
queryWrapper.like(StrUtil.isNotBlank(org.getOrgName()), "a.org_name", org.getOrgName());
if (ObjectUtil.isNotNull(org) && ObjectUtil.isNotNull(org.getParentOrgId())) {
queryWrapper.and(wrapper -> wrapper.eq("a.parent_org_id", org.getParentOrgId()).or().eq("a.org_id", org.getParentOrgId()));
}
queryWrapper.orderByAsc("a.parent_org_id");
......@@ -63,12 +73,14 @@ public class OrgController extends MenuController.BaseController {
return Result.success(aPage);
}
@GetMapping(value = "/details")
@PostMapping(value = "/details")
@ApiOperation(value = "获取单条组织详情", notes = "获取单条组织详情")
@ApiImplicitParam(name = "id", value = "组织的主键ID", required = true, dataType = "Long", paramType = "path")
public Result<Org> getById(Long id) {
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "组织机构管理-获取单条组织详情", moduleName = "获取单条组织详情")
// public Result<Org> getById(Long id) {
public Result<Org> getById(@RequestBody Long id) {
Org byId = orgService.getById(id);
if(byId != null && byId.getParentOrgId() != null && byId.getParentOrgId() > 0){
if (byId != null && byId.getParentOrgId() != null && byId.getParentOrgId() > 0) {
Org byId1 = orgService.getById(byId.getParentOrgId());
byId.setParentOrgName(byId1.getOrgName());
}
......@@ -77,15 +89,16 @@ public class OrgController extends MenuController.BaseController {
@PostMapping(value = "/create")
@ApiOperation(value = "保存组织详情", notes = "新增组织详情")
@OperLog(value = LogOperTypeEnum.ADD, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "组织机构管理-保存组织详情", moduleName = "保存组织详情")
public Result<Object> create(@RequestBody Org params) {
if(ObjectUtil.isNotNull(params.getParentOrgId()) && params.getParentOrgId() != 0){
if (ObjectUtil.isNotNull(params.getParentOrgId()) && params.getParentOrgId() != 0) {
Org byId = orgService.getById(params.getParentOrgId());
params.setIds(byId.getIds() + byId.getOrgId() + ",");
} else {
params.setParentOrgId(Long.parseLong("0"));
params.setIds("0,");
}
if(ObjectUtil.isNotNull(params.getOrgId()) && params.getOrgId() != 0){
if (ObjectUtil.isNotNull(params.getOrgId()) && params.getOrgId() != 0) {
params.setLastUpdateMan(getUserId());
params.setLastUpdateTime(new Date());
orgService.updateById(params);
......@@ -102,13 +115,14 @@ public class OrgController extends MenuController.BaseController {
@PostMapping(value = "/delete")
@ApiOperation(value = "删除单条组织", notes = "删除单条组织")
@ApiImplicitParam(name = "id", value = "组织的主键ID", required = true, dataType = "Long", paramType = "path")
@OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "组织机构管理-删除单条组织", moduleName = "删除单条组织")
public Result<Object> delete(@RequestBody String id) throws BaseException {
JSONObject jsonObject = JSONObject.parseObject(id);
id = jsonObject.getString("id");
QueryWrapper<Org> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("parent_org_id", id);
List<Org> list = orgService.list(queryWrapper);
if(list != null && !list.isEmpty()){
if (list != null && !list.isEmpty()) {
throw new BaseException(201, "删除组织存在下级组织！");
}
orgService.removeById(id);
......@@ -118,14 +132,15 @@ public class OrgController extends MenuController.BaseController {
@PostMapping(value = "/batchDelete")
@ApiOperation(value = "批量删除组织", notes = "批量删除组织")
@OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "组织机构管理-批量删除组织", moduleName = "批量删除组织")
public Result<Object> batchDelete(@ApiParam(value = "组织ID集合", required = true) @RequestBody List<Long> ids) throws BaseException {
if(ids == null || ids.size() < 1){
if (ids == null || ids.size() < 1) {
throw new BaseException(201, "参数错误");
}
QueryWrapper<Org> queryWrapper = new QueryWrapper<>();
queryWrapper.in("parent_org_id", ids);
List<Org> list = orgService.list(queryWrapper);
if(list != null && !list.isEmpty()){
if (list != null && !list.isEmpty()) {
throw new BaseException(201, "删除组织存在下级组织！");
}
orgService.removeByIds(ids);
......@@ -140,61 +155,82 @@ public class OrgController extends MenuController.BaseController {
}*/
@GetMapping(value = "/tree")
@PostMapping(value = "/tree")
@ApiOperation(value = "获取组织树形", notes = "获取组织树形")
@ApiImplicitParams({
/* @ApiImplicitParams({
@ApiImplicitParam(name = "parentOrgId", value = "组织的ID", required = false, dataType = "Long", paramType = "query"),
@ApiImplicitParam(name = "orgStatus", value = "组织状态：1启用 0禁用", required = false, dataType = "String", paramType = "query")
})
public Result<List<Org>> tree(Long parentOrgId, String orgStatus) {
})*/
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "组织机构管理-获取组织树形", moduleName = "获取组织树形")
//public Result<List<Org>> tree(Long parentOrgId, String orgStatus) {
public Result<List<Org>> tree(@RequestBody Map<String, Object> map) {
Long parentOrgId = (Long) map.get("parentOrgId");
String orgStatus = (String) map.get("orgStatus");
List<Org> orgs = orgService.tree(parentOrgId, orgStatus);
return Result.success(orgs);
}
@GetMapping(value = "/treeNew")
@PostMapping(value = "/treeNew")
@ApiOperation(value = "获取组织树形", notes = "获取组织树形")
@ApiImplicitParams({
/* @ApiImplicitParams({
@ApiImplicitParam(name = "parentOrgId", value = "组织的ID", required = false, dataType = "Long", paramType = "query"),
@ApiImplicitParam(name = "orgStatus", value = "组织状态：1启用 0禁用", required = false, dataType = "String", paramType = "query")
})
public Result<List<Org>> treeNew(Long parentOrgId, String deptFlag) {
})*/
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "组织机构管理-获取组织树形", moduleName = "获取组织树形")
// public Result<List<Org>> treeNew(Long parentOrgId, String deptFlag) {
public Result<List<Org>> treeNew(@RequestBody Map<String, Object> map) {
Long parentOrgId = (Long) map.get("parentOrgId");
String deptFlag = (String) map.get("deptFlag");
List<Org> orgs = orgService.treeNew(parentOrgId, deptFlag);
return Result.success(orgs);
}
@GetMapping(value = "/treeNewForDepet")
// @GetMapping(value = "/treeNewForDepet")
@PostMapping(value = "/treeNewForDepet")
@ApiOperation(value = "获取组织树形", notes = "获取组织树形")
@ApiImplicitParams({
/*@ApiImplicitParams({
@ApiImplicitParam(name = "parentOrgId", value = "组织的ID", required = false, dataType = "Long", paramType = "query"),
@ApiImplicitParam(name = "orgStatus", value = "组织状态：1启用 0禁用", required = false, dataType = "String", paramType = "query")
})
public Result<List<Org>> treeNewForDepet(Long parentOrgId, String deptFlag) {
})*/
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "组织机构管理-获取组织树形", moduleName = "获取组织树形")
//public Result<List<Org>> treeNewForDepet(Long parentOrgId, String deptFlag) {
public Result<List<Org>> treeNewForDepet(@RequestBody Map<String, Object> map) {
Long parentOrgId = (Long) map.get("parentOrgId");
String deptFlag = (String) map.get("deptFlag");
List<Org> orgs = orgService.treeNewForDepet(parentOrgId, deptFlag);
return Result.success(orgs);
}
@GetMapping(value = "/getSelect")
@PostMapping(value = "/getSelect")
@ApiOperation(value = "获取组织下拉", notes = "获取组织下拉")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "组织机构管理-获取组织下拉", moduleName = "获取组织下拉")
public Result<List<Org>> getSelect() {
List<Org> orgs = orgService.getSelect();
return Result.success(orgs);
}
@GetMapping(value = "/getdeptList")
@PostMapping(value = "/getdeptList")
@ApiOperation(value = "获取本部下的所有部门", notes = "获取本部下的所有部门")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "组织机构管理-获取本部下的所有部门", moduleName = "获取本部下的所有部门")
public Result<List<Org>> getdeptList() {
QueryWrapper wrapper = new QueryWrapper();
wrapper.eq("parent_org_id",51);
wrapper.eq("parent_org_id", 51);
List<Org> orgs = orgService.getBaseMapper().selectList(wrapper);
return Result.success(orgs);
}
@GetMapping(value = "/getdepttmentList")
@PostMapping(value = "/getdepttmentList")
@ApiImplicitParam(name = "id", value = "部门id", required = true, dataType = "Long", paramType = "path")
@ApiOperation(value = "获取本部下部门的处室", notes = "获取本部下部门的处室")
public Result<List<Org>> getdepttmentList(Long id) {
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "组织机构管理-获取本部下部门的处室", moduleName = "获取本部下部门的处室")
//public Result<List<Org>> getdepttmentList(Long id) {
public Result<List<Org>> getdepttmentList(@RequestBody Long id) {
QueryWrapper wrapper = new QueryWrapper();
wrapper.eq("parent_org_id",id);
wrapper.eq("parent_org_id", id);
List<Org> orgs = orgService.getBaseMapper().selectList(wrapper);
return Result.success(orgs);
}
......
system-manage/src/main/java/org/arch/manage/conterller/RoleController.java
......@@ -10,6 +10,9 @@ import org.arch.base.exception.BDException;
import org.arch.base.utils.StringUtils;
import org.arch.common.modules.sysmange.dto.*;
import org.arch.common.modules.sysmange.entity.Role;
import org.arch.log.annotation.OperLog;
import org.arch.log.logenum.LogOperTypeEnum;
import org.arch.log.logenum.LogTypeEnum;
import org.arch.manage.service.RoleService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -17,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* 角色controller
......@@ -24,42 +28,45 @@ import java.util.List;
@RestController
@RequestMapping("/role")
@Api(tags = "角色管理相关接口")
public class RoleController{
public class RoleController {
@Autowired
private RoleService roleService;
/**
* 根据条件分页查询
*
* @param user
* @return
*/
@ApiOperation(value = "根据条件分页查询", notes = "根据条件分页查询")
@PostMapping("/page")
public Result<Page<RoleDto>> page(@RequestBody RoleQueryDto roleQueryDto){
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-根据条件分页查询", moduleName = "角色管理相关接口")
public Result<Page<RoleDto>> page(@RequestBody RoleQueryDto roleQueryDto) {
IPage<Role> queryPage = new Page<>();
queryPage.setCurrent((roleQueryDto.getCurrPage()==null || roleQueryDto.getCurrPage()<=0)?1:roleQueryDto.getCurrPage());
queryPage.setSize((roleQueryDto.getPageSize()==null || roleQueryDto.getPageSize()<=0)?20:roleQueryDto.getPageSize());
queryPage.setCurrent((roleQueryDto.getCurrPage() == null || roleQueryDto.getCurrPage() <= 0) ? 1 : roleQueryDto.getCurrPage());
queryPage.setSize((roleQueryDto.getPageSize() == null || roleQueryDto.getPageSize() <= 0) ? 20 : roleQueryDto.getPageSize());
QueryWrapper<Role> queryWrapper = new QueryWrapper<>();
if(StringUtils.isNotBlank(roleQueryDto.getName())){
queryWrapper.like("role_name",roleQueryDto.getName());
if (StringUtils.isNotBlank(roleQueryDto.getName())) {
queryWrapper.like("role_name", roleQueryDto.getName());
}
if(StringUtils.isNotBlank(roleQueryDto.getSelectVal())){
if (StringUtils.isNotBlank(roleQueryDto.getSelectVal())) {
final String selectVal = roleQueryDto.getSelectVal();
queryWrapper.and(qw-> {
queryWrapper.and(qw -> {
QueryWrapper<Role> like = qw.like("role_name", selectVal);
});
}
IPage<Role> iPage = roleService.page(queryPage,queryWrapper);
IPage<Role> iPage = roleService.page(queryPage, queryWrapper);
Page<RoleDto> page = new Page<>();
BeanUtils.copyProperties(iPage,page);
if(iPage.getRecords() != null && iPage.getRecords().size() > 0){
BeanUtils.copyProperties(iPage, page);
if (iPage.getRecords() != null && iPage.getRecords().size() > 0) {
List<RoleDto> roleDtos = new ArrayList<>();
for (Role role : iPage.getRecords()){
for (Role role : iPage.getRecords()) {
RoleDto roleDto = new RoleDto();
BeanUtils.copyProperties(role,roleDto);
BeanUtils.copyProperties(role, roleDto);
roleDtos.add(roleDto);
}
page.setRecords(roleDtos);
......@@ -69,14 +76,16 @@ public class RoleController{
/**
* 角色添加
*
* @param role 角色添加相关
* @return 添加結果
*/
@ApiOperation(value = "添加角色信息", notes = "添加角色信息")
@PostMapping("/add")
public Result create(@RequestBody RoleAddDto roleAdd){
@OperLog(value = LogOperTypeEnum.ADD, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-添加角色信息", moduleName = "添加角色信息")
public Result create(@RequestBody RoleAddDto roleAdd) {
boolean flag = roleService.create(roleAdd);
if(flag){
if (flag) {
return Result.success();
}
return Result.error("创建角色失败！");
......@@ -84,14 +93,16 @@ public class RoleController{
/**
* 用户更新
*
* @param user
* @return
*/
@ApiOperation(value = "编辑用户信息", notes = "编辑用户信息")
@PostMapping("/update")
public Result update(@RequestBody RoleUpdateDto roleUpdate){
@OperLog(value = LogOperTypeEnum.UPDATE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-编辑用户信息", moduleName = "编辑用户信息")
public Result update(@RequestBody RoleUpdateDto roleUpdate) {
boolean flag = roleService.update(roleUpdate);
if(flag){
if (flag) {
return Result.success();
}
return Result.error("修改角色失败！");
......@@ -99,20 +110,23 @@ public class RoleController{
/**
* 根据id删除角色
*
* @param id id
* @return 删除结果
*/
@ApiOperation(value = "根据id删除角色", notes = "根据id删除角色")
@GetMapping("/delete")
@ApiImplicitParam(name = "id", value = "角色id", required = true, dataType = "Long", paramType = "path")
public Result delete(Long id){
if(id == null){
@PostMapping("/delete")
// @ApiImplicitParam(name = "id", value = "角色id", required = true, dataType = "Long", paramType = "path")
@OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-根据id删除角色", moduleName = "根据id删除角色")
//public Result delete(Long id){
public Result delete(@RequestBody Long id) {
if (id == null) {
return Result.error("角色id不能为空");
}
List<Long> ids = new ArrayList<>();
ids.add(id);
boolean flag = roleService.delete(ids);
if(flag){
if (flag) {
return Result.success();
}
return Result.error("删除角色失败！");
......@@ -120,17 +134,19 @@ public class RoleController{
/**
* 批量删除
*
* @param ids
* @return
*/
@PostMapping(value = "/batchDelete")
@ApiOperation(value = "批量删除角色", notes = "批量删除角色")
public Result batchDelete(@ApiParam(value = "用户ID集合", required = true) @RequestBody List<Long> ids){
if(ids == null || ids.size() < 1){
@OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-批量删除角色", moduleName = "批量删除角色")
public Result batchDelete(@ApiParam(value = "用户ID集合", required = true) @RequestBody List<Long> ids) {
if (ids == null || ids.size() < 1) {
throw new BDException("角色id不能为空");
}
boolean flag = roleService.delete(ids);
if(flag){
if (flag) {
return Result.success();
}
return Result.error("删除用户失败！");
......@@ -138,59 +154,72 @@ public class RoleController{
/**
* 获取所有的角色信息
*
* @return
*/
@GetMapping(value = "/getAll")
@PostMapping(value = "/getAll")
@ApiOperation(value = "获取所有角色", notes = "获取所有角色")
public Result<List<RoleSmallDto>> getAll(){
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-获取所有角色", moduleName = "获取所有角色")
public Result<List<RoleSmallDto>> getAll() {
List<Role> roles = roleService.list();
List<RoleSmallDto> roleSmallDtos = new ArrayList<>();
if(roles!= null){
for (Role role : roles){
if (roles != null) {
for (Role role : roles) {
RoleSmallDto rs = new RoleSmallDto();
BeanUtils.copyProperties(role,rs);
BeanUtils.copyProperties(role, rs);
roleSmallDtos.add(rs);
}
}
return Result.success(roleSmallDtos);
}
@GetMapping(value = "/getById")
@PostMapping(value = "/getById")
@ApiOperation(value = "根据id获取角色信息", notes = "根据id获取角色信息")
@ApiImplicitParam(name = "roleId", value = "角色id", required = true, dataType = "Long", paramType = "path")
public Result<RoleDto> getById(Long roleId){
// @ApiImplicitParam(name = "roleId", value = "角色id", required = true, dataType = "Long", paramType = "path")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-根据id获取角色信息", moduleName = "根据id获取角色信息")
// public Result<RoleDto> getById(Long roleId){
public Result<RoleDto> getById(@RequestBody Map<String, Long> map) {
Long roleId = map.get("roleId");
RoleDto roleDto = roleService.getRoleDtoById(roleId);
return Result.success(roleDto);
}
/**
* 启用或者禁用
*
* @return
*/
@GetMapping(value = "/enableOrUnEnable")
@PostMapping(value = "/enableOrUnEnable")
@ApiOperation(value = "启用或者禁用角色", notes = "启用或者禁用角色")
@ApiImplicitParams({
/* @ApiImplicitParams({
@ApiImplicitParam(name = "roleId", value = "角色id",required = true, dataType = "long", paramType = "path"),
@ApiImplicitParam(name = "enable", value = "禁用或者启用 0:禁用 1：启用", required = true, dataType = "long", paramType = "path"),
})
public Result enableOrUnEnable( Long roleId
,Integer enable){
boolean flag = roleService.enableOrUnEnable(roleId,enable);
if(!flag){
})*/
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-启用或者禁用角色", moduleName = "启用或者禁用角色")
/* public Result enableOrUnEnable( Long roleId
,Integer enable){*/
public Result enableOrUnEnable(@RequestBody Map<String, Object> map) {
Long roleId = (Long) map.get("roleId");
Integer enable = (Integer) map.get("enable");
boolean flag = roleService.enableOrUnEnable(roleId, enable);
if (!flag) {
return Result.error();
}
return Result.success();
}
/**
* 用户更新
*
* @param user
* @return
*/
@ApiOperation(value = "编辑用户信息", notes = "编辑用户信息")
@PostMapping("/updateUserRoles")
public Result updateUserRoles(@RequestBody RoleUpdateDto roleUpdate){
@OperLog(value = LogOperTypeEnum.UPDATE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-编辑用户信息", moduleName = "编辑用户信息")
public Result updateUserRoles(@RequestBody RoleUpdateDto roleUpdate) {
boolean flag = roleService.update(roleUpdate);
if(flag){
if (flag) {
return Result.success();
}
return Result.error("修改角色失败！");
......
system-manage/src/main/java/org/arch/manage/conterller/UserController.java
......@@ -18,6 +18,9 @@ import org.arch.base.utils.StringUtils;
import org.arch.common.modules.sysmange.dto.*;
import org.arch.common.modules.sysmange.entity.User;
import org.arch.common.modules.sysmange.vo.UsersRoles;
import org.arch.log.annotation.OperLog;
import org.arch.log.logenum.LogOperTypeEnum;
import org.arch.log.logenum.LogTypeEnum;
import org.arch.manage.service.RoleService;
import org.arch.manage.service.UserService;
import org.arch.manage.service.UsersRolesService;
......@@ -28,6 +31,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* 用户controller
......@@ -52,6 +56,7 @@ public class UserController {
*/
@ApiOperation(value = "根据条件分页查询", notes = "根据条件分页查询")
@PostMapping("/page")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-根据条件分页查询", moduleName = "根据条件分页查询")
public Result<Page<UserDto>> page(@RequestBody @Validated UserQueryDto userQuery){
IPage<User> queryPage = new Page<>();
queryPage.setCurrent((userQuery.getCurrPage()==null || userQuery.getCurrPage()<=0)?1:userQuery.getCurrPage());
......@@ -102,6 +107,7 @@ public class UserController {
*/
@ApiOperation(value = "添加用户信息", notes = "添加用户信息")
@PostMapping("/add")
@OperLog(value = LogOperTypeEnum.ADD, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-添加用户信息", moduleName = "添加用户信息")
public Result create(@RequestBody UserAddDto user){
boolean flag = userService.create(user);
if(flag){
......@@ -117,6 +123,7 @@ public class UserController {
*/
@ApiOperation(value = "编辑用户信息", notes = "编辑用户信息")
@PostMapping("/update")
@OperLog(value = LogOperTypeEnum.UPDATE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-编辑用户信息", moduleName = "编辑用户信息")
public Result update(@RequestBody UserUpdateDto user){
boolean flag = userService.update(user);
if(flag){
......@@ -128,6 +135,7 @@ public class UserController {
@ApiOperation(value = "根据用户id获取用户信息", notes = "根据用户id获取用户信息")
@PostMapping("/get")
@ApiImplicitParam(name = "id", value = "用户id", required = true, dataType = "Long", paramType = "path")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-根据用户id获取用户信息", moduleName = "根据用户id获取用户信息")
public Result<UserDto> getById(@RequestBody String id){
JSONObject jsonObject = JSONObject.parseObject(id);
id = jsonObject.getString("id");
......@@ -143,6 +151,7 @@ public class UserController {
@ApiOperation(value = "删除用户信息", notes = "删除用户信息")
@PostMapping("/delete")
@ApiImplicitParam(name = "id", value = "用户id", required = true, dataType = "Long", paramType = "path")
@OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-删除用户信息", moduleName = "删除用户信息")
public Result delete(@RequestBody String id){
JSONObject jsonObject = JSONObject.parseObject(id);
id = jsonObject.getString("id");
......@@ -165,6 +174,7 @@ public class UserController {
*/
@PostMapping(value = "/batchDelete")
@ApiOperation(value = "批量删除用户", notes = "批量删除用户")
@OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-批量删除用户", moduleName = "批量删除用户")
public Result batchDelete(@ApiParam(value = "用户ID集合", required = true) @RequestBody List<Long> ids){
if(ids == null || ids.size() < 1){
throw new BDException("用户id不能为空");
......@@ -183,6 +193,7 @@ public class UserController {
*/
@PostMapping(value = "/getUserTypes")
@ApiOperation(value = "获取员工类型", notes = "获取员工类型")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-获取员工类型", moduleName = "获取员工类型")
public Result<List<UserTypeDto>> getUserTypes(){
List<UserTypeDto> userTypeDtos = new ArrayList<>();
for (UserTypeEnum entity : UserTypeEnum.values()){
......@@ -200,6 +211,7 @@ public class UserController {
*/
@PostMapping(value = "/getUserSex")
@ApiOperation(value = "获取员工性别", notes = "获取员工性别")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-获取员工性别", moduleName = "获取员工性别")
public Result<List<UserTypeDto>> getUserSex(){
List<UserSexDto> userSexDtos = new ArrayList<>();
for (SexEnum entity : SexEnum.values()){
......@@ -216,9 +228,14 @@ public class UserController {
* @return
* @throws Exception
*/
@GetMapping(value = "/getIscUserByName")
@PostMapping(value = "/getIscUserByName")
@ApiOperation(value = "根据用户名获取isc用户信息", notes = "根据用户名获取isc用户信息")
public Result<List<User>> getIscUserByName(String name,String userLoginCode) throws Exception{
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-根据用户名获取isc用户信息", moduleName = "根据用户名获取isc用户信息")
// public Result<List<User>> getIscUserByName(String name,String userLoginCode) throws Exception{
// public Result<List<User>> getIscUserByName(String name,String userLoginCode) throws Exception{
public Result<List<User>> getIscUserByName(@RequestBody Map<String, String> map) throws Exception{
String name = map.get("name");
String userLoginCode = map.get("userLoginCode");
if(StringUtils.isBlank(name) && StringUtils.isBlank(userLoginCode)){
return Result.error("用户姓名和账号不能都为空！");
//return Result.success("用户姓名不能为空！");
......@@ -261,6 +278,7 @@ public class UserController {
*/
@ApiOperation(value = "添加用户信息", notes = "添加用户信息")
@PostMapping("/addIscUser")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-添加用户信息", moduleName = "添加用户信息")
public Result addIscUser(@ApiParam(value = "用户集合", required = true) @RequestBody List<User> userList){
QueryWrapper<Role> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("role_sign", "bus_user");
......@@ -298,6 +316,7 @@ public class UserController {
*/
@ApiOperation(value = "根据角色查询用户集合", notes = "根据角色查询用户集合")
@PostMapping("/getUserList")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-根据角色查询用户集合", moduleName = "根据角色查询用户集合")
public Result<List<UserDto>> getUserList(@RequestBody RoleUpdateDto roleUpdate){
return Result.success(userService.getUserList(roleUpdate));
......@@ -306,6 +325,7 @@ public class UserController {
@ApiOperation(value = "根据角色查询用户集合(包括所在部门)", notes = "根据角色查询用户集合(包括所在部门)")
@PostMapping("/getUserListAll")
@OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "角色管理相关接口-根据角色查询用户集合(包括所在部门)", moduleName = "根据角色查询用户集合(包括所在部门)")
public Result<List<UserDto>> getUserList1(@RequestBody RoleUpdateDto roleUpdate){
List<UserDto> userListAll = userService.getUserListAll(roleUpdate);
return Result.success(userListAll);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!