From c92523467edf0306bad25f141faa5fcb56da8806 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 06 三月 2024 11:24:17 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/service/impl/ServiceThirdDataServiceImpl.java |   26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceThirdDataServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceThirdDataServiceImpl.java
index fd958fb..12a7c82 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceThirdDataServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceThirdDataServiceImpl.java
@@ -10,12 +10,17 @@
 import com.smartor.service.IHospitalRecordService;
 import com.smartor.service.IHospitalUserinfoService;
 import com.smartor.service.IServiceThirdDataService;
+import com.smartor.yiwudataanalysis.ADT_A01;
 import com.smartor.yiwudataanalysis.ADT_A03;
-import lombok.extern.log4j.Log4j;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 
@@ -25,7 +30,7 @@
  * @author ruoyi
  * @date 2023-10-10
  */
-@Log4j
+@Slf4j
 @Service
 public class ServiceThirdDataServiceImpl implements IServiceThirdDataService {
 
@@ -40,7 +45,9 @@
     @Override
     public List<ServiceThirdData> queryList(ServiceThirdData serviceThirdData) {
 
+        log.info("------serviceThirdData鐨勫叆鍙傦細{}", serviceThirdData);
         List<ServiceThirdData> serviceThirdDataList = serviceThirdDataMapper.selectServiceThirdDataList(serviceThirdData);
+        log.info("------serviceThirdDataList鑾峰彇鏁版嵁鐨勬暟閲忥細{}", serviceThirdDataList.size());
         for (ServiceThirdData std : serviceThirdDataList) {
             PipeParser parser = new PipeParser();
             Message message = null;
@@ -49,13 +56,24 @@
                 dataInfo = dataInfo.replaceAll("\n", "");
                 dataInfo = dataInfo.substring(0, dataInfo.length() - 1);
                 message = parser.parse(dataInfo);
-                ADT_A03 adt_a03 = new ADT_A03();
+                List<Object> objectList = new ArrayList<>();
+                if (serviceThirdData.getDataType().equals("ADT^A03")) {
+                    ADT_A03 adt_a03 = new ADT_A03();
+                    objectList = adt_a03.explainPID(message, dataInfo);
+                } else if (serviceThirdData.getDataType().equals("ADT^A01")) {
+                    ADT_A01 adt_a01 = new ADT_A01();
+                    objectList = adt_a01.explainPID(message, dataInfo);
+                }
 
-                List<Object> objectList = adt_a03.explainPID(message, dataInfo);
                 HospitalRecord hospitalRecord = (HospitalRecord) objectList.get(0);
+                log.info("hospitalRecord鐨勫�间负锛歿}", hospitalRecord);
                 iHospitalRecordService.insertHospitalRecord(hospitalRecord);
 
                 HospitalUserinfo hospitalUserinfo = (HospitalUserinfo) objectList.get(1);
+                Date currentTime = new Date();
+                SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                String formattedDate = formatter.format(currentTime);
+                hospitalUserinfo.setCreateTime(formattedDate);
                 iHospitalUserinfoService.insertHospitalUserinfo(hospitalUserinfo);
 
                 int ii = serviceThirdDataMapper.updateIsDeal(std.getId());

--
Gitblit v1.9.3