diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java index 7c9c4e6..6cd9f06 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java @@ -58,8 +58,8 @@ @ApiOperation("审批生成证书和原始记录") @PostMapping("/generate/certificate") @ResponseBody - public void againCreateCertificate(@RequestBody @Valid IdDTO idDTO) { - measureApprovalService.againCreateCertificate(idDTO.getId()); + public ReturnDTO againCreateCertificate(@RequestBody @Valid IdDTO idDTO) { + return measureApprovalService.againCreateCertificate(idDTO.getId()); } @ApiOperation("详情") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java index 7c9c4e6..6cd9f06 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java @@ -58,8 +58,8 @@ @ApiOperation("审批生成证书和原始记录") @PostMapping("/generate/certificate") @ResponseBody - public void againCreateCertificate(@RequestBody @Valid IdDTO idDTO) { - measureApprovalService.againCreateCertificate(idDTO.getId()); + public ReturnDTO againCreateCertificate(@RequestBody @Valid IdDTO idDTO) { + return measureApprovalService.againCreateCertificate(idDTO.getId()); } @ApiOperation("详情") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java index 6bf1963..37a8bcb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java @@ -53,8 +53,8 @@ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑,最后提供查询接口显示在核查记录管理新建页面 @ApiOperation("审批生成证书和原始记录") @PostMapping("/generate/certificate") - public void againCreateFile(@RequestBody @Valid IdDTO idDTO) { - checkRecordApprovalService.againCreateFile(idDTO.getId()); + public ReturnDTO againCreateFile(@RequestBody @Valid IdDTO idDTO) { + return checkRecordApprovalService.againCreateFile(idDTO.getId()); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java index 7c9c4e6..6cd9f06 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java @@ -58,8 +58,8 @@ @ApiOperation("审批生成证书和原始记录") @PostMapping("/generate/certificate") @ResponseBody - public void againCreateCertificate(@RequestBody @Valid IdDTO idDTO) { - measureApprovalService.againCreateCertificate(idDTO.getId()); + public ReturnDTO againCreateCertificate(@RequestBody @Valid IdDTO idDTO) { + return measureApprovalService.againCreateCertificate(idDTO.getId()); } @ApiOperation("详情") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java index 6bf1963..37a8bcb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java @@ -53,8 +53,8 @@ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑,最后提供查询接口显示在核查记录管理新建页面 @ApiOperation("审批生成证书和原始记录") @PostMapping("/generate/certificate") - public void againCreateFile(@RequestBody @Valid IdDTO idDTO) { - checkRecordApprovalService.againCreateFile(idDTO.getId()); + public ReturnDTO againCreateFile(@RequestBody @Valid IdDTO idDTO) { + return checkRecordApprovalService.againCreateFile(idDTO.getId()); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index 3f29cc1..421b494 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -80,10 +80,11 @@ } @Override - public void againCreateCertificate(Long id) { + public ReturnDTO againCreateCertificate(Long id) { BizBusinessDeviceMeasureApproval deviceMeasureApproval = this.baseMapper.selectById(id); - genericEqptDataProvider.excuteMeasureTaskAsyn(deviceMeasureApproval,deviceMeasureApproval.getId(),deviceMeasureApproval.getCertificateWordFile(),deviceMeasureApproval.getOriginalRecordWordFile()); + genericEqptDataProvider.excuteMeasureTaskAsyn(deviceMeasureApproval, deviceMeasureApproval.getId(), deviceMeasureApproval.getCertificateWordFile(), deviceMeasureApproval.getOriginalRecordWordFile()); saveCertificatePrintInfo(deviceMeasureApproval); + return ReturnUtil.success(deviceMeasureApproval); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java index 7c9c4e6..6cd9f06 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java @@ -58,8 +58,8 @@ @ApiOperation("审批生成证书和原始记录") @PostMapping("/generate/certificate") @ResponseBody - public void againCreateCertificate(@RequestBody @Valid IdDTO idDTO) { - measureApprovalService.againCreateCertificate(idDTO.getId()); + public ReturnDTO againCreateCertificate(@RequestBody @Valid IdDTO idDTO) { + return measureApprovalService.againCreateCertificate(idDTO.getId()); } @ApiOperation("详情") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java index 6bf1963..37a8bcb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java @@ -53,8 +53,8 @@ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑,最后提供查询接口显示在核查记录管理新建页面 @ApiOperation("审批生成证书和原始记录") @PostMapping("/generate/certificate") - public void againCreateFile(@RequestBody @Valid IdDTO idDTO) { - checkRecordApprovalService.againCreateFile(idDTO.getId()); + public ReturnDTO againCreateFile(@RequestBody @Valid IdDTO idDTO) { + return checkRecordApprovalService.againCreateFile(idDTO.getId()); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index 3f29cc1..421b494 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -80,10 +80,11 @@ } @Override - public void againCreateCertificate(Long id) { + public ReturnDTO againCreateCertificate(Long id) { BizBusinessDeviceMeasureApproval deviceMeasureApproval = this.baseMapper.selectById(id); - genericEqptDataProvider.excuteMeasureTaskAsyn(deviceMeasureApproval,deviceMeasureApproval.getId(),deviceMeasureApproval.getCertificateWordFile(),deviceMeasureApproval.getOriginalRecordWordFile()); + genericEqptDataProvider.excuteMeasureTaskAsyn(deviceMeasureApproval, deviceMeasureApproval.getId(), deviceMeasureApproval.getCertificateWordFile(), deviceMeasureApproval.getOriginalRecordWordFile()); saveCertificatePrintInfo(deviceMeasureApproval); + return ReturnUtil.success(deviceMeasureApproval); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index bcd29fa..a8f3c54 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -188,11 +188,12 @@ * @param id * @param oldCertificateFile */ - public void excuteCheckTaskAsyn(Map map, Long id, String oldCertificateFile) { + public BizEquipmentStandardCheckRecordApproval excuteCheckTaskAsyn(Map map, Long id, String oldCertificateFile) { List customTemplateUrls = new ArrayList<>(); customTemplateUrls.add(oldCertificateFile); ThreadPoolExecutor threadPool = new ThreadPoolExecutor(1, 2, 100, TimeUnit.SECONDS, new LinkedBlockingQueue<>(2)); + BizEquipmentStandardCheckRecordApproval checkRecordApproval = new BizEquipmentStandardCheckRecordApproval(); //生成证书报告的 CompletableFuture certificateFutureTask = CompletableFuture.supplyAsync( () -> printFileRegister.registerPrintFile(CHECK_DATA_APPROVAL, "数据打印", null, map, true, null, customTemplateUrls), threadPool); @@ -201,7 +202,7 @@ String certificateFileUrl = certificateFutureTask.join(); BizEquipmentStandardCheckRecordApprovalMapper bizRecordApprovalMapper = SpringContextUtil.getBean(BizEquipmentStandardCheckRecordApprovalMapper.class); if (StringUtils.isNotEmpty(certificateFileUrl)) { - BizEquipmentStandardCheckRecordApproval checkRecordApproval = new BizEquipmentStandardCheckRecordApproval(); + if (!map.containsKey("id") || ObjectUtils.isEmpty(map.get("id"))) { return; } @@ -216,6 +217,7 @@ } } ); + return checkRecordApproval; } /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java index 7c9c4e6..6cd9f06 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java @@ -58,8 +58,8 @@ @ApiOperation("审批生成证书和原始记录") @PostMapping("/generate/certificate") @ResponseBody - public void againCreateCertificate(@RequestBody @Valid IdDTO idDTO) { - measureApprovalService.againCreateCertificate(idDTO.getId()); + public ReturnDTO againCreateCertificate(@RequestBody @Valid IdDTO idDTO) { + return measureApprovalService.againCreateCertificate(idDTO.getId()); } @ApiOperation("详情") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java index 6bf1963..37a8bcb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java @@ -53,8 +53,8 @@ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑,最后提供查询接口显示在核查记录管理新建页面 @ApiOperation("审批生成证书和原始记录") @PostMapping("/generate/certificate") - public void againCreateFile(@RequestBody @Valid IdDTO idDTO) { - checkRecordApprovalService.againCreateFile(idDTO.getId()); + public ReturnDTO againCreateFile(@RequestBody @Valid IdDTO idDTO) { + return checkRecordApprovalService.againCreateFile(idDTO.getId()); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index 3f29cc1..421b494 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -80,10 +80,11 @@ } @Override - public void againCreateCertificate(Long id) { + public ReturnDTO againCreateCertificate(Long id) { BizBusinessDeviceMeasureApproval deviceMeasureApproval = this.baseMapper.selectById(id); - genericEqptDataProvider.excuteMeasureTaskAsyn(deviceMeasureApproval,deviceMeasureApproval.getId(),deviceMeasureApproval.getCertificateWordFile(),deviceMeasureApproval.getOriginalRecordWordFile()); + genericEqptDataProvider.excuteMeasureTaskAsyn(deviceMeasureApproval, deviceMeasureApproval.getId(), deviceMeasureApproval.getCertificateWordFile(), deviceMeasureApproval.getOriginalRecordWordFile()); saveCertificatePrintInfo(deviceMeasureApproval); + return ReturnUtil.success(deviceMeasureApproval); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index bcd29fa..a8f3c54 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -188,11 +188,12 @@ * @param id * @param oldCertificateFile */ - public void excuteCheckTaskAsyn(Map map, Long id, String oldCertificateFile) { + public BizEquipmentStandardCheckRecordApproval excuteCheckTaskAsyn(Map map, Long id, String oldCertificateFile) { List customTemplateUrls = new ArrayList<>(); customTemplateUrls.add(oldCertificateFile); ThreadPoolExecutor threadPool = new ThreadPoolExecutor(1, 2, 100, TimeUnit.SECONDS, new LinkedBlockingQueue<>(2)); + BizEquipmentStandardCheckRecordApproval checkRecordApproval = new BizEquipmentStandardCheckRecordApproval(); //生成证书报告的 CompletableFuture certificateFutureTask = CompletableFuture.supplyAsync( () -> printFileRegister.registerPrintFile(CHECK_DATA_APPROVAL, "数据打印", null, map, true, null, customTemplateUrls), threadPool); @@ -201,7 +202,7 @@ String certificateFileUrl = certificateFutureTask.join(); BizEquipmentStandardCheckRecordApprovalMapper bizRecordApprovalMapper = SpringContextUtil.getBean(BizEquipmentStandardCheckRecordApprovalMapper.class); if (StringUtils.isNotEmpty(certificateFileUrl)) { - BizEquipmentStandardCheckRecordApproval checkRecordApproval = new BizEquipmentStandardCheckRecordApproval(); + if (!map.containsKey("id") || ObjectUtils.isEmpty(map.get("id"))) { return; } @@ -216,6 +217,7 @@ } } ); + return checkRecordApproval; } /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java index 889a4e6..871dd00 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java @@ -51,6 +51,21 @@ log.warn("组织接口不能传入为空,打印文档生成文档填充组织失败..."); return; } + //选择方框 + switch ((String) map.get("measureCategoryName")) { + case TEST_REPORT: + map.put("title", "测试结果"); + break; + case CALIBRATE_REPORT: ; + map.put("title", "校准结果"); + break; + case MEASURE_REPORT: + map.put("title", "检定结果"); + break; + default: + map.put("title", "校验结果"); + return; + } //西昌海口基本信息录入 if ("x".equals(labCode)) { map.put("s", XICHANG); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java index 7c9c4e6..6cd9f06 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java @@ -58,8 +58,8 @@ @ApiOperation("审批生成证书和原始记录") @PostMapping("/generate/certificate") @ResponseBody - public void againCreateCertificate(@RequestBody @Valid IdDTO idDTO) { - measureApprovalService.againCreateCertificate(idDTO.getId()); + public ReturnDTO againCreateCertificate(@RequestBody @Valid IdDTO idDTO) { + return measureApprovalService.againCreateCertificate(idDTO.getId()); } @ApiOperation("详情") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java index 6bf1963..37a8bcb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java @@ -53,8 +53,8 @@ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑,最后提供查询接口显示在核查记录管理新建页面 @ApiOperation("审批生成证书和原始记录") @PostMapping("/generate/certificate") - public void againCreateFile(@RequestBody @Valid IdDTO idDTO) { - checkRecordApprovalService.againCreateFile(idDTO.getId()); + public ReturnDTO againCreateFile(@RequestBody @Valid IdDTO idDTO) { + return checkRecordApprovalService.againCreateFile(idDTO.getId()); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index 3f29cc1..421b494 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -80,10 +80,11 @@ } @Override - public void againCreateCertificate(Long id) { + public ReturnDTO againCreateCertificate(Long id) { BizBusinessDeviceMeasureApproval deviceMeasureApproval = this.baseMapper.selectById(id); - genericEqptDataProvider.excuteMeasureTaskAsyn(deviceMeasureApproval,deviceMeasureApproval.getId(),deviceMeasureApproval.getCertificateWordFile(),deviceMeasureApproval.getOriginalRecordWordFile()); + genericEqptDataProvider.excuteMeasureTaskAsyn(deviceMeasureApproval, deviceMeasureApproval.getId(), deviceMeasureApproval.getCertificateWordFile(), deviceMeasureApproval.getOriginalRecordWordFile()); saveCertificatePrintInfo(deviceMeasureApproval); + return ReturnUtil.success(deviceMeasureApproval); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index bcd29fa..a8f3c54 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -188,11 +188,12 @@ * @param id * @param oldCertificateFile */ - public void excuteCheckTaskAsyn(Map map, Long id, String oldCertificateFile) { + public BizEquipmentStandardCheckRecordApproval excuteCheckTaskAsyn(Map map, Long id, String oldCertificateFile) { List customTemplateUrls = new ArrayList<>(); customTemplateUrls.add(oldCertificateFile); ThreadPoolExecutor threadPool = new ThreadPoolExecutor(1, 2, 100, TimeUnit.SECONDS, new LinkedBlockingQueue<>(2)); + BizEquipmentStandardCheckRecordApproval checkRecordApproval = new BizEquipmentStandardCheckRecordApproval(); //生成证书报告的 CompletableFuture certificateFutureTask = CompletableFuture.supplyAsync( () -> printFileRegister.registerPrintFile(CHECK_DATA_APPROVAL, "数据打印", null, map, true, null, customTemplateUrls), threadPool); @@ -201,7 +202,7 @@ String certificateFileUrl = certificateFutureTask.join(); BizEquipmentStandardCheckRecordApprovalMapper bizRecordApprovalMapper = SpringContextUtil.getBean(BizEquipmentStandardCheckRecordApprovalMapper.class); if (StringUtils.isNotEmpty(certificateFileUrl)) { - BizEquipmentStandardCheckRecordApproval checkRecordApproval = new BizEquipmentStandardCheckRecordApproval(); + if (!map.containsKey("id") || ObjectUtils.isEmpty(map.get("id"))) { return; } @@ -216,6 +217,7 @@ } } ); + return checkRecordApproval; } /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java index 889a4e6..871dd00 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java @@ -51,6 +51,21 @@ log.warn("组织接口不能传入为空,打印文档生成文档填充组织失败..."); return; } + //选择方框 + switch ((String) map.get("measureCategoryName")) { + case TEST_REPORT: + map.put("title", "测试结果"); + break; + case CALIBRATE_REPORT: ; + map.put("title", "校准结果"); + break; + case MEASURE_REPORT: + map.put("title", "检定结果"); + break; + default: + map.put("title", "校验结果"); + return; + } //西昌海口基本信息录入 if ("x".equals(labCode)) { map.put("s", XICHANG); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 8e2e079..cad65e7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -60,10 +60,11 @@ } @Override - public void againCreateFile(Long id) { + public ReturnDTO againCreateFile(Long id) { BizEquipmentStandardCheckRecordApproval checkApproval = this.baseMapper.selectById(id); Map map = BeanUtil.beanToMap(checkApproval); - genericEqptDataProvider.excuteCheckTaskAsyn(map, id, checkApproval.getCheckRecordWordFile()); + BizEquipmentStandardCheckRecordApproval recordApproval=genericEqptDataProvider.excuteCheckTaskAsyn(map, id, checkApproval.getCheckRecordWordFile()); + return ReturnUtil.success(recordApproval); } @Override diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java index 7c9c4e6..6cd9f06 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java @@ -58,8 +58,8 @@ @ApiOperation("审批生成证书和原始记录") @PostMapping("/generate/certificate") @ResponseBody - public void againCreateCertificate(@RequestBody @Valid IdDTO idDTO) { - measureApprovalService.againCreateCertificate(idDTO.getId()); + public ReturnDTO againCreateCertificate(@RequestBody @Valid IdDTO idDTO) { + return measureApprovalService.againCreateCertificate(idDTO.getId()); } @ApiOperation("详情") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java index 6bf1963..37a8bcb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java @@ -53,8 +53,8 @@ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑,最后提供查询接口显示在核查记录管理新建页面 @ApiOperation("审批生成证书和原始记录") @PostMapping("/generate/certificate") - public void againCreateFile(@RequestBody @Valid IdDTO idDTO) { - checkRecordApprovalService.againCreateFile(idDTO.getId()); + public ReturnDTO againCreateFile(@RequestBody @Valid IdDTO idDTO) { + return checkRecordApprovalService.againCreateFile(idDTO.getId()); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index 3f29cc1..421b494 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -80,10 +80,11 @@ } @Override - public void againCreateCertificate(Long id) { + public ReturnDTO againCreateCertificate(Long id) { BizBusinessDeviceMeasureApproval deviceMeasureApproval = this.baseMapper.selectById(id); - genericEqptDataProvider.excuteMeasureTaskAsyn(deviceMeasureApproval,deviceMeasureApproval.getId(),deviceMeasureApproval.getCertificateWordFile(),deviceMeasureApproval.getOriginalRecordWordFile()); + genericEqptDataProvider.excuteMeasureTaskAsyn(deviceMeasureApproval, deviceMeasureApproval.getId(), deviceMeasureApproval.getCertificateWordFile(), deviceMeasureApproval.getOriginalRecordWordFile()); saveCertificatePrintInfo(deviceMeasureApproval); + return ReturnUtil.success(deviceMeasureApproval); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index bcd29fa..a8f3c54 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -188,11 +188,12 @@ * @param id * @param oldCertificateFile */ - public void excuteCheckTaskAsyn(Map map, Long id, String oldCertificateFile) { + public BizEquipmentStandardCheckRecordApproval excuteCheckTaskAsyn(Map map, Long id, String oldCertificateFile) { List customTemplateUrls = new ArrayList<>(); customTemplateUrls.add(oldCertificateFile); ThreadPoolExecutor threadPool = new ThreadPoolExecutor(1, 2, 100, TimeUnit.SECONDS, new LinkedBlockingQueue<>(2)); + BizEquipmentStandardCheckRecordApproval checkRecordApproval = new BizEquipmentStandardCheckRecordApproval(); //生成证书报告的 CompletableFuture certificateFutureTask = CompletableFuture.supplyAsync( () -> printFileRegister.registerPrintFile(CHECK_DATA_APPROVAL, "数据打印", null, map, true, null, customTemplateUrls), threadPool); @@ -201,7 +202,7 @@ String certificateFileUrl = certificateFutureTask.join(); BizEquipmentStandardCheckRecordApprovalMapper bizRecordApprovalMapper = SpringContextUtil.getBean(BizEquipmentStandardCheckRecordApprovalMapper.class); if (StringUtils.isNotEmpty(certificateFileUrl)) { - BizEquipmentStandardCheckRecordApproval checkRecordApproval = new BizEquipmentStandardCheckRecordApproval(); + if (!map.containsKey("id") || ObjectUtils.isEmpty(map.get("id"))) { return; } @@ -216,6 +217,7 @@ } } ); + return checkRecordApproval; } /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java index 889a4e6..871dd00 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java @@ -51,6 +51,21 @@ log.warn("组织接口不能传入为空,打印文档生成文档填充组织失败..."); return; } + //选择方框 + switch ((String) map.get("measureCategoryName")) { + case TEST_REPORT: + map.put("title", "测试结果"); + break; + case CALIBRATE_REPORT: ; + map.put("title", "校准结果"); + break; + case MEASURE_REPORT: + map.put("title", "检定结果"); + break; + default: + map.put("title", "校验结果"); + return; + } //西昌海口基本信息录入 if ("x".equals(labCode)) { map.put("s", XICHANG); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 8e2e079..cad65e7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -60,10 +60,11 @@ } @Override - public void againCreateFile(Long id) { + public ReturnDTO againCreateFile(Long id) { BizEquipmentStandardCheckRecordApproval checkApproval = this.baseMapper.selectById(id); Map map = BeanUtil.beanToMap(checkApproval); - genericEqptDataProvider.excuteCheckTaskAsyn(map, id, checkApproval.getCheckRecordWordFile()); + BizEquipmentStandardCheckRecordApproval recordApproval=genericEqptDataProvider.excuteCheckTaskAsyn(map, id, checkApproval.getCheckRecordWordFile()); + return ReturnUtil.success(recordApproval); } @Override diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureApprovalService.java index 6b28ce4..2cb08f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureApprovalService.java @@ -26,7 +26,7 @@ ReturnDTO addMeasureApproval(BizBusinessDeviceMeasureApproval measureApproval); - void againCreateCertificate(Long id); + ReturnDTO againCreateCertificate(Long id); ReturnDTO detail(Long id) throws Exception; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java index 7c9c4e6..6cd9f06 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessDeviceMeasureApprovalController.java @@ -58,8 +58,8 @@ @ApiOperation("审批生成证书和原始记录") @PostMapping("/generate/certificate") @ResponseBody - public void againCreateCertificate(@RequestBody @Valid IdDTO idDTO) { - measureApprovalService.againCreateCertificate(idDTO.getId()); + public ReturnDTO againCreateCertificate(@RequestBody @Valid IdDTO idDTO) { + return measureApprovalService.againCreateCertificate(idDTO.getId()); } @ApiOperation("详情") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java index 6bf1963..37a8bcb 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardCheckRecordApprovalController.java @@ -53,8 +53,8 @@ // 即在保存草稿箱接口中保存成功后实现填充模板逻辑,最后提供查询接口显示在核查记录管理新建页面 @ApiOperation("审批生成证书和原始记录") @PostMapping("/generate/certificate") - public void againCreateFile(@RequestBody @Valid IdDTO idDTO) { - checkRecordApprovalService.againCreateFile(idDTO.getId()); + public ReturnDTO againCreateFile(@RequestBody @Valid IdDTO idDTO) { + return checkRecordApprovalService.againCreateFile(idDTO.getId()); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index 3f29cc1..421b494 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -80,10 +80,11 @@ } @Override - public void againCreateCertificate(Long id) { + public ReturnDTO againCreateCertificate(Long id) { BizBusinessDeviceMeasureApproval deviceMeasureApproval = this.baseMapper.selectById(id); - genericEqptDataProvider.excuteMeasureTaskAsyn(deviceMeasureApproval,deviceMeasureApproval.getId(),deviceMeasureApproval.getCertificateWordFile(),deviceMeasureApproval.getOriginalRecordWordFile()); + genericEqptDataProvider.excuteMeasureTaskAsyn(deviceMeasureApproval, deviceMeasureApproval.getId(), deviceMeasureApproval.getCertificateWordFile(), deviceMeasureApproval.getOriginalRecordWordFile()); saveCertificatePrintInfo(deviceMeasureApproval); + return ReturnUtil.success(deviceMeasureApproval); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java index bcd29fa..a8f3c54 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/GenericEqptDataProvider.java @@ -188,11 +188,12 @@ * @param id * @param oldCertificateFile */ - public void excuteCheckTaskAsyn(Map map, Long id, String oldCertificateFile) { + public BizEquipmentStandardCheckRecordApproval excuteCheckTaskAsyn(Map map, Long id, String oldCertificateFile) { List customTemplateUrls = new ArrayList<>(); customTemplateUrls.add(oldCertificateFile); ThreadPoolExecutor threadPool = new ThreadPoolExecutor(1, 2, 100, TimeUnit.SECONDS, new LinkedBlockingQueue<>(2)); + BizEquipmentStandardCheckRecordApproval checkRecordApproval = new BizEquipmentStandardCheckRecordApproval(); //生成证书报告的 CompletableFuture certificateFutureTask = CompletableFuture.supplyAsync( () -> printFileRegister.registerPrintFile(CHECK_DATA_APPROVAL, "数据打印", null, map, true, null, customTemplateUrls), threadPool); @@ -201,7 +202,7 @@ String certificateFileUrl = certificateFutureTask.join(); BizEquipmentStandardCheckRecordApprovalMapper bizRecordApprovalMapper = SpringContextUtil.getBean(BizEquipmentStandardCheckRecordApprovalMapper.class); if (StringUtils.isNotEmpty(certificateFileUrl)) { - BizEquipmentStandardCheckRecordApproval checkRecordApproval = new BizEquipmentStandardCheckRecordApproval(); + if (!map.containsKey("id") || ObjectUtils.isEmpty(map.get("id"))) { return; } @@ -216,6 +217,7 @@ } } ); + return checkRecordApproval; } /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java index 889a4e6..871dd00 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java @@ -51,6 +51,21 @@ log.warn("组织接口不能传入为空,打印文档生成文档填充组织失败..."); return; } + //选择方框 + switch ((String) map.get("measureCategoryName")) { + case TEST_REPORT: + map.put("title", "测试结果"); + break; + case CALIBRATE_REPORT: ; + map.put("title", "校准结果"); + break; + case MEASURE_REPORT: + map.put("title", "检定结果"); + break; + default: + map.put("title", "校验结果"); + return; + } //西昌海口基本信息录入 if ("x".equals(labCode)) { map.put("s", XICHANG); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java index 8e2e079..cad65e7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStandardCheckRecordApprovalServiceImpl.java @@ -60,10 +60,11 @@ } @Override - public void againCreateFile(Long id) { + public ReturnDTO againCreateFile(Long id) { BizEquipmentStandardCheckRecordApproval checkApproval = this.baseMapper.selectById(id); Map map = BeanUtil.beanToMap(checkApproval); - genericEqptDataProvider.excuteCheckTaskAsyn(map, id, checkApproval.getCheckRecordWordFile()); + BizEquipmentStandardCheckRecordApproval recordApproval=genericEqptDataProvider.excuteCheckTaskAsyn(map, id, checkApproval.getCheckRecordWordFile()); + return ReturnUtil.success(recordApproval); } @Override diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureApprovalService.java index 6b28ce4..2cb08f2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessDeviceMeasureApprovalService.java @@ -26,7 +26,7 @@ ReturnDTO addMeasureApproval(BizBusinessDeviceMeasureApproval measureApproval); - void againCreateCertificate(Long id); + ReturnDTO againCreateCertificate(Long id); ReturnDTO detail(Long id) throws Exception; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckRecordApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckRecordApprovalService.java index 1763363..607dba7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckRecordApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentStandardCheckRecordApprovalService.java @@ -18,7 +18,7 @@ ReturnDTO addCheckApproval(BizEquipmentStandardCheckRecordApproval checkRecordApproval); - void againCreateFile(Long id); + ReturnDTO againCreateFile(Long id); ReturnDTO detail(Long id); }