update

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/CourseStatisticServiceImpl.java

@@ -157,6 +157,7 @@ public class CourseStatisticServiceImpl implements CourseStatisticService {
         if (examCourses == null || examCourses.isEmpty()) {
             return;
         }
+
         //按课程和试卷类型逐个更新统计信息
         for (ExamCourseInfo info : examCourses) {
             //Key: examId_courseId_paperType
@@ -187,8 +188,8 @@ public class CourseStatisticServiceImpl implements CourseStatisticService {
         statistic.setOrgId(info.getOrgId());
         statistic.setExamId(info.getExamId());
         statistic.setCourseId(info.getCourseId());
-        statistic.setCourseCode(info.getCourseCode());
-        statistic.setCourseName(info.getCourseName());
+        statistic.setCourseCode(info.getCourseCode());//todo
+        statistic.setCourseName(info.getCourseName());//todo
         statistic.setPaperType(info.getPaperType());
         statistic.setTotalStudent(info.getTotalStudent());
         statistic.setPaperStatus(PaperStatus.无.getIndex());

examcloud-core-print-starter/src/test/java/cn/com/qmth/examcloud/core/print/test/CourseStatisticServiceTest.java

@@ -8,9 +8,9 @@
 package cn.com.qmth.examcloud.core.print.test;
 
 import cn.com.qmth.examcloud.core.print.service.CourseStatisticService;
-import cn.com.qmth.examcloud.core.print.service.bean.coursestatistic.CourseStatisticRefreshReq;
 import cn.com.qmth.examcloud.core.print.service.bean.coursestatistic.CourseStatisticInfo;
 import cn.com.qmth.examcloud.core.print.service.bean.coursestatistic.CourseStatisticQuery;
+import cn.com.qmth.examcloud.core.print.service.bean.coursestatistic.CourseStatisticRefreshReq;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -29,11 +29,11 @@ public class CourseStatisticServiceTest extends BaseTest {
     @Test
     public void getCourseStatisticListTest() throws Exception {
         CourseStatisticQuery query = new CourseStatisticQuery();
-        query.setOrgId(1L);
-        query.setExamId(1L);
-        query.setCourseId(1L);
+        query.setOrgId(27L);
+        query.setExamId(21L);
+        query.setCourseId(18L);
         query.setPaperStatus(0);
-        //query.setPaperId(1L);
+        //query.setPaperName("测试试卷");
         Page<CourseStatisticInfo> page = courseStatisticService.getCourseStatisticList(query);
         System.out.println(jsonMapper.toJson(page));
     }
@@ -41,16 +41,16 @@ public class CourseStatisticServiceTest extends BaseTest {
     @Test
     public void initCourseStatisticTest() throws Exception {
         CourseStatisticRefreshReq req = new CourseStatisticRefreshReq();
-        req.setOrgId(109L);
-        req.setExamId(178L);
+        req.setOrgId(27L);
+        req.setExamId(21L);
         List<CourseStatisticRefreshReq.Course> courses = new ArrayList<>();
-        courses.add(new CourseStatisticRefreshReq.Course(262L, "O"));
-        courses.add(new CourseStatisticRefreshReq.Course(263L, "O"));
+        courses.add(new CourseStatisticRefreshReq.Course(18L, "X"));
+        courses.add(new CourseStatisticRefreshReq.Course(19L, "X"));
         req.setCourses(courses);
         courseStatisticService.refreshCourseStatistic(req);
 
         //courseStatisticService.initAllCourseStatistic();
-        //courseStatisticService.syncCourseNameByCourseId(262L, "测试课程");
+        //courseStatisticService.syncCourseNameByCourseId(19L, "测试课程");
     }
 
 }

examcloud-core-print-starter/src/test/java/cn/com/qmth/examcloud/core/print/test/ExamStructureServiceTest.java

@@ -1,28 +0,0 @@
-/*
- * *************************************************
- * Copyright (c) 2018 QMTH. All Rights Reserved.
- * Created by Deason on 2018-11-01 10:33:19.
- * *************************************************
- */
-
-package cn.com.qmth.examcloud.core.print.test;
-
-import cn.com.qmth.examcloud.core.print.service.ExamStructureService;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * @author: fengdesheng
- * @since: 2018/11/01
- */
-public class ExamStructureServiceTest extends BaseTest {
-    @Autowired
-    private ExamStructureService examStructureService;
-
-    @Test
-    public void test() throws Exception {
-        examStructureService.syncOrgNameByOrgId(1L, "武汉大学1");
-        examStructureService.syncExamNameByExamId(1L, "计算机考试1");
-    }
-
-}

examcloud-core-print-starter/src/test/java/cn/com/qmth/examcloud/core/print/test/PrintingProjectServiceTest.java

@@ -10,7 +10,6 @@ package cn.com.qmth.examcloud.core.print.test;
 import cn.com.qmth.examcloud.core.print.common.jpa.OrderBuilder;
 import cn.com.qmth.examcloud.core.print.common.jpa.SearchBuilder;
 import cn.com.qmth.examcloud.core.print.common.jpa.SpecUtils;
-import cn.com.qmth.examcloud.core.print.common.jpa.SqlWrapper;
 import cn.com.qmth.examcloud.core.print.entity.PrintingProject;
 import cn.com.qmth.examcloud.core.print.repository.PrintingProjectRepository;
 import cn.com.qmth.examcloud.core.print.service.PrintingProjectService;
@@ -22,8 +21,6 @@ import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
-import org.springframework.jdbc.core.BeanPropertyRowMapper;
-import org.springframework.jdbc.core.JdbcTemplate;
 
 import java.util.Date;
 import java.util.List;
@@ -33,12 +30,10 @@ import java.util.List;
  * @since: 2018/10/17
  */
 public class PrintingProjectServiceTest extends BaseTest {
-    @Autowired
-    private PrintingProjectService printingProjectService;
     @Autowired
     private PrintingProjectRepository printingProjectRepository;
     @Autowired
-    private JdbcTemplate jdbcTemplate;
+    private PrintingProjectService printingProjectService;
 
     @Test
     public void getPrintingProjectListTest() throws Exception {
@@ -113,13 +108,4 @@ public class PrintingProjectServiceTest extends BaseTest {
         System.out.println(jsonMapper.toJson(list));
     }
 
-    //@Test
-    public void sqlTest() throws Exception {
-        SqlWrapper wrapper = new SqlWrapper()
-                .select().from("ec_prt_project")
-                .where().like("exam_id", 1L);
-        List<PrintingProject> list = jdbcTemplate.query(wrapper.build(), new BeanPropertyRowMapper(PrintingProject.class));
-        System.out.println(jsonMapper.toJson(list));
-    }
-
 }

examcloud-core-print-starter/src/test/java/cn/com/qmth/examcloud/core/print/test/ProjectStatisticServiceTest.java

@@ -22,8 +22,8 @@ public class ProjectStatisticServiceTest extends BaseTest {
 
     @Test
     public void getPrintingProjectStatisticTest() throws Exception {
-        Long orgId = 1L;
-        Long examId = 1L;
+        Long orgId = 27L;
+        Long examId = 70L;
         PrintingProjectStatisticInfo info = printingProjectStatisticService.getPrintingProjectStatistic(orgId, examId);
         System.out.println(jsonMapper.toJson(info));
     }

examcloud-core-print-starter/src/test/java/cn/com/qmth/examcloud/core/print/test/ProjectTemplateServiceTest.java

@@ -1,47 +0,0 @@
-/*
- * *************************************************
- * Copyright (c) 2018 QMTH. All Rights Reserved.
- * Created by Deason on 2018-11-01 10:31:34.
- * *************************************************
- */
-
-package cn.com.qmth.examcloud.core.print.test;
-
-import cn.com.qmth.examcloud.core.print.enums.TemplateType;
-import cn.com.qmth.examcloud.core.print.service.PrintingTemplateService;
-import cn.com.qmth.examcloud.core.print.service.bean.printingtemplate.PrintingTemplateInfo;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.List;
-
-/**
- * @author: fengdesheng
- * @since: 2018/11/01
- */
-public class ProjectTemplateServiceTest extends BaseTest {
-    @Autowired
-    private PrintingTemplateService printingTemplateService;
-
-    @Test
-    public void saveTest() throws Exception {
-        Long orgId = 1L;
-        Long examId = 1L;
-        PrintingTemplateInfo info = new PrintingTemplateInfo();
-        info.setOrgId(orgId);
-        info.setExamId(examId);
-        info.setTemplateType(TemplateType.考生数据表.getIndex());
-        info.setFileName("Test");
-        info.setFileUrl("test.xls");
-        printingTemplateService.savePrintingTemplate(info);
-    }
-
-    @Test
-    public void listTest() throws Exception {
-        Long orgId = 1L;
-        Long examId = 1L;
-        List<PrintingTemplateInfo> list = printingTemplateService.getPrintingTemplateList(orgId, examId);
-        System.out.println(jsonMapper.toJson(list));
-    }
-
-}

examcloud-core-print-starter/src/test/java/cn/com/qmth/examcloud/core/print/test/UpYunServiceTest.java

@@ -1,48 +0,0 @@
-/*
- * *************************************************
- * Copyright (c) 2018 QMTH. All Rights Reserved.
- * Created by Deason on 2018-11-01 17:41:12.
- * *************************************************
- */
-
-package cn.com.qmth.examcloud.core.print.test;
-
-import cn.com.qmth.examcloud.core.print.common.upyun.UpYunClient;
-import cn.com.qmth.examcloud.core.print.common.utils.FileUtils;
-import main.java.com.UpYun;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.io.File;
-
-/**
- * @author: fengdesheng
- * @since: 2018/11/01
- */
-public class UpYunServiceTest extends BaseTest {
-    @Autowired
-    private UpYunClient upYunClient;
-
-    @Test
-    public void demoTest() throws Exception {
-        final String dir = "C:/Users/deason/Desktop/";
-        final String fileName = "demo.png";
-
-        final String newFileName = FileUtils.newFileName(fileName);
-        final String newFilePath = upYunClient.getProperty().getUploadUrl() + FileUtils.dateDir() + newFileName;
-
-        UpYun client = upYunClient.getInstance();
-
-        //上传文件
-        File uploadFile = new File(dir + fileName);
-        client.writeFile(newFilePath, uploadFile);
-
-        //下载文件
-        File downloadFile = new File(dir + "temp_" + fileName);
-        client.readFile(newFilePath, downloadFile);
-
-        //https://ecs-test-static.qmth.com.cn/ecs-print/test/201811/f02b5abbacb543c59dce9adc16254305.png
-        System.out.println(upYunClient.getProperty().getFileUrl() + newFilePath);
-    }
-
-}