From f27000a5a610b6e1f03afc58a726443a52df9791 Mon Sep 17 00:00:00 2001
From: daichao <1438977546@qq.com>
Date: Tue, 17 Jun 2025 11:43:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DrugRetraceController.java     |  8 +++--
 .../domain/DrugRetailAndUseApplyInfo.java     |  5 ++-
 .../d2d/provtest/domain/ReceiveDataLog.java   |  2 +-
 .../handle/business/SubType2011Handler.java   |  7 ++--
 .../handle/business/SubType2017Handler.java   |  5 +--
 .../impl/ReceiveDataLogServiceImpl.java       | 36 +++++++++++++++++++
 6 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/alihealth/d2d/provtest/controller/DrugRetraceController.java b/src/main/java/com/alihealth/d2d/provtest/controller/DrugRetraceController.java
index 1b71dde..c4826fd 100644
--- a/src/main/java/com/alihealth/d2d/provtest/controller/DrugRetraceController.java
+++ b/src/main/java/com/alihealth/d2d/provtest/controller/DrugRetraceController.java
@@ -22,7 +22,11 @@ public class DrugRetraceController {
 
     @PostMapping(value = "/retrace")
     public AjaxResult retrace(@RequestBody DrugRetraceSearcher searcher) {
-        DrugRetraceVO drugRetraceVO = drugRetraceService.retrace(searcher);
-        return AjaxResult.success(drugRetraceVO);
+        try {
+            DrugRetraceVO drugRetraceVO = drugRetraceService.retrace(searcher);
+            return AjaxResult.success(drugRetraceVO);
+        } catch (Exception e) {
+            return AjaxResult.error(e.getMessage());
+        }
     }
 }
