zhangyunjie/edu-old
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 东区缴费分支初始化

Browse Source
This commit is contained in:
zhangyunjie
2025-05-15 15:34:03 +08:00
parent 39f3acc15f
commit 90c60a4910
1198 changed files with 3752 additions and 72555 deletions
Download Patch File Download Diff File Expand all files Collapse all files
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/dto/CardErrorExportDTO.java
-33
View File
@@ -1,33 +0,0 @@
package com.yida.data.user.dto;
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/2/19
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(value = "CardErrorExportDTO", description = "校园卡号导入错误返回类")
public class CardErrorExportDTO implements Serializable {
private static final long serialVersionUID = -3132562554433758713L;
@ExcelProperty("学生学号")
private String stuNumber;
@ExcelProperty("校园卡号")
private String stuCardNumber;
@ExcelProperty("错误信息")
private String errorMessage;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/dto/CardImportDTO.java
-36
View File
@@ -1,36 +0,0 @@
package com.yida.data.user.dto;
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/2/19
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(value = "CardImportDTO", description = "校园卡号导入类")
public class CardImportDTO implements Serializable {
private static final long serialVersionUID = 6536093595406368088L;
/**
* 学生学号
*/
@ExcelProperty(value = "学生学号")
private String stuNumber;
/**
* 校园卡号
*/
@ExcelProperty(value = "校园卡号")
private String stuCardNumber;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/dto/ImportStaffInformationDTO.java
-25
View File
@@ -1,25 +0,0 @@
package com.yida.data.user.dto;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 导入职工dto
*/
@Data
public class ImportStaffInformationDTO {
@ApiModelProperty("学号")
@ExcelProperty("学号")
private String studentNum;
@ApiModelProperty("学生类型：0走读，1住宿")
@ExcelProperty("类型")
private String type;
@ApiModelProperty("错误原因")
@ExcelProperty("错误原因")
private String error;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/dto/ImportStudentTypeDTO.java
-25
View File
@@ -1,25 +0,0 @@
package com.yida.data.user.dto;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 导入住宿学生dto
*/
@Data
public class ImportStudentTypeDTO {
@ApiModelProperty("学号")
@ExcelProperty("学号")
private String studentNum;
@ApiModelProperty("学生类型：0走读，1住宿")
@ExcelProperty("类型")
private String type;
@ApiModelProperty("错误原因")
@ExcelProperty("错误原因")
private String error;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/dto/ListStudentApplyDTO.java
-91
View File
@@ -1,91 +0,0 @@
package com.yida.data.user.dto;
import com.baomidou.mybatisplus.annotation.TableField;
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.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ListStudentApplyDTO {
@ApiModelProperty("当前页码，默认为1")
private Integer pageNum = 1;
@ApiModelProperty("页面大小，默认为10")
private Integer pageSize = 10;
/**
* 学生ID
*/
@ApiModelProperty("学生ID")
private Long studentId;
/**
* 学生姓名
*/
@ApiModelProperty("学生姓名")
private String studentName;
/**
* 学生学号
*/
@ApiModelProperty("学生学号")
private String studentNumber;
/**
* 应用编码
*/
@ApiModelProperty("学生学号")
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;
/**
* 学校ID
*/
@ApiModelProperty("学校ID")
private Long schoolId;
/**
* 学校IDList
*/
@ApiModelProperty("学校IDList")
private List<Long> schoolIdList;
/**
* 学区ID
*/
@ApiModelProperty("学区ID")
private Long campusId;
/**
* 学段ID
*/
@ApiModelProperty("学段ID")
private Long sectionId;
/**
* 年级ID
*/
@ApiModelProperty("年级ID")
private Long gradeId;
/**
* 班级ID
*/
@ApiModelProperty("班级ID")
private Long classId;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/dto/ListStudentApplyForDTO.java
-80
View File
@@ -1,80 +0,0 @@
package com.yida.data.user.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
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;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ListStudentApplyForDTO {
@ApiModelProperty("当前页码，默认为1")
private Integer pageNum = 1;
@ApiModelProperty("页面大小，默认为10")
private Integer pageSize = 10;
/**
* 学生ID
*/
@ApiModelProperty("学生ID")
private Long studentId;
/**
* 学生姓名
*/
@ApiModelProperty("学生姓名")
private String studentName;
/**
* 学生学号
*/
@ApiModelProperty("学生学号")
private String studentNumber;
/**
* 应用编码
*/
@ApiModelProperty("应用编码")
private String applyCode;
/**
* 学校ID
*/
@ApiModelProperty("学校ID")
private Long schoolId;
/**
* 学校IDList
*/
@ApiModelProperty("学校IDList")
private List<Long> schoolIdList;
/**
* 学区ID
*/
@ApiModelProperty("学区ID")
private Long campusId;
/**
* 学段ID
*/
@ApiModelProperty("学段ID")
private Long sectionId;
/**
* 年级ID
*/
@ApiModelProperty("年级ID")
private Long gradeId;
/**
* 班级ID
*/
@ApiModelProperty("班级ID")
private Long classId;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/dto/ManagerDTO.java
-11
View File
@@ -1,11 +0,0 @@
package com.yida.data.user.dto;
import java.util.List;
import lombok.Data;
@Data
public class ManagerDTO {
private List<Long> deptIdList;
private Long ruleId;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/dto/OutPageStudentDTO.java
-32
View File
@@ -1,32 +0,0 @@
package com.yida.data.user.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
* 分页查询学生列表数据请求类
*
* @author ZYJ
* @date 2023/2/19
*/
@Data
@ApiModel(value = "OutPageStudentDTO", description = "分页查询学生列表数据请求类")
public class OutPageStudentDTO implements Serializable {
private static final long serialVersionUID = 4601644422338829002L;
@NotNull
@ApiModelProperty(value = "学校id", required = true)
private Long schoolId;
@ApiModelProperty(value = "当前页码", required = true)
private Integer pageNum;
@NotNull
@ApiModelProperty(value = "每页数量")
private Integer pageSize;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/dto/PageStudentDTO.java
-6
View File
@@ -3,7 +3,6 @@ package com.yida.data.user.dto;
import com.yida.data.common.core.common.BaseDTO;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
import lombok.Data;
@Data
@@ -17,17 +16,12 @@ public class PageStudentDTO extends BaseDTO {
private Integer type;
@ApiModelProperty("校区id")
private Long campusId;
@ApiModelProperty("校区id")
private List<Long> campusIdList;
@ApiModelProperty("学段id")
private Long sectionId;
private List<Long> sectionIdList;
@ApiModelProperty("年级id")
private Long gradeId;
private List<Long> gradeIdList;
@ApiModelProperty("班级id")
private Long classId;
private List<Long> classIdList;
@ApiModelProperty("学号id")
private String stuNumber;
@ApiModelProperty("名字")
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/dto/StaffImportDTO.java
-77
View File
@@ -1,77 +0,0 @@
package com.yida.data.user.dto;
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 = "StaffImportDTO", description = "Excel职工信息导入类")
public class StaffImportDTO implements Serializable {
private static final long serialVersionUID = 5414511146002233669L;
/**
* 职工姓名
*/
@ExcelProperty(index = 0, value = "职工姓名")
@ApiModelProperty(value = "职工姓名")
private String name;
/**
* 性别
*/
@ExcelProperty(index = 1, value = "性别")
@ApiModelProperty(value = "性别")
private String sex;
/**
* 手机号
*/
@ExcelProperty(index = 2, value = "手机号")
@ApiModelProperty(value = "手机号")
private String mobile;
/**
* 地址
*/
@ExcelProperty(index = 3, value = "地址")
@ApiModelProperty(value = "地址")
private String address;
/**
* 部门
*/
@ExcelProperty(index = 4, value = "部门")
@ApiModelProperty(value = "部门")
private Long deptId;
/**
* 身份
*/
@ExcelProperty(index = 5, value = "身份")
@ApiModelProperty(value = "身份")
private String identity;
/**
* 职务
*/
@ExcelProperty(index = 6, value = "职务")
@ApiModelProperty(value = "职务")
private String position;
/**
* 是否同步企业微信
*/
@ExcelProperty(index = 7, value = "是否同步企业微信")
@ApiModelProperty(value = "是否同步企业微信")
private String isQw;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/dto/StrategyPlanSaveDTO.java
-31
View File
@@ -1,31 +0,0 @@
package com.yida.data.user.dto;
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 2022/12/12
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(value = "StrategyPlanSaveDTO", description = "人脸组-策略-通行计划信息保存类")
public class StrategyPlanSaveDTO implements Serializable {
private static final long serialVersionUID = 1264394221797979321L;
@ApiModelProperty("通行计划唯一编码")
private String uniqueCode;
@ApiModelProperty("通行计划-时间段集合")
private List<StrategyPlanTimeSaveDTO> planTimeList;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/dto/StrategyPlanTimeSaveDTO.java
-37
View File
@@ -1,37 +0,0 @@
package com.yida.data.user.dto;
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.LocalTime;
/**
* 人脸组-策略-通行计划-时间段信息保存类
*
* @author ZYJ
* @date 2022/12/12
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(value = "StrategyPlanTimeSaveDTO", description = "人脸组-策略-通行计划-时间段信息保存类")
public class StrategyPlanTimeSaveDTO implements Serializable {
private static final long serialVersionUID = 1666232372793999487L;
@ApiModelProperty(value = "开始时间")
@DateTimeFormat(pattern = "HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "HH:mm:ss")
private LocalTime planStartTime;
@ApiModelProperty(value = "结束时间")
@DateTimeFormat(pattern = "HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "HH:mm:ss")
private LocalTime planEndTime;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/dto/StrategySaveDTO.java
-71
View File
@@ -1,71 +0,0 @@
package com.yida.data.user.dto;
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.LocalDateTime;
import java.util.List;
/**
* 人脸组-策略信息保存类
*
* @author ZYJ
* @date 2022/12/12
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(value = "StrategySaveDTO", description = "人脸组-策略信息保存类")
public class StrategySaveDTO implements Serializable {
private static final long serialVersionUID = -4058986401549517015L;
@ApiModelProperty(value = "策略id")
private Long strategyId;
@ApiModelProperty(value = "人脸组id")
private Long faceGroupId;
@ApiModelProperty(value = "策略生效时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime strategyStartDate;
@ApiModelProperty(value = "策略失效时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime strategyEndDate;
@ApiModelProperty(value = "星期一通行计划uuid")
private String mondayUniqueCode;
@ApiModelProperty(value = "星期二通行计划uuid")
private String tuesdayUniqueCode;
@ApiModelProperty(value = "星期三通行计划uuid")
private String wednesdayUniqueCode;
@ApiModelProperty(value = "星期四通行计划uuid")
private String thursdayUniqueCode;
@ApiModelProperty(value = "星期五通行计划uuid")
private String fridayUniqueCode;
@ApiModelProperty(value = "星期六通行计划uuid")
private String saturdayUniqueCode;
@ApiModelProperty(value = "星期天通行计划uuid")
private String sundayUniqueCode;
@ApiModelProperty(value = "通行计划集合")
private List<StrategyPlanSaveDTO> planList;
@ApiModelProperty(value = "特殊日期集合")
private List<StrategySpecialDateSaveDTO> specialList;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/dto/StrategySpecialDateSaveDTO.java
-41
View File
@@ -1,41 +0,0 @@
package com.yida.data.user.dto;
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.util.List;
/**
* 人脸组-策略-特殊日期保存类
*
* @author ZYJ
* @date 2022/12/12
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(value = "StrategySpecialDateSaveDTO", description = "人脸组-策略-特殊日期保存类")
public class StrategySpecialDateSaveDTO implements Serializable {
private static final long serialVersionUID = -418058543595524019L;
@ApiModelProperty("特殊日期开始日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
private LocalDate specialStartDate;
@ApiModelProperty("特殊日期结束日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
private LocalDate specialEndDate;
@ApiModelProperty("特殊日期-时间段集合")
private List<StrategySpecialTimeSaveDTO> specialTimeList;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/dto/StrategySpecialTimeSaveDTO.java
-37
View File
@@ -1,37 +0,0 @@
package com.yida.data.user.dto;
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.LocalTime;
/**
* 人脸组-策略-特殊日期-时间段信息保存类
*
* @author ZYJ
* @date 2022/12/12
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(value = "StrategySpecialTimeSaveDTO", description = "人脸组-策略-特殊日期-时间段信息保存类")
public class StrategySpecialTimeSaveDTO implements Serializable {
private static final long serialVersionUID = -3507582697531274693L;
@ApiModelProperty(value = "开始时间")
@DateTimeFormat(pattern = "HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "HH:mm:ss")
private LocalTime specialStartTime;
@ApiModelProperty(value = "结束时间")
@DateTimeFormat(pattern = "HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "HH:mm:ss")
private LocalTime specialEndTime;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/dto/StudentDormExportDTO.java
-40
View File
@@ -1,40 +0,0 @@
package com.yida.data.user.dto;
import com.alibaba.excel.annotation.ExcelProperty;
import com.yida.data.common.core.converter.LocalDateTimeConverter;
import com.yida.data.common.core.entity.EasyExcelExportBaseDTO;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* 学生宿舍信息导出类
*
* @author ZYJ
* @date 2023/12/13
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "StudentDormExportDTO", description = "学生宿舍信息导出类")
public class StudentDormExportDTO extends EasyExcelExportBaseDTO implements Serializable {
private static final long serialVersionUID = 3404749621207403889L;
@ExcelProperty("学生姓名")
private String stuName;
@ExcelProperty("学号")
private String stuNumber;
@ExcelProperty("班级信息")
private String deptName;
@ExcelProperty("入住寝室")
private String dormRoomName;
@ExcelProperty(value = "入住时间", converter = LocalDateTimeConverter.class)
private LocalDateTime checkInTime;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/dto/StudentExportDTO.java
+5 -67
View File
@@ -1,14 +1,12 @@
package com.yida.data.user.dto;
import com.alibaba.excel.annotation.ExcelProperty;
import com.yida.data.common.core.converter.LocalDateConverter;
import com.yida.data.common.core.entity.EasyExcelExportBaseDTO;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.time.LocalDate;
/**
* 学生信息导出类
@@ -19,82 +17,22 @@ import java.time.LocalDate;
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "StudentExportDTO", description = "学生信息导出类")
public class StudentExportDTO extends StudentDormExportDTO implements Serializable {
public class StudentExportDTO extends EasyExcelExportBaseDTO implements Serializable {
private static final long serialVersionUID = 6625908714399734930L;
@ExcelProperty("学生姓名")
private String stuName;
@ExcelProperty("班级信息")
private String deptName;
@ExcelProperty("年级")
private String gradeName;
@ExcelProperty("曾用名")
private String formerName;
@ExcelProperty("班级")
private String className;
@ExcelProperty("学号")
private String stuNumber;
@ExcelProperty("考生号")
private String stuExamNumber;
@ExcelProperty("银行卡号")
private String creditCardNumbers;
@ExcelProperty("邮箱")
private String email;
@ExcelProperty("QQ号")
private String qqCode;
@ExcelProperty("微信号")
private String wxCode;
@ExcelProperty(value = "入学时间", converter = LocalDateConverter.class)
private LocalDate startDate;
@ExcelProperty("入学年级")
private String startGrade;
@ExcelProperty("政治面貌")
private String politicsStatus;
@ExcelProperty("邮政编码")
private String postalCode;
@ExcelProperty("籍贯")
private String nativePlace;
@ExcelProperty("现住址")
private String presentAddress;
/**
* 学生性别，0-男，1-女"
*/
@ExcelProperty("学生性别")
private String stuSex;
@ExcelProperty("民族")
private String nation;
@ExcelProperty("身份证号")
private String idNumber;
@ExcelProperty("校园卡号")
private String stuCardNumber;
/**
* 学生类别，0-走读，1-住宿
*/
@ExcelProperty("学生类型")
private String type;
/**
* 学籍状态：关联字典表
*/
@ExcelProperty("学籍状态")
private String studentStatus;
@ExcelProperty("是否采集人脸")
private String collectStatus;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/dto/WelcomeInviteImportDTO.java
-111
View File
@@ -1,15 +1,12 @@
package com.yida.data.user.dto;
import com.alibaba.excel.annotation.ExcelProperty;
import com.yida.data.common.core.converter.LocalDateConverter;
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.time.LocalDate;
/**
* Excel一键邀请信息导入类
@@ -114,112 +111,4 @@ public class WelcomeInviteImportDTO implements Serializable {
*/
@ExcelProperty(index = 14)
private String familyName;
/**
* 住宿类型
*/
@ExcelProperty(index = 15)
private String type;
/**
* 曾用名
*/
@ExcelProperty(index = 16)
private String formerName;
/**
* 考生号
*/
@ExcelProperty(index = 17)
private String stuExamNumber;
/**
* 银行卡号
*/
@ExcelProperty(index = 18)
private String creditCardNumbers;
/**
* 邮箱
*/
@ExcelProperty(index = 19)
private String email;
/**
* QQ号
*/
@ExcelProperty(index = 20)
private String qqCode;
/**
* 微信号
*/
@ExcelProperty(index = 21)
private String wxCode;
/**
* 入学时间
*/
@ExcelProperty(index = 22)
private String startDate;
/**
* 入学年级
*/
@ExcelProperty(index = 23)
private String startGrade;
/**
* 政治面貌
*/
@ExcelProperty(index = 24)
private String politicsStatus;
/**
* 邮政编码
*/
@ExcelProperty(index = 25)
private String postalCode;
/**
* 籍贯
*/
@ExcelProperty(index = 26)
private String nativePlace;
/**
* 现住址
*/
@ExcelProperty(index = 27)
private String presentAddress;
/**
* 学生性别
*/
@ExcelProperty(index = 28)
private String stuSex;
/**
* 民族
*/
@ExcelProperty(index = 29)
private String nation;
/**
* 身份证号
*/
@ExcelProperty(index = 30)
private String idNumber;
/**
* 校园卡号
*/
@ExcelProperty(index = 31)
private String stuCardNumber;
/**
* 学籍状态
*/
@ExcelProperty(index = 32)
private String studentStatus;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/dto/h5/ListUserDeptAttendanceDTO.java
-32
View File
@@ -1,32 +0,0 @@
package com.yida.data.user.dto.h5;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.time.LocalDate;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 查询用户关联班级或者寝室考勤请求类
*/
@Data
@ApiModel(value = "ListUserDeptAttendanceDTO", description = "查询用户关联班级或者寝室考勤请求类")
public class ListUserDeptAttendanceDTO implements Serializable {
@ApiModelProperty("职工主键【用户统计数据】")
private Long staffId;
@ApiModelProperty("查询日期【用户统计数据、详情】")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
private LocalDate date;
@ApiModelProperty("部门ID，班级或者宿舍【用于详情】")
private Long deptId;
@ApiModelProperty("类型：0班级，1宿舍【用于详情】")
private Integer type;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/fallback/RemoteFaceGroupDeviceServiceFallback.java
-35
View File
@@ -1,35 +0,0 @@
package com.yida.data.user.fallback;
import com.yida.data.common.core.annotation.Fallback;
import com.yida.data.common.core.common.ResultBean;
import com.yida.data.common.core.entity.user.EduFaceGroupDevice;
import com.yida.data.common.core.entity.user.EduUserDevice;
import com.yida.data.user.feign.RemoteFaceGroupDeviceService;
import com.yida.data.user.feign.RemoteUserDeviceService;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import java.util.List;
/**
* RemoteFaceGroupDeviceService fallback处理类
*
* @author ZYJ
* @date 2023/9/26
*/
@Slf4j
@Fallback
public class RemoteFaceGroupDeviceServiceFallback implements FallbackFactory<RemoteFaceGroupDeviceService> {
@Override
public RemoteFaceGroupDeviceService create(Throwable throwable) {
log.error("RemoteFaceGroupDeviceService fallback reason:{}", throwable.getMessage());
return new RemoteFaceGroupDeviceService() {
@Override
public ResultBean<List<Long>> listFaceGroupOnlineDevice(Long faceGroupId) {
return null;
}
};
}
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/fallback/RemoteFaceGroupStrategyServiceFallback.java
-31
View File
@@ -1,31 +0,0 @@
package com.yida.data.user.fallback;
import com.yida.data.common.core.annotation.Fallback;
import com.yida.data.common.core.common.ResultBean;
import com.yida.data.common.core.entity.user.EduFaceGroupStrategy;
import com.yida.data.user.feign.RemoteFaceGroupStrategyService;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
/**
* RemoteFaceGroupStrategyService fallback处理类
*
* @author ZYJ
* @date 2022/8/26
*/
@Slf4j
@Fallback
public class RemoteFaceGroupStrategyServiceFallback implements FallbackFactory<RemoteFaceGroupStrategyService> {
@Override
public RemoteFaceGroupStrategyService create(Throwable throwable) {
log.error("RemoteFaceGroupStrategyService fallback reason:{}", throwable.getMessage());
return new RemoteFaceGroupStrategyService() {
@Override
public ResultBean<EduFaceGroupStrategy> getStrategyInfo(Long faceGroupId) {
return null;
}
};
}
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/fallback/RemoteStaffServiceFallback.java
-31
View File
@@ -8,7 +8,6 @@ import com.yida.data.common.core.entity.user.EduTeacherDept;
import com.yida.data.user.dto.ListStaffDTO;
import com.yida.data.user.feign.RemoteStaffService;
import com.yida.data.user.vo.TeacherClassVO;
import com.yida.data.user.vo.TeacherDeptVO;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
@@ -76,11 +75,6 @@ public class RemoteStaffServiceFallback implements FallbackFactory<RemoteStaffSe
return null;
}
@Override
public ResultBean<List<Long>> listStaffByDeptIdNoPermission(Long deptId, String nameOrPhone, Long schoolId) {
return null;
}
/**
* 根据条件查询职工列表
*
@@ -112,11 +106,6 @@ public class RemoteStaffServiceFallback implements FallbackFactory<RemoteStaffSe
return null;
}
@Override
public ResultBean<List<EduStaffDept>> getStaffDeptByStaffIdsNoPermission(List<Long> staffIds) {
return null;
}
@Override
public ResultBean syncQywxStaff() {
return null;
@@ -185,26 +174,6 @@ public class RemoteStaffServiceFallback implements FallbackFactory<RemoteStaffSe
public ResultBean saveWxPublicOpenId(Long staffId, String openId) {
return null;
}
@Override
public ResultBean<List<Integer>> listStaffRolesByStaffId(Long staffId) {
return null;
}
@Override
public ResultBean<List<EduStaff>> getStaffList(List<Long> staffIds) {
return null;
}
@Override
public ResultBean updateStaffCache() {
return null;
}
@Override
public ResultBean<List<Long>> listClassIdByStaffId() {
return null;
}
};
}
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/fallback/RemoteStudentApplyServiceFallback.java
-44
View File
@@ -1,44 +0,0 @@
package com.yida.data.user.fallback;
import com.yida.data.common.core.annotation.Fallback;
import com.yida.data.common.core.common.ResultBean;
import com.yida.data.common.core.entity.user.EduStudentApply;
import com.yida.data.user.feign.RemoteStudentApplyService;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import java.util.List;
import java.util.Map;
/**
* RemoteStudentApplyService fallback处理类
*
* @author ZYJ
* @date 2022/8/26
*/
@Slf4j
@Fallback
public class RemoteStudentApplyServiceFallback implements FallbackFactory<RemoteStudentApplyService> {
@Override
public RemoteStudentApplyService create(Throwable throwable) {
log.error("RemoteStudentApplyService fallback reason:{}", throwable.getMessage());
return new RemoteStudentApplyService() {
@Override
public ResultBean<Map<Long, List<String>>> listApplyCode(Long[] studentIds) {
return null;
}
@Override
public ResultBean<Boolean> hasApply(Long studentId, String applyCode) {
return null;
}
@Override
public ResultBean<EduStudentApply> getStudentApply(Long studentId, String applyCode) {
return null;
}
};
}
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/fallback/RemoteStudentServiceFallback.java
-22
View File
@@ -1,6 +1,5 @@
package com.yida.data.user.fallback;
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yida.data.common.core.annotation.Fallback;
import com.yida.data.common.core.common.ResultBean;
@@ -323,27 +322,6 @@ public class RemoteStudentServiceFallback implements FallbackFactory<RemoteStude
public ResultBean<List<EduStudent>> listBaseStudentNoJoin(EduStudent eduStudent) {
return null;
}
@Override
public ResultBean<JSONObject> countUserDashboardNum(Long schoolId) {
return null;
}
@Override
public ResultBean saveStudent(EduStudent eduStudent) {
return null;
}
@Override
public ResultBean saveStudentDorm(EduStudent eduStudent) {
return null;
}
@Override
public ResultBean updateStudentCache() {
return null;
}
};
}
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/fallback/RemoteTeacherServiceFallback.java
+8 -1
View File
@@ -29,9 +29,16 @@ public class RemoteTeacherServiceFallback implements FallbackFactory<RemoteTeach
return new RemoteTeacherService() {
/**
* 更新教师信息
*
* @param schoolId
* @param campusId
* @param sectionId
* @param gradeId
* @param classId
* @param teacherList
*/
@Override
public ResultBean dealWxTeacherChange(Long schoolId, Long campusId, Long sectionId, Long gradeId, Long classId, List<Map> teacherList, Long deptWxId) {
public ResultBean dealWxTeacherChange(Long schoolId, Long campusId, Long sectionId, Long gradeId, Long classId, List<Map> teacherList) {
return null;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/fallback/RemoteUserDeptServiceFallback.java
-15
View File
@@ -115,11 +115,6 @@ public class RemoteUserDeptServiceFallback implements FallbackFactory<RemoteUser
return null;
}
@Override
public ResultBean<List<EduUserDept>> getParentListByDeptId(Long deptId) {
return null;
}
/**
* 批量保存家校部门
*
@@ -198,16 +193,6 @@ public class RemoteUserDeptServiceFallback implements FallbackFactory<RemoteUser
public ResultBean<List<EduUserDept>> findChildIdByParentAndTypeNoPermission(Long parentId, Integer type) {
return null;
}
@Override
public ResultBean<List<EduUserDept>> findListByParent(Long deptId) {
return null;
}
@Override
public ResultBean<List> getUserDeptTree(List<Long> deptIds) {
return null;
}
};
}
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/fallback/RemoteUserDeviceServiceFallback.java
-10
View File
@@ -28,16 +28,6 @@ public class RemoteUserDeviceServiceFallback implements FallbackFactory<RemoteUs
public ResultBean batchSave(List<EduUserDevice> list) {
return null;
}
@Override
public ResultBean<List<EduUserDevice>> listUserDevice(Long userId, Integer type, Long deviceId, Long faceGroupId) {
return null;
}
@Override
public ResultBean<String> deleteRelation(EduUserDevice userDevice) {
return null;
}
};
}
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/feign/RemoteFaceGroupDeviceService.java
-36
View File
@@ -1,36 +0,0 @@
package com.yida.data.user.feign;
import com.yida.data.common.core.common.ResultBean;
import com.yida.data.common.core.entity.constant.FebsServerConstant;
import com.yida.data.common.core.entity.user.EduFaceGroupDevice;
import com.yida.data.common.core.entity.user.EduUserDevice;
import com.yida.data.user.fallback.RemoteUserDeviceServiceFallback;
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;
/**
* 人脸组设备 Feign
*
* @author ZYJ
* @date 2023/9/28
*/
@FeignClient(name = FebsServerConstant.EDU_USER, contextId = "faceGroupDeviceService",
fallbackFactory = RemoteUserDeviceServiceFallback.class)
public interface RemoteFaceGroupDeviceService {
/**
* 查询人脸组设备id集合
*
* @param faceGroupId 人脸组id
* @return com.yida.data.common.core.common.ResultBean<java.util.List < java.lang.Long>>
* @author ZYJ
* @date 2023/9/28 16:08
*/
@GetMapping("/in/groupDevice/listFaceGroupOnlineDevice")
ResultBean<List<Long>> listFaceGroupOnlineDevice(@RequestParam Long faceGroupId);
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/feign/RemoteFaceGroupStrategyService.java
-19
View File
@@ -1,19 +0,0 @@
package com.yida.data.user.feign;
import com.yida.data.common.core.common.ResultBean;
import com.yida.data.common.core.entity.constant.FebsServerConstant;
import com.yida.data.common.core.entity.user.EduCourse;
import com.yida.data.common.core.entity.user.EduFaceGroupStrategy;
import com.yida.data.user.fallback.RemoteCourseServiceFallback;
import com.yida.data.user.fallback.RemoteFaceGroupStrategyServiceFallback;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
@FeignClient(value = FebsServerConstant.EDU_USER, contextId = "remoteFaceGroupStrategyServiceClient",
fallbackFactory = RemoteFaceGroupStrategyServiceFallback.class)
public interface RemoteFaceGroupStrategyService {
@GetMapping("/in/eduFaceGroupStrategy/getStrategyInfo")
ResultBean<EduFaceGroupStrategy> getStrategyInfo(@RequestParam("faceGroupId") Long faceGroupId);
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/feign/RemoteStaffService.java
+11 -52
View File
@@ -8,7 +8,6 @@ import com.yida.data.common.core.entity.user.EduTeacherDept;
import com.yida.data.user.dto.ListStaffDTO;
import com.yida.data.user.fallback.RemoteStaffServiceFallback;
import com.yida.data.user.vo.TeacherClassVO;
import com.yida.data.user.vo.TeacherDeptVO;
import io.swagger.annotations.ApiParam;
import org.apache.ibatis.annotations.Param;
import org.springframework.cloud.openfeign.FeignClient;
@@ -20,7 +19,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@FeignClient(value = FebsServerConstant.EDU_USER, contextId = "StaffServiceClient",
fallbackFactory = RemoteStaffServiceFallback.class)
fallbackFactory = RemoteStaffServiceFallback.class)
public interface RemoteStaffService {
@@ -32,7 +31,7 @@ public interface RemoteStaffService {
*/
@GetMapping("/staff/findTeacherRole")
ResultBean<List<EduTeacherDept>> findTeacherRole(@RequestParam("teacherId") Long teacherId,
@RequestParam("type") Integer type);
@RequestParam("type") Integer type);
/**
* 查询教师可见课程
@@ -43,7 +42,7 @@ public interface RemoteStaffService {
*/
@GetMapping("/staff/findTeacherCourseId")
ResultBean<List<Long>> findTeacherCourseId(@RequestParam("teacherId") Long teacherId,
@RequestParam("schoolId") Long schoolId);
@RequestParam("schoolId") Long schoolId);
/**
* 根据id查询职工信息
@@ -61,19 +60,13 @@ public interface RemoteStaffService {
*/
@GetMapping("/staff/listStaffByDeptId")
ResultBean<List<Long>> listStaffByDeptId(@RequestParam("deptId") @Param("deptId") Long deptId,
@RequestParam("nameOrPhone") @Param("nameOrPhone") String nameOrPhone,
@RequestParam("schoolId") Long schoolId);
@GetMapping("/in/staff/listStaffByDeptId")
ResultBean<List<Long>> listStaffByDeptIdNoPermission(@RequestParam("deptId") @Param("deptId") Long deptId,
@RequestParam("nameOrPhone") @Param("nameOrPhone") String nameOrPhone,
@RequestParam("schoolId") Long schoolId);
@RequestParam("nameOrPhone") @Param("nameOrPhone") String nameOrPhone,
@RequestParam("schoolId") Long schoolId);
/**
* 根据条件查询职工列表
*/
@PostMapping("/in/staff/listStaff")
@PostMapping("/staff/listStaff")
ResultBean<List<EduStaff>> listStaff(@RequestBody ListStaffDTO dto);
/**
@@ -91,9 +84,6 @@ public interface RemoteStaffService {
@PostMapping("/staff/getStaffDeptByStaffIds")
ResultBean<List<EduStaffDept>> getStaffDeptByStaffIds(@ApiParam("职工id") @RequestBody List<Long> staffIds);
@PostMapping("/in/staff/getStaffDeptByStaffIds")
ResultBean<List<EduStaffDept>> getStaffDeptByStaffIdsNoPermission(@ApiParam("职工id") @RequestBody List<Long> staffIds);
@GetMapping("/in/staff/syncQywxStaff")
ResultBean syncQywxStaff();
@@ -109,16 +99,16 @@ public interface RemoteStaffService {
*/
@GetMapping("/in/staff/getStaffByWxOrMobileOrOpenId")
ResultBean<EduStaff> getStaffByWxOrMobileOrOpenId(@RequestParam("wxId") String wxId,
@RequestParam("mobile") String mobile,
@RequestParam("wxOpenId") String wxOpenId,
@RequestParam("schoolId") Long schoolId);
@RequestParam("mobile") String mobile,
@RequestParam("wxOpenId") String wxOpenId,
@RequestParam("schoolId") Long schoolId);
/**
* 处理企业微信职工删除
*/
@GetMapping("/in/staff/dealWxUserDelete")
ResultBean dealWxUserDelete(@RequestParam("wxId") String wxId,
@RequestParam("schoolId") Long schoolId);
@RequestParam("schoolId") Long schoolId);
@GetMapping("/in/staff/getStaffByDahua")
ResultBean<EduStaff> getStaffByDahuaNoPermission(@RequestParam("dahuaCode") String dahuaCode);
@@ -143,36 +133,5 @@ public interface RemoteStaffService {
*/
@GetMapping("/in/staff/saveWxPublicOpenId")
ResultBean saveWxPublicOpenId(@RequestParam("staffId") Long staffId,
@RequestParam("openId") String openId);
@GetMapping("/in/staff/listStaffRolesByStaffId")
ResultBean<List<Integer>> listStaffRolesByStaffId(@RequestParam("staffId") Long staffId);
/**
* 根据职工id集合查询职工信息
*
* @param staffIds 职工id集合
* @return com.yida.data.common.core.common.ResultBean<java.util.List < com.yida.data.common.core.entity.user.EduStaff>>
* @author ZYJ
* @date 2023/6/8 17:24
*/
@PostMapping("/staff/getStaffList")
ResultBean<List<EduStaff>> getStaffList(@RequestBody List<Long> staffIds);
/**
* 更新职工信息缓存
*
* @return
*/
@GetMapping("in/staff/updateStaffCache")
ResultBean updateStaffCache();
/**
* 查询职工管理班级
*
* @return
*/
@GetMapping("in/staff/listClassIdByStaffId")
ResultBean<List<Long>> listClassIdByStaffId();
@RequestParam("openId") String openId);
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/feign/RemoteStudentApplyService.java
-28
View File
@@ -1,28 +0,0 @@
package com.yida.data.user.feign;
import com.yida.data.common.core.common.ResultBean;
import com.yida.data.common.core.entity.constant.FebsServerConstant;
import com.yida.data.common.core.entity.user.EduStudentApply;
import com.yida.data.user.fallback.RemoteStudentApplyServiceFallback;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
import java.util.Map;
@FeignClient(value = FebsServerConstant.EDU_USER, contextId = "studentApplyServiceClient",
fallbackFactory = RemoteStudentApplyServiceFallback.class)
public interface RemoteStudentApplyService {
@GetMapping("/in/transaction/studentApply/listApply")
ResultBean<Map<Long, List<String>>> listApplyCode(@RequestParam("studentIds") Long[] studentIds);
@GetMapping("/transaction/studentApply/hasApply")
ResultBean<Boolean> hasApply(@RequestParam("studentId") Long studentId,
@RequestParam("applyCode") String applyCode);
@GetMapping("/transaction/studentApply/getStudentApplyByIdAndCode")
ResultBean<EduStudentApply> getStudentApply(@RequestParam("studentId") Long studentId,
@RequestParam("applyCode") String applyCode);
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/feign/RemoteStudentService.java
-35
View File
@@ -1,6 +1,5 @@
package com.yida.data.user.feign;
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yida.data.common.core.common.ResultBean;
import com.yida.data.common.core.entity.constant.FebsServerConstant;
@@ -13,7 +12,6 @@ import com.yida.data.user.fallback.RemoteStudentServiceFallback;
import com.yida.data.user.vo.ListParentByStudentIdsVO;
import com.yida.data.user.vo.ParentInfoVO;
import com.yida.data.user.vo.StudentClassInfoVO;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -21,7 +19,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
import java.util.Map;
@FeignClient(value = FebsServerConstant.EDU_USER, contextId = "studentServiceClient",
fallbackFactory = RemoteStudentServiceFallback.class)
@@ -252,36 +249,4 @@ public interface RemoteStudentService {
*/
@PostMapping(value = "/in/student/listBaseStudentNoJoin")
ResultBean<List<EduStudent>> listBaseStudentNoJoin(@RequestBody EduStudent eduStudent);
/**
* 查询校园大数据的人员统计数据
*
* @param schoolId 学校id
* @return com.yida.data.common.core.common.ResultBean<cn.hutool.json.JSONObject>
* @author ZYJ
* @date 2023/4/24 15:09
*/
@GetMapping(value = "/in/student/countUserDashboardNum")
ResultBean<JSONObject> countUserDashboardNum(@RequestParam Long schoolId);
/**
* 新增/编辑学生
*
* @param eduStudent
* @return
*/
@PostMapping("out/student/saveStudent")
ResultBean<EduStudent> saveStudent(@RequestBody EduStudent eduStudent);
@PostMapping("in/student/saveStudentDorm")
ResultBean saveStudentDorm(@RequestBody EduStudent eduStudent);
/**
* 更新学生信息缓存
*
* @return
*/
@GetMapping("in/student/updateStudentCache")
ResultBean updateStudentCache();
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/feign/RemoteTeacherService.java
+1 -3
View File
@@ -28,8 +28,7 @@ public interface RemoteTeacherService {
@RequestParam("sectionId") Long sectionId,
@RequestParam("gradeId") Long gradeId,
@RequestParam("classId") Long classId,
@RequestBody List<Map> teacherList,
@RequestParam("deptWxId") Long deptWxId);
@RequestBody List<Map> teacherList);
/**
* 根据教师微信id查询教师信息
@@ -97,7 +96,6 @@ public interface RemoteTeacherService {
*
* @param deptId 家校部门id
* @param type 教师类型 1表示校区负责人，2表示年级负责人，3表示班主任，4表示任课老师，5表示学段负责人
* 1表示班级，2表示年级，3表示学段，4表示校区
* @return com.yida.data.common.core.common.ResultBean<java.util.List < com.yida.data.common.core.entity.user.EduStaff>>
* @author ZYJ
* @date 2022/7/15 17:48
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/feign/RemoteUserDeptService.java
+3 -28
View File
@@ -20,7 +20,7 @@ import java.util.List;
* @date 2021-11-22
*/
@FeignClient(value = FebsServerConstant.EDU_USER, contextId = "userDeptServiceClient",
fallbackFactory = RemoteUserDeptServiceFallback.class)
fallbackFactory = RemoteUserDeptServiceFallback.class)
public interface RemoteUserDeptService {
/**
@@ -99,16 +99,6 @@ public interface RemoteUserDeptService {
@GetMapping("/in/eduUserDept/getParentByDeptId")
ResultBean<EduUserDept> getParentByDeptId(@RequestParam Long deptId);
/**
* 根据家校部门id查询全部上级家校部门信息
*
* @param deptId
* @return
*/
@GetMapping("/in/eduUserDept/getParentListByDeptId")
ResultBean<List<EduUserDept>> getParentListByDeptId(@RequestParam Long deptId);
/**
* 批量保存家校部门
*
@@ -156,24 +146,9 @@ public interface RemoteUserDeptService {
ResultBean<List<EduUserDept>> findChildByParentAndType(@RequestParam Long parentId, @RequestParam Integer type);
/**
* 向下查询指定家校部门类型的家校部门id(可查询非直接子家校部门) 未毕业家校部门
* 向下查询指定家校部门类型的家校部门id(可查询非直接子家校部门)
* 未毕业家校部门
*/
@GetMapping("/in/eduUserDept/findChildIdByParentAndType")
ResultBean<List<EduUserDept>> findChildIdByParentAndTypeNoPermission(@RequestParam Long parentId, @RequestParam Integer type);
/**
* 向下查询指定家校部门类型的家校部门id(可查询非直接子家校部门) 未毕业家校部门
*/
@GetMapping("/in/eduUserDept/findListByParent")
ResultBean<List<EduUserDept>> findListByParent(@RequestParam Long deptId);
/**
* 获取家校部门树
*
* @param deptIds
* @return
*/
@PostMapping("in/eduUserDept/getUserDeptTree")
ResultBean<List> getUserDeptTree(@RequestBody List<Long> deptIds);
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/feign/RemoteUserDeviceService.java
-30
View File
@@ -6,10 +6,8 @@ import com.yida.data.common.core.entity.user.EduUserDevice;
import com.yida.data.user.fallback.RemoteUserDeviceServiceFallback;
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;
@@ -19,32 +17,4 @@ public interface RemoteUserDeviceService {
@PostMapping("/in/userDevice/batchSave")
ResultBean batchSave(@RequestBody List<EduUserDevice> list);
/**
* 获取设备和人员关联信息
*
* @param userId 用户id
* @param type 用户类型. 0-学生，1-职工
* @param deviceId 设备id
* @param faceGroupId 人脸组id
* @return com.yida.data.common.core.common.ResultBean<java.util.List < com.yida.data.common.core.entity.user.EduUserDevice>>
* @author ZYJ
* @date 2023/2/3 17:21
*/
@GetMapping("/in/userDevice/listUserDevice")
ResultBean<List<EduUserDevice>> listUserDevice(@RequestParam Long userId,
@RequestParam Integer type,
@RequestParam Long deviceId,
@RequestParam Long faceGroupId);
/**
* 删除设备和人员关联信息
*
* @param userDevice 删除信息
* @return com.yida.data.common.core.common.ResultBean<java.lang.String>
* @author ZYJ
* @date 2023/2/23 17:32
*/
@PostMapping("/in/userDevice/deleteRelation")
ResultBean<String> deleteRelation(@RequestBody EduUserDevice userDevice);
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/feign/RemoteUserFaceService.java
-9
View File
@@ -16,15 +16,6 @@ import org.springframework.web.bind.annotation.RequestParam;
fallbackFactory = RemoteUserFaceServiceFallback.class)
public interface RemoteUserFaceService {
/**
* 获取用户人脸信息
*
* @param userId 用户id
* @param type 用户类型，0-学生，1-职工
* @return com.yida.data.common.core.common.ResultBean<com.yida.data.common.core.entity.user.EduUserFace>
* @author ZYJ
* @date 2023/2/2 16:59
*/
@GetMapping("/in/face/getFaceByUser")
ResultBean<EduUserFace> getFaceByUser(@RequestParam("userId") Long userId,
@RequestParam("type") Integer type);
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/vo/ClassAttendanceDataVO.java
-55
View File
@@ -1,55 +0,0 @@
package com.yida.data.user.vo;
import com.yida.data.common.core.entity.user.EduStudent;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class ClassAttendanceDataVO {
/**
* 宿舍名称/班级名称
*/
@ApiModelProperty(value = "班级ID")
private Long classId;
/**
* 宿舍名称/班级名称
*/
@ApiModelProperty(value = "类型：0班级，1宿舍")
private Integer type;
/**
* 宿舍名称/班级名称
*/
@ApiModelProperty(value = "名称")
private String name;
/**
* 总人数
*/
@ApiModelProperty(value = "总人数")
private Integer totalNum;
/**
* 已采集人数
*/
@ApiModelProperty(value = "异常人数")
private Integer abnormalNum;
/**
* 关联学生数据
*/
@ApiModelProperty(value = "关联学生数据")
private List<Object> studentList;
/**
* 考勤时段ID
*/
@ApiModelProperty(value = "考勤时段ID")
private Long ruleTimeId;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/vo/DeptManagetVO.java
-16
View File
@@ -1,16 +0,0 @@
package com.yida.data.user.vo;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
import lombok.Data;
@Data
public class DeptManagetVO {
@ApiModelProperty("部门Id")
private Long deptId;
@ApiModelProperty("部门名称")
private String deptName;
@ApiModelProperty("部门管理员")
private List<ManagerVo> managerVoList;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/vo/DownLoadPicVO.java
+1 -1
View File
@@ -14,7 +14,7 @@ public class DownLoadPicVO {
@ApiModelProperty("是否上传完成，0-否，1-是")
private Integer finish;
@ApiModelProperty("下载总数")
private Integer totalNum;
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/vo/DownLoadStaffAttendanceRecordVO.java
-35
View File
@@ -1,35 +0,0 @@
package com.yida.data.user.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 下载职工通行记录进度-实体
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class DownLoadStaffAttendanceRecordVO {
@ApiModelProperty("本次操作标识")
private String key;
@ApiModelProperty("进度 0-100")
private Integer percent;
@ApiModelProperty("是否下载完成，0-否，1-是")
private Integer finish;
@ApiModelProperty("下载总数")
private Integer totalNum;
@ApiModelProperty("当前下载到第几个")
private Integer currentNum;
@ApiModelProperty("错误文件路径")
private String filePath;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/vo/ManagerVo.java
-10
View File
@@ -1,10 +0,0 @@
package com.yida.data.user.vo;
import lombok.Data;
@Data
public class ManagerVo {
private Long userId;
private String userName;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/vo/OutPageStudentVO.java
-46
View File
@@ -1,46 +0,0 @@
package com.yida.data.user.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* 分页查询学生列表数据返回类
*
* @author ZYJ
* @date 2023/2/20
*/
@Data
@ApiModel(value = "OutPageStudentVO", description = "分页查询学生列表数据返回类")
public class OutPageStudentVO implements Serializable {
private static final long serialVersionUID = 7179610417104867560L;
@ApiModelProperty("学生id")
private Long studentId;
@ApiModelProperty("学生姓名")
private String studentName;
@ApiModelProperty("校园卡号")
private String stuCardNumber;
@ApiModelProperty("学生头像url")
private String avatar;
@ApiModelProperty("学校id")
private Long schoolId;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createDate;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateDate;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/vo/StrategyInfoVO.java
-71
View File
@@ -1,71 +0,0 @@
package com.yida.data.user.vo;
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.LocalDateTime;
import java.util.List;
/**
* 人脸组-策略信息返回类
*
* @author ZYJ
* @date 2022/12/12
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(value = "StrategyInfoVO", description = "人脸组-策略信息返回类")
public class StrategyInfoVO implements Serializable {
private static final long serialVersionUID = 5883547164739281028L;
@ApiModelProperty(value = "策略id")
private Long strategyId;
@ApiModelProperty(value = "人脸组id")
private Long faceGroupId;
@ApiModelProperty(value = "策略生效时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime strategyStartDate;
@ApiModelProperty(value = "策略失效时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime strategyEndDate;
@ApiModelProperty(value = "星期一通行计划uuid")
private String mondayUniqueCode;
@ApiModelProperty(value = "星期二通行计划uuid")
private String tuesdayUniqueCode;
@ApiModelProperty(value = "星期三通行计划uuid")
private String wednesdayUniqueCode;
@ApiModelProperty(value = "星期四通行计划uuid")
private String thursdayUniqueCode;
@ApiModelProperty(value = "星期五通行计划uuid")
private String fridayUniqueCode;
@ApiModelProperty(value = "星期六通行计划uuid")
private String saturdayUniqueCode;
@ApiModelProperty(value = "星期天通行计划uuid")
private String sundayUniqueCode;
@ApiModelProperty(value = "通行计划集合")
private List<StrategyPlanVO> planList;
@ApiModelProperty(value = "特殊日期集合")
private List<StrategySpecialDateVO> specialList;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/vo/StrategyPlanTimeVO.java
-48
View File
@@ -1,48 +0,0 @@
package com.yida.data.user.vo;
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.LocalTime;
/**
* 人脸组-策略-通行计划-时间段信息返回类
*
* @author ZYJ
* @date 2022/12/12
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(value = "StrategyPlanTimeVO", description = "人脸组-策略-通行计划-时间段信息返回类")
public class StrategyPlanTimeVO implements Serializable {
private static final long serialVersionUID = -3006837050525867421L;
@ApiModelProperty(value = "人脸组id")
@TableField("face_group_id")
private Long faceGroupId;
@ApiModelProperty(value = "人脸组-策略id")
private Long faceGroupStrategyId;
@ApiModelProperty(value = "人脸组-策略-通行计划id")
private Long faceGroupStrategyPlanId;
@ApiModelProperty(value = "开始时间")
@DateTimeFormat(pattern = "HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "HH:mm:ss")
private LocalTime planStartTime;
@ApiModelProperty(value = "结束时间")
@DateTimeFormat(pattern = "HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "HH:mm:ss")
private LocalTime planEndTime;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/vo/StrategyPlanVO.java
-40
View File
@@ -1,40 +0,0 @@
package com.yida.data.user.vo;
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 2022/12/12
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(value = "StrategyPlanVO", description = "人脸组-策略-通行计划信息返回类")
public class StrategyPlanVO implements Serializable {
private static final long serialVersionUID = -4014484234037617273L;
@ApiModelProperty(value = "通行计划id")
private Long planId;
@ApiModelProperty(value = "人脸组id")
private Long faceGroupId;
@ApiModelProperty(value = "人脸组-策略id")
private Long faceGroupStrategyId;
@ApiModelProperty("通行计划唯一编码")
private String uniqueCode;
@ApiModelProperty("通行计划-时间段集合")
private List<StrategyPlanTimeVO> planTimeList;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/vo/StrategySpecialDateVO.java
-50
View File
@@ -1,50 +0,0 @@
package com.yida.data.user.vo;
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.util.List;
/**
* 人脸组-策略-特殊日期返回类
*
* @author ZYJ
* @date 2022/12/12
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(value = "StrategySpecialDateVO", description = "人脸组-策略-特殊日期返回类")
public class StrategySpecialDateVO implements Serializable {
private static final long serialVersionUID = -3513266099905879137L;
@ApiModelProperty(value = "特殊日期主键id")
private Long specialId;
@ApiModelProperty(value = "人脸组id")
private Long faceGroupId;
@ApiModelProperty(value = "人脸组-策略id")
private Long faceGroupStrategyId;
@ApiModelProperty(value = "特殊日期开始日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
private LocalDate specialStartDate;
@ApiModelProperty(value = "特殊日期结束日期")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
private LocalDate specialEndDate;
@ApiModelProperty("特殊日期-时间段集合")
private List<StrategySpecialTimeVO> specialTimeList;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/vo/StrategySpecialTimeVO.java
-37
View File
@@ -1,37 +0,0 @@
package com.yida.data.user.vo;
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.LocalTime;
/**
* 人脸组-策略-特殊日期-时间返回类
*
* @author ZYJ
* @date 2022/12/12
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(value = "StrategySpecialTimeVO", description = "人脸组-策略-特殊日期-时间返回类")
public class StrategySpecialTimeVO implements Serializable {
private static final long serialVersionUID = 3886115890777830964L;
@ApiModelProperty(value = "开始时间")
@DateTimeFormat(pattern = "HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "HH:mm:ss")
private LocalTime specialStartTime;
@ApiModelProperty(value = "结束时间")
@DateTimeFormat(pattern = "HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "HH:mm:ss")
private LocalTime specialEndTime;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/vo/StudentApplyImportErrorVO.java
-13
View File
@@ -1,13 +0,0 @@
package com.yida.data.user.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class StudentApplyImportErrorVO {
@ExcelProperty(index = 0, value = "错误信息")
@ApiModelProperty("错误信息")
private String errorMsg;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/vo/StudentApplyImportProgressVO.java
-13
View File
@@ -1,13 +0,0 @@
package com.yida.data.user.vo;
import lombok.Data;
@Data
public class StudentApplyImportProgressVO {
private Integer totalNum;
private Integer currentNum;
private String errorPageUrl;
private Integer finish;
private String redisKey;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/vo/StudentApplyImportVO.java
-53
View File
@@ -1,53 +0,0 @@
package com.yida.data.user.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class StudentApplyImportVO {
@ExcelProperty(index = 0, value = "序号")
@ApiModelProperty(value = "序号")
private Long indexNo;
@ExcelProperty(index = 1, value = "学校名称")
@ApiModelProperty("学校名称")
private String schoolName;
@ExcelProperty(index = 2, value = "校区名称")
@ApiModelProperty("校区名称")
private String campusName;
@ExcelProperty(index = 3, value = "学段名称")
@ApiModelProperty("学段名称")
private String sectionName;
@ExcelProperty(index = 4, value = "年级名称")
@ApiModelProperty("年级名称")
private String gradeName;
@ExcelProperty(index = 5, value = "班级名称")
@ApiModelProperty("班级名称")
private String className;
@ExcelProperty(index = 6, value = "学生姓名")
@ApiModelProperty("学生姓名")
private String studentName;
@ExcelProperty(index = 7, value = "学生学号")
@ApiModelProperty("学生学号")
private String studentNumber;
@ExcelProperty(index = 8, value = "开通应用")
@ApiModelProperty("开通应用")
private String applyName;
@ExcelProperty(index = 9, value = "有效开始时间")
@ApiModelProperty("有效开始时间")
private String startTime;
@ExcelProperty(index = 10, value = "有效结束时间")
@ApiModelProperty("有效结束时间")
private String endTime;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/vo/StudentApplyStatusVO.java
-15
View File
@@ -1,15 +0,0 @@
package com.yida.data.user.vo;
import io.swagger.annotations.ApiModelProperty;
import java.time.LocalDate;
import lombok.Data;
@Data
public class StudentApplyStatusVO {
@ApiModelProperty("应用状态，0-未开通，1-使用中，2-已过期")
private Integer status;
@ApiModelProperty("过期时间")
private LocalDate deadLine;
}
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/vo/TeacherDeptVO.java
-8
View File
@@ -10,11 +10,6 @@ import lombok.Data;
@ApiModel("教师班级学科关系")
public class TeacherDeptVO {
@ApiModelProperty("学校id")
private Long schoolId;
@ApiModelProperty("学校名称")
private String schoolName;
@ApiModelProperty("校区id")
private Long campusId;
@ApiModelProperty("校区名称")
@@ -35,9 +30,6 @@ public class TeacherDeptVO {
@ApiModelProperty("班级名称")
private String className;
@ApiModelProperty("班级人数")
private Long classStudentNum;
@ApiModelProperty("教师类型 1表示校区负责人，2表示年级负责人，3表示班主任，4表示任课老师，5表示学段负责人")
private Integer type;
febs-server/edu-user/edu-user-api/src/main/java/com/yida/data/user/vo/UserInfoVO.java
+1 -9
View File
@@ -5,13 +5,8 @@ import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@Data
public class UserInfoVO implements Serializable {
private static final long serialVersionUID = -2183584074714449444L;
public class UserInfoVO {
@ApiModelProperty("用户名称")
@ExcelProperty("用户名称")
private String name;
@@ -23,7 +18,4 @@ public class UserInfoVO implements Serializable {
@ApiModelProperty("学号/手机号")
@ExcelProperty("学号/手机号")
private String number;
@ApiModelProperty("设备名称")
private String deviceName;
}
febs-server/edu-user/edu-user-api/src/main/resources/META-INF/spring.factories
+1 -4
View File
@@ -7,7 +7,4 @@ com.yida.data.user.fallback.RemoteTeacherServiceFallback,\
com.yida.data.user.fallback.RemoteUserDeptServiceFallback,\
com.yida.data.user.fallback.RemoteUserDeviceFactoryServiceFallback,\
com.yida.data.user.fallback.RemoteUserDeviceServiceFallback,\
com.yida.data.user.fallback.RemoteUserFaceServiceFallback,\
com.yida.data.user.fallback.RemoteStudentApplyServiceFallback,\
com.yida.data.user.fallback.RemoteFaceGroupDeviceServiceFallback,\
com.yida.data.user.fallback.RemoteFaceGroupStrategyServiceFallback
com.yida.data.user.fallback.RemoteUserFaceServiceFallback