增加查询评卷员

core-api/src/main/java/cn/com/qmth/examcloud/service/core/api/UserApi.java

@@ -1,5 +1,29 @@
 package cn.com.qmth.examcloud.service.core.api;
 
+import io.swagger.annotations.ApiOperation;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import cn.com.qmth.examcloud.common.uac.annotation.Uac;
 import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
 import cn.com.qmth.examcloud.common.uac.enums.RoleMeta;
@@ -9,20 +33,6 @@ import cn.com.qmth.examcloud.service.core.enums.UserScope;
 import cn.com.qmth.examcloud.service.core.enums.UserType;
 import cn.com.qmth.examcloud.service.core.repo.UserRepo;
 import cn.com.qmth.examcloud.service.core.service.UserService;
-import io.swagger.annotations.ApiOperation;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import javax.servlet.http.HttpServletRequest;
 
 /**
  * 用户服务API
@@ -173,4 +183,11 @@ public class UserApi {
     	userService.logout(accessUser);
         return new ResponseEntity(HttpStatus.OK);
     }
+    
+    @ApiOperation(value="查询评卷员",notes="查询")
+    @GetMapping("/marker")
+    public ResponseEntity getMarker(HttpServletRequest request){
+        AccessUser accessUser = (AccessUser) request.getAttribute("accessUser");
+        return new ResponseEntity(userService.getMarker(accessUser.getRootOrgId()), HttpStatus.OK);
+    }
 }

core-api/src/main/java/cn/com/qmth/examcloud/service/core/service/UserService.java

@@ -4,6 +4,7 @@ import static org.springframework.data.domain.ExampleMatcher.GenericPropertyMatc
 
 import java.util.Date;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -181,4 +182,8 @@ public class UserService {
 		RedisUtil.deleteByte(accessUser.getToken());
 	}
 
+	public List<User> getMarker(Long rootOrgId) {
+		return userRepo.findMarkerByRootOrgId(rootOrgId);
+	}
+
 }

core-domain/src/main/java/cn/com/qmth/examcloud/service/core/entity/UserRole.java

@@ -1,9 +1,12 @@
 package cn.com.qmth.examcloud.service.core.entity;
 
-import javax.persistence.*;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.util.List;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
 
 /**
  * Created by songyue on 17/2/22.

core-domain/src/main/java/cn/com/qmth/examcloud/service/core/repo/UserRepo.java

@@ -32,5 +32,8 @@ public interface UserRepo extends JpaRepository<User,Long>,QueryByExampleExecuto
     List<User> findByRootOrgIdAndType(long rootOrgId,String userType);
 
 	List<User> findByOrgId(Long orgId);
+	
+	@Query(nativeQuery = true,value = "SELECT DISTINCT * FROM ecs_core_user us, ecs_core_user_role ur WHERE us.id = ur.user_id And us.root_org_id = ? And ur.role_code = 'MARKER' ")
+	List<User> findMarkerByRootOrgId(Long rootOrgId);
 
 }