From 31400217ee35d6cd8893056447b508193298cc4f Mon Sep 17 00:00:00 2001 From: daichao <1438977546@qq.com> Date: Thu, 12 Jun 2025 09:26:24 +0800 Subject: [PATCH] =?UTF-8?q?2011=20=E6=95=B0=E6=8D=AE=E9=9B=86=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProvTestServerController.java | 25 +++++++++--------- .../DomesticDrugProductionApplyInfo.java | 11 ++++---- .../handle/business/SubType2011Handler.java | 26 +++++++++++-------- ...euticalProductionLicenseBaseInfoMapper.xml | 2 +- ...PharmaceuticalTradingEnterprisesMapper.xml | 2 +- 5 files changed, 35 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/alihealth/d2d/provtest/controller/ProvTestServerController.java b/src/main/java/com/alihealth/d2d/provtest/controller/ProvTestServerController.java index b1ff539..1e9ce9e 100644 --- a/src/main/java/com/alihealth/d2d/provtest/controller/ProvTestServerController.java +++ b/src/main/java/com/alihealth/d2d/provtest/controller/ProvTestServerController.java @@ -41,15 +41,15 @@ public class ProvTestServerController { @RequestMapping("/receive") public @ResponseBody - Map receive(HttpServletRequest request) throws IOException { + Map receive(HttpServletRequest request) throws IOException { RequestWrapper requestWrapper = new RequestWrapper(request); String body = requestWrapper.getBodyString(); System.out.println(body); - Map paramsTemp = JSON.parseObject(body); + Map paramsTemp = JSON.parseObject(body); System.out.println(paramsTemp); - Map params = JSON.parseObject(paramsTemp.get("req").toString()); - logger.info("ProvTestController.receive.in.params:{}",params); - try{ + Map params = JSON.parseObject(paramsTemp.get("req").toString()); + logger.info("ProvTestController.receive.in.params:{}", params); + try { //传输流水号0 String processId = String.valueOf(params.get("process_id")); //事件编号 @@ -64,21 +64,21 @@ public class ProvTestServerController { String ver = String.valueOf(params.get("ver")); logger.info("processId:{}|eventId:{}|eventType:{}|event:{}|timeStamp:{}|ver:{}" - ,processId,eventId,eventType,event,timeStamp,ver); + , processId, eventId, eventType, event, timeStamp, ver); EventPojo eventPojo = JSON.parseObject(event, EventPojo.class); //获取私钥 String privateKey = certManager.getPrivateKey(); - logger.info("privateKey:{}",privateKey); + logger.info("privateKey:{}", privateKey); - String de = certManager.testDecrypt(privateKey,eventPojo.getData()); + String de = certManager.testDecrypt(privateKey, eventPojo.getData()); String xml = StreamUtil.getUnStreamContent(de); logger.info("解密之后的文件内容:{}", xml); //保存数据日志 - ReceiveDataLog log=new ReceiveDataLog(); + ReceiveDataLog log = new ReceiveDataLog(); log.setEventId(eventId); log.setProcessId(processId); log.setEventType(eventType); @@ -90,16 +90,15 @@ public class ProvTestServerController { receiveDataLogService.save(log); //解析并处理数据 - processingService.processEvent(eventPojo, xml,eventId); + processingService.processEvent(eventPojo, xml, eventId); return ResponseBuilder.success(); - }catch (Exception e){ - logger.error("{}",e); + } catch (Exception e) { + logger.error("{}", e); return ResponseBuilder.fail(BuzStatusEnum.SYS_ERR); } } - } diff --git a/src/main/java/com/alihealth/d2d/provtest/domain/DomesticDrugProductionApplyInfo.java b/src/main/java/com/alihealth/d2d/provtest/domain/DomesticDrugProductionApplyInfo.java index fce9f8e..8bfbd51 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/DomesticDrugProductionApplyInfo.java +++ b/src/main/java/com/alihealth/d2d/provtest/domain/DomesticDrugProductionApplyInfo.java @@ -13,7 +13,7 @@ import java.time.LocalDateTime; import java.util.Date; /** - * @author Jason 国产药品生产信息数据子集 + * @author Jason 国产药品生产信息数据子集 (2011) * @date 2025年06月04日 11:39:02 */ @Data @@ -66,13 +66,14 @@ public class DomesticDrugProductionApplyInfo { private String ymscph; @Column(name = "scrq") - private String scrq; + private Date scrq; @Column(name = "ymyxqjzrq") - private String ymyxqjzrq; + private Date ymyxqjzrq; @Column(name = "scsl") - private String scsl; + private Integer scsl; + @Column(name = "scdz") private String scdz; @@ -80,7 +81,7 @@ public class DomesticDrugProductionApplyInfo { private String rkdbh; @Column(name = "rksj") - private String rksj; + private Date rksj; @Column(name = "rkdwmc") private String rkdwmc; 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 359cbce..25822a3 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 @@ -26,7 +26,7 @@ import java.time.format.DateTimeFormatter; public class SubType2011Handler extends AbstractEventDataHandler { @Autowired - private IDomesticDrugProductionApplyInfoService service; + private IDomesticDrugProductionApplyInfoService service; @Override protected Class getEntityClass() { @@ -41,17 +41,19 @@ public class SubType2011Handler extends AbstractEventDataHandler - + diff --git a/src/main/resources/mapper/PharmaceuticalTradingEnterprisesMapper.xml b/src/main/resources/mapper/PharmaceuticalTradingEnterprisesMapper.xml index b02ad2f..6d924fd 100644 --- a/src/main/resources/mapper/PharmaceuticalTradingEnterprisesMapper.xml +++ b/src/main/resources/mapper/PharmaceuticalTradingEnterprisesMapper.xml @@ -1,5 +1,5 @@ - +