|
@@ -215,20 +215,27 @@ public abstract class ExportPaperAbstractService {
|
|
protected static Template FDSF_TMPLATE_ANSWER;
|
|
protected static Template FDSF_TMPLATE_ANSWER;
|
|
|
|
|
|
//原卷word A4 模板
|
|
//原卷word A4 模板
|
|
- public static Template ORIGINAL_PAPER = null;
|
|
|
|
|
|
+ public final static Template ORIGINAL_PAPER;
|
|
|
|
|
|
private static Configuration CONFIGURATION;
|
|
private static Configuration CONFIGURATION;
|
|
|
|
|
|
static {
|
|
static {
|
|
|
|
+
|
|
CONFIGURATION = new Configuration(Configuration.VERSION_2_3_25);
|
|
CONFIGURATION = new Configuration(Configuration.VERSION_2_3_25);
|
|
// 设置编码
|
|
// 设置编码
|
|
CONFIGURATION.setDefaultEncoding(ENCODING);
|
|
CONFIGURATION.setDefaultEncoding(ENCODING);
|
|
// 设置ftl模板路径
|
|
// 设置ftl模板路径
|
|
CONFIGURATION.setClassForTemplateLoading(DocxProcessUtil.class, "/");
|
|
CONFIGURATION.setClassForTemplateLoading(DocxProcessUtil.class, "/");
|
|
|
|
|
|
|
|
+ Template originalTemplate;
|
|
try {
|
|
try {
|
|
- ORIGINAL_PAPER = CONFIGURATION.getTemplate("original_paper.ftl", ENCODING);
|
|
|
|
|
|
+ originalTemplate = CONFIGURATION.getTemplate("original_paper.ftl", ENCODING);
|
|
|
|
+ } catch (IOException e) {
|
|
|
|
+ originalTemplate = null;
|
|
|
|
+ }
|
|
|
|
+ ORIGINAL_PAPER = originalTemplate;
|
|
|
|
|
|
|
|
+ try {
|
|
SXSF_TEMPLATE_PAPER = CONFIGURATION.getTemplate("sxsf_paper_template.ftl", ENCODING);
|
|
SXSF_TEMPLATE_PAPER = CONFIGURATION.getTemplate("sxsf_paper_template.ftl", ENCODING);
|
|
SXSF_TEMPLATE_ANSWER = CONFIGURATION.getTemplate("sxsf_answer_template.ftl", ENCODING);
|
|
SXSF_TEMPLATE_ANSWER = CONFIGURATION.getTemplate("sxsf_answer_template.ftl", ENCODING);
|
|
SXSF_OUTLINE_TEMPLATE_PAPER = CONFIGURATION.getTemplate("sxsf_outline_paper_template.ftl", ENCODING);
|
|
SXSF_OUTLINE_TEMPLATE_PAPER = CONFIGURATION.getTemplate("sxsf_outline_paper_template.ftl", ENCODING);
|
|
@@ -987,12 +994,12 @@ public abstract class ExportPaperAbstractService {
|
|
*/
|
|
*/
|
|
protected void uploadPaperOrAnswerFile(PaperExp paperExp, ExtractConfig extractConfig, User accessUser, String currNum,
|
|
protected void uploadPaperOrAnswerFile(PaperExp paperExp, ExtractConfig extractConfig, User accessUser, String currNum,
|
|
Template template, ExamFileType examFileType, ExamPaper examPaper) {
|
|
Template template, ExamFileType examFileType, ExamPaper examPaper) {
|
|
- String paperfileName = currNum + examFileType.name() + DOCX_SUFFIX;
|
|
|
|
|
|
+ String paperFileName = currNum + examFileType.name() + DOCX_SUFFIX;
|
|
try {
|
|
try {
|
|
- DocxProcessUtil.exportWord(paperExp, paperfileName, template);
|
|
|
|
- DocxProcessUtil.processImage(paperfileName, getPkgList(paperExp.getId()));
|
|
|
|
- File file = new File(TEMP_FILE_EXP + paperfileName);
|
|
|
|
- String paperFilePath = upYunProperty.getUploadPath() + extractConfig.getOrgId() + "/" + paperfileName;
|
|
|
|
|
|
+ DocxProcessUtil.exportWord(paperExp, paperFileName, template);
|
|
|
|
+ DocxProcessUtil.processImage(paperFileName, getPkgList(paperExp.getId()));
|
|
|
|
+ File file = new File(TEMP_FILE_EXP + paperFileName);
|
|
|
|
+ String paperFilePath = upYunProperty.getUploadPath() + extractConfig.getOrgId() + "/" + paperFileName;
|
|
UpYun upyun = new UpYun(upYunProperty.getBucketName(), upYunProperty.getUserName(), upYunProperty.getPassword());
|
|
UpYun upyun = new UpYun(upYunProperty.getBucketName(), upYunProperty.getUserName(), upYunProperty.getPassword());
|
|
upyun.writeFile(paperFilePath, file, true);
|
|
upyun.writeFile(paperFilePath, file, true);
|
|
ExamFile examFile = new ExamFile(paperExp.getId(), extractConfig, paperFilePath, examFileType, DOCX_SUFFIX);
|
|
ExamFile examFile = new ExamFile(paperExp.getId(), extractConfig, paperFilePath, examFileType, DOCX_SUFFIX);
|