Skip to content

S
sv-springboot
Commit ce8b3652 by Suvalue
Options

机构修改

parent a9c73d8d
Showing with 49 additions and 49 deletions
bsoft-admin/src/main/java/com/bsoft/admin/controller/OrgController.java
...@@ -20,7 +20,7 @@ import springfox.documentation.annotations.ApiIgnore; ...@@ -20,7 +20,7 @@ import springfox.documentation.annotations.ApiIgnore;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.List; import java.util.List;
@Api(tags = "机构API",produces="produces",consumes="consumes",protocols="protocols") @Api(tags = "机构API", produces = "produces", consumes = "consumes", protocols = "protocols")
@RequestMapping("/org") @RequestMapping("/org")
@RestController @RestController
public class OrgController { public class OrgController {
...@@ -32,7 +32,7 @@ public class OrgController { ...@@ -32,7 +32,7 @@ public class OrgController {
@PostMapping("parentall") @PostMapping("parentall")
@Token @Token
@ApiOperation("查询机构列表") @ApiOperation("查询机构列表")
public Object getParentAll(@RequestBody OrgReq.GetOrgReq org)throws Exception{ public Object getParentAll(@RequestBody OrgReq.GetOrgReq org) throws Exception {
List<DicOrgList> list = dicOrgService.getParentAll(org); List<DicOrgList> list = dicOrgService.getParentAll(org);
return Result.success(list); return Result.success(list);
} }
...@@ -40,7 +40,7 @@ public class OrgController { ...@@ -40,7 +40,7 @@ public class OrgController {
@PostMapping("all") @PostMapping("all")
@Token @Token
@ApiOperation("查询机构列表") @ApiOperation("查询机构列表")
public Object getAll(){ public Object getAll() {
List<DicOrg> list = dicOrgService.getAll(); List<DicOrg> list = dicOrgService.getAll();
return Result.success(list); return Result.success(list);
} }
...@@ -49,7 +49,7 @@ public class OrgController { ...@@ -49,7 +49,7 @@ public class OrgController {
@PostMapping("info") @PostMapping("info")
@Token @Token
@ApiOperation("查询机构详细信息") @ApiOperation("查询机构详细信息")
public Object getById(@RequestBody OrgReq.InfoOrgReq org)throws Exception{ public Object getById(@RequestBody OrgReq.InfoOrgReq org) throws Exception {
DicOrg info = dicOrgService.info(org.getOrgId()); DicOrg info = dicOrgService.info(org.getOrgId());
return Result.success(info); return Result.success(info);
} }
...@@ -57,13 +57,13 @@ public class OrgController { ...@@ -57,13 +57,13 @@ public class OrgController {
@PostMapping("add") @PostMapping("add")
@Token @Token
@ApiOperation("添加机构") @ApiOperation("添加机构")
public Object addUser(@ApiIgnore @CurrentUser Long userId,@Valid @RequestBody OrgReq.AddOrgReq org)throws Exception{ public Object addOrg(@ApiIgnore @CurrentUser Long userId, @Valid @RequestBody OrgReq.AddOrgReq org) throws Exception {
DicOrg sysRole = dicOrgService.getByName(org.getOrgName()); DicOrg sysRole = dicOrgService.getByName(org.getOrgName());
if(sysRole!=null){ if (sysRole != null) {
return Result.error("该机构已存在！"); return Result.error("该机构已存在！");
} }
boolean result = dicOrgService.addOrg(userId,org); boolean result = dicOrgService.addOrg(userId, org);
if(result) if (result)
return Result.success(null); return Result.success(null);
else else
return Result.error(); return Result.error();
...@@ -72,9 +72,9 @@ public class OrgController { ...@@ -72,9 +72,9 @@ public class OrgController {
@PostMapping("delete") @PostMapping("delete")
@Token @Token
@ApiOperation("删除机构") @ApiOperation("删除机构")
public Object addUser(@RequestBody OrgReq.DeleteOrgReq org)throws Exception{ public Object deleteOrg(@RequestBody OrgReq.DeleteOrgReq org) throws Exception {
boolean result = dicOrgService.deleteOrg(org); boolean result = dicOrgService.deleteOrg(org);
if(result) if (result)
return Result.success(null); return Result.success(null);
else else
return Result.error(); return Result.error();
...@@ -83,16 +83,16 @@ public class OrgController { ...@@ -83,16 +83,16 @@ public class OrgController {
@PostMapping("update") @PostMapping("update")
@Token @Token
@ApiOperation("修改机构") @ApiOperation("修改机构")
public Object addUser(@Valid @RequestBody OrgReq.UpdateOrgReq org)throws Exception{ public Object updateOrg(@Valid @RequestBody OrgReq.UpdateOrgReq org) throws Exception {
DicOrg reqDic = dicOrgService.info(org.getOrgId()); DicOrg reqDic = dicOrgService.info(org.getOrgId());
DicOrg nameRole = dicOrgService.getByName(org.getOrgName()); DicOrg nameRole = dicOrgService.getByName(org.getOrgName());
if(reqDic!=null){ if (reqDic != null) {
if(nameRole!=null&&!nameRole.getOrgName().equals(reqDic.getOrgName())){ if (nameRole != null && !nameRole.getOrgName().equals(reqDic.getOrgName())) {
return Result.error("该机构已存在"); return Result.error("该机构已存在");
} }
} }
boolean result = dicOrgService.updateOrg(org); boolean result = dicOrgService.updateOrg(org);
if(result) if (result)
return Result.success(null); return Result.success(null);
else else
return Result.error(); return Result.error();
...@@ -101,7 +101,7 @@ public class OrgController { ...@@ -101,7 +101,7 @@ public class OrgController {
@PostMapping("userorg") @PostMapping("userorg")
@Token @Token
@ApiOperation("查询用户机构") @ApiOperation("查询用户机构")
public Object getUserOrg(@RequestBody OrgReq.GetUserOrgReq org)throws Exception{ public Object getUserOrg(@RequestBody OrgReq.GetUserOrgReq org) throws Exception {
List<SysUserOrgRsList> list = dicOrgService.getUserOrg(org.getUserId()); List<SysUserOrgRsList> list = dicOrgService.getUserOrg(org.getUserId());
return Result.success(list); return Result.success(list);
} }
...@@ -109,9 +109,9 @@ public class OrgController { ...@@ -109,9 +109,9 @@ public class OrgController {
@PostMapping("saveuserorg") @PostMapping("saveuserorg")
@Token @Token
@ApiOperation("保存用户机构") @ApiOperation("保存用户机构")
public Object saveUserOrg(@ApiIgnore @CurrentUser Long userId,@RequestBody OrgReq.SaveUserOrgReq org)throws Exception{ public Object saveUserOrg(@ApiIgnore @CurrentUser Long userId, @RequestBody OrgReq.SaveUserOrgReq org) throws Exception {
boolean result = dicOrgService.saveUserOrg(userId,org); boolean result = dicOrgService.saveUserOrg(userId, org);
if(result) if (result)
return Result.success(null); return Result.success(null);
else else
return Result.error(); return Result.error();
......
bsoft-admin/src/main/java/com/bsoft/admin/model/reqmodel/OrgReq.java
...@@ -7,8 +7,8 @@ import javax.validation.constraints.NotNull; ...@@ -7,8 +7,8 @@ import javax.validation.constraints.NotNull;
import java.util.List; import java.util.List;
public class OrgReq { public class OrgReq {
public static class GetOrgReq{ public static class GetOrgReq {
@ApiModelProperty(value="机构名称",required = true) @ApiModelProperty(value = "机构名称", required = true)
private String orgName; private String orgName;
public String getOrgName() { public String getOrgName() {
...@@ -27,8 +27,8 @@ public class OrgReq { ...@@ -27,8 +27,8 @@ public class OrgReq {
} }
} }
public static class InfoOrgReq{ public static class InfoOrgReq {
@ApiModelProperty(value="机构ID",required = true) @ApiModelProperty(value = "机构ID", required = true)
@NotNull(message = "机构ID 参数必传") @NotNull(message = "机构ID 参数必传")
private Long orgId; private Long orgId;
...@@ -48,32 +48,32 @@ public class OrgReq { ...@@ -48,32 +48,32 @@ public class OrgReq {
} }
} }
public static class AddOrgReq{ public static class AddOrgReq {
@ApiModelProperty(value="组织机构代码",required = true) @ApiModelProperty(value = "组织机构代码", required = true)
@NotBlank(message = "组织机构代码 参数必传") @NotBlank(message = "组织机构代码 参数必传")
private String orgCode; private String orgCode;
@ApiModelProperty(value="机构名称",required = true) @ApiModelProperty(value = "机构名称", required = true)
@NotBlank(message = "机构名称 参数必传") @NotBlank(message = "机构名称 参数必传")
private String orgName; private String orgName;
@ApiModelProperty(value="登记号",required = true) @ApiModelProperty(value = "登记号", required = true)
private String orgNo; private String orgNo;
@ApiModelProperty(value="机构简称",required = true) @ApiModelProperty(value = "机构简称", required = true)
@NotBlank(message = "机构简称 参数必传") @NotBlank(message = "机构简称 参数必传")
private String orgShortName; private String orgShortName;
@ApiModelProperty(value="机构分类",required = true) @ApiModelProperty(value = "机构分类", required = true)
private String orgGroup; private String orgGroup;
@ApiModelProperty(value="机构类型",required = true) @ApiModelProperty(value = "机构类型", required = true)
private String orgType; private String orgType;
@ApiModelProperty(value="地址",required = true) @ApiModelProperty(value = "地址", required = true)
private String orgAddress; private String orgAddress;
@ApiModelProperty(value="父级关系",required = true) @ApiModelProperty(value = "父级关系", required = true)
@NotNull(message = "父级关系 参数必传") @NotNull(message = "父级关系 参数必传")
private Long parentId; private Long parentId;
...@@ -156,8 +156,8 @@ public class OrgReq { ...@@ -156,8 +156,8 @@ public class OrgReq {
} }
} }
public static class DeleteOrgReq{ public static class DeleteOrgReq {
@ApiModelProperty(value="机构ID",required = true) @ApiModelProperty(value = "机构ID", required = true)
@NotNull(message = "机构ID 参数必传") @NotNull(message = "机构ID 参数必传")
private Long orgId; private Long orgId;
...@@ -177,36 +177,36 @@ public class OrgReq { ...@@ -177,36 +177,36 @@ public class OrgReq {
} }
} }
public static class UpdateOrgReq{ public static class UpdateOrgReq {
@ApiModelProperty(value="机构ID",required = true) @ApiModelProperty(value = "机构ID", required = true)
@NotBlank(message = "机构ID 参数必传") @NotNull(message = "机构ID 参数必传")
private Long orgId; private Long orgId;
@ApiModelProperty(value="组织机构代码",required = true) @ApiModelProperty(value = "组织机构代码", required = true)
@NotBlank(message = "组织机构代码 参数必传") @NotBlank(message = "组织机构代码 参数必传")
private String orgCode; private String orgCode;
@ApiModelProperty(value="机构名称",required = true) @ApiModelProperty(value = "机构名称", required = true)
@NotBlank(message = "机构名称 参数必传") @NotBlank(message = "机构名称 参数必传")
private String orgName; private String orgName;
@ApiModelProperty(value="登记号",required = true) @ApiModelProperty(value = "登记号", required = true)
private String orgNo; private String orgNo;
@ApiModelProperty(value="机构简称",required = true) @ApiModelProperty(value = "机构简称", required = true)
@NotBlank(message = "机构简称 参数必传") @NotBlank(message = "机构简称 参数必传")
private String orgShortName; private String orgShortName;
@ApiModelProperty(value="机构分类",required = true) @ApiModelProperty(value = "机构分类", required = true)
private String orgGroup; private String orgGroup;
@ApiModelProperty(value="机构类型",required = true) @ApiModelProperty(value = "机构类型", required = true)
private String orgType; private String orgType;
@ApiModelProperty(value="地址",required = true) @ApiModelProperty(value = "地址", required = true)
private String orgAddress; private String orgAddress;
@ApiModelProperty(value="父级关系",required = true) @ApiModelProperty(value = "父级关系", required = true)
@NotNull(message = "父级关系 参数必传") @NotNull(message = "父级关系 参数必传")
private Long parentId; private Long parentId;
...@@ -301,8 +301,8 @@ public class OrgReq { ...@@ -301,8 +301,8 @@ public class OrgReq {
/** /**
* 查询用户机构入参 * 查询用户机构入参
*/ */
public static class GetUserOrgReq{ public static class GetUserOrgReq {
@ApiModelProperty(value="用户ID",required = true) @ApiModelProperty(value = "用户ID", required = true)
@NotNull(message = "用户ID 参数必传") @NotNull(message = "用户ID 参数必传")
private Long userId; private Long userId;
...@@ -325,12 +325,12 @@ public class OrgReq { ...@@ -325,12 +325,12 @@ public class OrgReq {
/** /**
* 配置用户机构入参 * 配置用户机构入参
*/ */
public static class SaveUserOrgReq{ public static class SaveUserOrgReq {
@ApiModelProperty(value="用户ID",required = true) @ApiModelProperty(value = "用户ID", required = true)
@NotNull(message = "用户ID 参数必传") @NotNull(message = "用户ID 参数必传")
private Long userId; private Long userId;
@ApiModelProperty(value="机构ID",required = true) @ApiModelProperty(value = "机构ID", required = true)
@NotNull(message = "机构ID 参数必传") @NotNull(message = "机构ID 参数必传")
private List<Long> org; private List<Long> org;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment