|
@@ -30,7 +30,7 @@ import java.util.Map;
|
|
|
|
|
|
@RestController
|
|
|
@Api(tags = "系统接口")
|
|
|
-@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/sys")
|
|
|
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX)
|
|
|
@Aac(strict = false, auth = true)
|
|
|
public class SystemController extends BaseController {
|
|
|
|
|
@@ -56,7 +56,7 @@ public class SystemController extends BaseController {
|
|
|
private SystemConfigServiceImpl systemConfigService;
|
|
|
|
|
|
@ApiOperation(value = "心跳接口")
|
|
|
- @PostMapping("/heartbeat")
|
|
|
+ @PostMapping("/sys/heartbeat")
|
|
|
public ActiveTimeVo heartbeat() {
|
|
|
User user = getAccessUser();
|
|
|
ActiveTimeVo vo = new ActiveTimeVo();
|
|
@@ -66,7 +66,7 @@ public class SystemController extends BaseController {
|
|
|
|
|
|
@Aac(auth = false)
|
|
|
@ApiOperation(value = "服务端状态")
|
|
|
- @RequestMapping(value = "/status", method = {RequestMethod.GET, RequestMethod.POST})
|
|
|
+ @RequestMapping(value = "/sys/status", method = {RequestMethod.GET, RequestMethod.POST})
|
|
|
public ApiStatusVo status(HttpServletRequest request) {
|
|
|
ApiStatusVo vo = new ApiStatusVo();
|
|
|
vo.setFileUriPrefix(sysProperty.getFileUriPrefix());
|
|
@@ -88,30 +88,32 @@ public class SystemController extends BaseController {
|
|
|
|
|
|
@Aac(auth = false)
|
|
|
@ApiOperation(value = "用户角色类型")
|
|
|
- @PostMapping("/role/list")
|
|
|
+ @PostMapping("/sys/role/list")
|
|
|
public List<Map<String, String>> roles() {
|
|
|
List<Map<String, String>> roles = new ArrayList<>();
|
|
|
for (Role r : Role.values()) {
|
|
|
Map<String, String> map = new HashMap<>();
|
|
|
- map.put("code", r.name());
|
|
|
- map.put("name", r.getName());
|
|
|
+ map.put("roleCode", r.name());
|
|
|
+ map.put("roleName", r.getName());
|
|
|
roles.add(map);
|
|
|
}
|
|
|
return roles;
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "答题卡卡格式查询")
|
|
|
- @PostMapping("/card/answer")
|
|
|
- public AnswerCardVo cardAnswer(HttpServletRequest request, @RequestParam Long examId,
|
|
|
- @RequestParam Integer number) {
|
|
|
+ @PostMapping("/card/info")
|
|
|
+ public AnswerCardVo cardInfo(HttpServletRequest request, @RequestParam Long examId,
|
|
|
+ @RequestParam Integer number) {
|
|
|
ExamEntity exam = examService.getById(examId);
|
|
|
if (exam == null || !exam.getEnable()) {
|
|
|
throw ParameterExceptions.EXAM_NOT_FOUND;
|
|
|
}
|
|
|
+
|
|
|
AnswerCardEntity card = answerCardService.findByExamAndNumber(examId, number);
|
|
|
if (card == null) {
|
|
|
throw new ParameterException("找不到卡格式");
|
|
|
}
|
|
|
+
|
|
|
AnswerCardVo vo = new AnswerCardVo(card);
|
|
|
User user = getAccessUser();
|
|
|
if (user.getRole().equals(Role.SCANNER)) {
|