diff --git a/src/main/java/com/alihealth/d2d/provtest/domain/DrugRetailAndUseApplyInfo.java b/src/main/java/com/alihealth/d2d/provtest/domain/DrugRetailAndUseApplyInfo.java
index f6acf3f..3c78552 100644
--- a/src/main/java/com/alihealth/d2d/provtest/domain/DrugRetailAndUseApplyInfo.java
+++ b/src/main/java/com/alihealth/d2d/provtest/domain/DrugRetailAndUseApplyInfo.java
@@ -7,7 +7,6 @@ import lombok.Builder;
 import lombok.Data;
 
 import javax.persistence.Column;
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -73,8 +72,8 @@ public class DrugRetailAndUseApplyInfo {
     @Column(name = "scrq")
     private Date scrq;
     //药品有效期截止日期
-    @Column(name = "ypqjzrq")
-    private Date ypqjzrq;
+    @Column(name = "ypyxqjzrq")
+    private Date ypyxqjzrq;
     //售药日期
     @Column(name = "syrq")
     private Date syrq;
diff --git a/src/main/java/com/alihealth/d2d/provtest/domain/ReceiveDataLog.java b/src/main/java/com/alihealth/d2d/provtest/domain/ReceiveDataLog.java
index 1250542..22807f6 100644
--- a/src/main/java/com/alihealth/d2d/provtest/domain/ReceiveDataLog.java
+++ b/src/main/java/com/alihealth/d2d/provtest/domain/ReceiveDataLog.java
@@ -56,7 +56,7 @@ public class ReceiveDataLog {
 
 
     @Column(name = "is_deleted")
-    private Date isDeleted;
+    private Long isDeleted;
 
 
 }
diff --git a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2011Handler.java b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2011Handler.java
index 12d74a0..9a7461e 100644
--- a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2011Handler.java
+++ b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2011Handler.java
@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Optional;
 
 /**
  * @author Jason
@@ -71,10 +72,12 @@ public class SubType2011Handler extends AbstractEventDataHandler<DomesticDrugPro
                     .jx(item.getString("JX"))
                     .zjgg(item.getString("ZJGG"))
                     .bzgg(item.getString("BZGG"))
-                    .bzzhb(Integer.parseInt(item.getString("BZZHB")))
-                    .ypyxq(Integer.parseInt(item.getString("YPYXQ")))
+                    .bzzhb(Integer.parseInt(Optional.ofNullable(item.getString("BZZHB")).orElse("0")))
+                    .ypyxq(Integer.parseInt(Optional.ofNullable(item.getString("YPYXQ")).orElse("0")))
                     .ypyxqdw(item.getString("YPYXQDW"))
                     .yppzwh(item.getString("YPPZWH"))
+
+                    //TODO 提供一个公共判空方法及转换方法，提高代码的鲁棒性
                     .yppzwhyxq(formatterDate.parse(item.getString("YPPZWHYXQ")))
                     .ypscph(item.getString("YPSCPH"))
 
diff --git a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2017Handler.java b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2017Handler.java
index c06a715..0426f51 100644
--- a/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2017Handler.java
+++ b/src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2017Handler.java
@@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 
@@ -61,7 +60,9 @@ public class SubType2017Handler extends AbstractEventDataHandler<DrugRetailAndUs
                     .yppzwhyxq(formatterDate.parse(item.getString("YPPZWHYXQ")))
                     .ymscph(item.getString("YMSCPH"))
                     .scrq(formatterDate.parse(item.getString("SCRQ")))
-                    .ypqjzrq(formatterDate.parse(item.getString("YPQJZRQ")))
+
+                    .ypyxqjzrq(formatterDate.parse(item.getString("YPYXQJZRQ")))
+
                     .syrq(formatterDate.parse(item.getString("SYRQ")))
                     .tyshxydmjkymdlqy(item.getString("TYSHXYDMJKYMDLQY"))
                     .jkymdlqymc(item.getString("JKYMDLQYMC"))
diff --git a/src/main/java/com/alihealth/d2d/provtest/service/impl/ReceiveDataLogServiceImpl.java b/src/main/java/com/alihealth/d2d/provtest/service/impl/ReceiveDataLogServiceImpl.java
index 2d5db5b..d66a38c 100644
--- a/src/main/java/com/alihealth/d2d/provtest/service/impl/ReceiveDataLogServiceImpl.java
+++ b/src/main/java/com/alihealth/d2d/provtest/service/impl/ReceiveDataLogServiceImpl.java
@@ -2,14 +2,50 @@ package com.alihealth.d2d.provtest.service.impl;
 
 import com.alihealth.d2d.provtest.domain.ReceiveDataLog;
 import com.alihealth.d2d.provtest.mapper.ReceiveDataLogMapper;
+import com.alihealth.d2d.provtest.searcher.DrugResolveSearcher;
 import com.alihealth.d2d.provtest.service.IReceiveDataLogService;
+import com.alihealth.d2d.provtest.utils.CertManager;
+import com.alihealth.d2d.provtest.utils.StreamUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.crypto.BadPaddingException;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import java.io.IOException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.spec.InvalidKeySpecException;
+
 /**
  * @author Jason
  * @date 2025年06月03日 15:37:17
  */
 @Service("receiveDataLogService")
 public class ReceiveDataLogServiceImpl extends ServiceImpl<ReceiveDataLogMapper, ReceiveDataLog> implements IReceiveDataLogService {
+    Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private ReceiveDataLogMapper receiveDataLogMapper;
+
+    @Autowired
+    private CertManager certManager;
+
+    @Override
+    public void resolve(DrugResolveSearcher searcher) throws NoSuchPaddingException, IllegalBlockSizeException, NoSuchAlgorithmException, InvalidKeySpecException, BadPaddingException, IOException, InvalidKeyException {
+      ReceiveDataLog receiveDataLog =  receiveDataLogMapper.selectOne(
+                new QueryWrapper<ReceiveDataLog>().lambda()
+                        .eq(ReceiveDataLog::getEventId, searcher.getEventId())
+        );
+        String data = receiveDataLog.getData();
+        String privateKey = certManager.getPrivateKey();
+        String de = certManager.testDecrypt(privateKey, data);
+        String xml = StreamUtil.getUnStreamContent(de);
+        logger.info("解密之后的文件内容:{}", xml);
+
+    }
 }