登记簿样式文件名称修改

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/constant/Constants.java

@@ -157,4 +157,6 @@ public class Constants {
     public static final String DAILY_FORMAT = "yyyy-MM-dd";
 
     public static final String HMS_FORMAT = "yyyy-MM-dd HH:mm:ss";
+
+    public static final String HM_FORMAT = "yyyyMMddHHmm";
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -881,10 +881,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
     }
 
     private String buildAccessPdfData(AccessPdf data) {
-        String fileOrgName = remoteOrgService.selectOrgById(data.getOrgId(), SecurityConstants.INNER).getShortName();
-        //String fileName = fileOrgName + "_" + RegisterBookType.MONITOR_ACCESS.getText() + "_" + DateUtil.format(new Date(), "yyyyMMddHHmmss") + ".pdf";
-        String fileName = fileOrgName + "_" + RegisterBookType.MONITOR_ACCESS.getText() + "_" + DateUtil.format(new Date(), "yyyyMMddHHmmss") + ".pdf";
-        data.setDest(fileName);
+
         //新方式生成pdf
         try {
             //返回相对地址
@@ -956,6 +953,8 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
             dataVos.add(v);
         }
         accessPdf.setDataVos(dataVos);
+        String fileName = registerBookPdfService.getPdfFileName(RegisterBookType.MONITOR_ACCESS,accessPdfVO.getOrgName());
+        accessPdf.setDest(fileName);
         return accessPdf;
     }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -733,8 +733,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
     public AjaxResult buildDrillTaskPdf(Long id) {
         CoreDrillTaskDetailVo task = this.selectCoreDrillTaskById(id);
         SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectOrgById(task.getOrgId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
-        //String fileName = getFileOrgName(sysOrg) + "_" + RegisterBookType.SAFETY_DRILL.getText() + "_" + DateUtil.format(new Date(), "yyyyMMddHHmmss") + ".pdf";
-        String fileName = task.getOrgName() + "_" + RegisterBookType.SAFETY_DRILL.getText() + "_" + DateUtil.format(new Date(), "yyyyMMddHHmmss") + ".pdf";
+        String fileName = registerBookPdfService.getPdfFileName(RegisterBookType.SAFETY_DRILL, task.getOrgName());
         Map<String, Object> data = this.getFtlDrill(task);
         data.put("fileName", fileName);
         data.put("id", id);
@@ -755,7 +754,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
             registerBookPdf.setOrgPath(sysOrg.getPath());
             registerBookPdf.setFileUrl(pdfUrl);
 
-           // final String name = task.getOrgName() + "_" + RegisterBookType.SAFETY_DRILL.getText() + "_" + DateUtil.format(new Date(), "yyyyMMdd") + ".pdf";
+            // final String name = task.getOrgName() + "_" + RegisterBookType.SAFETY_DRILL.getText() + "_" + DateUtil.format(new Date(), "yyyyMMdd") + ".pdf";
             registerBookPdf.setFileName(fileName);
             //registerBookPdf.setFileName(StringUtils.substringAfterLast(pdfUrl, File.separator));
             registerBookPdfService.saveOrUpdate(registerBookPdf);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -737,8 +737,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     public AjaxResult buildEduPdf(Long id) {
         CoreEduTrainingTaskDetailVo task = this.selectCoreEduTrainingTaskById(id);
         SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectOrgById(task.getOrgId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
-        //String fileName = getFileOrgName(sysOrg) + "_" + RegisterBookType.EDUCATION_TRAINING.getText() + "_" + DateUtil.format(new Date(), "yyyyMMddHHmmss") + ".pdf";
-        String fileName = task.getOrgName() + "_" + RegisterBookType.EDUCATION_TRAINING.getText() + "_" + DateUtil.format(new Date(), "yyyyMMddHHmmss") + ".pdf";
+        String fileName = registerBookPdfService.getPdfFileName(RegisterBookType.EDUCATION_TRAINING, sysOrg.getShortName());
         Map<String, Object> data = this.getFtlEdu(task);
         data.put("fileName", fileName);
         data.put("id", id);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/service/impl/CoreOutInRecordServiceImpl.java

@@ -206,8 +206,7 @@ public class CoreOutInRecordServiceImpl extends ServiceImpl<CoreOutInRecordMappe
         final CoreOutInRecordVo record = selectCoreOutInRecordById(id);
         final List<SysOrgVO> orgList = RedisUtils.getCacheList(CacheConstants.ORG_CACHE_LIST_KEY);
         final SysOrgVO sysOrg = orgList.stream().filter(org -> ObjectUtil.equal(record.getOrgId(), org.getId())).findFirst().get();
-        //String fileName = getFileOrgName(sysOrg) + "_" + RegisterBookType.VISIT_RECORD.getText() + "_" + DateUtil.format(new Date(), "yyyyMMddHHmmss") + ".pdf";
-        String fileName =record.getOrgName() + "_" + RegisterBookType.VISIT_RECORD.getText() + "_" + DateUtil.format(new Date(), "yyyyMMddHHmmss") + ".pdf";
+        String fileName = registerBookPdfService.getPdfFileName(RegisterBookType.VISIT_RECORD, record.getOrgName());
         Map<String, Object> data = this.getFtlEdu(record, orgList);
         data.put("fileName", fileName);
         data.put("id", id);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/registerbook/service/ICoreRegisterBookPdfService.java

@@ -8,6 +8,7 @@ import com.xunmei.common.core.domain.registerbook.dto.CoreRegisterBookPdfPageDto
 import com.xunmei.common.core.domain.registerbook.dto.ExportPdfDto;
 import com.xunmei.common.core.domain.registerbook.vo.CoreRegisterBookPdfPageVo;
 import com.xunmei.common.core.domain.registerbook.vo.PdfLocalFileTempVo;
+import com.xunmei.common.core.enums.RegisterBookType;
 import com.xunmei.common.core.web.page.TableDataInfo;
 
 import javax.servlet.http.HttpServletResponse;
@@ -24,6 +25,8 @@ public interface ICoreRegisterBookPdfService extends IService<CoreRegisterBookPd
 
     String getFileOrgName(Long orgId);
 
+    String getPdfFileName(RegisterBookType bookType,String orgName);
+
     TableDataInfo<CoreRegisterBookPdfPageVo> selectPage(CoreRegisterBookPdfPageDto coreRegisterBookPdf);
 
     List<CoreRegisterBookPdfPageVo> queryExportData(CoreRegisterBookPdfExportDto exportDto);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/registerbook/service/impl/CoreRegisterBookPdfServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.CacheConstants;
+import com.xunmei.common.core.constant.Constants;
 import com.xunmei.common.core.constant.ErrorMsgConstants;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.IdName;
@@ -18,6 +19,7 @@ import com.xunmei.common.core.domain.registerbook.dto.CoreRegisterBookPdfPageDto
 import com.xunmei.common.core.domain.registerbook.dto.ExportPdfDto;
 import com.xunmei.common.core.domain.registerbook.vo.CoreRegisterBookPdfPageVo;
 import com.xunmei.common.core.domain.registerbook.vo.PdfLocalFileTempVo;
+import com.xunmei.common.core.enums.RegisterBookType;
 import com.xunmei.common.core.util.BeanHelper;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.redis.utils.RedisUtils;
@@ -203,7 +205,11 @@ public class CoreRegisterBookPdfServiceImpl extends ServiceImpl<CoreRegisterBook
         return RemoteCallHandlerExecutor.executeRemoteCall(() -> {
             return orgService.selectOrgNameByPath(orgId, SecurityConstants.INNER);
         }, ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
+    }
 
+    @Override
+    public String getPdfFileName(RegisterBookType bookType, String orgName) {
+        return orgName + "_" + bookType.getText() + "_" + DateUtil.format(new Date(), Constants.HM_FORMAT) + ".pdf";
     }
 
     @Override
@@ -258,7 +264,7 @@ public class CoreRegisterBookPdfServiceImpl extends ServiceImpl<CoreRegisterBook
             }
             baos.flush();
             response.setContentType("application/octet-stream");
-            localFileName = localFileName.replace(localPathPrefix + File.separator , "");
+            localFileName = localFileName.replace(localPathPrefix + File.separator, "");
             final BoundValueOperations<String, String> ops = redisTemplate.boundValueOps(URLDecoder.decode(localFileName, "UTF-8"));
             final String string = ops.get();
             final PdfLocalFileTempVo object = JSON.parseObject(string, PdfLocalFileTempVo.class);
@@ -288,16 +294,16 @@ public class CoreRegisterBookPdfServiceImpl extends ServiceImpl<CoreRegisterBook
     @Override
     public Integer deleteWithFile(Long id) {
         final CoreRegisterBookPdf record = getById(id);
-        if(ObjectUtil.isNull(record)){
+        if (ObjectUtil.isNull(record)) {
             return 0;
         }
         final String fileUrl = record.getFileUrl();
-        if (ObjectUtil.isNotEmpty(fileUrl)){
+        if (ObjectUtil.isNotEmpty(fileUrl)) {
             String localPathPrefix = fileService.getLocalPathPrefix().getData();
             String staticPathPrefix = fileService.getStaticPathPrefix().getData();
             final String filePath = fileUrl.replace(staticPathPrefix, localPathPrefix);
             final File file = new File(filePath);
-            if (file.exists()){
+            if (file.exists()) {
                 file.delete();
             }
         }

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

@@ -1001,9 +1001,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult buildResumptionPdf(Long orgid) {
         SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectOrgById(orgid, SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
-        String fileOrgName = registerBookPdfService.getFileOrgName(orgid);
-        //String fileName = fileOrgName + "_" + RegisterBookType.SECURITY_PERFORMANCE.getText() + "_" + DateUtil.format(new Date(), "yyyyMMddHHmmss") + ".pdf";
-        String fileName =  sysOrg.getName() + "_" + RegisterBookType.SECURITY_PERFORMANCE.getText() + "_" + DateUtil.format(new Date(), "yyyyMMddHHmmss") + ".pdf";
+        String fileName = registerBookPdfService.getPdfFileName(RegisterBookType.SECURITY_PERFORMANCE,sysOrg.getName());
         Map<String, Object> data = this.getFtlResumption(orgid);
         data.put("fileName", fileName);
         data.put("orgName", sysOrg.getShortName());

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

@@ -1037,8 +1037,7 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
 
         registerBookVo.setCheckDatas(pointCheckDataList);
 
-       // String fileOrgName = registerBookPdfService.getFileOrgName(registerBookVo.getOrgId());
-        String fileName = registerBookVo.getOrgName() + "_" + RegisterBookType.SAFE_CHECK_REPORT.getText() + "_" + DateUtil.format(new Date(), "yyyyMMddHHmmss") + ".pdf";
+        String fileName = registerBookPdfService.getPdfFileName(RegisterBookType.SAFE_CHECK_REPORT,registerBookVo.getOrgName());
         registerBookVo.setDest(fileName);
         return registerBookVo;
     }