Merge remote-tracking branch 'origin/20210223' into 20210308

smart-city-platform/src/main/java/com/bz/smart_city/excel/AbstractResolverExcelTemplate.java

@@ -1,5 +1,6 @@
 package com.bz.smart_city.excel;
 
+import com.alibaba.fastjson.JSON;
 import com.bz.smart_city.commom.util.FileUtil;
 import com.bz.smart_city.commom.util.Util;
 import com.bz.smart_city.entity.Import;
@@ -75,7 +76,6 @@ public abstract class AbstractResolverExcelTemplate {
             failFile();
             recordMessage();
         } catch (Exception e) {
-            e.printStackTrace();
             messageContent.append("导入失败，读取文件错误。");
             Message message = new Message();
             message.setSiteId(record.getUserId());
@@ -86,7 +86,7 @@ public abstract class AbstractResolverExcelTemplate {
             message.setObjId(record.getId());
             message.setRead(0);
             messageService.insertSelective(message);
-            log.error("read excel error = " + e.getMessage());
+            log.error("read excel error = {} {}" , e.getMessage(), JSON.toJSON(e));
         }finally {
             FileUtil.deleteFile(record.getImportFilePath());
             try {