重构部分功能模块

fill-manager/src/main/java/com/mortals/xhx/common/utils/WordUtil.java

@@ -13,6 +13,7 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.util.DateUtils;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
+import lombok.extern.apachecommons.CommonsLog;
 import sun.misc.BASE64Encoder;
 
 import javax.imageio.ImageIO;
@@ -24,6 +25,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+@CommonsLog
 public class WordUtil {
 
     private Configuration configure = null;
@@ -96,7 +98,7 @@ public class WordUtil {
 
     public static String convertWordToJPEG(String inputFile, String jpegPath) {
         try {
-            System.out.println(String.format("文件转换开始：%s", DateUtils.getCurrStrDateTime()));
+            log.info(String.format("文件转换开始：%s", DateUtils.getCurrStrDateTime()));
             // 转换开始前时间
             long old = System.currentTimeMillis();
             // 新建的PDF文件路径
@@ -108,8 +110,6 @@ public class WordUtil {
             // 全面支持DOC, DOCX, OOXML, RTF HTML, OpenDocument, PDF, EPUB, XPS, SWF 相互转换
             //doc.save(os, SaveFormat.JPEG);
 
-
-
             ImageSaveOptions options = new ImageSaveOptions(SaveFormat.JPEG);
             options.setPrettyFormat(true);
             options.setUseAntiAliasing(true);
@@ -131,10 +131,10 @@ public class WordUtil {
             // 转换结束后时间
             long now = System.currentTimeMillis();
             //os.close();
-            System.out.println("文件转换结束,共耗时：" + ((now - old) / 1000.0) + "秒");
+            log.info("文件转换结束,共耗时：" + ((now - old) / 1000.0) + "秒");
             return jpegPath;
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e);
             throw new AppException(String.format("文件转换异常!", e.getMessage()));
         }
     }

fill-manager/src/main/java/com/mortals/xhx/module/home/web/HomeController.java

@@ -154,9 +154,14 @@ public class HomeController extends BaseJsonBodyController {
         try {
             String paths = matterDatumService.mergeFormToDoc(docFormVo, getContext());
             String[] vals = paths.split(";");
-            jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
-            jsonObject.put("mergeDoc", vals[0]);
-            jsonObject.put("preview", vals[1]);
+            if(vals.length>1){
+                jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+                jsonObject.put("mergeDoc", vals[0]);
+                jsonObject.put("preview", vals[1]);
+            }else{
+                throw new AppException("合成表单异常！");
+            }
+
             //todo 保存表单数据
 //            docFormVo.setCreateTime(new Date());
 //            docFormVo.setCreateUserId(getContextUserId(getContext()));

fill-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java

@@ -336,11 +336,11 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
                     MultipartFile multipartFile = new MockMultipartFile(templateName, templateName,
                             ContentType.APPLICATION_OCTET_STREAM.toString(), byteArrayOutputStream.toByteArray());
                     String mergedocPath = uploadService.saveFileUpload(multipartFile, "/mergedoc", context.getUser());
-                    log.info("mergedocPath:" + mergedocPath);
                     String mergedoc = rootPath + mergedocPath;
                     //转换预览图片
                     String fileName = RandomUtil.randomNumbers(12) + ".jpg";
                     String preView = this.filePath + "file/preview/" + fileName;
+                    log.info(String.format("mergedocPath:%s,preViewPath:%s", mergedocPath,preView));
                     WordUtil.convertWordToJPEG(mergedoc, preView);
                     log.info("preView:" + mergedocPath);
                     //下载地址拼装