认证驳回 添加原因

site/src/main/java/com/mooctest/crowd/site/command/AuthRejectCommand.java

@@ -0,0 +1,16 @@
+package com.mooctest.crowd.site.command;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author: Diors.Po
+ * @Email: 171256175@qq.com
+ * @date 2019-08-29 17:14
+ */
+@Data
+public class AuthRejectCommand {
+    @NotNull(message = "请输入驳回原因")
+    private String explain;
+}

site/src/main/java/com/mooctest/crowd/site/controller/AgencyController.java

@@ -3,8 +3,10 @@ package com.mooctest.crowd.site.controller;
 import com.alibaba.druid.sql.visitor.functions.Bin;
 import com.mooctest.crowd.domain.exception.BaseException;
 import com.mooctest.crowd.site.annotation.LoginRequired;
+import com.mooctest.crowd.site.annotation.SysAdminRequired;
 import com.mooctest.crowd.site.command.AgencyResourceAbilityUpdateCommand;
 import com.mooctest.crowd.site.command.ApplyAgencyAuthCommand;
+import com.mooctest.crowd.site.command.AuthRejectCommand;
 import com.mooctest.crowd.site.command.GenerateAgencyCommand;
 import com.mooctest.crowd.site.data.dto.UserDTO;
 import com.mooctest.crowd.site.data.vo.AgencyVO;
@@ -89,17 +91,17 @@ public class AgencyController {
     }
 
     @LoginRequired
+    @SysAdminRequired
     @RequestMapping(value = "/user/{userId}/agency/status/accept", method = RequestMethod.PUT)
