diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
index 56a707f..b13ce50 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
@@ -90,7 +90,7 @@
WHERE template_name= #{templateName}
AND template_type= #{coverModuleName}
- AND template_desc like concat('%',#{descn},'%')
+ AND template_desc =#{descn}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
index 56a707f..b13ce50 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
@@ -90,7 +90,7 @@
WHERE template_name= #{templateName}
AND template_type= #{coverModuleName}
- AND template_desc like concat('%',#{descn},'%')
+ AND template_desc =#{descn}
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 187c6f0..a6f2a77 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
@@ -70,7 +70,6 @@
if (saveResponse == null) {
//生成证书失败,删除保存的记录
this.baseMapper.deleteById(request);
- throw new BusinessException(BusinessExceptionEnum.MEASURE_FILE_CREATE_FAILED);
}
}
return ReturnUtil.success(saveResponse);
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
index 56a707f..b13ce50 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
@@ -90,7 +90,7 @@
WHERE template_name= #{templateName}
AND template_type= #{coverModuleName}
- AND template_desc like concat('%',#{descn},'%')
+ AND template_desc =#{descn}
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 187c6f0..a6f2a77 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
@@ -70,7 +70,6 @@
if (saveResponse == null) {
//生成证书失败,删除保存的记录
this.baseMapper.deleteById(request);
- throw new BusinessException(BusinessExceptionEnum.MEASURE_FILE_CREATE_FAILED);
}
}
return ReturnUtil.success(saveResponse);
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 6e217b9..2169025 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
@@ -50,7 +50,7 @@
private final PrintFileRegister printFileRegister;
- private ThreadPoolExecutor threadPool = new ThreadPoolExecutor(4, 10, 100,
+ private static ThreadPoolExecutor threadPool = new ThreadPoolExecutor(4, 10, 100,
TimeUnit.SECONDS, new LinkedBlockingQueue<>(10));
/**
@@ -155,10 +155,12 @@
* 生成更新证书的任务
*/
public void measureCertificateTask(BizBusinessDeviceMeasureApproval request) {
- StandardEquipmentPrint equipmentPrint=getStandardEquipmentPrint(request);
+ StandardEquipmentPrint equipmentPrint = getStandardEquipmentPrint(request);
+ log.info("---111111111");
//生成证书报告的
CompletableFuture> certificateFutureTask = CompletableFuture.supplyAsync(
() -> equipmentPrint.doCreateCertificateFile(request), threadPool);
+ log.info("--------222222222");
//生成原始记录的线程
CompletableFuture originalFutureTask = CompletableFuture.supplyAsync(
() -> equipmentPrint.doCreateOriginalFile(request), threadPool);
@@ -170,6 +172,7 @@
List certificateFileUrl = certificateFutureTask.join();
String originalRecordFileUrl = originalFutureTask.join();
BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class);
+ log.info("----------------获取生成的数据结果");
if (CollectionUtils.isNotEmpty(certificateFileUrl) || StringUtils.isNotEmpty(originalRecordFileUrl)) {
//生成证书文件
if (CollectionUtils.isNotEmpty(certificateFileUrl)) {
@@ -195,17 +198,18 @@
}
/**
- * 选择生成器
+ * 选择生成器
+ *
* @param request
* @return
*/
- private StandardEquipmentPrint getStandardEquipmentPrint(BizBusinessDeviceMeasureApproval request) {
+ private StandardEquipmentPrint getStandardEquipmentPrint(BizBusinessDeviceMeasureApproval request) {
//标准装置判别
if (ObjectUtils.isEmpty(request) || StringUtils.isEmpty(request.getBelongStandardEquipment())) {
throw new BusinessException(BusinessExceptionEnum.MEASURE_STANDARD_IS_NULL);
}
//检定项分类id判别
- if(ObjectUtils.isEmpty(request.getItemCategoryId())){
+ if (ObjectUtils.isEmpty(request.getItemCategoryId())) {
throw new BusinessException(BusinessExceptionEnum.MEASURE_ITEM_ID_IS_NULL);
}
StandardEquipmentPrint standardEquipmentPrint = SpringContextUtil.getBean(request.getBelongStandardEquipment());
@@ -213,5 +217,4 @@
}
-
}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
index 56a707f..b13ce50 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
@@ -90,7 +90,7 @@
WHERE template_name= #{templateName}
AND template_type= #{coverModuleName}
- AND template_desc like concat('%',#{descn},'%')
+ AND template_desc =#{descn}
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 187c6f0..a6f2a77 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
@@ -70,7 +70,6 @@
if (saveResponse == null) {
//生成证书失败,删除保存的记录
this.baseMapper.deleteById(request);
- throw new BusinessException(BusinessExceptionEnum.MEASURE_FILE_CREATE_FAILED);
}
}
return ReturnUtil.success(saveResponse);
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 6e217b9..2169025 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
@@ -50,7 +50,7 @@
private final PrintFileRegister printFileRegister;
- private ThreadPoolExecutor threadPool = new ThreadPoolExecutor(4, 10, 100,
+ private static ThreadPoolExecutor threadPool = new ThreadPoolExecutor(4, 10, 100,
TimeUnit.SECONDS, new LinkedBlockingQueue<>(10));
/**
@@ -155,10 +155,12 @@
* 生成更新证书的任务
*/
public void measureCertificateTask(BizBusinessDeviceMeasureApproval request) {
- StandardEquipmentPrint equipmentPrint=getStandardEquipmentPrint(request);
+ StandardEquipmentPrint equipmentPrint = getStandardEquipmentPrint(request);
+ log.info("---111111111");
//生成证书报告的
CompletableFuture> certificateFutureTask = CompletableFuture.supplyAsync(
() -> equipmentPrint.doCreateCertificateFile(request), threadPool);
+ log.info("--------222222222");
//生成原始记录的线程
CompletableFuture originalFutureTask = CompletableFuture.supplyAsync(
() -> equipmentPrint.doCreateOriginalFile(request), threadPool);
@@ -170,6 +172,7 @@
List certificateFileUrl = certificateFutureTask.join();
String originalRecordFileUrl = originalFutureTask.join();
BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class);
+ log.info("----------------获取生成的数据结果");
if (CollectionUtils.isNotEmpty(certificateFileUrl) || StringUtils.isNotEmpty(originalRecordFileUrl)) {
//生成证书文件
if (CollectionUtils.isNotEmpty(certificateFileUrl)) {
@@ -195,17 +198,18 @@
}
/**
- * 选择生成器
+ * 选择生成器
+ *
* @param request
* @return
*/
- private StandardEquipmentPrint getStandardEquipmentPrint(BizBusinessDeviceMeasureApproval request) {
+ private StandardEquipmentPrint getStandardEquipmentPrint(BizBusinessDeviceMeasureApproval request) {
//标准装置判别
if (ObjectUtils.isEmpty(request) || StringUtils.isEmpty(request.getBelongStandardEquipment())) {
throw new BusinessException(BusinessExceptionEnum.MEASURE_STANDARD_IS_NULL);
}
//检定项分类id判别
- if(ObjectUtils.isEmpty(request.getItemCategoryId())){
+ if (ObjectUtils.isEmpty(request.getItemCategoryId())) {
throw new BusinessException(BusinessExceptionEnum.MEASURE_ITEM_ID_IS_NULL);
}
StandardEquipmentPrint standardEquipmentPrint = SpringContextUtil.getBean(request.getBelongStandardEquipment());
@@ -213,5 +217,4 @@
}
-
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java
index 2dbf766..a7a12ad 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java
@@ -119,11 +119,13 @@
prepareCoverParams(map, measureItemInfo.getLabCode());
//定制化原始记录参数
prepareCustomCoverParams(map, measureItemInfo.getMeasureDataCalibratorList());
+ log.info("--------生成原始记录,获取模板");
//这一块逻辑比较复杂
customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "1", measureItemInfo.getItemCategoryName()));
//与证书模板区分
SnowflakeUtil snowflakeUtil = new SnowflakeUtil();
map.put("id", snowflakeUtil.nextId());
+ log.info("------------生成原始记录前");
//除了选用的模板不一致,模板配置流程是一致的
return printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, customTemplateUrls);
} catch (Exception ex) {
@@ -155,6 +157,7 @@
prepareCoverParams(map, measureItemInfo.getLabCode());
List customTemplateUrls = new ArrayList<>();
BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class);
+ log.info("--------生成证书报告,获取模板");
//这一块逻辑比较复杂
customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", measureItemInfo.getMeasureCategoryName()));
customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", "数字记录表内容"));
@@ -164,6 +167,7 @@
List urlList = new ArrayList<>();
PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
//除了选用的模板不一致,模板配置流程是一致的
+ log.info("------------生成证书报告前");
String wordUrl = printFileRegister.registerPrintFile(MEASURE_DATA, "证书打印", null, map, false, null, customTemplateUrls);
urlList.add(wordUrl);
if (map.containsKey("pdfUrl")) {
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
index 56a707f..b13ce50 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml
@@ -90,7 +90,7 @@
WHERE template_name= #{templateName}
AND template_type= #{coverModuleName}
- AND template_desc like concat('%',#{descn},'%')
+ AND template_desc =#{descn}
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 187c6f0..a6f2a77 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
@@ -70,7 +70,6 @@
if (saveResponse == null) {
//生成证书失败,删除保存的记录
this.baseMapper.deleteById(request);
- throw new BusinessException(BusinessExceptionEnum.MEASURE_FILE_CREATE_FAILED);
}
}
return ReturnUtil.success(saveResponse);
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 6e217b9..2169025 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
@@ -50,7 +50,7 @@
private final PrintFileRegister printFileRegister;
- private ThreadPoolExecutor threadPool = new ThreadPoolExecutor(4, 10, 100,
+ private static ThreadPoolExecutor threadPool = new ThreadPoolExecutor(4, 10, 100,
TimeUnit.SECONDS, new LinkedBlockingQueue<>(10));
/**
@@ -155,10 +155,12 @@
* 生成更新证书的任务
*/
public void measureCertificateTask(BizBusinessDeviceMeasureApproval request) {
- StandardEquipmentPrint equipmentPrint=getStandardEquipmentPrint(request);
+ StandardEquipmentPrint equipmentPrint = getStandardEquipmentPrint(request);
+ log.info("---111111111");
//生成证书报告的
CompletableFuture> certificateFutureTask = CompletableFuture.supplyAsync(
() -> equipmentPrint.doCreateCertificateFile(request), threadPool);
+ log.info("--------222222222");
//生成原始记录的线程
CompletableFuture originalFutureTask = CompletableFuture.supplyAsync(
() -> equipmentPrint.doCreateOriginalFile(request), threadPool);
@@ -170,6 +172,7 @@
List certificateFileUrl = certificateFutureTask.join();
String originalRecordFileUrl = originalFutureTask.join();
BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class);
+ log.info("----------------获取生成的数据结果");
if (CollectionUtils.isNotEmpty(certificateFileUrl) || StringUtils.isNotEmpty(originalRecordFileUrl)) {
//生成证书文件
if (CollectionUtils.isNotEmpty(certificateFileUrl)) {
@@ -195,17 +198,18 @@
}
/**
- * 选择生成器
+ * 选择生成器
+ *
* @param request
* @return
*/
- private StandardEquipmentPrint getStandardEquipmentPrint(BizBusinessDeviceMeasureApproval request) {
+ private StandardEquipmentPrint getStandardEquipmentPrint(BizBusinessDeviceMeasureApproval request) {
//标准装置判别
if (ObjectUtils.isEmpty(request) || StringUtils.isEmpty(request.getBelongStandardEquipment())) {
throw new BusinessException(BusinessExceptionEnum.MEASURE_STANDARD_IS_NULL);
}
//检定项分类id判别
- if(ObjectUtils.isEmpty(request.getItemCategoryId())){
+ if (ObjectUtils.isEmpty(request.getItemCategoryId())) {
throw new BusinessException(BusinessExceptionEnum.MEASURE_ITEM_ID_IS_NULL);
}
StandardEquipmentPrint standardEquipmentPrint = SpringContextUtil.getBean(request.getBelongStandardEquipment());
@@ -213,5 +217,4 @@
}
-
}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java
index 2dbf766..a7a12ad 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java
@@ -119,11 +119,13 @@
prepareCoverParams(map, measureItemInfo.getLabCode());
//定制化原始记录参数
prepareCustomCoverParams(map, measureItemInfo.getMeasureDataCalibratorList());
+ log.info("--------生成原始记录,获取模板");
//这一块逻辑比较复杂
customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "1", measureItemInfo.getItemCategoryName()));
//与证书模板区分
SnowflakeUtil snowflakeUtil = new SnowflakeUtil();
map.put("id", snowflakeUtil.nextId());
+ log.info("------------生成原始记录前");
//除了选用的模板不一致,模板配置流程是一致的
return printFileRegister.registerPrintFile(MEASURE_DATA, "原始记录打印", null, map, true, null, customTemplateUrls);
} catch (Exception ex) {
@@ -155,6 +157,7 @@
prepareCoverParams(map, measureItemInfo.getLabCode());
List customTemplateUrls = new ArrayList<>();
BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class);
+ log.info("--------生成证书报告,获取模板");
//这一块逻辑比较复杂
customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", measureItemInfo.getMeasureCategoryName()));
customTemplateUrls.add(bizBusinessMapper.customTemplateUrl(MEASURE_DATA, "2", "数字记录表内容"));
@@ -164,6 +167,7 @@
List urlList = new ArrayList<>();
PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
//除了选用的模板不一致,模板配置流程是一致的
+ log.info("------------生成证书报告前");
String wordUrl = printFileRegister.registerPrintFile(MEASURE_DATA, "证书打印", null, map, false, null, customTemplateUrls);
urlList.add(wordUrl);
if (map.containsKey("pdfUrl")) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeBuilder.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeBuilder.java
index dd240ae..cc7da9f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeBuilder.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/PressureGaugeBuilder.java
@@ -47,7 +47,7 @@
@Override
public List doCheckCertificateFile(BizEquipmentStandardCheckRecordApproval request) {
for (BizEquipmentInfo checkEquipment : request.getCheckEquipmentList()) {
- checkEquipment.setEquipmentType("测量设备");
+ checkEquipment.setEquipmentType("核查标准");
}
try {
//健壮性判断