feat: 初始化

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/atlas/AtlasDetailsCommentReplySelectPageDTO.java

@@ -0,0 +1,50 @@
+package com.yida.data.school.dto.atlas;
+
+import com.yida.data.common.core.common.BaseDTO;
+import com.yida.data.common.core.entity.atlas.CoreAtlasManagementDetailsCommentReply;
+
+import java.io.Serializable;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * 评论回复列表请求类
+ *
+ * @author ZYJ
+ * @date 2021/10/13
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "AtlasDetailsCommentReplySelectPageDTO", description = "评论回复列表请求类")
+public class AtlasDetailsCommentReplySelectPageDTO extends BaseDTO<CoreAtlasManagementDetailsCommentReply> implements Serializable {
+
+    private static final long serialVersionUID = -2791959580400825582L;
+
+    /**
+     * 评论id
+     */
+    @NotNull
+    @ApiModelProperty(value = "评论id", required = true)
+    private Long commentId;
+
+    /**
+     * 评论内容
+     */
+    @ApiModelProperty(value = "评论内容")
+    private String content;
+
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty(value = "审核状态. 0待审核,1审核通过,2审核未通过,不传或传空代表全部")
+    private String checkStatus;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/atlas/AtlasDetailsCommentSelectPageDTO.java

@@ -0,0 +1,50 @@
+package com.yida.data.school.dto.atlas;
+
+import com.yida.data.common.core.common.BaseDTO;
+import com.yida.data.common.core.entity.atlas.CoreAtlasManagementDetailsComment;
+
+import java.io.Serializable;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * 图集作品评论列表请求类
+ *
+ * @author ZYJ
+ * @date 2021/10/13
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "AtlasDetailsCommentSelectPageDTO", description = "图集作品评论列表请求类")
+public class AtlasDetailsCommentSelectPageDTO extends BaseDTO<CoreAtlasManagementDetailsComment> implements Serializable {
+
+    private static final long serialVersionUID = -4365470013849223113L;
+
+    /**
+     * 图集作品id
+     */
+    @NotNull
+    @ApiModelProperty(value = "图集作品id", required = true)
+    private Long atlasDetailsId;
+
+    /**
+     * 评论内容
+     */
+    @ApiModelProperty(value = "评论内容")
+    private String content;
+
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty(value = "审核状态. 0待审核,1审核通过,2审核未通过,不传或传空代表全部")
+    private String checkStatus;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/atlas/AtlasDetailsSaveDTO.java

@@ -0,0 +1,80 @@
+package com.yida.data.school.dto.atlas;
+
+import java.io.Serializable;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 保存图集作品请求类
+ *
+ * @author ZYJ
+ * @date 2021/9/2
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "AtlasDetailsSaveDTO", description = "保存图集作品请求类")
+public class AtlasDetailsSaveDTO implements Serializable {
+
+    private static final long serialVersionUID = 5779807608209722792L;
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(value = "主键id")
+    private Long id;
+
+    /**
+     * 学校id
+     */
+    @NotNull
+    @ApiModelProperty(value = "学校id", required = true)
+    private Long schoolId;
+
+    /**
+     * 对应的图集id
+     */
+    @NotNull
+    @ApiModelProperty(value = "对应的图集id", required = true)
+    private Long coreAtlasManagementId;
+
+    /**
+     * 图集类型: 0图片, 1视频
+     */
+    @NotBlank
+    @ApiModelProperty(value = "图集类型: 0图片, 1视频", required = true)
+    private String type;
+
+    /**
+     * 图片或视频路径
+     */
+    @NotBlank
+    @ApiModelProperty(value = "图片或视频路径", required = true)
+    private String filePathUrl;
+
+    /**
+     * 视频封面图路径
+     */
+    @ApiModelProperty(value = "视频封面图路径")
+    private String videoImgUrl;
+
+    /**
+     * 视频时长
+     */
+    @ApiModelProperty(value = "视频时长")
+    private String videoTime;
+
+    /**
+     * 视频或图片描述
+     */
+    @NotBlank
+    @ApiModelProperty(value = "视频或图片描述", required = true)
+    private String description;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/atlas/AtlasDetailsSelectPageDTO.java

@@ -0,0 +1,38 @@
+package com.yida.data.school.dto.atlas;
+
+import com.yida.data.common.core.common.BaseDTO;
+import com.yida.data.common.core.entity.atlas.CoreAtlasManagementDetails;
+
+import java.io.Serializable;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * 图集作品后台列表请求类
+ *
+ * @author ZYJ
+ * @date 2021/9/2
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "AtlasDetailsSelectPageDTO", description = "图集作品后台列表请求类")
+public class AtlasDetailsSelectPageDTO extends BaseDTO<CoreAtlasManagementDetails> implements Serializable {
+
+    private static final long serialVersionUID = -8279187438715633542L;
+
+    /**
+     * 图集id
+     */
+    @NotNull
+    @ApiModelProperty(value = "图集id", required = true)
+    private Long atlasId;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/atlas/AtlasSaveDTO.java

@@ -0,0 +1,68 @@
+package com.yida.data.school.dto.atlas;
+
+import java.io.Serializable;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 保存图集请求类
+ *
+ * @author ZYJ
+ * @date 2021/9/2
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "AtlasSaveDTO", description = "保存图集请求类")
+public class AtlasSaveDTO implements Serializable {
+
+    private static final long serialVersionUID = 7759845711056070627L;
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(value = "主键id")
+    private Long id;
+
+    /**
+     * 学校id
+     */
+    @NotNull
+    @ApiModelProperty(value = "学校id", required = true)
+    private Long schoolId;
+
+    /**
+     * 图集名称
+     */
+    @NotBlank
+    @ApiModelProperty(value = "图集名称", required = true)
+    private String atlasName;
+
+    /**
+     * 图集封面图片地址
+     */
+    @NotBlank
+    @ApiModelProperty(value = "图集封面图片地址", required = true)
+    private String atlasCoverImgUrl;
+
+    /**
+     * 图集背景图片
+     */
+    @NotBlank
+    @ApiModelProperty(value = "图集背景图片", required = true)
+    private String atlasBackgroundImgUrl;
+
+    /**
+     * 图集简介
+     */
+    @NotBlank
+    @ApiModelProperty(value = "图集简介", required = true)
+    private String atlasIntroduction;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/atlas/AtlasSelectPageDTO.java

@@ -0,0 +1,72 @@
+package com.yida.data.school.dto.atlas;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yida.data.common.core.common.BaseDTO;
+import com.yida.data.common.core.entity.atlas.CoreAtlasManagement;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * 图集后台列表请求类
+ *
+ * @author ZYJ
+ * @date 2021/9/2
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "AtlasSelectPageDTO", description = "图集后台列表请求类")
+public class AtlasSelectPageDTO extends BaseDTO<CoreAtlasManagement> implements Serializable {
+
+    private static final long serialVersionUID = 1785355810382375282L;
+
+    /**
+     * 学校id
+     */
+    @NotNull
+    @ApiModelProperty(value = "学校id", required = true)
+    private Long schoolId;
+
+    /**
+     * 图集名称
+     */
+    @ApiModelProperty(value = "图集名称")
+    private String atlasName;
+
+    /**
+     * 查询条件: 创建开始时间
+     */
+    @ApiModelProperty(value = "创建开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime startCreateDate;
+
+    /**
+     * 查询条件: 创建结束时间
+     */
+    @ApiModelProperty(value = "创建结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime endCreateDate;
+
+    /**
+     * 是否启用. 0:未启用, 1:已启用
+     */
+    @ApiModelProperty(value = "是否启用. 0:未启用, 1:已启用")
+    private Integer enableStatus;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/atlas/CheckCommentDTO.java

@@ -0,0 +1,33 @@
+package com.yida.data.school.dto.atlas;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 作品评论审核请求类
+ *
+ * @author ZYJ
+ * @date 2021/10/13
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "CheckCommentDTO", description = "作品评论审核请求类")
+public class CheckCommentDTO implements Serializable {
+
+    private static final long serialVersionUID = 7239810788971794785L;
+
+    @ApiModelProperty(value = "评论id", required = true)
+    private Long id;
+
+    @ApiModelProperty(value = "审核状态. 1审核通过,2审核未通过", required = true)
+    private String checkStatus;
+
+    @ApiModelProperty(value = "未通过理由")
+    private String reason;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/atlas/CheckCommentReplyDTO.java

@@ -0,0 +1,33 @@
+package com.yida.data.school.dto.atlas;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 评论回复审核请求类
+ *
+ * @author ZYJ
+ * @date 2021/10/13
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "CheckCommentReplyDTO", description = "评论回复审核请求类")
+public class CheckCommentReplyDTO implements Serializable {
+
+    private static final long serialVersionUID = -5395265069188191981L;
+
+    @ApiModelProperty(value = "回复id", required = true)
+    private Long id;
+
+    @ApiModelProperty(value = "审核的状态. 1审核通过,2审核未通过", required = true)
+    private String checkStatus;
+
+    @ApiModelProperty(value = "未通过理由")
+    private String reason;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/atlas/app/AppAtlasInfoDTO.java

@@ -0,0 +1,39 @@
+package com.yida.data.school.dto.atlas.app;
+
+import com.yida.data.common.core.common.AppRequestBaseDTO;
+
+import java.io.Serializable;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * app获取图集详情接口请求类
+ *
+ * @author ZYJ
+ * @date 2021/9/6
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "AppAtlasInfoDTO", description = "app获取图集详情接口请求类")
+public class AppAtlasInfoDTO extends AppRequestBaseDTO implements Serializable {
+
+    private static final long serialVersionUID = 7017764503870680059L;
+
+    /**
+     * 图集主键id
+     */
+    @NotNull
+    @ApiModelProperty(value = "图集主键id", required = true)
+    private Long atlasId;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/atlas/app/AppAtlasWorkCommentReplySaveDTO.java

@@ -0,0 +1,54 @@
+package com.yida.data.school.dto.atlas.app;
+
+import com.yida.data.common.core.common.AppRequestBaseDTO;
+
+import java.io.Serializable;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * app保存评论回复接口请求类
+ *
+ * @author ZYJ
+ * @date 2021/9/7
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "AppAtlasWorkCommentReplySaveDTO", description = "app保存评论回复接口请求类")
+public class AppAtlasWorkCommentReplySaveDTO extends AppRequestBaseDTO implements Serializable {
+
+    private static final long serialVersionUID = 7034033652452378819L;
+
+    /**
+     * 评论主键id
+     */
+    @NotNull
+    @ApiModelProperty(value = "评论主键id", required = true)
+    private Long coreAtlasManagementDetailsCommentId;
+
+    /**
+     * 评论回复内容
+     */
+    @NotBlank
+    @ApiModelProperty(value = "评论回复内容", required = true)
+    private String content;
+
+    /**
+     * 学校id
+     */
+    @NotNull
+    @ApiModelProperty(value = "学校id", required = true)
+    private Long schoolId;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/atlas/app/AppAtlasWorkCommentReplySelectDTO.java

@@ -0,0 +1,41 @@
+package com.yida.data.school.dto.atlas.app;
+
+import com.yida.data.common.core.common.AppPageRequestBaseDTO;
+import com.yida.data.common.core.entity.atlas.CoreAtlasManagementDetailsCommentReply;
+
+import java.io.Serializable;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * app分页查询评论回复列表接口请求类
+ *
+ * @author ZYJ
+ * @date 2021/9/7
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "AppAtlasWorkCommentReplySelectDTO", description = "app分页查询评论回复列表接口请求类")
+public class AppAtlasWorkCommentReplySelectDTO
+        extends AppPageRequestBaseDTO<CoreAtlasManagementDetailsCommentReply> implements Serializable {
+
+    private static final long serialVersionUID = -836795468568482616L;
+
+    /**
+     * 评论主键id
+     */
+    @NotNull
+    @ApiModelProperty(value = "评论主键id", required = true)
+    private Long commentId;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/atlas/app/AppAtlasWorkCommentSaveDTO.java

@@ -0,0 +1,60 @@
+package com.yida.data.school.dto.atlas.app;
+
+import com.yida.data.common.core.common.AppRequestBaseDTO;
+
+import java.io.Serializable;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * app保存图集作品评论接口请求类
+ *
+ * @author ZYJ
+ * @date 2021/9/7
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "AppAtlasWorkCommentSaveDTO", description = "app保存图集作品评论接口请求类")
+public class AppAtlasWorkCommentSaveDTO extends AppRequestBaseDTO implements Serializable {
+
+    private static final long serialVersionUID = -8818786433774592086L;
+
+    /**
+     * 图集id
+     */
+    @ApiModelProperty(value = "图集id", required = true)
+    private Long atlasId;
+
+    /**
+     * 图集作品主键id
+     */
+    @NotNull
+    @ApiModelProperty(value = "图集作品主键id", required = true)
+    private Long coreAtlasManagementDetailsId;
+
+    /**
+     * 评论内容
+     */
+    @NotBlank
+    @ApiModelProperty(value = "评论内容", required = true)
+    private String content;
+
+    /**
+     * 学校id
+     */
+    @NotNull
+    @ApiModelProperty(value = "学校id", required = true)
+    private Long schoolId;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/atlas/app/AppAtlasWorkCommentSelectDTO.java

@@ -0,0 +1,40 @@
+package com.yida.data.school.dto.atlas.app;
+
+import com.yida.data.common.core.common.AppPageRequestBaseDTO;
+import com.yida.data.common.core.entity.atlas.CoreAtlasManagementDetailsComment;
+
+import java.io.Serializable;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * app分页查询图集作品评论列表接口请求类
+ *
+ * @author ZYJ
+ * @date 2021/9/7
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "AppAtlasWorkCommentSelectDTO", description = "app分页查询图集作品评论列表接口请求类")
+public class AppAtlasWorkCommentSelectDTO extends AppPageRequestBaseDTO<CoreAtlasManagementDetailsComment> implements Serializable {
+
+    private static final long serialVersionUID = -1554520962612886364L;
+
+    /**
+     * 图集作品主键id
+     */
+    @NotNull
+    @ApiModelProperty(value = "图集作品主键id", required = true)
+    private Long atlasDetailsId;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/atlas/app/AppAtlasWorkInfoDTO.java

@@ -0,0 +1,39 @@
+package com.yida.data.school.dto.atlas.app;
+
+import com.yida.data.common.core.common.AppRequestBaseDTO;
+
+import java.io.Serializable;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * app获取图集作品详情接口请求类
+ *
+ * @author ZYJ
+ * @date 2021/9/6
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "AppAtlasWorkInfoDTO", description = "app获取图集作品详情接口请求类")
+public class AppAtlasWorkInfoDTO extends AppRequestBaseDTO implements Serializable {
+
+    private static final long serialVersionUID = -6988091402439532402L;
+
+    /**
+     * 图集作品主键id
+     */
+    @NotNull
+    @ApiModelProperty(value = "图集作品主键id", required = true)
+    private Long atlasDetailsId;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/atlas/app/AppAtlasWorkLikeDTO.java

@@ -0,0 +1,46 @@
+package com.yida.data.school.dto.atlas.app;
+
+import com.yida.data.common.core.common.AppRequestBaseDTO;
+
+import java.io.Serializable;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * app图集作品点赞/取消点赞请求类
+ *
+ * @author ZYJ
+ * @date 2021/9/7
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "AppAtlasWorkLikeDTO", description = "app图集作品点赞/取消点赞请求类")
+public class AppAtlasWorkLikeDTO extends AppRequestBaseDTO implements Serializable {
+
+    private static final long serialVersionUID = 2905506255666312125L;
+
+    /**
+     * 图集主键id
+     */
+    @NotNull
+    @ApiModelProperty(value = "图集主键id", required = true)
+    private Long atlasId;
+
+    /**
+     * 图集作品主键id
+     */
+    @NotNull
+    @ApiModelProperty(value = "图集作品主键id", required = true)
+    private Long atlasDetailsId;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/atlas/app/AppAtlasWorkListDTO.java

@@ -0,0 +1,49 @@
+package com.yida.data.school.dto.atlas.app;
+
+import com.yida.data.common.core.common.AppPageRequestBaseDTO;
+import com.yida.data.common.core.entity.atlas.CoreAtlasManagementDetails;
+import com.yida.data.common.core.enums.WorkTypeEnum;
+
+import java.io.Serializable;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * app根据类型查询图集作品分页数据请求类
+ *
+ * @author ZYJ
+ * @date 2021/9/6
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "AppAtlasWorkListDTO", description = "app根据类型查询图集作品分页数据请求类")
+public class AppAtlasWorkListDTO extends AppPageRequestBaseDTO<CoreAtlasManagementDetails> implements Serializable {
+
+    private static final long serialVersionUID = 6418635261338138410L;
+
+    /**
+     * 图集主键id
+     */
+    @NotNull
+    @ApiModelProperty(value = "图集主键id", required = true)
+    private Long atlasId;
+
+    /**
+     * 图集作品类型 {@link WorkTypeEnum}
+     */
+    @NotBlank
+    @ApiModelProperty(value = "图集作品类型. 0:图片,1:视频", required = true)
+    private String type;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/classCall/ClassCallAddDTO.java

@@ -0,0 +1,43 @@
+package com.yida.data.school.dto.classCall;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+
+@ApiModel("添加点名记录对象")
+@Data
+public class ClassCallAddDTO {
+
+    /**
+     * 班级ID
+     */
+    @ApiModelProperty(required = true, value = "班级ID")
+    @NotNull(message = "不能为空")
+    private Long classId;
+
+    /**
+     * 课程名称
+     */
+    @ApiModelProperty(required = true, value = "课程名称")
+    @NotBlank(message = "不能为空")
+    private String subjectName;
+
+    /**
+     * 点名教师id
+     */
+    @ApiModelProperty(required = true, value = "点名教师id")
+    @NotNull(message = "不能为空")
+    private Long teacherId;
+
+
+    /**
+     * 点名学生集合
+     */
+    @ApiModelProperty(required = true, value = "点名学生集合")
+    @NotEmpty(message = "不能为空")
+    List<StudentDTO> studentList;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/classCall/ClassCallPageDTO.java

@@ -0,0 +1,39 @@
+package com.yida.data.school.dto.classCall;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yida.data.common.core.common.BaseDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.time.LocalDate;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@ApiModel("分页查询点名记录条件")
+@Data
+public class ClassCallPageDTO extends BaseDTO {
+
+    /**
+     * 学校ID
+     */
+    @ApiModelProperty(required = false, value = "学校ID")
+    private Long schoolId;
+
+    /**
+     * 职工ID
+     */
+    @ApiModelProperty(required = false, value = "职工ID")
+    private Long staffId;
+
+    /**
+     * 班级ID
+     */
+    @ApiModelProperty(required = false, value = "班级ID")
+    private Long classId;
+
+
+    @ApiModelProperty(required = false, value = "点名日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private LocalDate date;
+
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/classCall/StudentDTO.java

@@ -0,0 +1,18 @@
+package com.yida.data.school.dto.classCall;
+
+import com.yida.data.common.core.entity.user.EduStudent;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+
+@Data
+public class StudentDTO {
+
+    @ApiModelProperty(required = true, value = "点名状态：0=异常，1=正常")
+    @NotNull(message = "不能为空")
+    private Integer status;
+
+    @ApiModelProperty(required = true, value = "学生主键ID")
+    @NotNull(message = "不能为空")
+    private Long studentId;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/classSchedule/ClassSchedulePageDTO.java

@@ -0,0 +1,33 @@
+package com.yida.data.school.dto.classSchedule;
+
+import com.yida.data.common.core.common.BaseDTO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("课程表分页查询条件")
+@Data
+public class ClassSchedulePageDTO extends BaseDTO {
+
+    @ApiModelProperty("使用状态,0-启用，1-停用")
+    private Integer status;
+
+    @ApiModelProperty("学期id")
+    private Long semesterId;
+
+    @ApiModelProperty("学校id")
+    private Long schoolId;
+
+    @ApiModelProperty("校区id")
+    private Long districtId;
+
+    @ApiModelProperty("学段id")
+    private Long sectionId;
+
+    @ApiModelProperty("年级id")
+    private Long gradeId;
+
+    @ApiModelProperty("课表名称")
+    private String classScheduleName;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/classSchedule/DownloadTemplateDTO.java

@@ -0,0 +1,16 @@
+package com.yida.data.school.dto.classSchedule;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("下载模板条件")
+@Data
+public class DownloadTemplateDTO {
+
+    @ApiModelProperty("课表id")
+    private Long scheduleId;
+
+    @ApiModelProperty("0-总课表，1-班级课表")
+    private Integer type;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/classSchedule/UpdateClassTimeDTO.java

@@ -0,0 +1,14 @@
+package com.yida.data.school.dto.classSchedule;
+
+import com.yida.data.common.core.entity.classschedule.EduClassScheduleTime;
+
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class UpdateClassTimeDTO {
+    private Long classScheduleId;
+
+    private List<EduClassScheduleTime> timeList;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/config/EduSchoolFunctionConfigDTO.java

@@ -0,0 +1,29 @@
+package com.yida.data.school.dto.config;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@ApiModel("学校关键功能点配置条件请求类")
+@Data
+public class EduSchoolFunctionConfigDTO {
+
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "学校主键")
+    @TableId(value = "school_id")
+    private Long school_id;
+
+    @ApiModelProperty(value = "关键功能点code")
+    @TableId(value = "function_code")
+    private String functionCode;
+
+    @ApiModelProperty(value = "是否启用1启用，其他未启用")
+    @TableId(value = "function_code")
+    private Integer state;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/exam/ClassCompareDTO.java

@@ -0,0 +1,43 @@
+package com.yida.data.school.dto.exam;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ClassCompareDTO {
+
+    @ApiModelProperty("查询的课程，不传为总分")
+    Long courseId;
+
+    @ApiModelProperty("查询的班级列表")
+    List<Long> classIds;
+
+    @ApiModelProperty("考试id")
+    Long examId;
+
+    @ApiModelProperty("高分率开始")
+    Double highScoreRateStart;
+    @ApiModelProperty("高分率结束")
+    Double highScoreRateEnd;
+    @ApiModelProperty("优秀率开始")
+    Double excellentScoreRateStart;
+    @ApiModelProperty("优秀率结束")
+    Double excellentScoreRateEnd;
+    @ApiModelProperty("良好率开始")
+    Double goodScoreRateStart;
+    @ApiModelProperty("良好率结束")
+    Double goodScoreRateEnd;
+    @ApiModelProperty("及格率开始")
+    Double passScoreRateStart;
+    @ApiModelProperty("及格率结束")
+    Double passScoreRateEnd;
+    @ApiModelProperty("低分率开始")
+    Double lowScoreRateStart;
+    @ApiModelProperty("低分率结束")
+    Double lowScoreRateEnd;
+
+    @ApiModelProperty("考试总分，不传")
+    private Double score;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/exam/FindClassExaminationDTO.java

@@ -0,0 +1,17 @@
+package com.yida.data.school.dto.exam;
+
+import lombok.Data;
+
+/**
+ * @author ccl
+ */
+@Data
+public class FindClassExaminationDTO {
+
+    private Long examId;
+    private Long teacherId;
+    private Long courseId;
+    private Long classId;
+
+
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/exam/ScoreSectionStasticDTO.java

@@ -0,0 +1,27 @@
+package com.yida.data.school.dto.exam;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ScoreSectionStasticDTO {
+    @ApiModelProperty("查询的课程，不传为总分")
+    Long courseId;
+
+    @ApiModelProperty("查询的班级列表")
+    List<Long> classIds;
+
+    @ApiModelProperty("考试id")
+    Long examId;
+
+    @ApiModelProperty("最低分")
+    private Double minScore;
+
+    @ApiModelProperty("最高分")
+    private Double maxScore;
+
+    @ApiModelProperty("分数区间")
+    private Double scoreInterval;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/exam/SelectClassScoreDTO.java

@@ -0,0 +1,21 @@
+package com.yida.data.school.dto.exam;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author ccl
+ */
+@Data
+public class SelectClassScoreDTO {
+    private List<Long> classId;
+    private Long examId;
+    private String studentName;
+    private Long courseId;
+    @ApiModelProperty("当前页码 默认1")
+    private Integer pageNum = 1;
+    @ApiModelProperty("页面大小 默认10")
+    private Integer pageSize = 10;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/facility/BatchGenerateDormRoomDTO.java

@@ -0,0 +1,21 @@
+package com.yida.data.school.dto.facility;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("批量生成寝室")
+@Data
+public class BatchGenerateDormRoomDTO {
+
+    @ApiModelProperty("宿舍楼id")
+    private Long dormId;
+    @ApiModelProperty("床位数量")
+    private Integer bedNum;
+    @ApiModelProperty("楼层")
+    private Integer floor;
+    @ApiModelProperty("起始门牌号")
+    private Integer startNum;
+    @ApiModelProperty("结束门牌号")
+    private Integer endNum;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/index/EditPersonNumDTO.java

@@ -0,0 +1,14 @@
+package com.yida.data.school.dto.index;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class EditPersonNumDTO {
+
+    @ApiModelProperty("寝室id")
+    private Long dormRoomId;
+
+    @ApiModelProperty("变更数量")
+    private Integer num;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/index/ImportDormRoomDTO.java

@@ -0,0 +1,33 @@
+package com.yida.data.school.dto.index;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 导入寝室
+ */
+@Data
+public class ImportDormRoomDTO {
+
+    @ApiModelProperty("宿舍楼名称")
+    @ExcelProperty("宿舍楼名称")
+    private String dormName;
+
+    @ApiModelProperty("楼层")
+    @ExcelProperty("楼层")
+    private Integer floor;
+
+    @ApiModelProperty("寝室号")
+    @ExcelProperty("寝室号")
+    private String dormRoomName;
+
+    @ApiModelProperty("床位数量")
+    @ExcelProperty("床位数量")
+    private Integer bedNum;
+
+    @ApiModelProperty("错误原因")
+    @ExcelProperty("错误原因")
+    private String error;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/index/ListDormRoomDTO.java

@@ -0,0 +1,31 @@
+package com.yida.data.school.dto.index;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 查询宿舍楼列表
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ListDormRoomDTO {
+
+    @ApiModelProperty("学校id")
+    private Long schoolId;
+
+    @ApiModelProperty("宿舍楼id")
+    private List<Long> dormIds;
+
+    @ApiModelProperty("楼层")
+    private Integer floor;
+
+    @ApiModelProperty("宿管id")
+    private Long masterId;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/index/PageDormDTO.java

@@ -0,0 +1,28 @@
+package com.yida.data.school.dto.index;
+
+import com.yida.data.common.core.common.BaseDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PageDormDTO extends BaseDTO {
+    @ApiModelProperty("宿舍楼id")
+    private Long dormId;
+
+    @ApiModelProperty("宿管id")
+    private Long masterId;
+
+    @ApiModelProperty("关键词")
+    private String keyword;
+
+    @ApiModelProperty("学校id")
+    private Long schoolId;
+
+    @ApiModelProperty("宿舍id(后台使用)")
+    private List<Long> dormRoomIds;
+
+    @ApiModelProperty("宿舍楼id集合(查询条件有宿管id时使用)")
+    private List<Long> dormIds;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/index/PageDormRoomDTO.java

@@ -0,0 +1,21 @@
+package com.yida.data.school.dto.index;
+
+import com.yida.data.common.core.common.BaseDTO;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分页查询寝室
+ */
+@Data
+public class PageDormRoomDTO extends BaseDTO {
+    @ApiModelProperty("楼层")
+    private Integer floor;
+
+    @ApiModelProperty("宿舍楼id")
+    private Long dormId;
+
+    @ApiModelProperty("寝室号")
+    private String name;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/index/SaveDeptHomeAppDTO.java

@@ -0,0 +1,30 @@
+package com.yida.data.school.dto.index;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yida.data.common.core.entity.school.EduSchoolHomeMicroCol;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import lombok.Data;
+
+@Data
+public class SaveDeptHomeAppDTO {
+
+    private Long id;
+
+    @ApiModelProperty(value = "应用类型. 0:系统应用, 1:第三方应用,2:微信小程序")
+    private Integer appType;
+    private Integer userType;
+    private Long baseAppId;
+    private String name;
+    private String logo;
+    private String appSrc;
+    private Integer enableStatus;
+    private Integer sort;
+    @ApiModelProperty(value = "微信小程序appid")
+    private String appId;
+    /**
+     * 微信小程序secret
+     */
+    @ApiModelProperty(value = "微信小程序secret")
+    private String appSecret;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/index/SaveMicroDTO.java

@@ -0,0 +1,16 @@
+package com.yida.data.school.dto.index;
+
+import com.yida.data.common.core.entity.school.EduSchoolHomeMicroCol;
+
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class SaveMicroDTO {
+
+    private String name;
+
+    private List<EduSchoolHomeMicroCol> microCol;
+
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/leave/FindPageLeaveListDTO.java

@@ -0,0 +1,16 @@
+package com.yida.data.school.dto.leave;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author ccl
+ */
+@Data
+public class FindPageLeaveListDTO {
+    private List<Long> campsIdList;
+    private List<Long> sectionIdList;
+    private List<Long> gradeIdList;
+    private List<Long> classIdList;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/leave/ListStudentRequestDetailDTO.java

@@ -0,0 +1,35 @@
+package com.yida.data.school.dto.leave;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.time.LocalDateTime;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@ApiModel("查询学生请假条数据")
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ListStudentRequestDetailDTO {
+
+    @ApiModelProperty("学生id")
+    private Long studentId;
+
+    @ApiModelProperty("班级id")
+    private Long classId;
+
+    @ApiModelProperty("开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime startTime;
+
+    @ApiModelProperty("结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime endTime;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/letterbox/LetterBoxConfigDTO.java

@@ -0,0 +1,24 @@
+package com.yida.data.school.dto.letterbox;
+
+import com.yida.data.common.core.entity.letter.EduLetterBoxConfig;
+import com.yida.data.common.core.entity.letter.EduLetterBoxReplyPerson;
+import com.yida.data.common.core.entity.user.EduStaff;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author ccl
+ */
+@Data
+public class LetterBoxConfigDTO {
+    @ApiModelProperty("轮播图")
+    private List<EduLetterBoxConfig> bannerList;
+    @ApiModelProperty("写信须知")
+    private String tip;
+    @ApiModelProperty("回复人员")
+    private List<EduStaff> replyPerson;
+    @ApiModelProperty("部门id")
+    private Long deptId;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/letterbox/LetterBoxDTO.java

@@ -0,0 +1,19 @@
+package com.yida.data.school.dto.letterbox;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author ccl
+ */
+@Data
+public class LetterBoxDTO {
+    @ApiModelProperty("学校id")
+    private Long schoolId;
+    @ApiModelProperty("回复内容")
+    private String replyContent;
+    @ApiModelProperty("信箱主键id")
+    private List<Long> ids;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/news/ListNoticeDTO.java

@@ -0,0 +1,24 @@
+package com.yida.data.school.dto.news;
+
+import com.yida.data.common.core.common.BaseDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ListNoticeDTO extends BaseDTO {
+
+    @ApiModelProperty("标题")
+    private String title;
+
+    @ApiModelProperty("学校")
+    private Long schoolId;
+
+    @ApiModelProperty("是否公开,0-否，1-是")
+    private Integer isPublic;
+
+    @ApiModelProperty("不查询的公告id")
+    private Long notShowId;
+
+    @ApiModelProperty("状态 0-待发送，1-已发送")
+    private Integer status;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/news/SysNoticeSaveDTO.java

@@ -0,0 +1,34 @@
+package com.yida.data.school.dto.news;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@ApiModel("系统通知保存实体")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SysNoticeSaveDTO implements Serializable {
+
+    private static final long serialVersionUID = 3153155441647207183L;
+    @ApiModelProperty("用户id")
+    private List<Long> userId;
+
+    @ApiModelProperty("内容")
+    private String content;
+
+    @ApiModelProperty("推送时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createDate;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/program/SmallProgramSaveDTO.java

@@ -0,0 +1,111 @@
+package com.yida.data.school.dto.program;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 保存小程序请求类
+ *
+ * @author ZYJ
+ * @date 2021/12/10
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "SmallProgramSaveDTO", description = "保存小程序请求类")
+public class SmallProgramSaveDTO implements Serializable {
+
+    private static final long serialVersionUID = -3582668978281452290L;
+
+    /**
+     * 小程序主键id
+     */
+    @ApiModelProperty(value = "小程序主键id")
+    private Long id;
+
+    /**
+     * 小程序名称
+     */
+    @NotBlank
+    @ApiModelProperty(value = "小程序名称")
+    private String smallProgramName;
+
+    /**
+     * 小程序类型id
+     */
+    @ApiModelProperty(value = "小程序类型id")
+    private String typeId;
+
+    /**
+     * 小程序类型名称
+     */
+    @ApiModelProperty(value = "小程序类型名称")
+    private String typeName;
+
+    /**
+     * 链接地址
+     */
+    @ApiModelProperty(value = "链接地址")
+    private String linkUrl;
+
+    /**
+     * 小程序logo图片
+     */
+    @ApiModelProperty(value = "小程序logo图片")
+    private String coverLogoImg;
+
+    /**
+     * 小程序大图
+     */
+    @ApiModelProperty(value = "小程序大图")
+    private String imageUrl;
+
+    /**
+     * 关键词组, 多个用英文逗号隔开
+     */
+    @ApiModelProperty(value = "关键词组, 多个用英文逗号隔开")
+    private String keyWords;
+
+    /**
+     * 操作权限（0为可见，1为可操作）
+     */
+    @ApiModelProperty(value = "操作权限（0为可见，1为可操作）")
+    private Integer authorityType;
+
+    /**
+     * 是否显示分享（0为不显示，1为显示）
+     */
+    @ApiModelProperty(value = "是否显示分享（0为不显示，1为显示）")
+    private Integer isShare;
+
+    /**
+     * 分享标题
+     */
+    @ApiModelProperty(value = "分享标题")
+    private String shareTitle;
+
+    /**
+     * 分享地址
+     */
+    @ApiModelProperty(value = "分享地址")
+    private String shareUrl;
+
+    /**
+     * 分享图片
+     */
+    @ApiModelProperty(value = "分享图片")
+    private String shareImg;
+
+    /**
+     * 图标下方展示名称
+     */
+    @ApiModelProperty(value = "图标下方展示名称")
+    private Integer logoType;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/program/SmallProgramSelectPageDTO.java

@@ -0,0 +1,39 @@
+package com.yida.data.school.dto.program;
+
+import com.yida.data.common.core.common.BaseDTO;
+import com.yida.data.common.core.entity.program.EduSmallProgram;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 小程序后台列表请求类
+ *
+ * @author ZYJ
+ * @date 2021/12/10
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "SmallProgramSelectPageDTO", description = "小程序后台列表请求类")
+public class SmallProgramSelectPageDTO extends BaseDTO<EduSmallProgram> implements Serializable {
+
+    private static final long serialVersionUID = 1834359730736520273L;
+
+    @ApiModelProperty(value = "小程序名称")
+    private String smallProgramName;
+
+    @ApiModelProperty(value = "展示位置")
+    private Integer showPosition;
+
+    @ApiModelProperty(value = "学校或教育局id", hidden = true)
+    private Long deptId;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/screen/SchoolDashboardBaseSaveDTO.java

@@ -0,0 +1,33 @@
+package com.yida.data.school.dto.screen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 保存校园大数据基础建设
+ *
+ * @author ZYJ
+ * @date 2023/4/20
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "SchoolDashboardBaseSaveDTO", description = "保存校园大数据基础建设")
+public class SchoolDashboardBaseSaveDTO implements Serializable {
+
+    private static final long serialVersionUID = -7304594726411432290L;
+
+    @ApiModelProperty(value = "标题")
+    private String label;
+
+    @ApiModelProperty(value = "数量+单位")
+    private String unit;
+
+    @ApiModelProperty(value = "图标")
+    private String icon;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/screen/SchoolDashboardSaveDTO.java

@@ -0,0 +1,130 @@
+package com.yida.data.school.dto.screen;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 保存校园大数据请求类
+ *
+ * @author ZYJ
+ * @date 2023/4/20
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "SchoolDashboardSaveDTO", description = "保存校园大数据请求类")
+public class SchoolDashboardSaveDTO implements Serializable {
+
+    private static final long serialVersionUID = 3417294163343915202L;
+
+    @ApiModelProperty("主键")
+    private Long id;
+
+    @ApiModelProperty("创建时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty("学校id")
+    private Long schoolId;
+
+    @ApiModelProperty("大屏名称")
+    private String title;
+
+    @ApiModelProperty("学校logo地址")
+    private String headerUrl;
+
+    @ApiModelProperty("模板类型1:单页，2双页，3.。。")
+    private Integer modeType;
+
+    @ApiModelProperty(value = "所属区域")
+    private String area;
+
+    @ApiModelProperty("地址")
+    private String address;
+
+    @ApiModelProperty("学校创建时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private LocalDate schoolCreateDate;
+
+    @ApiModelProperty("学校占地面积")
+    private Integer schoolArea;
+
+    @ApiModelProperty(value = "主管部门")
+    private String competentDepartment;
+
+    @ApiModelProperty("办学类型")
+    private String eduType;
+
+    @ApiModelProperty("院校特色")
+    private String eduFeature;
+
+    @ApiModelProperty("院校类型")
+    private String institutionType;
+
+    @ApiModelProperty("硕士点")
+    private Integer masterNum;
+
+    @ApiModelProperty("博士点")
+    private Integer doctorNum;
+
+    @ApiModelProperty("重点学科数")
+    private Integer keyDisciplinesNum;
+
+    @ApiModelProperty("科研项目数")
+    private Integer researchProjectNum;
+
+    @ApiModelProperty("学校简介")
+    private String eduIntroduction;
+
+    @ApiModelProperty("办学理念")
+    private String eduPhilosophy;
+
+    @ApiModelProperty("办学使命")
+    private String eduMission;
+
+    @ApiModelProperty("办学校训")
+    private String eduMotto;
+
+    @ApiModelProperty("校园风采")
+    private String campusStyle;
+
+    @ApiModelProperty("官方电话")
+    private String telephone;
+
+    @ApiModelProperty("教师人数")
+    private Integer teacherNum;
+
+    @ApiModelProperty("院系数量")
+    private Integer departmentNum;
+
+    @ApiModelProperty("一级学科数量")
+    private Integer firstLevelDisciplineNum;
+
+    @ApiModelProperty("二级学科数量")
+    private Integer secondaryDisciplineNum;
+
+    @ApiModelProperty("班级数")
+    private Integer classNum;
+
+    @ApiModelProperty("学生人数")
+    private Integer studentNum;
+
+    @ApiModelProperty("基础建设集合")
+    private List<SchoolDashboardBaseSaveDTO> baseList;
+
+    @ApiModelProperty("师资力量集合")
+    private List<SchoolDashboardTeacherSaveDTO> teacherList;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/screen/SchoolDashboardTeacherSaveDTO.java

@@ -0,0 +1,30 @@
+package com.yida.data.school.dto.screen;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 保存校园大数据师资力量
+ *
+ * @author ZYJ
+ * @date 2023/4/20
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "SchoolDashboardTeacherSaveDTO", description = "保存校园大数据师资力量")
+public class SchoolDashboardTeacherSaveDTO implements Serializable {
+
+    private static final long serialVersionUID = -1683405994263409134L;
+
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+    @ApiModelProperty(value = "数量")
+    private Integer num;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/secondClass/ListCourseContentDTO.java

@@ -0,0 +1,15 @@
+package com.yida.data.school.dto.secondClass;
+
+import com.yida.data.common.core.common.BaseDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("查询课程内容条件")
+@Data
+public class ListCourseContentDTO extends BaseDTO {
+
+    private Long courseId;
+
+    private String name;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/secondClass/ListCourseDTO.java

@@ -0,0 +1,36 @@
+package com.yida.data.school.dto.secondClass;
+
+import com.yida.data.common.core.common.BaseDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 查询课程条件
+ */
+@Data
+public class ListCourseDTO extends BaseDTO {
+
+    @ApiModelProperty("讲师id")
+    private Long lecturerId;
+
+    @ApiModelProperty("课程名称")
+    private String name;
+
+    @ApiModelProperty("主题id")
+    private Long subjectId;
+
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    @ApiModelProperty("排序方式 0/null-创建时间倒序，1-访问量倒序")
+    private Integer sortType;
+
+    @ApiModelProperty("发布状态 0-未发布，1-已发布")
+    private Integer status;
+
+    @ApiModelProperty("推荐到首页 0-不推荐，1-推荐")
+    private Integer homeRecommed;
+
+    @ApiModelProperty("限制查询条数")
+    private Integer limit;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/secondClass/ListVenueExhibitDTO.java

@@ -0,0 +1,20 @@
+package com.yida.data.school.dto.secondClass;
+
+import com.yida.data.common.core.common.BaseDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("查询场馆展品条件")
+@Data
+public class ListVenueExhibitDTO extends BaseDTO {
+
+    @ApiModelProperty("场馆id")
+    private Long venueId;
+
+    @ApiModelProperty("分组id")
+    private Long groupId;
+
+    @ApiModelProperty("展品名称")
+    private String name;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/secondClass/ListVenueGuideDTO.java

@@ -0,0 +1,16 @@
+package com.yida.data.school.dto.secondClass;
+
+import com.yida.data.common.core.common.BaseDTO;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@ApiModel("查询")
+@Data
+public class ListVenueGuideDTO extends BaseDTO {
+
+    private Long venueId;
+
+    private String name;
+
+    private Integer status;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/secondClass/SaveCourseInfoDTO.java

@@ -0,0 +1,22 @@
+package com.yida.data.school.dto.secondClass;
+
+
+import com.yida.data.common.core.entity.school.secondClass.EduSecondClassBanner;
+import com.yida.data.common.core.entity.school.secondClass.EduSecondClassSubject;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import lombok.Data;
+
+@ApiModel("保存名师在线")
+@Data
+public class SaveCourseInfoDTO {
+
+    @ApiModelProperty("标题")
+    private String title;
+
+    @ApiModelProperty("banner")
+    private EduSecondClassBanner banner;
+
+    private List<EduSecondClassSubject> subjectList;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/secondClass/SaveHomeInfoDTO.java

@@ -0,0 +1,24 @@
+package com.yida.data.school.dto.secondClass;
+
+import com.yida.data.common.core.entity.school.secondClass.EduSecondClassBanner;
+import com.yida.data.common.core.entity.school.secondClass.EduSecondClassSubject;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import lombok.Data;
+
+@ApiModel("保存主页信息")
+@Data
+public class SaveHomeInfoDTO {
+
+    private Integer type;
+
+    @ApiModelProperty("标题")
+    private String title;
+
+    @ApiModelProperty("banner")
+    private EduSecondClassBanner banner;
+
+    @ApiModelProperty("主题列表")
+    private List<EduSecondClassSubject> subjectList;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/secondClass/SaveVenueInfoDTO.java

@@ -0,0 +1,21 @@
+package com.yida.data.school.dto.secondClass;
+
+import com.yida.data.common.core.entity.school.secondClass.EduSecondClassBanner;
+import com.yida.data.common.core.entity.school.secondClass.EduSecondClassSubject;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import lombok.Data;
+
+@ApiModel("保存场馆数据")
+@Data
+public class SaveVenueInfoDTO {
+
+    @ApiModelProperty("标题")
+    private String title;
+
+    @ApiModelProperty("banner")
+    private EduSecondClassBanner banner;
+
+    private List<EduSecondClassSubject> subjectList;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/smart/AddUploadFileStepDTO.java

@@ -0,0 +1,41 @@
+package com.yida.data.school.dto.smart;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 步骤文件上传类
+ *
+ * @author ZYJ
+ * @date 2023/6/5
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "AddUploadFileStepDTO", description = "步骤文件上传类")
+public class AddUploadFileStepDTO implements Serializable {
+
+    private static final long serialVersionUID = -209072639419583186L;
+
+    @ApiModelProperty(value = "关联关系id", required = true)
+    private Long relationId;
+
+    @ApiModelProperty(value = "指南id", required = true)
+    private Long guideId;
+
+    @ApiModelProperty(value = "花名册id", required = true)
+    private Long rosterId;
+
+    @ApiModelProperty(value = "步骤id", required = true)
+    private Long stepId;
+
+    @ApiModelProperty(value = "附件地址", required = true)
+    private List<String> upLoadFileUrlList;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/smart/ClassFixImportDTO.java

@@ -0,0 +1,63 @@
+package com.yida.data.school.dto.smart;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Excel职工信息导入类
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "ClassFixImportDTO", description = "Excel固定班级学生导入类")
+public class ClassFixImportDTO implements Serializable {
+
+    private static final long serialVersionUID = -3772088981386664273L;
+    /**
+     * 校区
+     */
+    @ExcelProperty(index = 0, value = "校区")
+    @ApiModelProperty(value = "校区")
+    private String campusName;
+
+    /**
+     * 学段
+     */
+    @ExcelProperty(index = 1, value = "学段")
+    @ApiModelProperty(value = "学段")
+    private String sectionName;
+
+    /**
+     * 年级
+     */
+    @ExcelProperty(index = 2, value = "年级")
+    @ApiModelProperty(value = "年级")
+    private String gradeName;
+
+    /**
+     * 班级
+     */
+    @ExcelProperty(index = 3, value = "班级")
+    @ApiModelProperty(value = "班级")
+    private String className;
+
+    /**
+     * 姓名
+     */
+    @ExcelProperty(index = 4, value = "姓名")
+    @ApiModelProperty(value = "姓名")
+    private String rosterName;
+
+    /**
+     * 身份证号
+     */
+    @ExcelProperty(index = 5, value = "身份证号")
+    @ApiModelProperty(value = "身份证号")
+    private String idNumber;
+
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/smart/ClassImportDTO.java

@@ -0,0 +1,88 @@
+package com.yida.data.school.dto.smart;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * Excel职工信息导入类
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "ClassImportDTO", description = "Excel预选班级导入类")
+public class ClassImportDTO implements Serializable {
+
+    private static final long serialVersionUID = -8812791024900293183L;
+    /**
+     * 校区
+     */
+    @ExcelProperty(index = 0, value = "校区")
+    @ApiModelProperty(value = "校区")
+    private String campusName;
+
+    /**
+     * 学段
+     */
+    @ExcelProperty(index = 1, value = "学段")
+    @ApiModelProperty(value = "学段")
+    private String sectionName;
+
+    /**
+     * 年级
+     */
+    @ExcelProperty(index = 2, value = "年级")
+    @ApiModelProperty(value = "年级")
+    private String gradeName;
+
+    /**
+     * 班级
+     */
+    @ExcelProperty(index = 3, value = "班级")
+    @ApiModelProperty(value = "班级")
+    private String className;
+
+
+    /**
+     * 系部
+     */
+    @ExcelProperty(index = 4, value = "系部")
+    @ApiModelProperty(value = "系部")
+    private String departmentName;
+
+
+    /**
+     * 专业
+     */
+    @ExcelProperty(index = 5, value = "专业")
+    @ApiModelProperty(value = "专业")
+    private String majorName;
+
+    /**
+     * 预设人数
+     */
+    @ExcelProperty(index = 6, value = "预设人数")
+    @ApiModelProperty(value = "预设人数")
+    private Integer number;
+
+
+    /**
+     * 男生占比
+     */
+    @ExcelProperty(index = 7, value = "男生占比")
+    @ApiModelProperty(value = "男生占比")
+    private Integer male;
+
+    /**
+     * 女生占比
+     */
+    @ExcelProperty(index = 8, value = "女生占比")
+    @ApiModelProperty(value = "女生占比")
+    private Integer female;
+
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/smart/CustomDormImportDTO.java

@@ -0,0 +1,102 @@
+package com.yida.data.school.dto.smart;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Excel职工信息导入类
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "CustomDormImportDTO", description = "Excel自定义预选宿舍导入类")
+public class CustomDormImportDTO implements Serializable {
+
+
+    private static final long serialVersionUID = 4258485996992370675L;
+    /**
+     * 系部
+     */
+    @ExcelProperty(index = 0, value = "系部")
+    @ApiModelProperty(value = "系部")
+    private String departmentName;
+
+
+    /**
+     * 专业
+     */
+    @ExcelProperty(index = 1, value = "专业")
+    @ApiModelProperty(value = "专业")
+    private String majorName;
+
+    /**
+     * 宿舍楼
+     */
+    @ExcelProperty(index = 2, value = "宿舍楼")
+    @ApiModelProperty(value = "宿舍楼")
+    private String dormName;
+
+    /**
+     * 寝室号
+     */
+    @ExcelProperty(index = 3, value = "宿舍号")
+    @ApiModelProperty(value = "宿舍号")
+    private String dormRoomName;
+
+    /**
+     * 性别
+     */
+    @ExcelProperty(index = 4, value = "性别,男/女")
+    @ApiModelProperty(value = "性别")
+    private String gender;
+
+    /**
+     * 人数
+     */
+    @ExcelProperty(index = 5, value = "人数")
+    @ApiModelProperty(value = "人数")
+    private Integer number;
+
+    /**
+     * 校区ID
+     */
+    @ExcelProperty(index = 6, value = "校区id")
+    @ApiModelProperty(value = "校区ID")
+    private Long campusId;
+
+    /**
+     * 部门id
+     */
+    @ExcelProperty(index = 7, value = "部门id")
+    @ApiModelProperty(value = "部门id")
+    private Long deptId;
+
+
+    /**
+     * 指南id
+     */
+    @ExcelProperty(index = 8, value = "指南id")
+    @ApiModelProperty(value = "指南id")
+    private Long guideId;
+
+    /**
+     * 步骤id
+     */
+    @ExcelProperty(index = 9, value = "步骤id")
+    @ApiModelProperty(value = "步骤id")
+    private Long stepId;
+
+    /**
+     * 学校id
+     */
+    @ExcelProperty(index = 10, value = "学校id")
+    @ApiModelProperty(value = "学校id")
+    private Long schoolId;
+
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/smart/DormImportDTO.java

@@ -0,0 +1,67 @@
+package com.yida.data.school.dto.smart;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Excel职工信息导入类
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "DormImportDTO", description = "Excel预选宿舍导入类")
+public class DormImportDTO implements Serializable {
+
+    private static final long serialVersionUID = -4260457409043932228L;
+
+
+    /**
+     * 系部
+     */
+    @ExcelProperty(index = 0, value = "系部")
+    @ApiModelProperty(value = "系部")
+    private String departmentName;
+
+
+    /**
+     * 专业
+     */
+    @ExcelProperty(index = 1, value = "专业")
+    @ApiModelProperty(value = "专业")
+    private String majorName;
+
+    /**
+     * 宿舍楼
+     */
+    @ExcelProperty(index = 2, value = "宿舍楼")
+    @ApiModelProperty(value = "宿舍楼")
+    private String dormName;
+
+    /**
+     * 寝室号
+     */
+    @ExcelProperty(index = 3, value = "宿舍号")
+    @ApiModelProperty(value = "宿舍号")
+    private String dormRoomName;
+
+    /**
+     * 性别
+     */
+    @ExcelProperty(index = 4, value = "性别,男/女")
+    @ApiModelProperty(value = "性别")
+    private String gender;
+
+    /**
+     * 人数
+     */
+    @ExcelProperty(index = 5, value = "人数")
+    @ApiModelProperty(value = "人数")
+    private String realNumber;
+
+
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/smart/DormImportFixDTO.java

@@ -0,0 +1,49 @@
+package com.yida.data.school.dto.smart;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Excel职工信息导入类
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "DormImportDTO", description = "Excel预选宿舍导入类")
+public class DormImportFixDTO implements Serializable {
+
+
+    /**
+     * 宿舍楼
+     */
+    @ExcelProperty(index = 0, value = "宿舍楼")
+    @ApiModelProperty(value = "宿舍楼")
+    private String dormName;
+
+    /**
+     * 寝室号
+     */
+    @ExcelProperty(index = 1, value = "宿舍号")
+    @ApiModelProperty(value = "宿舍号")
+    private String dormRoomName;
+    /**
+     * 姓名
+     */
+    @ExcelProperty(index = 2, value = "姓名")
+    @ApiModelProperty(value = "姓名")
+    private String rosterName;
+
+    /**
+     * 身份证号
+     */
+    @ExcelProperty(index = 3, value = "身份证号")
+    @ApiModelProperty(value = "身份证号")
+    private String idNumber;
+
+
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/smart/GuideFillInfoSaveDTO.java

@@ -0,0 +1,70 @@
+package com.yida.data.school.dto.smart;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 保存迎新填报信息请求类
+ *
+ * @author ZYJ
+ * @date 2023/5/17
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "GuideFillInfoSaveDTO", description = "保存迎新填报信息请求类")
+public class GuideFillInfoSaveDTO implements Serializable {
+
+    private static final long serialVersionUID = -5379563542815778231L;
+
+    @ApiModelProperty(value = "微信openId")
+    private String openId;
+
+    @ApiModelProperty(value = "部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "指南id")
+    private Long guideId;
+
+    @ApiModelProperty(value = "头像")
+    private String avatar;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "性别. 0-男，1-女")
+    private Integer sex;
+
+    @ApiModelProperty(value = "身份证号码")
+    private String idNumber;
+
+    @ApiModelProperty(value = "录取专业")
+    private String admittedMajor;
+
+    @ApiModelProperty(value = "录取专业ID")
+    private Long admittedMajorId;
+
+    @ApiModelProperty(value = "录取系部")
+    private String admittedDepartment;
+
+    @ApiModelProperty(value = "录取系部ID")
+    private Long admittedDepartmentId;
+
+    @ApiModelProperty(value = "身份证正面照片")
+    private String idCardRight;
+
+    @ApiModelProperty(value = "身份证反面照片")
+    private String idCardReverse;
+
+    @ApiModelProperty(value = "录取通知书照片")
+    private String admissionLetter;
+
+    @ApiModelProperty("校区id")
+    private Long campusId;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/smart/GuideRosterErrorExportDTO.java

@@ -0,0 +1,30 @@
+package com.yida.data.school.dto.smart;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 指南花名册导入错误返回类
+ *
+ * @author ZYJ
+ * @date 2023/6/1
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "GuideRosterErrorExportDTO", description = "学生信息导入错误返回类")
+public class GuideRosterErrorExportDTO implements Serializable {
+
+    private static final long serialVersionUID = 3208630028278503011L;
+
+    /**
+     * 错误信息
+     */
+    @ExcelProperty("错误信息")
+    private String errorMessage;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/smart/GuideRosterImportDTO.java

@@ -0,0 +1,76 @@
+package com.yida.data.school.dto.smart;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * Excel指南花名册信息导入类
+ *
+ * @author ZYJ
+ * @date 2021/8/24
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "GuideRosterImportDTO", description = "Excel指南花名册信息导入类")
+public class GuideRosterImportDTO implements Serializable {
+
+    private static final long serialVersionUID = 3782716915186380684L;
+
+    /**
+     * 姓名
+     */
+    @ExcelProperty(index = 0)
+    private String fullName;
+
+    /**
+     * 毕业院校
+     */
+    @ExcelProperty(index = 1)
+    private String graduateSchool;
+
+    /**
+     * 身份证号码
+     */
+    @ExcelProperty(index = 2)
+    private String idNumber;
+
+
+    /**
+     * 录取系部
+     */
+    @ExcelProperty(index = 3)
+    private String admittedDepartment;
+
+    /**
+     * 录取专业
+     */
+    @ExcelProperty(index = 4)
+    private String admittedMajor;
+
+
+    /**
+     * 录取年级
+     */
+    @ExcelProperty(index = 5)
+    private String admittedGrade;
+
+    /**
+     * 录取班级
+     */
+    @ExcelProperty(index = 6)
+    private String admittedClass;
+
+    /**
+     * 手机号码
+     */
+    @ExcelProperty(index = 7)
+    private String mobile;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/smart/GuideRosterSelectPageDTO.java

@@ -0,0 +1,66 @@
+package com.yida.data.school.dto.smart;
+
+import com.yida.data.common.core.common.BaseDTO;
+import com.yida.data.common.core.entity.smart.EduSmartWelcomeGuideRoster;
+import com.yida.data.common.core.enums.RegistrationStatusEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 迎新指南花名册后台列表请求类
+ *
+ * @author ZYJ
+ * @date 2023/5/22
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "GuideRosterSelectPageDTO", description = "迎新指南花名册后台列表请求类")
+public class GuideRosterSelectPageDTO extends BaseDTO<EduSmartWelcomeGuideRoster> implements Serializable {
+
+    private static final long serialVersionUID = 2382158515196055662L;
+
+    @ApiModelProperty(value = "指南id")
+    private Long guideId;
+
+    @ApiModelProperty(value = "毕业院校")
+    private String graduateSchool;
+
+    @ApiModelProperty(value = "姓名")
+    private String fullName;
+
+    @ApiModelProperty(value = "身份证号码")
+    private String idNumber;
+
+    @ApiModelProperty(value = "录取专业")
+    private String admittedMajor;
+
+    @ApiModelProperty(value = "未通过的步骤")
+    private Long notPassStepId;
+
+    @ApiModelProperty(value = "通过的步骤")
+    private Long passStepId;
+
+    @ApiModelProperty(value = "是否缴费0=否，1=是")
+    private Integer payStatus;
+
+    /**
+     * {@link RegistrationStatusEnum}
+     */
+    @ApiModelProperty(value = "报到状态. 0-未报到,1-报到成功(全部步骤通过)")
+    private Integer registrationStatus;
+
+
+    private List<Long> passRosterIdList;
+
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/smart/GuideSaveDTO.java

@@ -0,0 +1,51 @@
+package com.yida.data.school.dto.smart;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 保存迎新指南请求类
+ *
+ * @author ZYJ
+ * @date 2023/5/15
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "GuideSaveDTO", description = "保存迎新指南请求类")
+public class GuideSaveDTO implements Serializable {
+
+    private static final long serialVersionUID = 8167376276179823069L;
+
+    @ApiModelProperty(value = "指南id")
+    private Long id;
+
+    @ApiModelProperty(value = "指南标题")
+    private String guideTitle;
+
+    @ApiModelProperty(value = "指南前言")
+    private String guideForeword;
+
+    @ApiModelProperty(value = "资料上报字段，多个以英文逗号分隔")
+    private String formField;
+
+    @ApiModelProperty(value = "缴费金额")
+    private BigDecimal money;
+
+    @ApiModelProperty(value = "是否启用二维码缴费,0未启用，1启用")
+    private Integer moneyStatus;
+
+    @ApiModelProperty(value = "学区id")
+    private Long campusId;
+
+    @ApiModelProperty(value = "指南步骤列表")
+    private List<GuideStepSaveDTO> stepList;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/smart/GuideSelectPageDTO.java

@@ -0,0 +1,40 @@
+package com.yida.data.school.dto.smart;
+
+import com.yida.data.common.core.common.BaseDTO;
+import com.yida.data.common.core.entity.smart.EduSmartWelcomeGuide;
+import com.yida.data.common.core.enums.EnableStatusEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 迎新指南后台列表请求类
+ *
+ * @author ZYJ
+ * @date 2023/5/15
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "GuideSelectPageDTO", description = "迎新指南后台列表请求类")
+public class GuideSelectPageDTO extends BaseDTO<EduSmartWelcomeGuide> implements Serializable {
+
+    private static final long serialVersionUID = -3256496082335396363L;
+
+    @ApiModelProperty(value = "指南标题")
+    private String guideTitle;
+
+    @ApiModelProperty(value = "部门id", hidden = true)
+    private Long deptId;
+
+    /**
+     * {@link EnableStatusEnum}
+     */
+    @ApiModelProperty("启用状态.0:未启用,1:已启用")
+    private Integer enableStatus;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/smart/GuideStepSaveDTO.java

@@ -0,0 +1,65 @@
+package com.yida.data.school.dto.smart;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yida.data.common.core.entity.smart.EduSmartWelcomeGuideStepClass;
+import com.yida.data.common.core.entity.smart.EduSmartWelcomeGuideStepClassFix;
+import com.yida.data.common.core.entity.smart.EduSmartWelcomeGuideStepDorm;
+import com.yida.data.common.core.entity.smart.EduSmartWelcomeGuideStepDormFix;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 保存迎新指南步骤请求类
+ *
+ * @author ZYJ
+ * @date 2023/5/15
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "GuideStepSaveDTO", description = "保存迎新指南步骤请求类")
+public class GuideStepSaveDTO implements Serializable {
+
+    private static final long serialVersionUID = -2496615484964480529L;
+
+    @ApiModelProperty(value = "步骤类型")
+    private Integer stepType;
+
+    @ApiModelProperty(value = "步骤名称")
+    private String stepName;
+
+    @ApiModelProperty(value = "唯一id")
+    private String uniqueId;
+
+    @ApiModelProperty(value = "前提步骤唯一id")
+    private String premiseStepUniqueId;
+
+    @ApiModelProperty(value = "步骤说明")
+    private String stepDescription;
+
+    @ApiModelProperty(value = "缴费金额")
+    private BigDecimal money;
+
+    @ApiModelProperty(value = "审核是否需要评语,0否，1是")
+    private Integer isComment;
+
+    @ApiModelProperty(value = "审核人员id列表")
+    private List<Long> staffIdList;
+    @ApiModelProperty(value = "预分班级列表")
+    private List<EduSmartWelcomeGuideStepClass> classList;
+    @ApiModelProperty(value = "预分班级列表")
+    private List<EduSmartWelcomeGuideStepDorm> dormList;
+    @ApiModelProperty(value = "固定班级列表")
+    private List<EduSmartWelcomeGuideStepClassFix> classFixList;
+    @ApiModelProperty(value = "固定宿舍列表")
+    private List<EduSmartWelcomeGuideStepDormFix> dormFixList;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/smart/StaffPassStepDTO.java

@@ -0,0 +1,41 @@
+package com.yida.data.school.dto.smart;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 职工通过步骤请求类
+ *
+ * @author ZYJ
+ * @date 2023/6/5
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "StaffPassStepDTO", description = "职工通过步骤请求类")
+public class StaffPassStepDTO implements Serializable {
+
+    private static final long serialVersionUID = 4784257912777425471L;
+
+    @ApiModelProperty(value = "关联关系id", required = true)
+    private Long relationId;
+
+    @ApiModelProperty(value = "花名册id", required = true)
+    private Long rosterId;
+
+    @ApiModelProperty(value = "职工id", required = true)
+    private Long staffId;
+
+    @ApiModelProperty(value = "步骤id", required = true)
+    private Long stepId;
+
+    @ApiModelProperty(value = "评语内容", required = false)
+    private String commentContent;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/smart/UpdateQrCodeInfoDTO.java

@@ -0,0 +1,34 @@
+package com.yida.data.school.dto.smart;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 保存指南二维码配置请求类
+ *
+ * @author ZYJ
+ * @date 2023/6/13
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "UpdateQrCodeInfoDTO", description = "保存指南二维码配置请求类")
+public class UpdateQrCodeInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = -5982188939970322279L;
+
+    @ApiModelProperty(value = "指南id")
+    private Long guideId;
+
+    @ApiModelProperty(value = "是否启用自动生成二维码状态. 0:未启用,1:已启用")
+    private Integer qrCodeEnableStatus;
+
+    @ApiModelProperty(value = "没有二维码时的提示")
+    private String qrCodeNoticeMessage;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/smart/h5/CreateGuideStepOrderDTO.java

@@ -0,0 +1,60 @@
+package com.yida.data.school.dto.smart.h5;
+
+import com.yida.data.common.core.enums.PayWay;
+import com.yida.data.common.core.enums.UnionPayTypeEnum;
+import com.yida.data.common.core.enums.WxPayTypeEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 生成花名册步骤订单请求类
+ *
+ * @author ZYJ
+ * @date 2023/6/19
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "CreateGuideStepOrderDTO", description = "生成花名册步骤订单请求类")
+public class CreateGuideStepOrderDTO implements Serializable {
+
+    private static final long serialVersionUID = 5371030556983911931L;
+
+    @ApiModelProperty("指南id")
+    private Long guideId;
+
+//    @ApiModelProperty("步骤id")
+//    private Long stepId;
+
+    @ApiModelProperty("关联关系id")
+    private Long relationId;
+
+    @ApiModelProperty("微信授权码")
+    private String code;
+
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    /**
+     * 支付方式
+     * {@link PayWay}
+     */
+    @ApiModelProperty("支付方式. 写死为5")
+    private String payWay;
+
+    /**
+     * 支付类型
+     * 银联云闪付: {@link UnionPayTypeEnum}
+     * 微信类型: {@link WxPayTypeEnum}
+     */
+    @ApiModelProperty("支付类型. 当前可以不填写")
+    private Integer payType;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/smart/h5/RosterFaceMatchDTO.java

@@ -0,0 +1,38 @@
+package com.yida.data.school.dto.smart.h5;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 花名册人脸对比请求类
+ *
+ * @author ZYJ
+ * @date 2023/6/21
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "RosterFaceMatchDTO", description = "花名册人脸对比请求类")
+public class RosterFaceMatchDTO implements Serializable {
+
+    private static final long serialVersionUID = 1474013091202762132L;
+
+    @ApiModelProperty("指南id")
+    private Long guideId;
+
+    @ApiModelProperty("步骤id")
+    private Long stepId;
+
+    @ApiModelProperty("关联关系id")
+    private Long relationId;
+
+    @ApiModelProperty("base64图片信息")
+    private String base64;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/smart/h5/RosterPageDTO.java

@@ -0,0 +1,39 @@
+package com.yida.data.school.dto.smart.h5;
+
+import com.yida.data.common.core.common.BaseDTO;
+import com.yida.data.common.core.entity.smart.EduSmartWelcomeGuide;
+import com.yida.data.common.core.entity.smart.EduSmartWelcomeGuideRoster;
+import com.yida.data.common.core.entity.smart.EduSmartWelcomeGuideRosterRelation;
+import com.yida.data.common.core.enums.EnableStatusEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 花名册列表h5查询请求类
+ *
+ * @author ZYJ
+ * @date 2023/7/7
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "RosterPageDTO", description = "花名册列表h5查询请求类")
+public class RosterPageDTO extends BaseDTO<EduSmartWelcomeGuideRosterRelation> implements Serializable {
+
+    private static final long serialVersionUID = 5839750378167181943L;
+
+    @ApiModelProperty(value = "名称")
+    private String rosterName;
+
+    @ApiModelProperty(value = "部门id")
+    private Long deptId;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/transaction/ApplyFunction.java

@@ -0,0 +1,17 @@
+package com.yida.data.school.dto.transaction;
+
+import com.yida.data.common.core.entity.apply.EduApply;
+import com.yida.data.common.core.entity.apply.EduApplyFunction;
+
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class ApplyFunction {
+    /**
+     * app名字
+     */
+    private EduApply eduApply;
+    private List<EduApplyFunction> eduApplyFunction;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/transaction/EduApplyProductOrderDTO.java

@@ -0,0 +1,85 @@
+package com.yida.data.school.dto.transaction;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author ccl
+ */
+@Data
+public class EduApplyProductOrderDTO {
+    @ApiModelProperty("省")
+    private Long provinceId;
+
+    @ApiModelProperty("市")
+    private Long cityId;
+
+    @ApiModelProperty("县")
+    private Long countyId;
+
+    @ApiModelProperty("乡")
+    private Long townId;
+
+    @ApiModelProperty(value = "区域id")
+    private Long areaId;
+
+    @ApiModelProperty("学校id")
+    private Long schoolId;
+
+    @ApiModelProperty("校区id")
+    private Long campusId;
+
+    @ApiModelProperty("学段id")
+    private Long sectionId;
+
+    @ApiModelProperty("年级id")
+    private Long gradeId;
+
+    @ApiModelProperty("班级id")
+    private Long classId;
+
+    @ApiModelProperty("订单状态，订单状态：0：待付款\\r\\n1：付款中\\r\\n2：交易完成（正常支付成功）\\r\\n3：待退款\\r\\n4：交易关闭")
+    private Integer orderStatus;
+
+    @ApiModelProperty("订单编号")
+    private String orderCode;
+
+    @ApiModelProperty("手机号")
+    private String phone;
+
+    @ApiModelProperty("商品名")
+    private String productName;
+
+    @ApiModelProperty("学生名")
+    private String studentName;
+
+    @ApiModelProperty("学号")
+    private String studentNumber;
+
+    @ApiModelProperty("开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime startTime;
+
+    @ApiModelProperty("结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime endTime;
+
+    /**
+     * 当前页数
+     */
+    @ApiModelProperty(value = "当前页数")
+    private Integer current = 1;
+    /**
+     * 当前页数量
+     */
+    @ApiModelProperty(value = "当前页数量")
+    private Integer size = 10;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/transaction/ListApplyFunctionDTO.java

@@ -0,0 +1,55 @@
+package com.yida.data.school.dto.transaction;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import java.time.LocalDateTime;
+import java.util.List;
+import lombok.Builder;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+@Builder
+public class ListApplyFunctionDTO {
+
+    private Integer pageSize;
+
+    private Integer pageNum;
+
+    private Long id;
+
+    private Long studentId;
+
+    private List<Long> studentIdList;
+
+    private String studentName;
+
+    private String studentNumber;
+
+    private String applyCode;
+
+    @ApiModelProperty("有效期开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime startTime;
+
+    @ApiModelProperty("有效期结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime endTime;
+
+    @TableField(exist = false)
+    private String deptName;
+
+    private Long schoolId;
+    private Long campusId;
+    private Long sectionId;
+    private Long gradeId;
+    private Long classId;
+
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/transaction/ListBuyStudentDTO.java

@@ -0,0 +1,42 @@
+package com.yida.data.school.dto.transaction;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author ccl
+ */
+@Data
+public class ListBuyStudentDTO {
+    Integer pageSize;
+    Integer pageNum;
+    @ApiModelProperty("商品对应学校id")
+    private Long schoolId;
+    @ApiModelProperty("校区id")
+    private Long campusId;
+    @ApiModelProperty("学段id")
+    private Long sectionId;
+    @ApiModelProperty("年级id")
+    private Long gradeId;
+    @ApiModelProperty("班级id")
+    private Long classId;
+    @ApiModelProperty("学生姓名")
+    private String studentName;
+    @ApiModelProperty("学生学号")
+    private String stuNum;
+    @ApiModelProperty("距离到期时间的天数")
+    private Integer dateNum;
+    @ApiModelProperty("商品id")
+    private Long productId;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime dateTime;
+    private List<Long> studentId;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/transaction/ProductSelectDTO.java

@@ -0,0 +1,74 @@
+package com.yida.data.school.dto.transaction;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author ccl
+ */
+@Data
+public class ProductSelectDTO {
+
+    @ApiModelProperty("省")
+    private Long provinceId;
+
+    @ApiModelProperty("市")
+    private Long cityId;
+
+    @ApiModelProperty("县")
+    private Long countyId;
+
+    @ApiModelProperty("乡")
+    private Long villageId;
+
+    @ApiModelProperty(value = "区域id")
+    private Long areaId;
+
+    /**
+     * 商品
+     */
+    @ApiModelProperty("学校id")
+    private Long schoolId;
+    /**
+     * 开始价格
+     */
+    @ApiModelProperty("开始价格")
+    private Double startPrice;
+    /**
+     * 结束价格
+     */
+    @ApiModelProperty("结束价格")
+    private Double endPrice;
+
+    /**
+     * 时间
+     */
+    @ApiModelProperty("开始时间")
+    private String startTime;
+    /**
+     * 时间
+     */
+    @ApiModelProperty("结束时间")
+    private String endTime;
+
+    /**
+     * 页码
+     */
+    private Integer current = 1;
+    /**
+     * 数量
+     */
+    private Integer size = 10;
+
+    @ApiModelProperty("一级类目")
+    private String firstCategory;
+
+    @ApiModelProperty("二级类目")
+    private String secondCategory;
+
+    @ApiModelProperty("商品名称")
+    private String name;
+
+    @ApiModelProperty("商品状态 0是未上架，1是已上架，3是已经下架")
+    private Integer status;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/userLeave/AuditRequestDTO.java

@@ -0,0 +1,72 @@
+package com.yida.data.school.dto.userLeave;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 审核请假提交对象
+ */
+@Data
+@ApiModel
+public class AuditRequestDTO {
+
+    /**
+     *
+     */
+    @ApiModelProperty(value = "")
+    private Long id;
+
+    /**
+     * 流程ID
+     */
+    @ApiModelProperty(value = "流程ID")
+    private Long processId;
+
+    /**
+     * 请假主体ID
+     */
+    @ApiModelProperty(value = "请假主体ID")
+    private Long requestId;
+
+    /**
+     * 审核人ID
+     */
+    @ApiModelProperty(value = "审核人ID")
+    private Long approvalId;
+
+
+    /**
+     * 审核结果：1=通过，0=不通过，默认0
+     */
+    @ApiModelProperty(value = "审核结果：1=通过，0=不通过，默认0")
+    private Integer approvalResult;
+
+    /**
+     * 审核不通过的原因
+     */
+    @ApiModelProperty(value = "审核不通过的原因")
+    private String approvalReason;
+
+    /**
+     * 审核顺序
+     */
+    @ApiModelProperty(value = "审核顺序")
+    private Integer sort;
+
+
+    /**
+     * 审核顺序
+     */
+    @ApiModelProperty(value = "审核第几流程ID")
+    private Long viewId;
+
+    /**
+     * 审核不通过原因
+     */
+    @ApiModelProperty(value = "审核不通过原因")
+    private String refuseReason;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/userLeave/EduLeaveRequestProcessConfigDTO.java

@@ -0,0 +1,93 @@
+package com.yida.data.school.dto.userLeave;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yida.data.common.core.entity.userLeave.EduLeaveRequestProcessConfig;
+import com.yida.data.common.core.entity.userLeave.EduLeaveRequestProcessConfigApplicableDepartments;
+import com.yida.data.common.core.entity.userLeave.EduLeaveRequestProcessConfigApprovalUser;
+import com.yida.data.common.core.entity.userLeave.EduLeaveRequestProcessConfigView;
+import io.swagger.annotations.ApiModelProperty;
+import java.time.LocalDateTime;
+import java.util.List;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * Entity
+ *
+ * @author wjm
+ * @date 2022-12-01 10:45:56
+ */
+@Data
+public class EduLeaveRequestProcessConfigDTO {
+
+    /**
+     *
+     */
+    @ApiModelProperty(value = "")
+    private Long id;
+
+    /**
+     * 学生id
+     */
+    @ApiModelProperty(value = "学生id")
+    private String processName;
+
+    /**
+     * 流程类型：0=教师，1=学生
+     */
+    @ApiModelProperty(value = "流程类型：0=教师，1=学生")
+    private Integer processType;
+
+    /**
+     * 最小天数
+     */
+    @ApiModelProperty(value = "最小天数")
+    private Integer minDays;
+
+    /**
+     * 最大天数
+     */
+    @ApiModelProperty(value = "最大天数")
+    private Integer maxDays;
+
+
+    /**
+     * 是否小于半天
+     */
+    @ApiModelProperty(value = "是否小于半天1=是，0=否")
+    private Integer lessHalfDay;
+
+
+    /**
+     * 基于less_half_day   定义半天是几小时
+     */
+    @ApiModelProperty(value = "基于less_half_day   定义半天是几小时")
+    private Integer hours;
+
+    /**
+     * 学校id
+     */
+    @ApiModelProperty(value = "学校id")
+    private Long schoolId;
+
+
+    /**
+     * 具体的审核流程
+     */
+    @ApiModelProperty(value = "具体的审核流程")
+    private List<EduLeaveRequestProcessConfigView> eduLeaveRequestProcessConfigViewList;
+
+
+    /**
+     * 适用人员部门
+     */
+    @ApiModelProperty(value = "适用人员部门")
+    private List<EduLeaveRequestProcessConfigApplicableDepartments> applicableDepartmentsList;
+
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/userLeave/LeaveRequestPageDTO.java

@@ -0,0 +1,51 @@
+package com.yida.data.school.dto.userLeave;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yida.data.common.core.common.BaseDTO;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class LeaveRequestPageDTO extends BaseDTO {
+
+    @ApiModelProperty("请假人姓名")
+    private String requestUserName;
+    @ApiModelProperty("请假类型：0教师请假，1学生请假")
+    private Integer requestType;
+    @ApiModelProperty("所属学校ID")
+    private Long schoolId;
+    @ApiModelProperty("审核状态：0待审核，3审核中,4已审核(包含1已通过，2已拒绝)")
+    private Integer status;
+    private List<Integer> statusList;
+    private List<Long> studentIdList;
+    @ApiModelProperty("请假主体ID集合")
+    private List<Long> idList;
+
+    @ApiModelProperty(value = "开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime startDateTime;
+
+    @ApiModelProperty(value = "结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime endDateTime;
+
+    private Long campusId;
+    private Long sectionId;
+    private Long gradeId;
+    private Long classId;
+
+    @ApiModelProperty("mysql查询学生列表. 0：不查询, 1：查询")
+    private Integer selectStudentId;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/userLeave/ListUserRequestDTO.java

@@ -0,0 +1,36 @@
+package com.yida.data.school.dto.userLeave;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.time.LocalDateTime;
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@ApiModel("查询用户请假数据")
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ListUserRequestDTO {
+
+    @ApiModelProperty("请假人ID")
+    private List<Long> userIdList;
+
+    @ApiModelProperty("0教师请假，1学生请假")
+    private Integer requestType;
+
+    @ApiModelProperty("开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime startTime;
+
+    @ApiModelProperty("结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime endTime;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/userLeave/SendStaffNoticeDTO.java

@@ -0,0 +1,96 @@
+package com.yida.data.school.dto.userLeave;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.time.LocalDateTime;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 发送职工模板消息 数据封装类
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SendStaffNoticeDTO {
+
+    /**
+     * 学校ID
+     */
+    private Long schoolId;
+    /**
+     * 本次审核职工
+     */
+    private String staffWxId;
+
+    /**
+     * 本次审核职工
+     */
+    private String staffName;
+
+    /**
+     * 学校类型
+     */
+    private String schoolType;
+
+    /**
+     * 上一位审核职工
+     */
+    private String preStaffName;
+    /**
+     * 上一位审核职工角色
+     */
+    private String preStaffRoleName;
+
+    /**
+     * 学生姓名 / 职工姓名
+     */
+    private String requestUserName;
+    /**
+     * 学生所属班级名称  / 职工所属部门
+     */
+    private String requestUserDeptName;
+    /**
+     * 请假时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime requestTime;
+    /**
+     * 请假原因
+     */
+    private String requestReason;
+
+    /**
+     * 请假去向
+     */
+    private String requestFor;
+
+    /**
+     * 请假开始时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH")
+    private LocalDateTime requestStartTime;
+    /**
+     * 请假结束时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH")
+    private LocalDateTime requestEndTime;
+
+
+    /**
+     * 审批结果 1已通过，0未通过
+     */
+    private Integer status;
+
+    /**
+     * 请假类型
+     */
+    private Integer Type;
+
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/visitor/ListVisitorRecordDTO.java

@@ -0,0 +1,41 @@
+package com.yida.data.school.dto.visitor;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yida.data.common.core.common.BaseDTO;
+import io.swagger.annotations.ApiModelProperty;
+import java.time.LocalDateTime;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+public class ListVisitorRecordDTO extends BaseDTO {
+
+    @ApiModelProperty("学校id")
+    private Long schoolId;
+
+    @ApiModelProperty("结果类型，0-已处理，1-待处理")
+    private Integer type;
+
+    @ApiModelProperty(value = "结果详细类型，0-待处理，1-同意，2-拒绝，3-已取消")
+    private Integer result;
+
+    @ApiModelProperty(value = "0-待访问，1-访问中，2-访问结束，3-已取消")
+    private Integer status;
+
+    @ApiModelProperty("预约到访开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime startTime;
+
+
+    @ApiModelProperty("预约到访结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime endTime;
+
+    @ApiModelProperty("访客姓名、身份证号、联系电话")
+    private String keyword;
+
+    @ApiModelProperty("受访人")
+    private Long staffId;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/dto/visitor/ListVisitorRecordToStaffDTO.java

@@ -0,0 +1,17 @@
+package com.yida.data.school.dto.visitor;
+
+import com.yida.data.common.core.common.BaseDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ListVisitorRecordToStaffDTO extends BaseDTO {
+
+    @ApiModelProperty("0-待审批，1-处理中，2-已完成")
+    private Integer type;
+
+    @ApiModelProperty("访客名称")
+    private String name;
+
+    private Long staffId;
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/fallback/facility/RemoteDormitoryServiceFallback.java

@@ -0,0 +1,149 @@
+package com.yida.data.school.fallback.facility;
+
+import com.yida.data.common.core.annotation.Fallback;
+import com.yida.data.common.core.common.ResultBean;
+import com.yida.data.common.core.entity.school.EduDormitory;
+import com.yida.data.common.core.entity.school.EduDormitoryMaster;
+import com.yida.data.common.core.entity.school.EduDormitoryRoom;
+import com.yida.data.school.dto.index.EditPersonNumDTO;
+import com.yida.data.school.dto.index.ListDormRoomDTO;
+import com.yida.data.school.feign.facility.RemoteDormitoryService;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+
+/**
+ * RemoteDormitoryService fallback处理类
+ *
+ * @author ZYJ
+ * @date 2022/8/26
+ */
+@Slf4j
+@Fallback
+public class RemoteDormitoryServiceFallback implements FallbackFactory<RemoteDormitoryService> {
+
+    @Override
+    public RemoteDormitoryService create(Throwable throwable) {
+        log.error("RemoteDormitoryService fallback reason:{}", throwable.getMessage());
+
+        return new RemoteDormitoryService() {
+            /**
+             * 查询宿管管辖的宿舍楼
+             *
+             * @param masterId
+             * @return
+             */
+            @Override
+            public ResultBean<List<EduDormitory>> listDormByMaster(Long masterId) {
+                return null;
+            }
+
+            /**
+             * 查询寝室
+             *
+             * @param dto
+             */
+            @Override
+            public ResultBean<List<EduDormitoryRoom>> listDormRoom(ListDormRoomDTO dto) {
+                return null;
+            }
+
+            /**
+             * 查询寝室
+             *
+             * @param id
+             * @return
+             */
+            @Override
+            public ResultBean<EduDormitoryRoom> getDormRoom(Long id) {
+                return null;
+            }
+
+            /**
+             * 查询寝室
+             *
+             * @param id
+             * @return
+             */
+            @Override
+            public ResultBean<EduDormitoryRoom> getDormRoomNoPermission(Long id) {
+                return null;
+            }
+
+            /**
+             * 根据名称和宿舍查询
+             *
+             * @param name
+             * @param dormId
+             * @return
+             */
+            @Override
+            public ResultBean<EduDormitoryRoom> getDormRoomByNameAndDorm(String name, Long dormId) {
+                return null;
+            }
+
+            /**
+             * 根据名称查询宿舍
+             *
+             * @param name
+             * @param schoolId
+             * @return
+             */
+            @Override
+            public ResultBean<EduDormitory> getDormByName(String name, Long schoolId) {
+                return null;
+            }
+
+            /**
+             * 修改寝室入住的人数
+             *
+             * @param dtos
+             * @return
+             */
+            @Override
+            public ResultBean editPersonNum(List<EditPersonNumDTO> dtos) {
+                return null;
+            }
+
+            @Override
+            public ResultBean editPersonNumNoPermission(List<EditPersonNumDTO> dtos) {
+                return null;
+            }
+
+            /**
+             * 获取宿舍
+             *
+             * @param id
+             * @return
+             */
+            @Override
+            public ResultBean<EduDormitory> getDorm(Long id) {
+                return null;
+            }
+
+            /**
+             * 获取宿舍信息(不鉴权)
+             *
+             * @param id 宿舍id
+             * @return com.yida.data.common.core.common.ResultBean<com.yida.data.common.core.entity.school.EduDormitory>
+             * @author ZYJ
+             * @date 2022/7/15 15:20
+             */
+            @Override
+            public ResultBean<EduDormitory> getDormNoPermission(Long id) {
+                return null;
+            }
+
+            @Override
+            public ResultBean<List<EduDormitory>> getDormBySchoolId(Long schoolId) {
+                return null;
+            }
+
+            @Override
+            public ResultBean<List<EduDormitoryRoom>> listDormRoomNoAuth(ListDormRoomDTO dto) {
+                return null;
+            }
+        };
+    }
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/fallback/index/RemoteDeptHomeInfoServiceFallback.java

@@ -0,0 +1,37 @@
+package com.yida.data.school.fallback.index;
+
+import com.yida.data.common.core.annotation.Fallback;
+import com.yida.data.common.core.common.ResultBean;
+import com.yida.data.common.core.entity.school.EduDeptHomeApp;
+import com.yida.data.school.dto.leave.ListStudentRequestDetailDTO;
+import com.yida.data.school.dto.userLeave.ListUserRequestDTO;
+import com.yida.data.school.feign.index.RemoteDeptHomeIndexService;
+import com.yida.data.school.feign.leave.RemoteLeaveRequestService;
+import com.yida.data.school.vo.userLeave.EduLeaveRequestUserVO;
+import feign.hystrix.FallbackFactory;
+import java.util.List;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * RemoteDeptHomeIndexService fallback处理类
+ *
+ * @author ZYJ
+ * @date 2022/8/26
+ */
+@Slf4j
+@Fallback
+public class RemoteDeptHomeInfoServiceFallback implements FallbackFactory<RemoteDeptHomeIndexService> {
+
+    @Override
+    public RemoteDeptHomeIndexService create(Throwable throwable) {
+        log.error("RemoteDeptHomeIndexService fallback reason:{}", throwable.getMessage());
+
+        return new RemoteDeptHomeIndexService() {
+
+            @Override
+            public ResultBean<List<EduDeptHomeApp>> getDeptAppList(Long schoolId) {
+                return null;
+            }
+        };
+    }
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/fallback/leave/RemoteLeaveRequestServiceFallback.java

@@ -0,0 +1,40 @@
+package com.yida.data.school.fallback.leave;
+
+import com.yida.data.common.core.annotation.Fallback;
+import com.yida.data.common.core.common.ResultBean;
+import com.yida.data.school.dto.leave.ListStudentRequestDetailDTO;
+import com.yida.data.school.dto.userLeave.ListUserRequestDTO;
+import com.yida.data.school.feign.leave.RemoteLeaveRequestService;
+import com.yida.data.school.vo.userLeave.EduLeaveRequestUserVO;
+import feign.hystrix.FallbackFactory;
+import java.util.List;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * RemoteLeaveRequestService fallback处理类
+ *
+ * @author ZYJ
+ * @date 2022/8/26
+ */
+@Slf4j
+@Fallback
+public class RemoteLeaveRequestServiceFallback implements FallbackFactory<RemoteLeaveRequestService> {
+
+    @Override
+    public RemoteLeaveRequestService create(Throwable throwable) {
+        log.error("RemoteLeaveRequestService fallback reason:{}", throwable.getMessage());
+
+        return new RemoteLeaveRequestService() {
+
+            @Override
+            public ResultBean<Boolean> existRequest(ListStudentRequestDetailDTO dto) {
+                return null;
+            }
+
+            @Override
+            public ResultBean<List<EduLeaveRequestUserVO>> findList(ListUserRequestDTO dto) {
+                return null;
+            }
+        };
+    }
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/fallback/news/RemoteManuscriptServiceFallback.java

@@ -0,0 +1,30 @@
+package com.yida.data.school.fallback.news;
+
+import com.yida.data.common.core.annotation.Fallback;
+import com.yida.data.common.core.common.ResultBean;
+import com.yida.data.school.feign.news.RemoteManuscriptService;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * RemoteManuscriptService fallback处理类
+ *
+ * @author ZYJ
+ * @date 2022/8/26
+ */
+@Slf4j
+@Fallback
+public class RemoteManuscriptServiceFallback implements FallbackFactory<RemoteManuscriptService> {
+
+    @Override
+    public RemoteManuscriptService create(Throwable throwable) {
+        log.error("RemoteManuscriptService fallback reason:{}", throwable.getMessage());
+
+        return new RemoteManuscriptService() {
+            @Override
+            public ResultBean publishManuscript(Long id) {
+                return null;
+            }
+        };
+    }
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/fallback/news/RemoteNoticeSchoolServiceFallback.java

@@ -0,0 +1,30 @@
+package com.yida.data.school.fallback.news;
+
+import com.yida.data.common.core.annotation.Fallback;
+import com.yida.data.common.core.common.ResultBean;
+import com.yida.data.school.feign.news.RemoteNoticeSchoolService;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * RemoteNoticeSchoolService fallback处理类
+ *
+ * @author ZYJ
+ * @date 2022/8/26
+ */
+@Slf4j
+@Fallback
+public class RemoteNoticeSchoolServiceFallback implements FallbackFactory<RemoteNoticeSchoolService> {
+
+    @Override
+    public RemoteNoticeSchoolService create(Throwable throwable) {
+        log.error("RemoteNoticeSchoolService fallback reason:{}", throwable.getMessage());
+
+        return new RemoteNoticeSchoolService() {
+            @Override
+            public ResultBean sendNotice(Long noticeId) {
+                return null;
+            }
+        };
+    }
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/fallback/news/RemoteNoticeSystemServiceFallback.java

@@ -0,0 +1,36 @@
+package com.yida.data.school.fallback.news;
+
+import com.yida.data.common.core.annotation.Fallback;
+import com.yida.data.common.core.common.ResultBean;
+import com.yida.data.school.dto.news.SysNoticeSaveDTO;
+import com.yida.data.school.feign.news.RemoteNoticeSystemService;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * RemoteNoticeSystemService fallback处理类
+ *
+ * @author ZYJ
+ * @date 2022/8/26
+ */
+@Slf4j
+@Fallback
+public class RemoteNoticeSystemServiceFallback implements FallbackFactory<RemoteNoticeSystemService> {
+
+    @Override
+    public RemoteNoticeSystemService create(Throwable throwable) {
+        log.error("RemoteNoticeSystemService fallback reason:{}", throwable.getMessage());
+
+        return new RemoteNoticeSystemService() {
+            /**
+             * 发送系统通知
+             *
+             * @param dto
+             */
+            @Override
+            public ResultBean<String> sendNotice(SysNoticeSaveDTO dto) {
+                return null;
+            }
+        };
+    }
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/fallback/news/RemoteNoticeSystemUserServiceFallback.java

@@ -0,0 +1,35 @@
+package com.yida.data.school.fallback.news;
+
+import com.yida.data.common.core.annotation.Fallback;
+import com.yida.data.common.core.entity.notice.EduNoticeSystemUser;
+import com.yida.data.school.feign.news.RemoteNoticeSystemUserService;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * RemoteNoticeSystemUserService fallback处理类
+ *
+ * @author ZYJ
+ * @date 2022/8/26
+ */
+@Slf4j
+@Fallback
+public class RemoteNoticeSystemUserServiceFallback implements FallbackFactory<RemoteNoticeSystemUserService> {
+
+    @Override
+    public RemoteNoticeSystemUserService create(Throwable throwable) {
+        log.error("RemoteNoticeSystemUserService fallback reason:{}", throwable.getMessage());
+
+        return new RemoteNoticeSystemUserService() {
+            /**
+             * 新增通知关联用户
+             *
+             * @param eduNoticeSystemUser
+             */
+            @Override
+            public Long insertNotice(EduNoticeSystemUser eduNoticeSystemUser) {
+                return null;
+            }
+        };
+    }
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/fallback/news/RemoteNoticeUpdateServiceFallback.java

@@ -0,0 +1,36 @@
+package com.yida.data.school.fallback.news;
+
+import com.yida.data.common.core.annotation.Fallback;
+import com.yida.data.common.core.common.ResultBean;
+import com.yida.data.school.feign.news.RemoteNoticeUpdateService;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * RemoteNoticeUpdateService fallback处理类
+ *
+ * @author ZYJ
+ * @date 2022/8/26
+ */
+@Slf4j
+@Fallback
+public class RemoteNoticeUpdateServiceFallback implements FallbackFactory<RemoteNoticeUpdateService> {
+
+    @Override
+    public RemoteNoticeUpdateService create(Throwable throwable) {
+        log.error("RemoteNoticeUpdateService fallback reason:{}", throwable.getMessage());
+
+        return new RemoteNoticeUpdateService() {
+            /**
+             * 定时发送购买通知
+             *
+             * @param noticeId
+             * @return
+             */
+            @Override
+            public ResultBean updateBuyNoticeById(Long noticeId) {
+                return null;
+            }
+        };
+    }
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/fallback/schoolConfig/RemoteEduSchoolFuncationConfigServiceFallback.java

@@ -0,0 +1,37 @@
+package com.yida.data.school.fallback.schoolConfig;
+
+import com.yida.data.common.core.annotation.Fallback;
+import com.yida.data.common.core.common.ResultBean;
+import com.yida.data.common.core.entity.school.EduSchoolFunctionConfig;
+import com.yida.data.school.feign.schoolConfig.RemoteEduSchoolFuncationConfigService;
+import feign.hystrix.FallbackFactory;
+import java.util.List;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * RemoteEduSchoolFuncationConfigService fallback处理类
+ */
+@Slf4j
+@Fallback
+public class RemoteEduSchoolFuncationConfigServiceFallback implements FallbackFactory<RemoteEduSchoolFuncationConfigService> {
+
+    @Override
+    public RemoteEduSchoolFuncationConfigService create(Throwable throwable) {
+        log.error("RemoteEduSchoolFuncationConfigService fallback reason:{}", throwable.getMessage());
+
+        return new RemoteEduSchoolFuncationConfigService() {
+
+            @Override
+            public ResultBean<List<EduSchoolFunctionConfig>> getSchoolFunctionConfigListByCondition() {
+                return null;
+            }
+
+            @Override
+            public ResultBean<Boolean> checkSchoolFunctionCode(Long schoolId, String code) {
+                return null;
+            }
+
+
+        };
+    }
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/fallback/smart/RemoteSmartWelcomeServiceFallback.java

@@ -0,0 +1,46 @@
+package com.yida.data.school.fallback.smart;
+
+import com.yida.data.common.core.annotation.Fallback;
+import com.yida.data.common.core.common.ResultBean;
+import com.yida.data.common.core.entity.smart.EduSmartWelcomeGuideRosterRelation;
+import com.yida.data.common.core.entity.smart.EduSmartWelcomeGuideStep;
+import com.yida.data.school.feign.smart.RemoteSmartWelcomeService;
+import com.yida.data.school.feign.transaction.RemoteProductOrderService;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+
+/**
+ * RemoteSmartWelcomeService fallback处理类
+ *
+ * @author ZYJ
+ * @date 2023/5/17
+ */
+@Slf4j
+@Fallback
+public class RemoteSmartWelcomeServiceFallback implements FallbackFactory<RemoteSmartWelcomeService> {
+
+    @Override
+    public RemoteSmartWelcomeService create(Throwable throwable) {
+        log.error("RemoteSmartWelcomeService fallback reason:{}", throwable.getMessage());
+
+        return new RemoteSmartWelcomeService() {
+
+            @Override
+            public ResultBean<EduSmartWelcomeGuideRosterRelation> getOpenIdRelation(String openId, Long deptId) {
+                return null;
+            }
+
+            @Override
+            public ResultBean<List<EduSmartWelcomeGuideStep>> listStepInfo(Long relationId, Long guideId) {
+                return null;
+            }
+
+            @Override
+            public ResultBean<String> updateGuideRosterOrderStatus() {
+                return null;
+            }
+        };
+    }
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/fallback/transaction/RemoteProductOrderServiceFallback.java

@@ -0,0 +1,45 @@
+package com.yida.data.school.fallback.transaction;
+
+import com.yida.data.common.core.annotation.Fallback;
+import com.yida.data.common.core.common.ResultBean;
+import com.yida.data.school.feign.transaction.RemoteProductOrderService;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * RemoteProductOrderService fallback处理类
+ *
+ * @author ZYJ
+ * @date 2022/8/26
+ */
+@Slf4j
+@Fallback
+public class RemoteProductOrderServiceFallback implements FallbackFactory<RemoteProductOrderService> {
+
+    @Override
+    public RemoteProductOrderService create(Throwable throwable) {
+        log.error("RemoteProductOrderService fallback reason:{}", throwable.getMessage());
+
+        return new RemoteProductOrderService() {
+            /**
+             * 更新订单状态
+             *
+             * @return
+             */
+            @Override
+            public ResultBean updateOrderStatus() {
+                return null;
+            }
+
+            /**
+             * 更新退款订单状态
+             *
+             * @return
+             */
+            @Override
+            public ResultBean updateRefundStatus() {
+                return null;
+            }
+        };
+    }
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/fallback/transaction/RemoteProductServiceFallback.java

@@ -0,0 +1,51 @@
+package com.yida.data.school.fallback.transaction;
+
+import com.yida.data.common.core.annotation.Fallback;
+import com.yida.data.common.core.common.ResultBean;
+import com.yida.data.school.feign.transaction.RemoteProductService;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * RemoteProductService fallback处理类
+ *
+ * @author ZYJ
+ * @date 2022/8/26
+ */
+@Slf4j
+@Fallback
+public class RemoteProductServiceFallback implements FallbackFactory<RemoteProductService> {
+
+    @Override
+    public RemoteProductService create(Throwable throwable) {
+        log.error("RemoteProductService fallback reason:{}", throwable.getMessage());
+
+        return new RemoteProductService() {
+            @Override
+            public ResultBean upDateProductById(Long id) {
+                return null;
+            }
+
+            /**
+             * 商品催缴任务
+             *
+             * @param id
+             * @return
+             */
+            @Override
+            public ResultBean productSendNotice(Long id) {
+                return null;
+            }
+
+            /**
+             * 监视商品是否失效
+             *
+             * @return
+             */
+            @Override
+            public ResultBean productMonitor() {
+                return null;
+            }
+        };
+    }
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/fallback/visitor/RemoteVisitorServiceFallback.java

@@ -0,0 +1,30 @@
+package com.yida.data.school.fallback.visitor;
+
+import com.yida.data.common.core.annotation.Fallback;
+import com.yida.data.common.core.common.ResultBean;
+import com.yida.data.school.feign.visitor.RemoteVisitorService;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * RemoteVisitorService fallback处理类
+ *
+ * @author ZYJ
+ * @date 2022/8/26
+ */
+@Slf4j
+@Fallback
+public class RemoteVisitorServiceFallback implements FallbackFactory<RemoteVisitorService> {
+
+    @Override
+    public RemoteVisitorService create(Throwable throwable) {
+        log.error("RemoteVisitorService fallback reason:{}", throwable.getMessage());
+
+        return new RemoteVisitorService() {
+            @Override
+            public ResultBean dealRequestDdl() {
+                return null;
+            }
+        };
+    }
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/feign/facility/RemoteDormitoryService.java

@@ -0,0 +1,120 @@
+package com.yida.data.school.feign.facility;
+
+import com.yida.data.common.core.common.ResultBean;
+import com.yida.data.common.core.entity.constant.FebsServerConstant;
+import com.yida.data.common.core.entity.school.EduDormitory;
+import com.yida.data.common.core.entity.school.EduDormitoryMaster;
+import com.yida.data.common.core.entity.school.EduDormitoryRoom;
+import com.yida.data.school.dto.index.EditPersonNumDTO;
+import com.yida.data.school.dto.index.ListDormRoomDTO;
+
+import com.yida.data.school.fallback.facility.RemoteDormitoryServiceFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@FeignClient(value = FebsServerConstant.EDU_SCHOOL, contextId = "dormitoryServiceClient",
+    fallbackFactory = RemoteDormitoryServiceFallback.class)
+public interface RemoteDormitoryService {
+
+    /**
+     * 查询宿管管辖的宿舍楼
+     *
+     * @param masterId
+     * @return
+     */
+    @GetMapping("/facility/dorm/listDormByMaster")
+    ResultBean<List<EduDormitory>> listDormByMaster(@RequestParam("masterId") Long masterId);
+
+
+    /**
+     * 查询寝室
+     */
+    @PostMapping("/facility/dormRoom/listDormRoom")
+    ResultBean<List<EduDormitoryRoom>> listDormRoom(@RequestBody ListDormRoomDTO dto);
+
+    @PostMapping("/in/facility/dormRoom/listDormRoom")
+    ResultBean<List<EduDormitoryRoom>> listDormRoomNoAuth(@RequestBody ListDormRoomDTO dto);
+
+    /**
+     * 查询寝室
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/facility/dormRoom/getDormRoom")
+    ResultBean<EduDormitoryRoom> getDormRoom(@RequestParam("id") Long id);
+
+    /**
+     * 查询寝室
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/in/facility/dormRoom/getDormRoom")
+    ResultBean<EduDormitoryRoom> getDormRoomNoPermission(@RequestParam("id") Long id);
+
+    /**
+     * 根据名称和宿舍查询
+     *
+     * @param name
+     * @return
+     */
+    @GetMapping("/facility/dormRoom/getDormRoomByNameAndDorm")
+    ResultBean<EduDormitoryRoom> getDormRoomByNameAndDorm(@RequestParam("name") String name,
+        @RequestParam("dormId") Long dormId);
+
+    /**
+     * 根据名称查询宿舍
+     *
+     * @param name
+     * @return
+     */
+    @GetMapping("/facility/dorm/getDormByName")
+    ResultBean<EduDormitory> getDormByName(@RequestParam("name") String name,
+        @RequestParam("schoolId") Long schoolId);
+
+    /**
+     * 修改寝室入住的人数
+     *
+     * @return
+     */
+    @PostMapping("/facility/dormRoom/editPersonNum")
+    ResultBean editPersonNum(@RequestBody List<EditPersonNumDTO> dtos);
+
+    /**
+     * 修改寝室入住的人数
+     *
+     * @return
+     */
+    @PostMapping("in/facility/dormRoom/editPersonNum")
+    ResultBean editPersonNumNoPermission(@RequestBody List<EditPersonNumDTO> dtos);
+
+    /**
+     * 获取宿舍
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/facility/dorm/getDorm")
+    ResultBean<EduDormitory> getDorm(@RequestParam("id") Long id);
+
+    /**
+     * 获取宿舍信息(不鉴权)
+     *
+     * @param id 宿舍id
+     * @return com.yida.data.common.core.common.ResultBean<com.yida.data.common.core.entity.school.EduDormitory>
+     * @author ZYJ
+     * @date 2022/7/15 15:20
+     */
+    @GetMapping("/in/facility/dorm/getDorm")
+    ResultBean<EduDormitory> getDormNoPermission(@RequestParam("id") Long id);
+
+    @GetMapping("/in/facility/dorm/getDormListBySchoolId")
+    ResultBean<List<EduDormitory>> getDormBySchoolId(@RequestParam("schoolId") Long schoolId);
+
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/feign/index/RemoteDeptHomeIndexService.java

@@ -0,0 +1,27 @@
+package com.yida.data.school.feign.index;
+
+import com.yida.data.common.core.common.ResultBean;
+import com.yida.data.common.core.entity.constant.FebsServerConstant;
+import com.yida.data.common.core.entity.school.EduDeptHomeApp;
+import com.yida.data.school.dto.leave.ListStudentRequestDetailDTO;
+import com.yida.data.school.dto.userLeave.ListUserRequestDTO;
+import com.yida.data.school.fallback.index.RemoteDeptHomeInfoServiceFallback;
+import com.yida.data.school.fallback.leave.RemoteLeaveRequestServiceFallback;
+import com.yida.data.school.vo.userLeave.EduLeaveRequestUserVO;
+import java.util.List;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(value = FebsServerConstant.EDU_SCHOOL, contextId = "deptHomeIndexServiceClient",
+    fallbackFactory = RemoteDeptHomeInfoServiceFallback.class)
+public interface RemoteDeptHomeIndexService {
+
+    /**
+     * 查询学校对应的小程序
+     */
+    @GetMapping("/in/index/home/getDeptAppList")
+    ResultBean<List<EduDeptHomeApp>> getDeptAppList(@RequestParam Long schoolId);
+
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/feign/leave/RemoteLeaveRequestService.java

@@ -0,0 +1,36 @@
+package com.yida.data.school.feign.leave;
+
+import com.yida.data.common.core.common.ResultBean;
+import com.yida.data.common.core.entity.constant.FebsServerConstant;
+import com.yida.data.school.dto.leave.ListStudentRequestDetailDTO;
+import com.yida.data.school.dto.userLeave.ListUserRequestDTO;
+import com.yida.data.school.fallback.leave.RemoteLeaveRequestServiceFallback;
+import com.yida.data.school.vo.userLeave.EduLeaveRequestUserVO;
+import java.util.List;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+/**
+ * @author ccl
+ */
+@FeignClient(value = FebsServerConstant.EDU_SCHOOL, contextId = "leaveRequestServiceClient",
+    fallbackFactory = RemoteLeaveRequestServiceFallback.class)
+public interface RemoteLeaveRequestService {
+
+    /**
+     * 是否存在通过的请假条
+     *
+     * @param dto
+     * @return
+     */
+    @PostMapping("/in/request/leaveRequest/existRequest")
+    ResultBean<Boolean> existRequest(ListStudentRequestDetailDTO dto);
+
+    /**
+     * @param dto
+     * @return
+     */
+    @PostMapping("/in/eduLeaveRequestUser/findList")
+    ResultBean<List<EduLeaveRequestUserVO>> findList(ListUserRequestDTO dto);
+
+}

febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/feign/news/RemoteManuscriptService.java

@@ -0,0 +1,16 @@
+package com.yida.data.school.feign.news;
+
+import com.yida.data.common.core.common.ResultBean;
+import com.yida.data.common.core.entity.constant.FebsServerConstant;
+import com.yida.data.school.fallback.news.RemoteManuscriptServiceFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(value = FebsServerConstant.EDU_SCHOOL, contextId = "manuscriptServiceClient",
+        fallbackFactory = RemoteManuscriptServiceFallback.class)
+public interface RemoteManuscriptService {
+
+    @GetMapping("/in/news/manuscript/publishManuscript")
+    ResultBean publishManuscript(@RequestParam("id") Long id);
+}