更新登记证返回值

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgChangeRegistrationTransferService.java

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationTransferDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationTransfer;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
 import java.util.Map;
 
 /**
@@ -32,5 +33,5 @@ public interface IJgChangeRegistrationTransferService extends IService<JgChangeR
 
     void revocation(String instanceId);
 
-    void exportUseRegistrationCertificate(String sequenceNbr, HttpServletResponse response);
+    File exportUseRegistrationCertificate(String sequenceNbr);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationTransferController.java

@@ -149,7 +149,7 @@ public class JgChangeRegistrationTransferController extends BaseController {
 	@GetMapping(value = "/export")
 	@ApiOperation(httpMethod = "GET", value = "导出使用登记证", notes = "导出使用登记证")
 	public void exportImageZip(HttpServletResponse response, @RequestParam("sequenceNbr") String sequenceNbr){
-		jgChangeRegistrationTransferService.exportUseRegistrationCertificate(sequenceNbr, response);
+		jgChangeRegistrationTransferService.exportUseRegistrationCertificate(sequenceNbr);
 	}
 
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgTransferNoticeController.java

@@ -162,7 +162,7 @@ public class JgTransferNoticeController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "特种设备登记证导出", notes = "特种设备登记证导出")
     @GetMapping(value = "/certificate/report")
-    public void generateCertificateReport(HttpServletResponse response) {
+    public void generateCertificateReport() {
         Map<String, Object> map = new HashMap<>();
         // 组装模板变量
         map.put("useRegistrationCode", "20231225123"); // 编号
@@ -181,6 +181,6 @@ public class JgTransferNoticeController extends BaseController {
         // 生成二维码
         String qrCode = ImageUtils.generateQRCode("YZGZ20231225001", 70, 65);
         map.put("supervisoryCode", qrCode);  // 监管二维码
-        commonService.generateCertificateReport(map, response);
+        commonService.generateCertificateReport(map);
     }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/ICommonService.java

@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -35,5 +36,5 @@ public interface ICommonService {
 
     List<Map<String,Object>> getEnterpriseEmployee(String unitCode);
 
-    void generateCertificateReport(Map<String, Object> map, HttpServletResponse response);
+    File generateCertificateReport(Map<String, Object> map);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java

@@ -284,7 +284,7 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     @Override
-    public void generateCertificateReport(Map<String, Object> map, HttpServletResponse response) {
+    public File generateCertificateReport(Map<String, Object> map) {
         if (CollectionUtils.isEmpty(map)) {
             throw new IllegalArgumentException("参数不能为空");
         }
@@ -323,19 +323,22 @@ public class CommonServiceImpl implements ICommonService {
 //        } catch (IOException e) {
 //            log.error("删除临时文件失败：{}", e);
 //        }
-        try {
-            byte[] bytes = file2byte(pdfFile);
-            String docTitle = pdfFile.getName();
-            FileExporter.exportFile(FileExporter.FileType.valueOf("pdf"), docTitle, bytes, response);
-        } catch (Exception e) {
-            log.error("pdf文件转换失败：{}", e);
-        } finally {
-            try {
-                Files.deleteIfExists(pdfFile.toPath());
-            } catch (Exception e) {
-                log.error("文件找不到，删除失败：{}", e);
-            }
-        }
+
+        return pdfFile;
+
+//        try {
+//            byte[] bytes = file2byte(pdfFile);
+//            String docTitle = pdfFile.getName();
+//            FileExporter.exportFile(FileExporter.FileType.valueOf("pdf"), docTitle, bytes, response);
+//        } catch (Exception e) {
+//            log.error("pdf文件转换失败：{}", e);
+//        } finally {
+//            try {
+//                Files.deleteIfExists(pdfFile.toPath());
+//            } catch (Exception e) {
+//                log.error("文件找不到，删除失败：{}", e);
+//            }
+//        }
     }
 
     /**

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationTransferServiceImpl.java

@@ -62,6 +62,7 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
 import java.io.IOException;
 import java.time.LocalDate;
 import java.util.ArrayList;
@@ -829,7 +830,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      *
      * @param sequenceNbr
      */
-    public void exportUseRegistrationCertificate(String sequenceNbr, HttpServletResponse response) {
+    public File exportUseRegistrationCertificate(String sequenceNbr) {
         Map<String, Object> exportParamsMap = new HashMap<>();
         //查询移装变更详情
         JgChangeRegistrationTransfer transfer = this.getById(sequenceNbr);
@@ -928,6 +929,6 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             exportParamsMap.put("factoryNum", factoryInfo.getFactoryNum());
         }
         //调用生成使用登记证
-        commonService.generateCertificateReport(exportParamsMap, response);
+        return commonService.generateCertificateReport(exportParamsMap);
     }
 }
\ No newline at end of file