Merge branch 'V0.0.4' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.4

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppPlanServiceImpl.java

@@ -798,7 +798,11 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             registerBookPdf.setOrgName(sysOrg.getShortName());
             registerBookPdf.setOrgPath(sysOrg.getPath());
             registerBookPdf.setFileUrl(pdfUrl);
-            registerBookPdf.setFileName(StringUtils.substringAfterLast(pdfUrl, "\\"));
+            //registerBookPdf.setFileName(StringUtils.substringAfterLast(pdfUrl, "\\"));
+            registerBookPdf.setFileName(StringUtils.substringAfterLast(pdfUrl, "/"));
+            if(StringUtils.isEmpty(registerBookPdf.getFileName())||StringUtils.isEmpty(pdfUrl)){
+                throw new SystemException(ErrorMsgConstants.GENERATE_PDF_ERROR);
+            }
             registerBookPdfService.save(registerBookPdf);
 //            LambdaUpdateWrapper<AppPlan> updateWrapper = new LambdaUpdateWrapper<>();
 //            updateWrapper.eq(AppPlan::getId, id);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafecheckPlanServiceImpl.java

@@ -15,6 +15,7 @@ import com.xunmei.common.core.domain.DateRange;
 import com.xunmei.common.core.domain.registerbook.domain.CoreRegisterBookPdf;
 import com.xunmei.common.core.enums.CycleCommonEnum;
 import com.xunmei.common.core.enums.RegisterBookType;
+import com.xunmei.common.core.exception.SystemException;
 import com.xunmei.common.core.utils.DateHelper;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
@@ -621,8 +622,12 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
         registerBookPdf.setOrgId(org.getId());
         registerBookPdf.setOrgPath(org.getPath());
         registerBookPdf.setFileUrl(url);
-        registerBookPdf.setFileName(StringUtils.substringAfterLast(url, "\\"));
+        //registerBookPdf.setFileName(StringUtils.substringAfterLast(url, "\\"));
+        registerBookPdf.setFileName(StringUtils.substringAfterLast(url, "/"));
         registerBookPdf.setOrgName(registerBookVo.getOrgName());
+        if(StringUtils.isEmpty(url)||StringUtils.isEmpty(registerBookPdf.getFileName())){
+            throw new SystemException(ErrorMsgConstants.GENERATE_PDF_ERROR);
+        }
         registerBookPdfService.save(registerBookPdf);
         CoreSafetyTask tem = new CoreSafetyTask();
         tem.setId(appSafetyCheckTask.getId());

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/service/LocalSysFileServiceImpl.java

@@ -658,6 +658,11 @@ public class LocalSysFileServiceImpl implements ISysFileService {
                 return null;
             }
             final String pdfFileName = pdf.getFileName();
+            //pdfFileName==null的时候在下面会报错此处加个判断，要处理问题还需要在问题源头除处理
+            // registerBookPdfBatchExportTempDir (Is a directory)
+            if(StringUtils.isEmpty(pdfFileName)){
+                return null;
+            }
             final PdfToZipTempVo tempVo = new PdfToZipTempVo();
             //tempVo.setBytes(bytes);
             tempVo.setFileName(pdfFileName);