2011 数据集字段调整

src/main/java/com/alihealth/d2d/provtest/controller/ProvTestServerController.java

@@ -41,15 +41,15 @@ public class ProvTestServerController {
 
     @RequestMapping("/receive")
     public @ResponseBody
-    Map<String,Object> receive(HttpServletRequest request) throws IOException {
+    Map<String, Object> receive(HttpServletRequest request) throws IOException {
         RequestWrapper requestWrapper = new RequestWrapper(request);
         String body = requestWrapper.getBodyString();
         System.out.println(body);
-        Map<String,Object> paramsTemp = JSON.parseObject(body);
+        Map<String, Object> paramsTemp = JSON.parseObject(body);
         System.out.println(paramsTemp);
-        Map<String,Object> params = JSON.parseObject(paramsTemp.get("req").toString());
-        logger.info("ProvTestController.receive.in.params:{}",params);
-        try{
+        Map<String, Object> 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);
         }
 
     }
 
 
-
 }

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;

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<DomesticDrugProductionApplyInfo> {
 
     @Autowired
-    private  IDomesticDrugProductionApplyInfoService service;
+    private IDomesticDrugProductionApplyInfoService service;
 
     @Override
     protected Class<DomesticDrugProductionApplyInfo> getEntityClass() {
@@ -41,17 +41,19 @@ public class SubType2011Handler extends AbstractEventDataHandler<DomesticDrugPro
     @Override
     protected DomesticDrugProductionApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance) {
         EventBasic evtBasic = eventBody.getEvtBasic();
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String formattedDate = LocalDate.parse(
-                item.getString("SCRQ"),
-                DateTimeFormatter.ofPattern("yyyyMMdd")
-        ).format(DateTimeFormatter.ISO_LOCAL_DATE); //
+        //时间格式
+        SimpleDateFormat formatterDatetime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        //日期格式
+        SimpleDateFormat formatterDate = new SimpleDateFormat("yyyy-MM-dd");
+
         try {
             return DomesticDrugProductionApplyInfo.builder()
                     .eventId(eventBody.getEventID())
-                    .recTime(formatter.parse(eventBody.getRecTime()))
+                    .recTime(formatterDatetime.parse(eventBody.getRecTime()))
                     .rkdbh(evtBasic.getString("RKDBH"))
-                    .rksj(evtBasic.getString("RKSJ"))
+
+                    .rksj(formatterDatetime.parse(evtBasic.getString("RKSJ")))
+
                     .rkdwmc(evtBasic.getString("RKDWMC"))
                     .rkdwtyshxydm(evtBasic.getString("RKDWTYSHXYDM"))
                     .rkdwlx(evtBasic.getString("RKDWLX"))
@@ -60,9 +62,11 @@ public class SubType2011Handler extends AbstractEventDataHandler<DomesticDrugPro
                     .yptymc(item.getString("YPTYMC"))
                     .gjypbsm(item.getString("GJYPBSM"))
                     .ymscph(item.getString("YMSCPH"))
-                    .scrq(formattedDate)
-                    .ymyxqjzrq(item.getString("YMYXQJZRQ"))
-                    .scsl(item.getString("SCSL"))
+
+                    .scrq(formatterDate.parse(item.getString("SCRQ")))
+                    .ymyxqjzrq(formatterDate.parse(item.getString("YMYXQJZRQ")))
+
+                    .scsl(Integer.parseInt(item.getString("SCSL")))
                     .scdz(item.getString("SCDZ"))
                     .ypzsm(instance.getString("YPZSM"))
                     .syjbzypzsm(instance.getString("SYJBZYPZSM"))

src/main/resources/mapper/PharmaceuticalProductionLicenseBaseInfoMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.alihealth.d2d.provtest.generator.temp.mapper.PharmaceuticalProductionLicenseBaseInfoMapper">
+<mapper namespace="com.alihealth.d2d.provtest.mapper.PharmaceuticalProductionLicenseBaseInfoMapper">
 
 </mapper>

src/main/resources/mapper/PharmaceuticalTradingEnterprisesMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.alihealth.d2d.provtest.generator.temp.mapper.PharmaceuticalTradingEnterprisesMapper">
+<mapper namespace="com.alihealth.d2d.provtest.mapper.PharmaceuticalTradingEnterprisesMapper">
 
 </mapper>