deason 1 year ago
parent
commit
9780556ace

+ 15 - 5
src/main/java/cn/com/qmth/examcloud/tool/service/create_random_paper_template/CreateRandomPaperTemplateTask.java

@@ -156,6 +156,7 @@ public class CreateRandomPaperTemplateTask {
 
 
         Map<String, String> params = new HashMap<>();
         Map<String, String> params = new HashMap<>();
         params.put("courseNo", courseCode);
         params.put("courseNo", courseCode);
+        params.put("ids", "");
 
 
         String paperType = questionPool == 1 ? "importPaper" : "genPaper";
         String paperType = questionPool == 1 ? "importPaper" : "genPaper";
         String url = user.getServerUrl() + "/api/ecs_ques/" + paperType + "/huoge/1/10";
         String url = user.getServerUrl() + "/api/ecs_ques/" + paperType + "/huoge/1/10";
@@ -167,9 +168,16 @@ public class CreateRandomPaperTemplateTask {
 
 
         });
         });
 
 
+        String[] keywords = paperKeywords.split(",");
+
         List<String> paperIds = new ArrayList<>();
         List<String> paperIds = new ArrayList<>();
         for (PaperVO vo : page.getContent()) {
         for (PaperVO vo : page.getContent()) {
-            //todo
+            for (String keyword : keywords) {
+                if (vo.getName().contains(keyword)) {
+                    paperIds.add(vo.getId());
+                    break;
+                }
+            }
         }
         }
 
 
         return paperIds;
         return paperIds;
@@ -186,16 +194,18 @@ public class CreateRandomPaperTemplateTask {
 
 
         String paperType = questionPool == 1 ? "IMPORT" : "GENERATE";
         String paperType = questionPool == 1 ? "IMPORT" : "GENERATE";
 
 
-        Map<String, Object> params = new HashMap<>();
+        Map<String, String> params = new HashMap<>();
         params.put("name", "todo");//todo
         params.put("name", "todo");//todo
-        params.put("courseId", courseId);
+        params.put("courseId", courseId.toString());
         params.put("paperStructType", paperStructType);
         params.put("paperStructType", paperStructType);
         params.put("paperStructId", paperStructId);
         params.put("paperStructId", paperStructId);
         params.put("paperType", paperType);
         params.put("paperType", paperType);
         params.put("paperIds", StringUtils.join(paperIds, ","));
         params.put("paperIds", StringUtils.join(paperIds, ","));
 
 
-        final String url = user.getServerUrl() + "/api/ecs_ques/randompaper/save";
-        HttpHelper.post(url, headers, params);
+        String x = HttpHelper.toUrlParams(params);
+
+        final String url = user.getServerUrl() + "/api/ecs_ques/randompaper/save?" + x;
+        HttpHelper.post(url, headers, null);
     }
     }
 
 
 }
 }

+ 26 - 1
src/test/java/cn/com/qmth/examcloud/tool/ToolTest.java

@@ -1,9 +1,13 @@
 package cn.com.qmth.examcloud.tool;
 package cn.com.qmth.examcloud.tool;
 
 
+import cn.com.qmth.examcloud.tool.cache.LoginSessionManager;
 import cn.com.qmth.examcloud.tool.config.SysProperty;
 import cn.com.qmth.examcloud.tool.config.SysProperty;
+import cn.com.qmth.examcloud.tool.entity.TaskEntity;
 import cn.com.qmth.examcloud.tool.service.CommonService;
 import cn.com.qmth.examcloud.tool.service.CommonService;
+import cn.com.qmth.examcloud.tool.service.create_random_paper_template.CreateRandomPaperTemplateTask;
 import cn.com.qmth.examcloud.tool.service.query_paper_struct.QueryPaperStructTask;
 import cn.com.qmth.examcloud.tool.service.query_paper_struct.QueryPaperStructTask;
 import cn.com.qmth.examcloud.tool.service.reset_student_password.ResetStudentPasswordTask;
 import cn.com.qmth.examcloud.tool.service.reset_student_password.ResetStudentPasswordTask;
+import cn.com.qmth.examcloud.tool.utils.JsonMapper;
 import cn.com.qmth.examcloud.tool.vo.user.User;
 import cn.com.qmth.examcloud.tool.vo.user.User;
 import org.junit.Test;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runner.RunWith;
@@ -11,6 +15,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.junit4.SpringRunner;
 
 
+import java.util.HashMap;
+import java.util.Map;
+
 @RunWith(SpringRunner.class)
 @RunWith(SpringRunner.class)
 @SpringBootTest
 @SpringBootTest
 public class ToolTest {
 public class ToolTest {
@@ -27,12 +34,30 @@ public class ToolTest {
     @Autowired
     @Autowired
     private QueryPaperStructTask queryPaperStructTask;
     private QueryPaperStructTask queryPaperStructTask;
 
 
+    @Autowired
+    private CreateRandomPaperTemplateTask createRandomPaperTemplateTask;
+
     @Test
     @Test
     public void demo() throws Exception {
     public void demo() throws Exception {
         User user = doLogin();
         User user = doLogin();
 
 
         // resetStudentPasswordTask.start(user, 0L);
         // resetStudentPasswordTask.start(user, 0L);
         // queryPaperStructTask.start(user, 0L);
         // queryPaperStructTask.start(user, 0L);
+        // createRandomPaperTemplate(user);
+    }
+
+    private void createRandomPaperTemplate(User user) {
+        Map<String, String> params = new HashMap<>();
+        params.put("examId", "81");
+        params.put("structType", "1");
+        params.put("structName", "精确结构2023");
+        params.put("questionPool", "1");
+        params.put("paperKeywords", "_2,_3");
+
+        TaskEntity task = new TaskEntity();
+        task.setUserToken(user.getToken());
+        task.setParams(new JsonMapper().toJson(params));
+        createRandomPaperTemplateTask.start(task);
     }
     }
 
 
     private User doLogin() {
     private User doLogin() {
@@ -42,7 +67,7 @@ public class ToolTest {
         String smsCode = "5220";
         String smsCode = "5220";
 
 
         User user = commonService.login(serverUrl, loginName, password, smsCode);
         User user = commonService.login(serverUrl, loginName, password, smsCode);
-        System.out.println(user.getKey() + " " + user.getToken());
+        LoginSessionManager.addLoginSession(user);
         return user;
         return user;
     }
     }