报告到下载平台

common-collect/src/main/java/com/docus/server/ws/IReportService.java

@@ -1,7 +1,7 @@
 package com.docus.server.ws;
 
 
-import com.docus.server.collect.infrastructure.pojo.dto.ReportDTO;
+import com.docus.server.archivefile.pojo.dto.ReportDTO;
 
 import java.util.List;
 

common-collect/src/main/java/com/docus/server/ws/event/TaskConsumptionReportDownEvent.java

@@ -1,6 +1,6 @@
 package com.docus.server.ws.event;
 
-import com.docus.server.collect.infrastructure.pojo.dto.ReportDTO;
+import com.docus.server.archivefile.pojo.dto.ReportDTO;
 import lombok.Getter;
 import org.springframework.context.ApplicationEvent;
 

common-collect/src/main/java/com/docus/server/ws/impl/BasicServiceImpl.java

@@ -27,11 +27,13 @@ public class BasicServiceImpl implements IBasicService {
     private ITBasicService tBasicService;
 
     @Override
-    @TrackGroup(group = "WEBSERVICE_XML_BASIC",
+    @TrackGroup(
-            beanNames = {"tBasicConverter", "wsBasicResultImpl"}, processor = VisitorProcessor.class)
+        group = "WEBSERVICE_XML_BASIC", desc = "新增基础数据",
+        beanNames = {"tBasicConverter", "wsBasicResultImpl"},
+        processor = VisitorProcessor.class)
     public String setTBasic(String message) {
         log.info("新增基础数据：{}", message);
-        tBasicService.insertTBasic(getTBasicDTO());
+        tBasicService.insertTBasic(getValue());
         return null;
     }
 
@@ -43,14 +45,16 @@ public class BasicServiceImpl implements IBasicService {
      * @see VisitorProcessor 通用处理器
      */
     @Override
-    @TrackGroup(group = "WEBSERVICE_XML_BASIC",
+    @TrackGroup(
-            beanNames = {"tBasicConverter", "wsBasicResultImpl"}, processor = VisitorProcessor.class)
+        group = "WEBSERVICE_XML_BASIC", desc = "更新基础数据",
+        beanNames = {"tBasicConverter", "wsBasicResultImpl"},
+        processor = VisitorProcessor.class)
     public String updateTBasic(String message) {
-        tBasicService.updateTBasic(getTBasicDTO());
+        tBasicService.updateTBasic(getValue());
         return null;
     }
 
-    public TBasicDTO getTBasicDTO() {
+    public TBasicDTO getValue() {
         return JSON.fromJSON((String) TrackHelper.getValue("jsonStr"), TBasicDTO.class);
     }
 }

common-collect/src/main/java/com/docus/server/ws/impl/DeptServerImpl.java

@@ -30,7 +30,10 @@ public class DeptServerImpl implements IDeptServer {
      * @see VisitorProcessor 通用处理器
      */
     @Override
-    @TrackGroup(group = "WEBSERVICE_XML_DEPT", beanNames = {"powerDeptConverter", "wsDeptResultImpl"}, processor = VisitorProcessor.class)
+    @TrackGroup(
+        group = "WEBSERVICE_XML_DEPT", desc = "接收科室信息",
+        beanNames = {"powerDeptConverter", "wsDeptResultImpl"},
+        processor = VisitorProcessor.class)
     public String deptModify(String message) {
         log.info("新增/修改科室数据：{}", message);
         collectService.insertOrUpdateDept(JSON.fromJSON((String) TrackHelper.getValue("jsonStr"), DeptDTO.class));

common-collect/src/main/java/com/docus/server/ws/impl/ReportServiceImpl.java

@@ -4,9 +4,9 @@ import com.docus.core.util.Func;
 import com.docus.infrastructure.redis.service.IdService;
 import com.docus.server.archivefile.mapper.AfCollectTaskMapper;
 import com.docus.server.archivefile.mapper.AfReportRecordMapper;
+import com.docus.server.archivefile.pojo.dto.ReportDTO;
 import com.docus.server.archivefile.pojo.entity.AfCollectTask;
 import com.docus.server.archivefile.pojo.entity.AfReportRecord;
-import com.docus.server.collect.infrastructure.pojo.dto.ReportDTO;
 import com.docus.server.record.mapper.TBasicMapper;
 import com.docus.server.ws.IReportService;
 import com.docus.server.ws.event.TaskConsumptionReportDownEvent;
@@ -58,27 +58,27 @@ public class ReportServiceImpl implements IReportService {
         }
     }
 
-    private void threePartyPushReports(ReportDTO reportDto) {
+    private void threePartyPushReports(ReportDTO reportDTO) {
         String patientId = null;
         try {
             // 如果出现多条出错的情况，还是得保存收到的信息，人工干预处理
-            patientId = tBasicMapper.getPatientIdByInpatientNoAndAdminssTimes(reportDto.getInpatientNo(), reportDto.getAdmisstimes());
+            patientId = tBasicMapper.getPatientIdByInpatientNoAndAdminssTimes(reportDTO.getInpatientNo(), reportDTO.getAdmisstimes());
         } catch (Exception ex) {
             log.error("查询病案主键出错了", ex);
         }
         // 不验证数据，始终保存收到的信息
-        AfReportRecord afReportRecord = afReportRecordMapper.getRecordBySerialnumAndInpatientNoAndSysFlag(reportDto.getSerialnum(), reportDto.getInpatientNo(), reportDto.getAdmisstimes(), reportDto.getSysFlag());
+        AfReportRecord afReportRecord = afReportRecordMapper.getRecordBySerialnumAndInpatientNoAndSysFlag(reportDTO.getSerialnum(), reportDTO.getInpatientNo(), reportDTO.getAdmisstimes(), reportDTO.getSysFlag());
         if (afReportRecord == null) {
             long id = idService.getDateSeq();
-            afReportRecord = new AfReportRecord(reportDto);
+            afReportRecord = new AfReportRecord(reportDTO);
             afReportRecord.setTaskId(id);
             afReportRecord.setPatientId(patientId);
             afReportRecordMapper.saveRecord(afReportRecord);
         } else {
             // 更新 主要更新 url
-            afReportRecord.setDownUrl(reportDto.getDownUrl());
+            afReportRecord.setDownUrl(reportDTO.getDownUrl());
-            afReportRecord.setDownType(reportDto.getDowntype());
+            afReportRecord.setDownType(reportDTO.getDowntype());
-            afReportRecord.setFileName(reportDto.getFileTitle());
+            afReportRecord.setFileName(reportDTO.getFileTitle());
             afReportRecord.setPatientId(patientId);
             afReportRecordMapper.updateRecordByTaskId(afReportRecord);
         }
@@ -86,7 +86,7 @@ public class ReportServiceImpl implements IReportService {
 
         // 根据记录中的任务id，查询是否需要新增任务
         if (Func.isBlank(patientId)) {
-            log.warn("病案号：{}，住院次数：{} 未找到病案基础数据，暂不进行下载任务！", reportDto.getInpatientNo(), reportDto.getAdmisstimes());
+            log.warn("病案号：{}，住院次数：{} 未找到病案基础数据，暂不进行下载任务！", reportDTO.getInpatientNo(), reportDTO.getAdmisstimes());
             return;
         }
         // 判断是否需要保存任务
@@ -94,11 +94,11 @@ public class ReportServiceImpl implements IReportService {
         if (afCollectTask == null) {
             afCollectTask = new AfCollectTask();
             afCollectTask.setId(afReportRecord.getTaskId());
-            afCollectTask.setC1(reportDto.getSerialnum());
+            afCollectTask.setC1(reportDTO.getSerialnum());
-            afCollectTask.setC2(reportDto.getFileTitle());
+            afCollectTask.setC2(reportDTO.getFileTitle());
-            afCollectTask.setC3(reportDto.getJzh());
+            afCollectTask.setC3(reportDTO.getJzh());
             afCollectTask.setPatientId(patientId);
-            afCollectTask.setSysflag(reportDto.getSysFlag());
+            afCollectTask.setSysflag(reportDTO.getSysFlag());
             afCollectTask.setState("0");
             afCollectTask.setPatientId(patientId);
             collectTaskMapper.saveTask(afCollectTask);

common-collect/src/main/java/com/docus/server/ws/impl/UserServerImpl.java

@@ -30,8 +30,10 @@ public class UserServerImpl implements IUserServer {
      * @see VisitorProcessor 通用处理器
      */
     @Override
-    @TrackGroup(group = "WEBSERVICE_XML_USER",
+    @TrackGroup(
-        beanNames = {"powerUserConverter", "wsUserResultImpl"}, processor = VisitorProcessor.class)
+        group = "WEBSERVICE_XML_USER", desc = "接收用户信息",
+        beanNames = {"powerUserConverter", "wsUserResultImpl"},
+        processor = VisitorProcessor.class)
     public String userModify(String message) {
         log.debug("新增/修改用户数据：{}", message);
         collectService.insertOrUpdateUser(JSON.fromJSON((String) TrackHelper.getValue("jsonStr"), UserDTO.class));

docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/ReportDTO.java

@@ -1,4 +1,4 @@
-package com.docus.server.collect.infrastructure.pojo.dto;
+package com.docus.server.archivefile.pojo.dto;
 
 import lombok.Data;
 

docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/ReportDownDTO.java

@@ -1,4 +1,4 @@
-package com.docus.server.collect.infrastructure.pojo.dto;
+package com.docus.server.archivefile.pojo.dto;
 
 
 import io.swagger.annotations.ApiModelProperty;
@@ -27,4 +27,4 @@ public class ReportDownDTO {
     private String scanusercode;
     @ApiModelProperty(value = "扫描用户名称")
     private String scanusername;
-}
+}

docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/ReportDownPatientDTO.java

@@ -1,4 +1,4 @@
-package com.docus.server.collect.infrastructure.pojo.dto;
+package com.docus.server.archivefile.pojo.dto;
 
 import com.docus.server.archivefile.pojo.entity.AfReportRecord;
 import io.swagger.annotations.ApiModelProperty;

docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/dto/ReportDownScanFileDTO.java

@@ -1,4 +1,4 @@
-package com.docus.server.collect.infrastructure.pojo.dto;
+package com.docus.server.archivefile.pojo.dto;
 
 import com.docus.server.archivefile.pojo.entity.AfReportRecord;
 import io.swagger.annotations.ApiModelProperty;

docus-archivefile/src/main/java/com/docus/server/archivefile/pojo/entity/AfReportRecord.java

@@ -1,5 +1,6 @@
 package com.docus.server.archivefile.pojo.entity;
 
+import com.docus.server.archivefile.pojo.dto.ReportDTO;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -87,15 +88,15 @@ public class AfReportRecord implements Serializable {
     public AfReportRecord() {
     }
 
-    public AfReportRecord(ReportDto reportDto) {
+    public AfReportRecord(ReportDTO reportDTO) {
-        this.jzh = reportDto.getJzh();
+        this.jzh = reportDTO.getJzh();
-        this.admissTimes = reportDto.getAdmisstimes();
+        this.admissTimes = reportDTO.getAdmisstimes();
-        this.inpatientNo = reportDto.getInpatientNo();
+        this.inpatientNo = reportDTO.getInpatientNo();
-        this.downUrl = reportDto.getDownUrl();
+        this.downUrl = reportDTO.getDownUrl();
-        this.sysflag = reportDto.getSysFlag();
+        this.sysflag = reportDTO.getSysFlag();
-        this.zdAssortId = reportDto.getAssortId();
+        this.zdAssortId = reportDTO.getAssortId();
-        this.serialnum = reportDto.getSerialnum();
+        this.serialnum = reportDTO.getSerialnum();
-        this.fileName = reportDto.getFileTitle();
+        this.fileName = reportDTO.getFileTitle();
-        this.downType = reportDto.getDowntype();
+        this.downType = reportDTO.getDowntype();
     }
-}
+}