3.2.0-印品管理

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

@@ -21,12 +21,14 @@ import com.qmth.distributed.print.business.service.BasicTemplateService;
 import com.qmth.distributed.print.business.service.ExamCardDetailService;
 import com.qmth.distributed.print.business.service.ExamCardService;
 import com.qmth.distributed.print.business.util.PdfFillUtils;
+import com.qmth.teachcloud.common.config.DictionaryConfig;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicAttachment;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ClassifyEnum;
 import com.qmth.teachcloud.common.enums.EnumResult;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.enums.UploadFileEnum;
 import com.qmth.teachcloud.common.service.BasicAttachmentService;
 import com.qmth.teachcloud.common.service.TeachcloudCommonService;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -37,8 +39,11 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;
+import java.util.StringJoiner;
 import java.util.stream.Collectors;
 
 /**
@@ -67,6 +72,9 @@ public class BasicTemplateServiceImpl extends ServiceImpl<BasicTemplateMapper, B
     @Resource
     BasicTemplateMapper basicTemplateMapper;
 
+    @Resource
+    DictionaryConfig dictionaryConfig;
+
     @Override
     public IPage<TemplateDto> list(Boolean enable, String type, String name, Long startTime, Long endTime, Integer pageNumber, Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
@@ -192,17 +200,29 @@ public class BasicTemplateServiceImpl extends ServiceImpl<BasicTemplateMapper, B
             throw ExceptionResultEnum.ERROR.exception("模板类型有误");
         }
         ClassifyEnum classifyEnum = ClassifyEnum.valueOf(classifyStr);
+
+        LocalDateTime nowTime = LocalDateTime.now();
+        StringJoiner pdfStringJoiner = new StringJoiner("");
+        pdfStringJoiner.add(UploadFileEnum.PDF.getTitle()).add(File.separator);
+        pdfStringJoiner.add(String.valueOf(nowTime.getYear())).add(File.separator)
+                .add(String.format("%02d", nowTime.getMonthValue())).add(File.separator)
+                .add(String.format("%02d", nowTime.getDayOfMonth()));
+        pdfStringJoiner.add(File.separator).add(SystemConstant.getUuid()).add(SystemConstant.PDF_PREFIX);
+
+        String pdfDirName = pdfStringJoiner.toString();
+        String destUrl = dictionaryConfig.fssLocalPdfDomain().getConfig() + File.separator + pdfDirName;
+
         // 签到表
         if (ClassifyEnum.SIGN.equals(classifyEnum)) {
             if (StringUtils.isBlank(basicTemplate.getPreviewPath())) {
-                String json = PdfFillUtils.parseSignTempData(basicTemplate.getDisplayRange(), "签到表预览.pdf");
+                String json = PdfFillUtils.parseSignTempData(basicTemplate.getDisplayRange(), destUrl);
                 basicTemplate.setPreviewPath(json);
                 basicTemplateMapper.updateById(basicTemplate);
             }
             return basicTemplate.getPreviewPath() == null ? null : teachcloudCommonService.filePreview(basicTemplate.getPreviewPath());
         } else if (ClassifyEnum.PACKAGE.equals(classifyEnum)) {
             if (StringUtils.isBlank(basicTemplate.getPreviewPath())) {
-                String json = PdfFillUtils.packageTempData(basicTemplate.getDisplayRange(), "卷袋贴预览.pdf");
+                String json = PdfFillUtils.packageTempData(basicTemplate.getDisplayRange(), destUrl);
                 basicTemplate.setPreviewPath(json);
                 basicTemplateMapper.updateById(basicTemplate);
             }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/CreatePdfUtil.java

@@ -663,7 +663,7 @@ public class CreatePdfUtil {
                 studentMap.put("studentCode", examStudentCourseDto.getStudentCode());
             }
             if (studentHeadPlateMap.containsKey("clazzName")) {
-                studentMap.put("className", StringUtils.isBlank(examStudentCourseDto.getTeachClazzName()) ? examStudentCourseDto.getClazzName() : examStudentCourseDto.getClazzName());
+                studentMap.put("className", StringUtils.isBlank(examStudentCourseDto.getTeachClazzName()) ? examStudentCourseDto.getClazzName() : examStudentCourseDto.getTeachClazzName());
             }
             if (studentHeadPlateMap.containsKey("ticketNumber")) {
                 studentMap.put("ticketNumber", examStudentCourseDto.getTicketNumber());

distributed-print-business/src/main/resources/mapper/ExamStudentMapper.xml

@@ -88,6 +88,7 @@
         edc.paper_number as paperNumber,
         es.clazz_id clazzId,
         es.clazz_name clazzName,
+        es.teach_clazz_name teachClazzName,
         es.college_name collegeName,
         es.major_name majorName,
         es.student_clazz_type studentClazzType