登记簿样式文件名称修改

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SafeCheckTaskRegisterBookVo.java

@@ -48,5 +48,7 @@ public class SafeCheckTaskRegisterBookVo {
   private List<CheckDataVo> checkDatas;
   private String dest;
 
+  private String fileName;
+
 
 }

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

@@ -830,7 +830,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         int i = tMonitoringRetrievalPlanMapper.updateById(plan);
         this.updateComplete(isComplete, tMonitoringRetrievalPlan, plan);
         long l1 = System.currentTimeMillis();
-        System.out.print(l1-l);
+        System.out.print(l1 - l);
         return i;
     }
 
@@ -882,6 +882,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

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

@@ -733,7 +733,8 @@ 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 = 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";
         Map<String, Object> data = this.getFtlDrill(task);
         data.put("fileName", fileName);
         data.put("id", id);
@@ -753,7 +754,10 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
             registerBookPdf.setOrgName(task.getOrgName());
             registerBookPdf.setOrgPath(sysOrg.getPath());
             registerBookPdf.setFileUrl(pdfUrl);
-            registerBookPdf.setFileName(StringUtils.substringAfterLast(pdfUrl, File.separator));
+
+           // 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,7 +737,8 @@ 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 = 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";
         Map<String, Object> data = this.getFtlEdu(task);
         data.put("fileName", fileName);
         data.put("id", id);
@@ -760,7 +761,8 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
             registerBookPdf.setOrgName(task.getOrgName());
             registerBookPdf.setOrgPath(sysOrg.getPath());
             registerBookPdf.setFileUrl(pdfUrl);
-            registerBookPdf.setFileName(StringUtils.substringAfterLast(pdfUrl, File.separator));
+            registerBookPdf.setFileName(fileName);
+            //registerBookPdf.setFileName(StringUtils.substringAfterLast(pdfUrl, File.separator));
             registerBookPdfService.saveOrUpdate(registerBookPdf);
         }, threadPoolTaskExecutor);
 

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

@@ -206,7 +206,8 @@ 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 = 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";
         Map<String, Object> data = this.getFtlEdu(record, orgList);
         data.put("fileName", fileName);
         data.put("id", id);
@@ -231,7 +232,8 @@ public class CoreOutInRecordServiceImpl extends ServiceImpl<CoreOutInRecordMappe
             registerBookPdf.setOrgName(record.getOrgName());
             registerBookPdf.setOrgPath(sysOrg.getPath());
             registerBookPdf.setFileUrl(pdfUrl);
-            registerBookPdf.setFileName(StringUtils.substringAfterLast(pdfUrl, File.separator));
+            registerBookPdf.setFileName(fileName);
+            //registerBookPdf.setFileName(StringUtils.substringAfterLast(pdfUrl, File.separator));
             registerBookPdfService.saveOrUpdate(registerBookPdf);
         }, threadPoolTaskExecutor);
 

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

@@ -1002,7 +1002,8 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
     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 = 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";
         Map<String, Object> data = this.getFtlResumption(orgid);
         data.put("fileName", fileName);
         data.put("orgName", sysOrg.getShortName());
@@ -1027,7 +1028,8 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             registerBookPdf.setOrgPath(sysOrg.getPath());
             registerBookPdf.setFileUrl(pdfUrl);
             //registerBookPdf.setFileName(StringUtils.substringAfterLast(pdfUrl, "\\"));
-            registerBookPdf.setFileName(StringUtils.substringAfterLast(pdfUrl, File.separator));
+            registerBookPdf.setFileName(fileName);
+            //registerBookPdf.setFileName(StringUtils.substringAfterLast(pdfUrl, File.separator));
             if (StringUtils.isEmpty(registerBookPdf.getFileName()) || StringUtils.isEmpty(pdfUrl)) {
                 throw new SystemException(ErrorMsgConstants.GENERATE_PDF_ERROR);
             }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/controller/CoreSafecheckPlanController.java

