bug

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/ClientService.java

@@ -35,7 +35,7 @@ public interface ClientService {
 
     Boolean validateData(Long examDetailId, String packageCode, String lastCode);
 
-    List<Map<String, String>> getBatchUrl(String machineCode, Long orgId, Long printPlanId, String courseCode, String paperNumber, Boolean isTry, Boolean isPass);
+    List<Map<String, Object>> getBatchUrl(String machineCode, Long orgId, Long printPlanId, String courseCode, String paperNumber, Boolean isTry, Boolean isPass);
 
     void exportClientPrintTask(HttpServletResponse response, String machineCode, Long orgId, String printPlanId, String status, String courseCode, String paperNumber, String examPlace, String examRoom, Long examStartTime, Long examEndTime, Boolean isDownload, Boolean validate) throws Exception;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ClientServiceImpl.java

@@ -516,21 +516,19 @@ public class ClientServiceImpl implements ClientService {
     }
 
     @Override
-    public List<Map<String, String>> getBatchUrl(String machineCode, Long orgId, Long printPlanId, String courseCode, String paperNumber, Boolean isTry, Boolean isPass) {
+    public List<Map<String, Object>> getBatchUrl(String machineCode, Long orgId, Long printPlanId, String courseCode, String paperNumber, Boolean isTry, Boolean isPass) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         List<ClientExamTaskDto> clientExamTaskDtos = examTaskService.listTryTask(schoolId, machineCode, orgId, printPlanId, courseCode, paperNumber, isTry, isPass);
-        List<Map<String, String>> list = new ArrayList<>();
+        List<Map<String, Object>> list = new ArrayList<>();
         for (ClientExamTaskDto clientExamTaskDto : clientExamTaskDtos) {
-            Map<String, String> map = new HashMap<>();
+            Map<String, Object> map = new HashMap<>();
             map.put("printPlanId", clientExamTaskDto.getPrintPlanId());
             map.put("courseCode", clientExamTaskDto.getCourseCode());
             map.put("courseName", clientExamTaskDto.getCourseName());
             map.put("paperNumber", clientExamTaskDto.getPaperNumber());
             List<Map<String, String>> mapList = examTaskDetailService.getUrl(schoolId, Long.valueOf(clientExamTaskDto.getPrintPlanId()), Long.valueOf(clientExamTaskDto.getExamTaskId()));
-            for (Map<String, String> stringMap : mapList) {
-                stringMap.putAll(map);
-                list.add(stringMap);
-            }
+            map.put("list", mapList);
+            list.add(map);
         }
         return list;
     }
@@ -587,9 +585,9 @@ public class ClientServiceImpl implements ClientService {
 
     @Override
     public void checkPrivilege(Long userId) {
-       List<SysPrivilege> sysPrivileges = sysPrivilegeService.getClientUrlByUserId(userId);
+        List<SysPrivilege> sysPrivileges = sysPrivilegeService.getClientUrlByUserId(userId);
         long count = sysPrivileges.stream().filter(m -> "客户端".equals(m.getName()) && "client".equals(m.getUrl())).count();
-        if(count == 0){
+        if (count == 0) {
             throw ExceptionResultEnum.ERROR.exception("用户没有权限，无法登录");
         }
     }

distributed-print/src/main/java/com/qmth/distributed/print/api/ClientController.java

@@ -1,5 +1,6 @@
 package com.qmth.distributed.print.api;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.boot.api.annotation.Aac;
@@ -149,7 +150,7 @@ public class ClientController {
                              @RequestParam(value = "paperNumber", required = false) String paperNumber,
                              @RequestParam(value = "isTry", required = false) Boolean isTry,
                              @RequestParam(value = "isPass", required = false) Boolean isPass) {
-        List<Map<String, String>> urls = clientService.getBatchUrl(machineCode, orgId, printPlanId, courseCode, paperNumber, isTry, isPass);
+        List<Map<String, Object>> urls = clientService.getBatchUrl(machineCode, orgId, printPlanId, courseCode, paperNumber, isTry, isPass);
         return ResultUtil.ok(urls);
     }