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 8f057d9..7c9c4e6 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 @@ -56,7 +56,7 @@ * 审批之后再次生成证书和原始记录(为了生成签名和公章等,进行再次的图片的合成) */ @ApiOperation("审批生成证书和原始记录") - @GetMapping("/generate/certificate") + @PostMapping("/generate/certificate") @ResponseBody public void againCreateCertificate(@RequestBody @Valid IdDTO idDTO) { measureApprovalService.againCreateCertificate(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 8f057d9..7c9c4e6 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 @@ -56,7 +56,7 @@ * 审批之后再次生成证书和原始记录(为了生成签名和公章等,进行再次的图片的合成) */ @ApiOperation("审批生成证书和原始记录") - @GetMapping("/generate/certificate") + @PostMapping("/generate/certificate") @ResponseBody public void againCreateCertificate(@RequestBody @Valid IdDTO idDTO) { measureApprovalService.againCreateCertificate(idDTO.getId()); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleParamsEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleParamsEnum.java index 5489ae5..a3060ad 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleParamsEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleParamsEnum.java @@ -2,6 +2,7 @@ public interface PrintFileModuleParamsEnum { + //0.02活塞压力填充参数 String INDICATED_VALUE_ONE = "valueOne"; String INDICATED_VALUE_TWO = "valueTwo"; @@ -23,4 +24,32 @@ String UNIT_I = "unitI"; String UNIT_V = "unitV"; + + //多功能校准源 + String TEST_VALUE_ONE = "testValueOne"; + + String TEST_VALUE_TWO = "testValueTwo"; + + String TEST_VALUE_THREE = "testValueThree"; + + String TEST_VALUE_FOUR = "testValueFour"; + + String TEST_VALUE_FIVE = "testValueFive"; + + String TEST_VALUE_SIX = "testValueSix"; + + String STANDARD_DEVIATION = "standardDeviation"; + + String RELATIVE_REPEATABILITY = "relativeRepeatability"; + + String PARAMS = "params"; + + String CHECK_POINT = "checkPoint"; + + String UNIT = "unit"; + + String UREL = "urel"; + + String LESSTHAN = "lessThan"; + } 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 8f057d9..7c9c4e6 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 @@ -56,7 +56,7 @@ * 审批之后再次生成证书和原始记录(为了生成签名和公章等,进行再次的图片的合成) */ @ApiOperation("审批生成证书和原始记录") - @GetMapping("/generate/certificate") + @PostMapping("/generate/certificate") @ResponseBody public void againCreateCertificate(@RequestBody @Valid IdDTO idDTO) { measureApprovalService.againCreateCertificate(idDTO.getId()); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleParamsEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleParamsEnum.java index 5489ae5..a3060ad 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleParamsEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleParamsEnum.java @@ -2,6 +2,7 @@ public interface PrintFileModuleParamsEnum { + //0.02活塞压力填充参数 String INDICATED_VALUE_ONE = "valueOne"; String INDICATED_VALUE_TWO = "valueTwo"; @@ -23,4 +24,32 @@ String UNIT_I = "unitI"; String UNIT_V = "unitV"; + + //多功能校准源 + String TEST_VALUE_ONE = "testValueOne"; + + String TEST_VALUE_TWO = "testValueTwo"; + + String TEST_VALUE_THREE = "testValueThree"; + + String TEST_VALUE_FOUR = "testValueFour"; + + String TEST_VALUE_FIVE = "testValueFive"; + + String TEST_VALUE_SIX = "testValueSix"; + + String STANDARD_DEVIATION = "standardDeviation"; + + String RELATIVE_REPEATABILITY = "relativeRepeatability"; + + String PARAMS = "params"; + + String CHECK_POINT = "checkPoint"; + + String UNIT = "unit"; + + String UREL = "urel"; + + String LESSTHAN = "lessThan"; + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureApprovalMapper.java index 81d229a..e547139 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureApprovalMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureApprovalMapper.java @@ -36,7 +36,7 @@ String customTemplateByCategory(@Param("templateType") String templateType, @Param("itemCategoryId") Long itemCategoryId); - String getMeasureAddress(@Param("addressId")String addressId); + String getMeasureAddress(@Param("addressId") String addressId); @Select("SELECT count(id) from biz_business_device_measure_approval where approval_status = 4 and sample_id = #{sampleId} and order_id=#{orderId}") Long selectSampleCertifications(@Param("sampleId") Long sampleId, @Param("orderId") Long orderId); @@ -47,4 +47,7 @@ Page certificateRecordsById(Page page, @Param("request") CertificateRecordRequest certificateRecordRequest); Page certificateMonitorsById(Page page, @Param("request") CertificateMonitorRequest certificateMonitorRequest); + + Integer updateCertificate(@Param("id") Long id, @Param("originalRecordFile") String originalRecordFile, @Param("certificateFile") String certificateFile); + } 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 8f057d9..7c9c4e6 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 @@ -56,7 +56,7 @@ * 审批之后再次生成证书和原始记录(为了生成签名和公章等,进行再次的图片的合成) */ @ApiOperation("审批生成证书和原始记录") - @GetMapping("/generate/certificate") + @PostMapping("/generate/certificate") @ResponseBody public void againCreateCertificate(@RequestBody @Valid IdDTO idDTO) { measureApprovalService.againCreateCertificate(idDTO.getId()); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleParamsEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleParamsEnum.java index 5489ae5..a3060ad 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleParamsEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleParamsEnum.java @@ -2,6 +2,7 @@ public interface PrintFileModuleParamsEnum { + //0.02活塞压力填充参数 String INDICATED_VALUE_ONE = "valueOne"; String INDICATED_VALUE_TWO = "valueTwo"; @@ -23,4 +24,32 @@ String UNIT_I = "unitI"; String UNIT_V = "unitV"; + + //多功能校准源 + String TEST_VALUE_ONE = "testValueOne"; + + String TEST_VALUE_TWO = "testValueTwo"; + + String TEST_VALUE_THREE = "testValueThree"; + + String TEST_VALUE_FOUR = "testValueFour"; + + String TEST_VALUE_FIVE = "testValueFive"; + + String TEST_VALUE_SIX = "testValueSix"; + + String STANDARD_DEVIATION = "standardDeviation"; + + String RELATIVE_REPEATABILITY = "relativeRepeatability"; + + String PARAMS = "params"; + + String CHECK_POINT = "checkPoint"; + + String UNIT = "unit"; + + String UREL = "urel"; + + String LESSTHAN = "lessThan"; + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureApprovalMapper.java index 81d229a..e547139 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureApprovalMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureApprovalMapper.java @@ -36,7 +36,7 @@ String customTemplateByCategory(@Param("templateType") String templateType, @Param("itemCategoryId") Long itemCategoryId); - String getMeasureAddress(@Param("addressId")String addressId); + String getMeasureAddress(@Param("addressId") String addressId); @Select("SELECT count(id) from biz_business_device_measure_approval where approval_status = 4 and sample_id = #{sampleId} and order_id=#{orderId}") Long selectSampleCertifications(@Param("sampleId") Long sampleId, @Param("orderId") Long orderId); @@ -47,4 +47,7 @@ Page certificateRecordsById(Page page, @Param("request") CertificateRecordRequest certificateRecordRequest); Page certificateMonitorsById(Page page, @Param("request") CertificateMonitorRequest certificateMonitorRequest); + + Integer updateCertificate(@Param("id") Long id, @Param("originalRecordFile") String originalRecordFile, @Param("certificateFile") String certificateFile); + } 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 68d60c6..630ff39 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureApprovalMapper.xml @@ -110,6 +110,12 @@ WHERE id= #{addressId} + + UPDATE biz_business_device_measure_approval + SET original_record_file=#{originalRecordFile},certificate_file=#{certificateFile} + WHERE id= #{id} + + + + UPDATE biz_business_device_measure_approval + SET original_record_file=#{originalRecordFile},certificate_file=#{certificateFile} + WHERE id= #{id} + + + + UPDATE biz_business_device_measure_approval + SET original_record_file=#{originalRecordFile},certificate_file=#{certificateFile} + WHERE id= #{id} + +