diff --git a/src/main/java/com/xdap/self_development/controller/DeleteController.java b/src/main/java/com/xdap/self_development/controller/DeleteController.java index 6a095b7..7864962 100644 --- a/src/main/java/com/xdap/self_development/controller/DeleteController.java +++ b/src/main/java/com/xdap/self_development/controller/DeleteController.java @@ -36,7 +36,7 @@ public class DeleteController { @GetMapping("/loginVo") public Response loginVo(@RequestParam String userId) { Map map = new HashMap<>(); - AppTokenDTO token = apaasMyTokenFeign.token( + AppTokenDTO token = apaasMyTokenFeign.getAppToken( "client_credentials", "2b5b3de8-e7fd-406a-a59a-d5568457b1f4", "94bddc6a-27a4-4204-885b-b075812ec535" diff --git a/src/main/java/com/xdap/self_development/controller/ResponsiblePersonController.java b/src/main/java/com/xdap/self_development/controller/ResponsiblePersonController.java index 9f02997..40eb995 100644 --- a/src/main/java/com/xdap/self_development/controller/ResponsiblePersonController.java +++ b/src/main/java/com/xdap/self_development/controller/ResponsiblePersonController.java @@ -56,6 +56,22 @@ public class ResponsiblePersonController { return Response.ok().data(deptResponsible); } + // 查询所有部门填写人 + @GetMapping("/getDeptFilled") + public Response getDeptFilled( + @Valid DeptResponsiblePageForm form, + BindingResult bindingResult + ) { + if (bindingResult.hasErrors()) { + bindingResult.getFieldErrors().forEach(error -> { + throw new MpaasBusinessException(error.getDefaultMessage()); + }); + } + PageQueryResult deptResponsible = + responsiblePersonService.getDeptFilled(form); + return Response.ok().data(deptResponsible); + } + // 根据部门id获取子部门 @GetMapping("/getSubDepartmentById") public Response getSubDepartmentById( @@ -113,7 +129,22 @@ public class ResponsiblePersonController { }); } responsiblePersonService.saveResponsiblePerson(form); - return Response.ok().setMessage(form.toString()); + return Response.ok().setMessage("添加成功"); + } + + // 保存部门填写人 + @PostMapping("/saveFilledPerson") + public Response saveFilledPerson( + @Valid @RequestBody ResponsiblePersonForm form, + BindingResult bindingResult + ) { + if (bindingResult.hasErrors()) { + bindingResult.getFieldErrors().forEach(error -> { + throw new MpaasBusinessException(error.getDefaultMessage()); + }); + } + responsiblePersonService.saveFilledPerson(form); + return Response.ok().setMessage("添加成功"); } // 修改部门责任人 diff --git a/src/main/java/com/xdap/self_development/feign/ApaasMyTokenFeign.java b/src/main/java/com/xdap/self_development/feign/ApaasMyTokenFeign.java index 985ec09..46dad5b 100644 --- a/src/main/java/com/xdap/self_development/feign/ApaasMyTokenFeign.java +++ b/src/main/java/com/xdap/self_development/feign/ApaasMyTokenFeign.java @@ -1,14 +1,23 @@ package com.xdap.self_development.feign; import com.xdap.self_development.feign.dto.AppTokenDTO; +import com.xdap.self_development.feign.dto.UserTokenDT0; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; -@FeignClient(name = "apaas-client", url = "http://apaas-meim.app.yuchai.com/apaas/backend/a5e8e08/ycgf-yf-rddata") +@FeignClient(name = "apaas-client", url = "${apaas.token.url}") public interface ApaasMyTokenFeign { @PostMapping("/xdap-open/token") - AppTokenDTO token(@RequestParam("grant type") String grant_type, - @RequestParam("client id") String client_id, - @RequestParam("client secret")String client_secret); + AppTokenDTO getAppToken( + @RequestParam("grant_type") String grant_type, + @RequestParam("client_id") String client_id, + @RequestParam("client_secret")String client_secret + ); + + @PostMapping("/xdap-open/token/userToken") + UserTokenDT0 getUserToken( + @RequestParam("token") String token, + @RequestParam("userid") String userid + ); } \ No newline at end of file diff --git a/src/main/java/com/xdap/self_development/feign/dto/UserTokenDT0.java b/src/main/java/com/xdap/self_development/feign/dto/UserTokenDT0.java new file mode 100644 index 0000000..04f69a1 --- /dev/null +++ b/src/main/java/com/xdap/self_development/feign/dto/UserTokenDT0.java @@ -0,0 +1,8 @@ +package com.xdap.self_development.feign.dto; + +import lombok.Data; + +@Data +public class UserTokenDT0 { + private String access_token; +} diff --git a/src/main/java/com/xdap/self_development/pojo/ResponsiblePerson.java b/src/main/java/com/xdap/self_development/pojo/ResponsiblePerson.java index 066d9a2..041682d 100644 --- a/src/main/java/com/xdap/self_development/pojo/ResponsiblePerson.java +++ b/src/main/java/com/xdap/self_development/pojo/ResponsiblePerson.java @@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode; @Table("yfsjglpt_model_responsible_person") @SQLQuery(value = { @SQL(view = "getResponsibleAndName", - sql = "SELECT ymrp.*, xu.username FROM yfsjglpt_model_responsible_person ymrp JOIN xdap_users xu ON ymrp.user_id = xu.id") + sql = "SELECT ymrp.*, xu.username FROM yfsjglpt_model_responsible_person ymrp JOIN xdap_users xu ON ymrp.user_id = xu.id where ymrp.person_level = #level") }) public class ResponsiblePerson extends MpaasBasePojo { @RowID(sequence = "responsible_person_s", type = RowIDType.UUID) @@ -19,6 +19,7 @@ public class ResponsiblePerson extends MpaasBasePojo { private String userId; private String department; private String subsystem; + private Integer personLevel; @Column(type = ColumnType.CALCULATE) private String username; diff --git a/src/main/java/com/xdap/self_development/pojo/permissions.java b/src/main/java/com/xdap/self_development/pojo/permissions.java new file mode 100644 index 0000000..7991a5d --- /dev/null +++ b/src/main/java/com/xdap/self_development/pojo/permissions.java @@ -0,0 +1,4 @@ +package com.xdap.self_development.pojo; + +public class permissions { +} diff --git a/src/main/java/com/xdap/self_development/pojo/role.java b/src/main/java/com/xdap/self_development/pojo/role.java new file mode 100644 index 0000000..e631f09 --- /dev/null +++ b/src/main/java/com/xdap/self_development/pojo/role.java @@ -0,0 +1,4 @@ +package com.xdap.self_development.pojo; + +public class role { +} diff --git a/src/main/java/com/xdap/self_development/service/ResponsiblePersonService.java b/src/main/java/com/xdap/self_development/service/ResponsiblePersonService.java index 318e715..f19aec2 100644 --- a/src/main/java/com/xdap/self_development/service/ResponsiblePersonService.java +++ b/src/main/java/com/xdap/self_development/service/ResponsiblePersonService.java @@ -15,12 +15,16 @@ import java.util.Set; public interface ResponsiblePersonService { void saveResponsiblePerson(@Valid ResponsiblePersonForm form); + void saveFilledPerson(@Valid ResponsiblePersonForm form); + void updateResponsiblePerson(@Valid UpdateResponsiblePersonForm form); void deleteResponsiblePerson(@NotBlank String rowId); PageQueryResult getDeptResponsible(@Valid DeptResponsiblePageForm form); + PageQueryResult getDeptFilled(@Valid DeptResponsiblePageForm form); + Boolean isResponsiblePerson(String userId); Set getAllSubsystem(); diff --git a/src/main/java/com/xdap/self_development/service/impl/ResponsiblePersonServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/ResponsiblePersonServiceImpl.java index 690c3f2..80c2732 100644 --- a/src/main/java/com/xdap/self_development/service/impl/ResponsiblePersonServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/ResponsiblePersonServiceImpl.java @@ -29,17 +29,23 @@ public class ResponsiblePersonServiceImpl implements ResponsiblePersonService { @Override public void saveResponsiblePerson(ResponsiblePersonForm form) { - List responsiblePeople = bd.getBusinessDatabase() - .eq("department_id", form.getDepartmentId()) - .doQuery(ResponsiblePerson.class); - if (!responsiblePeople.isEmpty()) { - throw new MpaasBusinessException("该部门已有责任人"); - } ResponsiblePerson responsiblePerson = new ResponsiblePerson(); responsiblePerson.setDepartment(form.getDepartment()); responsiblePerson.setDepartmentId(form.getDepartmentId()); responsiblePerson.setUserId(form.getUserId()); responsiblePerson.setSubsystem(form.getSubsystem()); + responsiblePerson.setPersonLevel(1); + bd.getBusinessDatabase().doInsert(responsiblePerson); + } + + @Override + public void saveFilledPerson(ResponsiblePersonForm form) { + ResponsiblePerson responsiblePerson = new ResponsiblePerson(); + responsiblePerson.setDepartment(form.getDepartment()); + responsiblePerson.setDepartmentId(form.getDepartmentId()); + responsiblePerson.setUserId(form.getUserId()); + responsiblePerson.setSubsystem(form.getSubsystem()); + responsiblePerson.setPersonLevel(2); bd.getBusinessDatabase().doInsert(responsiblePerson); } @@ -63,7 +69,9 @@ public class ResponsiblePersonServiceImpl implements ResponsiblePersonService { @Override public void deleteResponsiblePerson(String rowId) { - bd.getBusinessDatabase().rowid("id", rowId).doDelete(ResponsiblePerson.class); + bd.getBusinessDatabase() + .rowid("id", rowId) + .doDelete(ResponsiblePerson.class); } @Override @@ -71,18 +79,32 @@ public class ResponsiblePersonServiceImpl implements ResponsiblePersonService { return bd.getBusinessDatabase() .viewQueryMode(true).view("getResponsibleAndName") + .setVar("level", 1) + .doPageQuery(form.getPageNumber(), form.getPageSize(), ResponsiblePerson.class); + } + + @Override + public PageQueryResult getDeptFilled(DeptResponsiblePageForm form) { + return bd.getBusinessDatabase() + .viewQueryMode(true).view("getResponsibleAndName") + .setVar("level", 2) .doPageQuery(form.getPageNumber(), form.getPageSize(), ResponsiblePerson.class); } @Override public Boolean isResponsiblePerson(String userId) { - List responsiblePeople = bd.getBusinessDatabase().eq("userId", userId).doQuery(ResponsiblePerson.class); + List responsiblePeople = bd.getBusinessDatabase() + .eq("userId", userId) + .doQuery(ResponsiblePerson.class); return !responsiblePeople.isEmpty(); } @Override public Set getAllSubsystem() { - List