@@ -49,7 +49,7 @@ public class CoreSafecheckPlanController extends BaseController {
     @GetMapping(value = "/distributesingle/{id}/{immediateEffect}")
 //    @RequiresPermissions("core:plan:findById")
     public AjaxResult distributeSingle(@PathVariable Long id, @PathVariable Boolean immediateEffect) throws Exception {
-        int i = coreSafecheckPlanService.distributeSingle(id,immediateEffect);
+        int i = coreSafecheckPlanService.distributeSingle(id, immediateEffect);
 //        CoreSafecheckPlan plan = coreSafecheckPlanService.getById(id);
 //        //撤回后的下发如果是无周期或者勾选立即执行也需要生成任务
 //        if (plan.isBuildTaskNow() || plan.getPlanCycle() == 6) {
@@ -101,7 +101,7 @@ public class CoreSafecheckPlanController extends BaseController {
     @PostMapping
     public AjaxResult add(@RequestBody CoreSafecheckPlan coreSafecheckPlan) throws Exception {
 //        Integer hasEdit = coreSafecheckPlan.getTaskHasCompleted();
-       Long planId = coreSafecheckPlan.getId();
+        Long planId = coreSafecheckPlan.getId();
 //        //处理无周期
 //        if (coreSafecheckPlan.getPlanCycle() == 6) {
 //            coreSafecheckPlan.setBuildTaskNow(true);
@@ -111,7 +111,7 @@ public class CoreSafecheckPlanController extends BaseController {
         if (planId != null) {
 //            coreSafecheckPlan = coreSafecheckPlanService.getById(planId);
 //            coreSafecheckPlan.setHasEdit(hasEdit);
-            coreSafecheckPlanService.childrenPlan(planId,returnId);
+            coreSafecheckPlanService.childrenPlan(planId, returnId);
         }
 //        //判断是否是编辑并且计划所属任务不存在已完成或者逾期,需要删除所有任务重新生成
 //        boolean isEditAll = hasEdit == null && planId != null ;
@@ -149,7 +149,7 @@ public class CoreSafecheckPlanController extends BaseController {
     @RequiresPermissions("core:checkplan:distribute")
     public AjaxResult distribute(@RequestBody DistributeDto dto, @PathVariable Boolean immediateEffect) {
         try {
-            coreSafecheckPlanService.distributeToOrg(dto,immediateEffect);
+            coreSafecheckPlanService.distributeToOrg(dto, immediateEffect);
             //下发完成生成任务
 //            CoreSafecheckPlan plan = coreSafecheckPlanService.getById(dto.getId());
 //            //如果选择了立即生效或者无周期
@@ -181,9 +181,9 @@ public class CoreSafecheckPlanController extends BaseController {
     }
 
     @ApiOperation(value = "根据任务id生成pdf")
-    @GetMapping(value = "/buildPdf")
-    public AjaxResult buildPdf() {
-        coreSafecheckPlanService.buildPdf(1722881151897399300L);
+    @GetMapping(value = "/buildPdf/{id}")
+    public AjaxResult buildPdf(@PathVariable("id") Long id) {
+        coreSafecheckPlanService.buildPdf(id);
         return AjaxResult.success("开始更新安全检查状态!");
     }
 }

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

@@ -939,12 +939,13 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
         registerBookPdf.setOrgPath(org.getPath());
         registerBookPdf.setFileUrl(url);
         //registerBookPdf.setFileName(StringUtils.substringAfterLast(url, "\\"));
-        registerBookPdf.setFileName(StringUtils.substringAfterLast(url, File.separator));
+        //registerBookPdf.setFileName(StringUtils.substringAfterLast(url, File.separator));
+        registerBookPdf.setFileName(registerBookVo.getDest());
         registerBookPdf.setOrgName(registerBookVo.getOrgName());
         if (StringUtils.isEmpty(url) || StringUtils.isEmpty(registerBookPdf.getFileName())) {
             throw new SystemException(ErrorMsgConstants.GENERATE_PDF_ERROR);
         }
-        registerBookPdfService.save(registerBookPdf);
+        registerBookPdfService.saveOrUpdate(registerBookPdf);
         CoreSafetyTask tem = new CoreSafetyTask();
         tem.setId(appSafetyCheckTask.getId());
         tem.setPdfUrl(url);
@@ -973,11 +974,6 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
     }
 
     private String buildSafeCheckPdfData(SafeCheckTaskRegisterBookVo data) {
-
-        String fileOrgName = registerBookPdfService.getFileOrgName(data.getOrgId());
-        String fileName = fileOrgName + "_" + RegisterBookType.SAFE_CHECK_REPORT.getText() + "_" + DateUtil.format(new Date(), "yyyyMMddHHmmss") + ".pdf";
-
-        data.setDest(fileName);
         //新方式生成pdf
         try {
             //返回相对地址
@@ -1040,6 +1036,10 @@ 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";
+        registerBookVo.setDest(fileName);
         return registerBookVo;
     }