-    public AgencyVO passAuth(@PathVariable("userId") Long userId, HttpSession session){
-        Long operatorId = Long.parseLong((String)session.getAttribute("userId"));
-        return agencyService.passAuth(userId, operatorId);
+    public AgencyVO passAuth(@PathVariable("userId") Long userId){
+        return agencyService.passAuth(userId);
     }
 
     @LoginRequired
+    @SysAdminRequired
     @RequestMapping(value = "/user/{userId}/agency/status/reject", method = RequestMethod.PUT)
-    public AgencyVO rejectAuth(@PathVariable("userId") Long userId, HttpSession session){
-        Long operatorId = Long.parseLong((String)session.getAttribute("userId"));
-        return agencyService.rejectAuth(userId, operatorId);
+    public AgencyVO rejectAuth(@PathVariable("userId") Long userId, @RequestBody @Validated AuthRejectCommand command){
+        return agencyService.rejectAuth(userId, command.getExplain());
     }
 
     /**

site/src/main/java/com/mooctest/crowd/site/controller/TestController.java

@@ -8,6 +8,7 @@ import com.mooctest.crowd.domain.dao.UserDao;
 import com.mooctest.crowd.domain.domainobject.CrowdTestProjectStatus;
 import com.mooctest.crowd.site.annotation.LoginRequired;
 import com.mooctest.crowd.site.anticorruption.impl.data.UserInfo;
+import com.mooctest.crowd.site.command.AuthRejectCommand;
 import com.mooctest.crowd.site.service.CrowdProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
@@ -64,9 +65,11 @@ public class TestController {
         return restTemplate.exchange(url, HttpMethod.POST,entity, UserInfo.class).getBody();
     }
 
-    @RequestMapping(value = "/test", method = RequestMethod.POST)
-    public Object exceptionTest() throws IOException {
-        return agencyResourceDao.getTotalResourceByType("服务器资源");
+    @RequestMapping(value = "/test/{userId}", method = RequestMethod.POST)
+    public Object exceptionTest(@PathVariable("userId") Long userId, AuthRejectCommand command) throws IOException {
+        System.out.println(command.getExplain());
+        return null;
+//        return agencyResourceDao.getTotalResourceByType("服务器资源");
     }
 
     @RequestMapping(value = "/session/put", method = RequestMethod.GET)

site/src/main/java/com/mooctest/crowd/site/controller/UserController.java

@@ -105,27 +105,25 @@ public class UserController {
     /**
      * 个人认证：通过审核
      * @param userId
-     * @param session
      * @return
      */
     @LoginRequired
+    @SysAdminRequired
     @RequestMapping(value = "/user/{userId}/personalAuth/status/accept", method = RequestMethod.PUT)
-    public PersonalAuthVO passPersonalAuth(@PathVariable("userId") Long userId, HttpSession session){
-        Long operatorId = Long.parseLong((String)session.getAttribute("userId"));
-        return userService.passPersonalAuth(userId, operatorId);
+    public PersonalAuthVO passPersonalAuth(@PathVariable("userId") Long userId){
+        return userService.passPersonalAuth(userId);
     }
 
     /**
      * 个人认证：审核未通过
      * @param userId
-     * @param session
      * @return
      */
     @LoginRequired
+    @SysAdminRequired
     @RequestMapping(value = "/user/{userId}/personalAuth/status/reject", method = RequestMethod.PUT)
-    public PersonalAuthVO rejectPersonalAuth(@PathVariable("userId") Long userId, HttpSession session){
-        Long operatorId = Long.parseLong((String)session.getAttribute("userId"));
-        return userService.rejectPersonalAuth(userId, operatorId);
+    public PersonalAuthVO rejectPersonalAuth(@PathVariable("userId") Long userId, @RequestBody @Validated AuthRejectCommand command){
+        return userService.rejectPersonalAuth(userId, command.getExplain());
     }
 
     /**
@@ -206,8 +204,8 @@ public class UserController {
      */
     @LoginRequired
     @RequestMapping(value = "/user/{userId}/enterpriseAuth/status/reject", method = RequestMethod.PUT)
-    public EnterpriseAuthVO rejectEnterpriseAuth(@PathVariable("userId") Long userId){
-        return userService.rejectEnterpriseAuth(userId);
+    public EnterpriseAuthVO rejectEnterpriseAuth(@PathVariable("userId") Long userId, @RequestBody @Validated AuthRejectCommand command){
+        return userService.rejectEnterpriseAuth(userId, command.getExplain());
     }
 
     @LoginRequired

site/src/main/java/com/mooctest/crowd/site/service/AgencyService.java

@@ -27,9 +27,9 @@ public interface AgencyService {
 
     List<EvolutionAgencyVO> getAgencyList();
 
-    AgencyVO passAuth(Long userId, Long operatorId);
+    AgencyVO passAuth(Long userId);
 
-    AgencyVO rejectAuth(Long userId, Long operatorId);
+    AgencyVO rejectAuth(Long userId, String explain);
 
     AgencyVO getAgencyDetails(Long userId);
 }

site/src/main/java/com/mooctest/crowd/site/service/impl/AgencyServiceImpl.java

@@ -115,10 +115,7 @@ public class AgencyServiceImpl implements AgencyService {
     }
 
     @Override
-    public AgencyVO passAuth(Long userId, Long operatorId) {
-        User operator = userRepo.getByID(operatorId);
-        if (operator.getRoleList().stream().noneMatch(role -> role.getName().equals("SystemAdministrator")))
-            throw new UnauthorizedException("无权限进行此操作");
+    public AgencyVO passAuth(Long userId) {
         User user = userRepo.getByID(userId);
         if (user.getEvaluationAgency() == null)
             throw new BaseException("该用户未申请机构认证！");
@@ -128,14 +125,11 @@ public class AgencyServiceImpl implements AgencyService {
     }
 
     @Override
-    public AgencyVO rejectAuth(Long userId, Long operatorId) {
-        User operator = userRepo.getByID(operatorId);
-        if (operator.getRoleList().stream().noneMatch(role -> role.getName().equals("SystemAdministrator")))
-            throw new UnauthorizedException("无权限进行此操作");
+    public AgencyVO rejectAuth(Long userId, String explain) {
         User user = userRepo.getByID(userId);
         if (user.getEvaluationAgency() == null)
             throw new BaseException("该用户未申请机构认证！");
-        user.getEvaluationAgency().rejectAuthentication("");
+        user.getEvaluationAgency().rejectAuthentication(explain);
         return new AgencyVO(userRepo.saveUser(user).getEvaluationAgency());
     }