From aca07099fe5aac1f38b46a78746c7df8f9329970 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 13 九月 2023 14:53:33 +0800
Subject: [PATCH] Merge branch 'master-fwq-phis下载中心' into master-test
---
phis-download-feign/src/main/java/com/hz/his/dto/common/OperateDto.java | 15 +++
phis-download-feign/.gitignore | 26 +++++
phis-download-feign/src/main/java/com/hz/his/dto/common/PageDto.java | 101 ++++++++++++++++++++
phis-download-feign/src/main/java/com/hz/his/dto/common/TimeDto.java | 46 +++++++++
phis-download-feign/pom.xml | 63 ++++++++++++
phis-download-feign/src/main/java/com/hz/his/dto/DAppointDto.java | 34 ++++++
6 files changed, 285 insertions(+), 0 deletions(-)
diff --git a/phis-download-feign/.gitignore b/phis-download-feign/.gitignore
new file mode 100644
index 0000000..dfeef60
--- /dev/null
+++ b/phis-download-feign/.gitignore
@@ -0,0 +1,26 @@
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+*.iml
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+/target/
+/.idea/
diff --git a/phis-download-feign/pom.xml b/phis-download-feign/pom.xml
new file mode 100644
index 0000000..d1bd73a
--- /dev/null
+++ b/phis-download-feign/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>com.hz</groupId>
+ <artifactId>phis-download-feign</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <parent>
+ <groupId>com.hz</groupId>
+ <artifactId>phis-service-feign</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>com.hx.gitee</groupId>
+ <artifactId>hx-common</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.github.ulisesbocchio</groupId>
+ <artifactId>jasypt-spring-boot-starter</artifactId>
+ </dependency>
+
+ <!--openfeign鐨勬敮鎸�-->
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-openfeign</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-loadbalancer</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <!-- <finalName>cases_common</finalName>-->
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </resource>
+ </resources>
+
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/DAppointDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/DAppointDto.java
new file mode 100644
index 0000000..4b93b88
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/DAppointDto.java
@@ -0,0 +1,34 @@
+package com.hz.his.dto;
+
+import com.hz.his.dto.common.OperateDto;
+import lombok.Data;
+
+/**
+ * @author fwq
+ * 瀵煎嚭棰勭害Dto
+ */
+@Data
+public class DAppointDto extends OperateDto {
+
+ String startTime;
+ String endTime;
+ String shopId;
+ String doctorId;
+ String keyWord;
+ String corpUserName;
+ String doctorName;
+ String type;
+ Integer orderType;
+ Integer isMicApprove;
+ String projectName;
+ String userLevel;
+ String field;
+ String id;
+ String userId;
+ String roleId;
+ String corpUserId;
+ String createCuName;
+ String channelType;
+ String chatCorpName;
+ String appType;
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/common/OperateDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/common/OperateDto.java
new file mode 100644
index 0000000..dbcf98a
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/common/OperateDto.java
@@ -0,0 +1,15 @@
+package com.hz.his.dto.common;
+
+import lombok.Data;
+
+/**
+ * @author fwq
+ */
+@Data
+public class OperateDto {
+ /**鎿嶄綔浜烘爣璇�*/
+ String operateId;
+ /**鎿嶄綔浜哄悕绉�*/
+ String operateMan;
+
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/common/PageDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/common/PageDto.java
new file mode 100644
index 0000000..d2a6360
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/common/PageDto.java
@@ -0,0 +1,101 @@
+package com.hz.his.dto.common;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author ChenJiaHe
+ * 鍒嗛〉鎵╁睍绫�*/
+@Data
+public class PageDto {
+ /**鏍囪瘑*/
+ private String id;
+ /**褰撳墠椤垫暟*/
+ private Integer pageNum;
+ /**褰撳墠椤垫樉绀烘潯鏁�*/
+ private Integer pageSize;
+ /**鍏抽敭瀛�*/
+ private String keyWord;
+ /**涓婄骇鏍囪瘑*/
+ private String parentId;
+ /**鍒嗙被鏍囪瘑*/
+ private String typeId;
+ private List<String> typeIdList;
+ //appid
+ private String appId;
+
+
+ public Integer getPageNum() {
+ if(this.pageNum == null || this.pageNum < 0){
+ this.pageNum = 1;
+ }
+ return this.pageNum;
+ }
+
+ public Integer getPageNum(Integer pageNum) {
+ if(pageNum != null){
+ this.pageNum = pageNum;
+ }else{
+ this.pageNum = getPageNum();
+ }
+ return this.pageNum;
+ }
+
+ public void setPageNum(Integer pageNum) {
+ this.pageNum = pageNum;
+ }
+
+ public Integer getPageSize() {
+ if(this.pageSize == null || this.pageSize < 0 || this.pageSize > 800){
+ this.pageSize = 800;
+ }
+ return this.pageSize;
+ }
+
+ public Integer getPageSize(Integer pageSize) {
+ if(pageSize != null){
+ this.pageSize = pageSize;
+ }else{
+ this.pageSize = getPageSize();
+ }
+ return this.pageSize;
+ }
+
+ public void setPageSize(Integer pageSize) {
+ this.pageSize = pageSize;
+ }
+
+ public String getKeyWord() {
+ return keyWord;
+ }
+
+ public void setKeyWord(String keyWord) {
+ this.keyWord = keyWord;
+ }
+
+ public String getParentId() {
+ return parentId;
+ }
+
+ public void setParentId(String parentId) {
+ this.parentId = parentId;
+ }
+
+ public String getTypeId() {
+ return typeId;
+ }
+
+ public void setTypeId(String typeId) {
+ this.typeId = typeId;
+ }
+
+ public String getAppId() {
+ return appId;
+ }
+
+ public void setAppId(String appId) {
+ this.appId = appId;
+ }
+}
diff --git a/phis-download-feign/src/main/java/com/hz/his/dto/common/TimeDto.java b/phis-download-feign/src/main/java/com/hz/his/dto/common/TimeDto.java
new file mode 100644
index 0000000..92513a9
--- /dev/null
+++ b/phis-download-feign/src/main/java/com/hz/his/dto/common/TimeDto.java
@@ -0,0 +1,46 @@
+package com.hz.his.dto.common;
+
+import java.util.Date;
+
+/**
+ * @author fwq
+ * 鏃堕棿鎵╁睍绫�
+ */
+public class TimeDto {
+
+ private String timeString;
+
+ private Date timeDate;
+
+ public TimeDto(String timeString) {
+ this.timeString = timeString;
+ }
+
+ public TimeDto(Date timeDate) {
+ this.timeDate = timeDate;
+ }
+
+ public TimeDto() {
+ }
+
+ public TimeDto(String timeString, Date timeDate) {
+ this.timeString = timeString;
+ this.timeDate = timeDate;
+ }
+
+ public String getTimeString() {
+ return timeString;
+ }
+
+ public void setTimeString(String timeString) {
+ this.timeString = timeString;
+ }
+
+ public Date getTimeDate() {
+ return timeDate;
+ }
+
+ public void setTimeDate(Date timeDate) {
+ this.timeDate = timeDate;
+ }
+}
--
Gitblit v1.8.0