common-frame/hcframe
17
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

新增接口级别权限，机构管理改为逻辑删除，新增获取用户副岗接口

Browse Source
This commit is contained in:
lhc
2021-05-20 10:32:40 +08:00
parent 0bc1c6a56f
commit e9db8feebf
5 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
hcframe-parent/hcframe-user/src/main/java/com/hcframe/user/module/manage/controller/ManageController.java
View File

@@ -31,63 +31,71 @@ public class ManageController {
@GetMapping("/{name}")
public ResultVO<String> getName(@PathVariable String name) {
return ResultVO.getSuccess("Hello!"+name);
return ResultVO.getSuccess("Hello!" + name);
}
@PostMapping()
@LogAnno(operateType="新增用户信息",moduleName="系统管理-用户管理-馆内用户管理")
@LogAnno(operateType = "新增用户信息", moduleName = "系统管理-用户管理-馆内用户管理")
@ApiOperation(value = "新增用户信息", notes = "将自动传承ey-value对象模式即可")
public ResultVO<Map<String,Object>> addUser(@RequestParam Map<String,Object> user) {
@RequiresPermissions(value = {"system:userManage:innerUser:add"})
public ResultVO<Map<String, Object>> addUser(@RequestParam Map<String, Object> user) {
return manageService.addUser(user);
}
@PutMapping("/{version}")
@LogAnno(operateType="更新用户信息",moduleName="系统管理-用户管理-馆内用户管理")
@LogAnno(operateType = "更新用户信息", moduleName = "系统管理-用户管理-馆内用户管理")
@ApiOperation(value = "更新用户信息")
@RequiresPermissions(value = {"system:userManage:innerUser:edit"})
public ResultVO<Integer> updateUser(@RequestParam Map<String,Object> user,@PathVariable Integer version) {
return manageService.updateUser(user,version);
public ResultVO<Integer> updateUser(@RequestParam Map<String, Object> user, @PathVariable Integer version) {
return manageService.updateUser(user, version);
}
@DeleteMapping("/{ids}")
@LogAnno(operateType="删除用户信息",moduleName="系统管理-用户管理-馆内用户管理")
@LogAnno(operateType = "删除用户信息", moduleName = "系统管理-用户管理-馆内用户管理")
@ApiOperation(value = "删除用户（逻辑删除）", notes = "删除后职位也会被删除")
@RequiresPermissions(value = {"system:userManage:innerUser:delete"})
public ResultVO<Integer> deleteUser(@PathVariable String ids) {
return manageService.deleteUser(ids);
}
@GetMapping()
@ApiOperation(value = "获取用户列表" )
@RequiresPermissions(value = {"userinfo","system:userManage:innerUser:list","system:empower:innerUser:list","empowerUser"},logical = Logical.OR)
public ResultVO<PageInfo<Map<String,Object>>> getUserList(String data, WebPageInfo webPageInfo,String orgId) {
return manageService.getUserList(data, webPageInfo,orgId);
@ApiOperation(value = "获取用户列表")
@RequiresPermissions(value = {"userinfo", "system:userManage:innerUser:list", "system:empower:innerUser:list", "empowerUser"}, logical = Logical.OR)
public ResultVO<PageInfo<Map<String, Object>>> getUserList(String data, WebPageInfo webPageInfo, String orgId) {
return manageService.getUserList(data, webPageInfo, orgId);
}
@PutMapping("disable/{version}")
@LogAnno(operateType="用户启用禁用",moduleName="系统管理-用户管理-馆内用户管理")
@ApiOperation(value = "启用/禁用",notes = "用户启用禁用")
@LogAnno(operateType = "用户启用禁用", moduleName = "系统管理-用户管理-馆内用户管理")
@ApiOperation(value = "启用/禁用", notes = "用户启用禁用")
@RequiresPermissions(value = {"system:userManage:innerUser:enabled"})
public ResultVO<Integer> disable(Boolean enabled,String userId,@PathVariable Integer version) {
return manageService.disable(enabled,userId,version);
public ResultVO<Integer> disable(Boolean enabled, String userId, @PathVariable Integer version) {
return manageService.disable(enabled, userId, version);
}
@PutMapping("/resetPassword/{version}")
@LogAnno(operateType="重置密码",moduleName="系统管理-用户管理-馆内用户管理")
@LogAnno(operateType = "重置密码", moduleName = "系统管理-用户管理-馆内用户管理")
@ApiOperation(value = "重置密码")
@RequiresPermissions(value = { "system:userManage:innerUser:resetPassword" })
public ResultVO<Integer> resetPassword(String userId,@PathVariable Integer version) {
return manageService.resetPassword(userId,version);
@RequiresPermissions(value = {"system:userManage:innerUser:resetPassword"})
public ResultVO<Integer> resetPassword(String userId, @PathVariable Integer version) {
return manageService.resetPassword(userId, version);
}
@PutMapping("changePassword")
@LogAnno(operateType="修改密码",moduleName="系统管理-用户管理-馆内用户管理")
@ApiOperation(value = "修改密码",notes = "用户输入原密码和新密码")
public ResultVO<Integer> changePassword(String pwd,String npwd,String npwd2) {
return manageService.changePassword(pwd,npwd,npwd2);
@LogAnno(operateType = "修改密码", moduleName = "系统管理-用户管理-馆内用户管理")
@ApiOperation(value = "修改密码", notes = "用户输入原密码和新密码")
public ResultVO<Integer> changePassword(String pwd, String npwd, String npwd2) {
return manageService.changePassword(pwd, npwd, npwd2);
}
@GetMapping("/sync")
public ResultVO<Object> sync() {
return manageService.sync();
}
@GetMapping("getUserPost")
@ApiOperation(value = "获取用户副岗信息", notes = "用户输入原密码和新密码")
public ResultVO<Object> getUserPost(String userId) {
return manageService.getUserPost(userId);
}
}

2
hcframe-parent/hcframe-user/src/main/java/com/hcframe/user/module/manage/service/ManageService.java
View File

@@ -22,4 +22,6 @@ public interface ManageService {
ResultVO<Object> sync();
ResultVO<Integer> changePassword(String pwd, String npwd, String npwd2);
ResultVO<Object> getUserPost(String userId);
}

6
hcframe-parent/hcframe-user/src/main/java/com/hcframe/user/module/manage/service/impl/ManageServiceDataImpl.java
View File

@@ -228,4 +228,10 @@ public class ManageServiceDataImpl implements ManageService {
}
return tableService.updateWithDate(TABLE_INFO, map, version);
}
@Override
public ResultVO<Object> getUserPost(String userId) {
Condition condition = Condition.creatCriteria().andEqual("MEMBER_ID",userId.replaceAll("\"","")).build();
return ResultVO.getSuccess(baseMapper.selectByCondition("GB_DEPUTY_POST", condition));
}
}

5
hcframe-parent/hcframe-user/src/main/java/com/hcframe/user/module/userinfo/controller/DeptController.java
View File

@@ -30,25 +30,28 @@ public class DeptController {
@PostMapping()
@ApiOperation(value = "新增dept", notes = "将自动传承key-value对象模式即可")
@RequiresPermissions(value = {"system:userManage:orgManage:add"})
public ResultVO<Object> addDept(@RequestParam Map<String, Object> org) {
return deptService.addDept(org);
}
@PutMapping("/{version}")
@ApiOperation(value = "更新dept")
@RequiresPermissions(value = {"system:userManage:orgManage:edit"})
public ResultVO<Integer> updateDept(@RequestParam Map<String, Object> org, @PathVariable Integer version) {
return deptService.updateDept(org, version);
}
@DeleteMapping("/{ids}")
@ApiOperation(value = "删除dept", notes = "删除后职位也会被删除")
@RequiresPermissions(value = {"system:userManage:orgManage:delete"})
public ResultVO<Object> deleteDept(@PathVariable String ids) {
return deptService.deleteDept(ids);
}
@GetMapping()
@ApiOperation(value = "获取机构列表", notes = "删除后职位也会被删除")
@RequiresPermissions(value = {"orgManage","empowerOrg","system:empower:org:list"},logical = Logical.OR)
@RequiresPermissions(value = {"orgManage","empowerOrg","system:empower:org:list","system:userManage:orgManage:list"},logical = Logical.OR)
public ResultVO<PageInfo<Map<String, Object>>> getDeptList(String data, WebPageInfo webPageInfo,String code) {
return deptService.getDeptList(data, webPageInfo,code);
}

2
hcframe-parent/hcframe-user/src/main/java/com/hcframe/user/module/userinfo/service/impl/DeptServiceImpl.java
View File

@@ -151,7 +151,7 @@ public class DeptServiceImpl implements DeptService {
.creatCriteria()
.andIn(ID, Arrays.asList(idArr))
.build();
tableService.delete(TABLE_INFO, ids);
tableService.logicDelete(TABLE_INFO, ids);
return ResultVO.getSuccess();
}