feat: 东区缴费分支初始化

2025-05-15 15:08:15 +08:00
parent 39f3acc15f
commit bafd4aa3ab
261 changed files with 3751 additions and 9416 deletions
@@ -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("名字")
@@ -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;
 }
@@ -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;
 }
@@ -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;
-            }
        };
    }
 }
@@ -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;
-            }
-
        };
    }
 }
@@ -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;
            }

@@ -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;
-            }
        };
    }
 }
@@ -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;
-            }
        };
    }
 }
@@ -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);
 }
@@ -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();
 }
@@ -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
@@ -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);
 }
@@ -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);
 }
@@ -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);
@@ -14,7 +14,7 @@ public class DownLoadPicVO {

    @ApiModelProperty("是否上传完成，0-否，1-是")
    private Integer finish;
-
+    
    @ApiModelProperty("下载总数")
    private Integer totalNum;

@@ -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;
@@ -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;
 }
@@ -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