From ba7ebce826f1d50083d09ab1ff33a739d59b2913 Mon Sep 17 00:00:00 2001 From: linrf Date: Fri, 11 Aug 2023 17:09:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=AF=E5=8A=A8=E7=AD=89?= =?UTF-8?q?=E5=BE=85=E9=87=87=E9=9B=86=E5=99=A8=E8=BF=9E=E6=8E=A5=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/controller/PatientController.java | 35 ++++++++++++++ .../server/common/utils/StartUpExeUtils.java | 5 ++ .../ActiveAddPatientResponse.java | 45 ++++++++++++++++++ .../AddPatientActiveRequest.java | 31 +++++++++++++ .../AddPatientPassiveRequest.java | 46 +++++++++++++++++++ .../dto/scheduling.management/FileInfo.java | 35 ++++++++++++++ pom.xml | 1 + 7 files changed, 198 insertions(+) create mode 100644 collector-scheduling-management/src/main/java/com/docus/server/controller/PatientController.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/ActiveAddPatientResponse.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/AddPatientActiveRequest.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/AddPatientPassiveRequest.java create mode 100644 docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/FileInfo.java diff --git a/collector-scheduling-management/src/main/java/com/docus/server/controller/PatientController.java b/collector-scheduling-management/src/main/java/com/docus/server/controller/PatientController.java new file mode 100644 index 0000000..ff8a55f --- /dev/null +++ b/collector-scheduling-management/src/main/java/com/docus/server/controller/PatientController.java @@ -0,0 +1,35 @@ +package com.docus.server.controller; + +import com.docus.infrastructure.web.api.CommonResult; +import com.docus.server.dto.scheduling.management.ActiveAddPatientResponse; +import com.docus.server.dto.scheduling.management.AddPatientActiveRequest; +import com.docus.server.dto.scheduling.management.AddPatientPassiveRequest; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 文件上传下载 API + * + * @author AutoGenerator + * @since 2023-07-15 + */ +@Api(value = "http接口文件同步", tags = "http接口文件同步") +@RestController +@RequestMapping("/api") +public class PatientController { + + @ApiOperation("http接口文件被动同步") + @PostMapping("/addPatientPassive") + public CommonResult addPatientPassive(AddPatientPassiveRequest request) throws Exception { + return CommonResult.success("ok"); + } + + @ApiOperation("http接口文件主动同步") + @PostMapping("/addPatientActive") + public CommonResult addPatientActive(AddPatientActiveRequest request) throws Exception { + return CommonResult.success(new ActiveAddPatientResponse()); + } +} diff --git a/collector-terminal-management/src/main/java/com/docus/server/common/utils/StartUpExeUtils.java b/collector-terminal-management/src/main/java/com/docus/server/common/utils/StartUpExeUtils.java index 06b4dbf..f95c1bb 100644 --- a/collector-terminal-management/src/main/java/com/docus/server/common/utils/StartUpExeUtils.java +++ b/collector-terminal-management/src/main/java/com/docus/server/common/utils/StartUpExeUtils.java @@ -16,6 +16,11 @@ public class StartUpExeUtils { private static boolean startExeStatus = true;//exe启动状态 + //重启终端 + public static void restartTerminal() throws IOException { + Runtime.getRuntime().exec("D:\\webroot\\collector-terminal-management\\jenkins-update.bat d:\\webroot"); + } + //重启虚拟机 public static void restartComputer() throws IOException { Runtime.getRuntime().exec("shutdown /r /t 0"); diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/ActiveAddPatientResponse.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/ActiveAddPatientResponse.java new file mode 100644 index 0000000..12b87ee --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/ActiveAddPatientResponse.java @@ -0,0 +1,45 @@ +package com.docus.server.dto.scheduling.management; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 采集器异常日志 Add DTO + * + * @author AutoGenerator + * @since 2023-07-15 + */ +@Data +@ApiModel(value = "患者信息", description = "患者信息") +public class ActiveAddPatientResponse implements Serializable { + + @ApiModelProperty(value = "住院号") + private String inpNo; + + @ApiModelProperty(value = "姓名") + private String name; + + @ApiModelProperty(value = "住院次数") + private String visitId; + + @ApiModelProperty(value = "记帐号") + private String patientId; + + @ApiModelProperty(value = "来源(电子病历)") + private String source; + + @ApiModelProperty(value = "文件信息") + private List fileInfoList; + + @ApiModelProperty(value = "入库时间") + private Date beginTime; + + @ApiModelProperty(value = "入库更新时间") + private Date endTime; + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/AddPatientActiveRequest.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/AddPatientActiveRequest.java new file mode 100644 index 0000000..2903368 --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/AddPatientActiveRequest.java @@ -0,0 +1,31 @@ +package com.docus.server.dto.scheduling.management; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 采集器异常日志 Add DTO + * + * @author AutoGenerator + * @since 2023-07-15 + */ +@Data +@ApiModel(value = "患者信息", description = "患者信息") +public class AddPatientActiveRequest implements Serializable { + + @ApiModelProperty(value = "住院号") + private String inpNo; + + @ApiModelProperty(value = "姓名") + private String name; + + @ApiModelProperty(value = "住院次数") + private String visitId; + + @ApiModelProperty(value = "记帐号") + private String patientId; + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/AddPatientPassiveRequest.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/AddPatientPassiveRequest.java new file mode 100644 index 0000000..93045fe --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/AddPatientPassiveRequest.java @@ -0,0 +1,46 @@ +package com.docus.server.dto.scheduling.management; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 采集器异常日志 Add DTO + * + * @author AutoGenerator + * @since 2023-07-15 + */ +@Data +@ApiModel(value = "患者信息", description = "患者信息") +public class AddPatientPassiveRequest implements Serializable { + + @ApiModelProperty(value = "住院号") + private String inpNo; + + @ApiModelProperty(value = "姓名") + private String name; + + @ApiModelProperty(value = "住院次数") + private String visitId; + + @ApiModelProperty(value = "记帐号") + private String patientId; + + @ApiModelProperty(value = "来源(电子病历)") + private String source; + + @ApiModelProperty(value = "文件信息") + private List fileInfoList; + + @ApiModelProperty(value = "入库时间") + private Date beginTime; + + @ApiModelProperty(value = "入库更新时间") + private Date endTime; + + +} diff --git a/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/FileInfo.java b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/FileInfo.java new file mode 100644 index 0000000..820a33b --- /dev/null +++ b/docus-client-interface/src/main/java/com/docus/server/dto/scheduling.management/FileInfo.java @@ -0,0 +1,35 @@ +package com.docus.server.dto.scheduling.management; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 采集器异常日志 Add DTO + * + * @author AutoGenerator + * @since 2023-07-15 + */ +@Data +@ApiModel(value = "文件信息", description = "文件信息") +public class FileInfo implements Serializable { + + @ApiModelProperty(value = "文件唯一标识") + private String id; + + @ApiModelProperty(value = "文件名") + private String title; + + @ApiModelProperty(value = "下载地址") + private String fileUrl; + + @ApiModelProperty(value = "文件类型") + private String assortId; + + @ApiModelProperty(value = "文件类型名称") + private String assortName; + + +} diff --git a/pom.xml b/pom.xml index 6081ef2..c30ebc2 100644 --- a/pom.xml +++ b/pom.xml @@ -14,6 +14,7 @@ collect-sdry collector-scheduling-management + collector-terminal-management common-collect common-docus common-sysem