refactor: 根包由 com.bestsch.bschclassmanage 重命名为 com.yunhai.bschclassmanage
- git mv src/main/java/com/bestsch/bschclassmanage -> src/main/java/com/yunhai/bschclassmanage - 255 个 Java 文件的 package/import 同步替换为 com.yunhai.bschclassmanage - pom.xml 项目 groupId 设为 com.yunhai(与外部依赖 com.bestsch:bsch-* 无关,未改动) - IDE 缓存 workspace.xml 路径同步更新(外部依赖坐标 com.bestsch:bsch-* 保持不动)
This commit is contained in:
@@ -0,0 +1,14 @@
|
||||
# 2026-08-12
|
||||
|
||||
## 项目:bschclassmanage(原 classicalchinese 重构)
|
||||
|
||||
### 已修复的三类启动/路由问题
|
||||
1. **CORS 启动失败**:Spring Boot 2.7.18 (Spring 5.3) 校验 `allowCredentials=true` 时 `allowedOrigins` 不能含 `*`。已将 23 个 Controller 的 `@CrossOrigin(origins={"*","*"}, allowCredentials="true")` 改为 `originPatterns={"*"}`。
|
||||
2. **/api/* 与 /oapi/* 接口 404**:`Config.API_PATH="/api/"` 与 `Config.OAPI="/oapi/"` 常量尾部带斜杠,拼接 `API_PATH+"/subject/"` 产生 `/api//subject/`(双斜杠)。Spring Boot 2.7 默认 PathPatternParser 不折叠双斜杠导致匹配失败。已将常量尾斜杠去掉(`/api`、`/oapi`、`/mobiapi`)。`LoginUserController` 单独用 `Config.API_PATH` 无拼接故正常。
|
||||
3. **currentrole 取不到(500/NPE)**:`UserSysRoleArgumentResolver` 原只从请求头 `currentrole` 取身份 JSON(childId/roleId/schId),URL 参数被忽略导致 `curRole` 为 null。已改为「Header 优先,查不到退回 URL 参数 currentrole」,便于本地调试,生产仍走 Header。
|
||||
|
||||
### Git
|
||||
- 提交 `66cd0f1`:包重命名为 `com.yunhai.bschclassmanage`,含以上修复。
|
||||
- 远程 origin 指向 `http://gitea.yunhaixingtong.com/wanghu/BSChClassManage.git`(原 classicalchinese 旧地址已替换)。
|
||||
- 已 `git push -u origin master` 成功。本地仓库级身份:Allen <allen@yunhaixingtong.com>。
|
||||
- 注意:gitea http push 需账号密码;URL 中 `&` 须编码为 `%26`。
|
||||
@@ -9,6 +9,7 @@
|
||||
<version>2.7.18</version>
|
||||
<relativePath/> <!-- lookup parent from repository -->
|
||||
</parent>
|
||||
<groupId>com.yunhai</groupId>
|
||||
<!-- <groupId>com.bestsch.previewUnit</groupId>-->
|
||||
<artifactId>BschClass</artifactId>
|
||||
<version>0.1</version>
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
package com.bestsch.bschclassmanage.service;
|
||||
|
||||
import com.bestsch.bschclassmanage.Repository.BaseDicGradeRepository;
|
||||
import com.bestsch.bschclassmanage.entity.BaseDicGrade;
|
||||
import com.bestsch.bschclassmanage.utils.RedisConstants;
|
||||
import com.bestsch.bschclassmanage.utils.RedisUtil;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public interface IBaseDicGradeService {
|
||||
|
||||
List<BaseDicGrade> getSysGradeList();
|
||||
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage;
|
||||
package com.yunhai.bschclassmanage;
|
||||
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.Repository;
|
||||
package com.yunhai.bschclassmanage.Repository;
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.BaseDicGrade;
|
||||
import com.yunhai.bschclassmanage.entity.BaseDicGrade;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.Repository;
|
||||
package com.yunhai.bschclassmanage.Repository;
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.BaseDicSubject;
|
||||
import com.yunhai.bschclassmanage.entity.BaseDicSubject;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
package com.bestsch.bschclassmanage.Repository;
|
||||
package com.yunhai.bschclassmanage.Repository;
|
||||
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.BaseSchsystemGrade;
|
||||
import com.yunhai.bschclassmanage.entity.BaseSchsystemGrade;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.Repository;
|
||||
package com.yunhai.bschclassmanage.Repository;
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.BaseSchsystem;
|
||||
import com.yunhai.bschclassmanage.entity.BaseSchsystem;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.Repository;
|
||||
package com.yunhai.bschclassmanage.Repository;
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.BaseYearTerm;
|
||||
import com.yunhai.bschclassmanage.entity.BaseYearTerm;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.Repository;
|
||||
package com.yunhai.bschclassmanage.Repository;
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.OperationLogRecord;
|
||||
import com.yunhai.bschclassmanage.entity.OperationLogRecord;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
+3
-3
@@ -1,8 +1,8 @@
|
||||
package com.bestsch.bschclassmanage.Repository;
|
||||
package com.yunhai.bschclassmanage.Repository;
|
||||
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.BaseSchsystemGrade;
|
||||
import com.bestsch.bschclassmanage.entity.SchBinSchsystem;
|
||||
import com.yunhai.bschclassmanage.entity.BaseSchsystemGrade;
|
||||
import com.yunhai.bschclassmanage.entity.SchBinSchsystem;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
+3
-3
@@ -1,7 +1,7 @@
|
||||
package com.bestsch.bschclassmanage.Repository;
|
||||
package com.yunhai.bschclassmanage.Repository;
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.SchClass;
|
||||
import com.bestsch.bschclassmanage.entity.SchClassHistory;
|
||||
import com.yunhai.bschclassmanage.entity.SchClass;
|
||||
import com.yunhai.bschclassmanage.entity.SchClassHistory;
|
||||
import io.lettuce.core.dynamic.annotation.Param;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.Repository;
|
||||
package com.yunhai.bschclassmanage.Repository;
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.SchClass;
|
||||
import com.yunhai.bschclassmanage.entity.SchClass;
|
||||
import io.lettuce.core.dynamic.annotation.Param;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
+3
-3
@@ -1,7 +1,7 @@
|
||||
package com.bestsch.bschclassmanage.Repository;
|
||||
package com.yunhai.bschclassmanage.Repository;
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.BaseDicGrade;
|
||||
import com.bestsch.bschclassmanage.entity.SchClassTeachHistory;
|
||||
import com.yunhai.bschclassmanage.entity.BaseDicGrade;
|
||||
import com.yunhai.bschclassmanage.entity.SchClassTeachHistory;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.Repository;
|
||||
package com.yunhai.bschclassmanage.Repository;
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.SchClassTeach;
|
||||
import com.yunhai.bschclassmanage.entity.SchClassTeach;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.Repository;
|
||||
package com.yunhai.bschclassmanage.Repository;
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.SchDicCampus;
|
||||
import com.yunhai.bschclassmanage.entity.SchDicCampus;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.Repository;
|
||||
package com.yunhai.bschclassmanage.Repository;
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.SchDicCourseDivision;
|
||||
import com.yunhai.bschclassmanage.entity.SchDicCourseDivision;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.Repository;
|
||||
package com.yunhai.bschclassmanage.Repository;
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.SchDicCourseMajors;
|
||||
import com.yunhai.bschclassmanage.entity.SchDicCourseMajors;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
+3
-3
@@ -1,7 +1,7 @@
|
||||
package com.bestsch.bschclassmanage.Repository;
|
||||
package com.yunhai.bschclassmanage.Repository;
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.SchDicCampus;
|
||||
import com.bestsch.bschclassmanage.entity.SchDicCourse;
|
||||
import com.yunhai.bschclassmanage.entity.SchDicCampus;
|
||||
import com.yunhai.bschclassmanage.entity.SchDicCourse;
|
||||
import io.lettuce.core.dynamic.annotation.Param;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.Repository;
|
||||
package com.yunhai.bschclassmanage.Repository;
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.SchDicDivision;
|
||||
import com.yunhai.bschclassmanage.entity.SchDicDivision;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.Repository;
|
||||
package com.yunhai.bschclassmanage.Repository;
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.SchDicMajors;
|
||||
import com.yunhai.bschclassmanage.entity.SchDicMajors;
|
||||
import io.lettuce.core.dynamic.annotation.Param;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
+3
-3
@@ -1,7 +1,7 @@
|
||||
package com.bestsch.bschclassmanage.Repository;
|
||||
package com.yunhai.bschclassmanage.Repository;
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.BaseDicGrade;
|
||||
import com.bestsch.bschclassmanage.entity.SchDicSubject;
|
||||
import com.yunhai.bschclassmanage.entity.BaseDicGrade;
|
||||
import com.yunhai.bschclassmanage.entity.SchDicSubject;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
import org.springframework.data.jpa.repository.Query;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.Repository;
|
||||
package com.yunhai.bschclassmanage.Repository;
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.SchInfo;
|
||||
import com.yunhai.bschclassmanage.entity.SchInfo;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
+3
-3
@@ -1,7 +1,7 @@
|
||||
package com.bestsch.bschclassmanage.Repository;
|
||||
package com.yunhai.bschclassmanage.Repository;
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.SchClassTeachHistory;
|
||||
import com.bestsch.bschclassmanage.entity.SchStudentHistory;
|
||||
import com.yunhai.bschclassmanage.entity.SchClassTeachHistory;
|
||||
import com.yunhai.bschclassmanage.entity.SchStudentHistory;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.Repository;
|
||||
package com.yunhai.bschclassmanage.Repository;
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.SchStudent;
|
||||
import com.yunhai.bschclassmanage.entity.SchStudent;
|
||||
import io.lettuce.core.dynamic.annotation.Param;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.Repository;
|
||||
package com.yunhai.bschclassmanage.Repository;
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.SchTeacherCustomGroupInGrade;
|
||||
import com.yunhai.bschclassmanage.entity.SchTeacherCustomGroupInGrade;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.Repository;
|
||||
package com.yunhai.bschclassmanage.Repository;
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.SchTeacherCustomGroupInSubject;
|
||||
import com.yunhai.bschclassmanage.entity.SchTeacherCustomGroupInSubject;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
+3
-3
@@ -1,7 +1,7 @@
|
||||
package com.bestsch.bschclassmanage.Repository;
|
||||
package com.yunhai.bschclassmanage.Repository;
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.SchTeacherCustomGroup;
|
||||
import com.bestsch.bschclassmanage.entity.SchTeacherCustomGroupInTeacher;
|
||||
import com.yunhai.bschclassmanage.entity.SchTeacherCustomGroup;
|
||||
import com.yunhai.bschclassmanage.entity.SchTeacherCustomGroupInTeacher;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.Repository;
|
||||
package com.yunhai.bschclassmanage.Repository;
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.SchTeacherCustomGroup;
|
||||
import com.yunhai.bschclassmanage.entity.SchTeacherCustomGroup;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.Repository;
|
||||
package com.yunhai.bschclassmanage.Repository;
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.SchTeacherGroup;
|
||||
import com.yunhai.bschclassmanage.entity.SchTeacherGroup;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
|
||||
+3
-3
@@ -1,7 +1,7 @@
|
||||
package com.bestsch.bschclassmanage.Repository;
|
||||
package com.yunhai.bschclassmanage.Repository;
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.SchTeacher;
|
||||
import com.bestsch.bschclassmanage.model.vo.TeacherSchVO;
|
||||
import com.yunhai.bschclassmanage.entity.SchTeacher;
|
||||
import com.yunhai.bschclassmanage.model.vo.TeacherSchVO;
|
||||
import io.lettuce.core.dynamic.annotation.Param;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.Repository;
|
||||
package com.yunhai.bschclassmanage.Repository;
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.UpgradeLog;
|
||||
import com.yunhai.bschclassmanage.entity.UpgradeLog;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
import org.springframework.stereotype.Repository;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.Repository.specification;
|
||||
package com.yunhai.bschclassmanage.Repository.specification;
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.OperationLogRecord;
|
||||
import com.yunhai.bschclassmanage.entity.OperationLogRecord;
|
||||
import org.springframework.data.jpa.domain.Specification;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
+3
-3
@@ -1,7 +1,7 @@
|
||||
package com.bestsch.bschclassmanage.Repository.specification;
|
||||
package com.yunhai.bschclassmanage.Repository.specification;
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.SchClass;
|
||||
import com.bestsch.bschclassmanage.entity.SchTeacher;
|
||||
import com.yunhai.bschclassmanage.entity.SchClass;
|
||||
import com.yunhai.bschclassmanage.entity.SchTeacher;
|
||||
import org.springframework.data.jpa.domain.Specification;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
+3
-3
@@ -1,7 +1,7 @@
|
||||
package com.bestsch.bschclassmanage.Repository.specification;
|
||||
package com.yunhai.bschclassmanage.Repository.specification;
|
||||
|
||||
import com.bestsch.bschclassmanage.entity.SchTeacher;
|
||||
import com.bestsch.bschclassmanage.entity.SchTeacherGroup;
|
||||
import com.yunhai.bschclassmanage.entity.SchTeacher;
|
||||
import com.yunhai.bschclassmanage.entity.SchTeacherGroup;
|
||||
import org.springframework.data.jpa.domain.Specification;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage.annotation;
|
||||
package com.yunhai.bschclassmanage.annotation;
|
||||
|
||||
import java.lang.annotation.*;
|
||||
|
||||
+5
-5
@@ -1,8 +1,8 @@
|
||||
package com.bestsch.bschclassmanage.aspect;
|
||||
package com.yunhai.bschclassmanage.aspect;
|
||||
|
||||
import com.bestsch.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.bestsch.bschclassmanage.utils.OtherUtil;
|
||||
import com.bestsch.bschclassmanage.utils.UserContext;
|
||||
import com.yunhai.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.yunhai.bschclassmanage.utils.OtherUtil;
|
||||
import com.yunhai.bschclassmanage.utils.UserContext;
|
||||
import com.yunhai.platform.utils.model.BoaUser;
|
||||
import org.aspectj.lang.ProceedingJoinPoint;
|
||||
import org.aspectj.lang.annotation.Around;
|
||||
@@ -22,7 +22,7 @@ public class ControllerUserContextAspect {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(ControllerUserContextAspect.class);
|
||||
|
||||
@Around("execution(* com.bestsch.bschclassmanage.controller..*.*(..))")
|
||||
@Around("execution(* com.yunhai.bschclassmanage.controller..*.*(..))")
|
||||
public Object setUserContext(ProceedingJoinPoint joinPoint) throws Throwable {
|
||||
// 1. 从方法参数中提取 BoaUser 和 UserSysRole
|
||||
Object[] args = joinPoint.getArgs();
|
||||
+6
-6
@@ -1,10 +1,10 @@
|
||||
package com.bestsch.bschclassmanage.aspect;
|
||||
package com.yunhai.bschclassmanage.aspect;
|
||||
|
||||
import com.bestsch.bschclassmanage.annotation.OperationLog;
|
||||
import com.bestsch.bschclassmanage.entity.OperationLogRecord;
|
||||
import com.bestsch.bschclassmanage.service.ILogService;
|
||||
import com.bestsch.bschclassmanage.utils.LogContextHolder;
|
||||
import com.bestsch.bschclassmanage.utils.UserContext;
|
||||
import com.yunhai.bschclassmanage.annotation.OperationLog;
|
||||
import com.yunhai.bschclassmanage.entity.OperationLogRecord;
|
||||
import com.yunhai.bschclassmanage.service.ILogService;
|
||||
import com.yunhai.bschclassmanage.utils.LogContextHolder;
|
||||
import com.yunhai.bschclassmanage.utils.UserContext;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import org.aspectj.lang.ProceedingJoinPoint;
|
||||
import org.aspectj.lang.annotation.Around;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage.config;
|
||||
package com.yunhai.bschclassmanage.config;
|
||||
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage.config;
|
||||
package com.yunhai.bschclassmanage.config;
|
||||
|
||||
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.config;
|
||||
package com.yunhai.bschclassmanage.config;
|
||||
|
||||
import com.bestsch.bschclassmanage.controller.Handler.UserSysRoleArgumentResolver;
|
||||
import com.yunhai.bschclassmanage.controller.Handler.UserSysRoleArgumentResolver;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
|
||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage.config;
|
||||
package com.yunhai.bschclassmanage.config;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage.config;
|
||||
package com.yunhai.bschclassmanage.config;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.parser.ParserConfig;
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
package com.bestsch.bschclassmanage.controller;
|
||||
package com.yunhai.bschclassmanage.controller;
|
||||
|
||||
|
||||
import com.bestsch.bschclassmanage.model.vo.PageVO;
|
||||
import com.yunhai.bschclassmanage.model.vo.PageVO;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.controller.Handler;
|
||||
package com.yunhai.bschclassmanage.controller.Handler;
|
||||
|
||||
import com.bestsch.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.yunhai.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import org.springframework.core.MethodParameter; // ✅ 正确包
|
||||
import org.springframework.web.bind.annotation.RestControllerAdvice;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage.controller.Handler;
|
||||
package com.yunhai.bschclassmanage.controller.Handler;
|
||||
|
||||
import com.yunhai.platform.utils.exception.ErrorCode;
|
||||
import org.springframework.http.HttpStatus;
|
||||
+7
-7
@@ -1,11 +1,11 @@
|
||||
package com.bestsch.bschclassmanage.controller.api;
|
||||
package com.yunhai.bschclassmanage.controller.api;
|
||||
|
||||
import com.bestsch.bschclassmanage.config.Config;
|
||||
import com.bestsch.bschclassmanage.controller.BaseController;
|
||||
import com.bestsch.bschclassmanage.entity.OperationLogRecord;
|
||||
import com.bestsch.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.bestsch.bschclassmanage.model.vo.PageVO;
|
||||
import com.bestsch.bschclassmanage.service.ILogService;
|
||||
import com.yunhai.bschclassmanage.config.Config;
|
||||
import com.yunhai.bschclassmanage.controller.BaseController;
|
||||
import com.yunhai.bschclassmanage.entity.OperationLogRecord;
|
||||
import com.yunhai.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.yunhai.bschclassmanage.model.vo.PageVO;
|
||||
import com.yunhai.bschclassmanage.service.ILogService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
+3
-3
@@ -1,8 +1,8 @@
|
||||
package com.bestsch.bschclassmanage.controller.api;
|
||||
package com.yunhai.bschclassmanage.controller.api;
|
||||
|
||||
|
||||
import com.bestsch.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.bestsch.bschclassmanage.config.Config;
|
||||
import com.yunhai.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.yunhai.bschclassmanage.config.Config;
|
||||
import com.yunhai.platform.openapi.client.YschBaseOpenApi;
|
||||
import com.yunhai.platform.utils.model.BoaModule;
|
||||
import com.yunhai.platform.utils.model.BoaUser;
|
||||
+14
-14
@@ -1,22 +1,22 @@
|
||||
package com.bestsch.bschclassmanage.controller.api;
|
||||
package com.yunhai.bschclassmanage.controller.api;
|
||||
|
||||
|
||||
import cn.afterturn.easypoi.excel.ExcelExportUtil;
|
||||
import cn.afterturn.easypoi.excel.entity.ExportParams;
|
||||
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
|
||||
import com.bestsch.bschclassmanage.config.Config;
|
||||
import com.bestsch.bschclassmanage.entity.SchClass;
|
||||
import com.bestsch.bschclassmanage.model.excel.ImportRuleExcelColumn;
|
||||
import com.bestsch.bschclassmanage.model.excel.SchClassExcelColumn;
|
||||
import com.bestsch.bschclassmanage.model.excel.SchHeightClassExcelColumn;
|
||||
import com.bestsch.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.bestsch.bschclassmanage.model.vo.BaseSchClassVO;
|
||||
import com.bestsch.bschclassmanage.model.vo.HigherSchClassVO;
|
||||
import com.bestsch.bschclassmanage.model.vo.PageVO;
|
||||
import com.bestsch.bschclassmanage.model.vo.SelectIntVO;
|
||||
import com.bestsch.bschclassmanage.service.*;
|
||||
import com.bestsch.bschclassmanage.utils.EasyPoiUtils;
|
||||
import com.bestsch.bschclassmanage.utils.UserContext;
|
||||
import com.yunhai.bschclassmanage.config.Config;
|
||||
import com.yunhai.bschclassmanage.entity.SchClass;
|
||||
import com.yunhai.bschclassmanage.model.excel.ImportRuleExcelColumn;
|
||||
import com.yunhai.bschclassmanage.model.excel.SchClassExcelColumn;
|
||||
import com.yunhai.bschclassmanage.model.excel.SchHeightClassExcelColumn;
|
||||
import com.yunhai.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.yunhai.bschclassmanage.model.vo.BaseSchClassVO;
|
||||
import com.yunhai.bschclassmanage.model.vo.HigherSchClassVO;
|
||||
import com.yunhai.bschclassmanage.model.vo.PageVO;
|
||||
import com.yunhai.bschclassmanage.model.vo.SelectIntVO;
|
||||
import com.yunhai.bschclassmanage.service.*;
|
||||
import com.yunhai.bschclassmanage.utils.EasyPoiUtils;
|
||||
import com.yunhai.bschclassmanage.utils.UserContext;
|
||||
import com.yunhai.platform.utils.model.BoaUser;
|
||||
import org.apache.poi.ss.usermodel.Workbook;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
+13
-13
@@ -1,21 +1,21 @@
|
||||
package com.bestsch.bschclassmanage.controller.api;
|
||||
package com.yunhai.bschclassmanage.controller.api;
|
||||
|
||||
|
||||
import cn.afterturn.easypoi.excel.ExcelExportUtil;
|
||||
import cn.afterturn.easypoi.excel.entity.ExportParams;
|
||||
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
|
||||
import com.bestsch.bschclassmanage.config.Config;
|
||||
import com.bestsch.bschclassmanage.enums.CustomGroupType;
|
||||
import com.bestsch.bschclassmanage.model.dto.AddMemberDTO;
|
||||
import com.bestsch.bschclassmanage.model.dto.SchCustomGroupDTO;
|
||||
import com.bestsch.bschclassmanage.model.dto.SetLeaderDTO;
|
||||
import com.bestsch.bschclassmanage.model.excel.CustomGroupExcelColumn;
|
||||
import com.bestsch.bschclassmanage.model.excel.ImportRuleExcelColumn;
|
||||
import com.bestsch.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.bestsch.bschclassmanage.model.vo.SchCustomGroupVO;
|
||||
import com.bestsch.bschclassmanage.service.*;
|
||||
import com.bestsch.bschclassmanage.utils.EasyPoiUtils;
|
||||
import com.bestsch.bschclassmanage.utils.UserContext;
|
||||
import com.yunhai.bschclassmanage.config.Config;
|
||||
import com.yunhai.bschclassmanage.enums.CustomGroupType;
|
||||
import com.yunhai.bschclassmanage.model.dto.AddMemberDTO;
|
||||
import com.yunhai.bschclassmanage.model.dto.SchCustomGroupDTO;
|
||||
import com.yunhai.bschclassmanage.model.dto.SetLeaderDTO;
|
||||
import com.yunhai.bschclassmanage.model.excel.CustomGroupExcelColumn;
|
||||
import com.yunhai.bschclassmanage.model.excel.ImportRuleExcelColumn;
|
||||
import com.yunhai.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.yunhai.bschclassmanage.model.vo.SchCustomGroupVO;
|
||||
import com.yunhai.bschclassmanage.service.*;
|
||||
import com.yunhai.bschclassmanage.utils.EasyPoiUtils;
|
||||
import com.yunhai.bschclassmanage.utils.UserContext;
|
||||
import com.yunhai.platform.utils.model.BoaUser;
|
||||
import org.apache.poi.ss.usermodel.Workbook;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
+7
-7
@@ -1,12 +1,12 @@
|
||||
package com.bestsch.bschclassmanage.controller.api;
|
||||
package com.yunhai.bschclassmanage.controller.api;
|
||||
|
||||
|
||||
import com.bestsch.bschclassmanage.config.Config;
|
||||
import com.bestsch.bschclassmanage.entity.SchDicCampus;
|
||||
import com.bestsch.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.bestsch.bschclassmanage.model.vo.SelectIntVO;
|
||||
import com.bestsch.bschclassmanage.service.ISchDicCampusService;
|
||||
import com.bestsch.bschclassmanage.utils.UserContext;
|
||||
import com.yunhai.bschclassmanage.config.Config;
|
||||
import com.yunhai.bschclassmanage.entity.SchDicCampus;
|
||||
import com.yunhai.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.yunhai.bschclassmanage.model.vo.SelectIntVO;
|
||||
import com.yunhai.bschclassmanage.service.ISchDicCampusService;
|
||||
import com.yunhai.bschclassmanage.utils.UserContext;
|
||||
import com.yunhai.platform.utils.model.BoaUser;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
+11
-11
@@ -1,16 +1,16 @@
|
||||
package com.bestsch.bschclassmanage.controller.api;
|
||||
package com.yunhai.bschclassmanage.controller.api;
|
||||
|
||||
|
||||
import com.bestsch.bschclassmanage.config.Config;
|
||||
import com.bestsch.bschclassmanage.controller.BaseController;
|
||||
import com.bestsch.bschclassmanage.enums.CourseType;
|
||||
import com.bestsch.bschclassmanage.model.dto.SchDicCourseDTO;
|
||||
import com.bestsch.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.bestsch.bschclassmanage.model.vo.PageVO;
|
||||
import com.bestsch.bschclassmanage.model.vo.SchDicCourseVO;
|
||||
import com.bestsch.bschclassmanage.model.vo.SelectIntVO;
|
||||
import com.bestsch.bschclassmanage.service.ISchDicCourseService;
|
||||
import com.bestsch.bschclassmanage.utils.UserContext;
|
||||
import com.yunhai.bschclassmanage.config.Config;
|
||||
import com.yunhai.bschclassmanage.controller.BaseController;
|
||||
import com.yunhai.bschclassmanage.enums.CourseType;
|
||||
import com.yunhai.bschclassmanage.model.dto.SchDicCourseDTO;
|
||||
import com.yunhai.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.yunhai.bschclassmanage.model.vo.PageVO;
|
||||
import com.yunhai.bschclassmanage.model.vo.SchDicCourseVO;
|
||||
import com.yunhai.bschclassmanage.model.vo.SelectIntVO;
|
||||
import com.yunhai.bschclassmanage.service.ISchDicCourseService;
|
||||
import com.yunhai.bschclassmanage.utils.UserContext;
|
||||
import com.yunhai.platform.utils.model.BoaUser;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
+7
-7
@@ -1,12 +1,12 @@
|
||||
package com.bestsch.bschclassmanage.controller.api;
|
||||
package com.yunhai.bschclassmanage.controller.api;
|
||||
|
||||
|
||||
import com.bestsch.bschclassmanage.config.Config;
|
||||
import com.bestsch.bschclassmanage.entity.SchDicDivision;
|
||||
import com.bestsch.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.bestsch.bschclassmanage.model.vo.SelectIntVO;
|
||||
import com.bestsch.bschclassmanage.service.ISchDicDivisionService;
|
||||
import com.bestsch.bschclassmanage.utils.UserContext;
|
||||
import com.yunhai.bschclassmanage.config.Config;
|
||||
import com.yunhai.bschclassmanage.entity.SchDicDivision;
|
||||
import com.yunhai.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.yunhai.bschclassmanage.model.vo.SelectIntVO;
|
||||
import com.yunhai.bschclassmanage.service.ISchDicDivisionService;
|
||||
import com.yunhai.bschclassmanage.utils.UserContext;
|
||||
import com.yunhai.platform.utils.model.BoaUser;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
+7
-7
@@ -1,12 +1,12 @@
|
||||
package com.bestsch.bschclassmanage.controller.api;
|
||||
package com.yunhai.bschclassmanage.controller.api;
|
||||
|
||||
|
||||
import com.bestsch.bschclassmanage.config.Config;
|
||||
import com.bestsch.bschclassmanage.entity.SchDicMajors;
|
||||
import com.bestsch.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.bestsch.bschclassmanage.model.vo.SelectIntVO;
|
||||
import com.bestsch.bschclassmanage.service.ISchDicMajorsService;
|
||||
import com.bestsch.bschclassmanage.utils.UserContext;
|
||||
import com.yunhai.bschclassmanage.config.Config;
|
||||
import com.yunhai.bschclassmanage.entity.SchDicMajors;
|
||||
import com.yunhai.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.yunhai.bschclassmanage.model.vo.SelectIntVO;
|
||||
import com.yunhai.bschclassmanage.service.ISchDicMajorsService;
|
||||
import com.yunhai.bschclassmanage.utils.UserContext;
|
||||
import com.yunhai.platform.utils.model.BoaUser;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
+5
-5
@@ -1,10 +1,10 @@
|
||||
package com.bestsch.bschclassmanage.controller.api;
|
||||
package com.yunhai.bschclassmanage.controller.api;
|
||||
|
||||
|
||||
import com.bestsch.bschclassmanage.config.Config;
|
||||
import com.bestsch.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.bestsch.bschclassmanage.model.vo.SelectIntVO;
|
||||
import com.bestsch.bschclassmanage.service.IBaseSchsystemGradeService;
|
||||
import com.yunhai.bschclassmanage.config.Config;
|
||||
import com.yunhai.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.yunhai.bschclassmanage.model.vo.SelectIntVO;
|
||||
import com.yunhai.bschclassmanage.service.IBaseSchsystemGradeService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
+19
-19
@@ -1,26 +1,26 @@
|
||||
package com.bestsch.bschclassmanage.controller.api;
|
||||
package com.yunhai.bschclassmanage.controller.api;
|
||||
|
||||
import cn.afterturn.easypoi.excel.ExcelExportUtil;
|
||||
import cn.afterturn.easypoi.excel.entity.ExportParams;
|
||||
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
|
||||
import com.bestsch.bschclassmanage.config.Config;
|
||||
import com.bestsch.bschclassmanage.controller.BaseController;
|
||||
import com.bestsch.bschclassmanage.entity.SchClass;
|
||||
import com.bestsch.bschclassmanage.enums.StuAbnormalStatus;
|
||||
import com.bestsch.bschclassmanage.model.dto.StuAbnormalStatusDTO;
|
||||
import com.bestsch.bschclassmanage.model.dto.StuTransferClassDTO;
|
||||
import com.bestsch.bschclassmanage.model.excel.ImportRuleExcelColumn;
|
||||
import com.bestsch.bschclassmanage.model.excel.StudentExcelColumn;
|
||||
import com.bestsch.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.bestsch.bschclassmanage.model.vo.PageVO;
|
||||
import com.bestsch.bschclassmanage.model.vo.SchStudentVO;
|
||||
import com.bestsch.bschclassmanage.model.vo.SelectIntVO;
|
||||
import com.bestsch.bschclassmanage.service.IBaseSchsystemGradeService;
|
||||
import com.bestsch.bschclassmanage.service.IComSchTreeService;
|
||||
import com.bestsch.bschclassmanage.service.ISchClassService;
|
||||
import com.bestsch.bschclassmanage.service.ISchStudentService;
|
||||
import com.bestsch.bschclassmanage.utils.EasyPoiUtils;
|
||||
import com.bestsch.bschclassmanage.utils.UserContext;
|
||||
import com.yunhai.bschclassmanage.config.Config;
|
||||
import com.yunhai.bschclassmanage.controller.BaseController;
|
||||
import com.yunhai.bschclassmanage.entity.SchClass;
|
||||
import com.yunhai.bschclassmanage.enums.StuAbnormalStatus;
|
||||
import com.yunhai.bschclassmanage.model.dto.StuAbnormalStatusDTO;
|
||||
import com.yunhai.bschclassmanage.model.dto.StuTransferClassDTO;
|
||||
import com.yunhai.bschclassmanage.model.excel.ImportRuleExcelColumn;
|
||||
import com.yunhai.bschclassmanage.model.excel.StudentExcelColumn;
|
||||
import com.yunhai.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.yunhai.bschclassmanage.model.vo.PageVO;
|
||||
import com.yunhai.bschclassmanage.model.vo.SchStudentVO;
|
||||
import com.yunhai.bschclassmanage.model.vo.SelectIntVO;
|
||||
import com.yunhai.bschclassmanage.service.IBaseSchsystemGradeService;
|
||||
import com.yunhai.bschclassmanage.service.IComSchTreeService;
|
||||
import com.yunhai.bschclassmanage.service.ISchClassService;
|
||||
import com.yunhai.bschclassmanage.service.ISchStudentService;
|
||||
import com.yunhai.bschclassmanage.utils.EasyPoiUtils;
|
||||
import com.yunhai.bschclassmanage.utils.UserContext;
|
||||
import com.yunhai.platform.utils.model.BoaUser;
|
||||
import org.apache.poi.ss.usermodel.Workbook;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
+7
-7
@@ -1,12 +1,12 @@
|
||||
package com.bestsch.bschclassmanage.controller.api;
|
||||
package com.yunhai.bschclassmanage.controller.api;
|
||||
|
||||
|
||||
import com.bestsch.bschclassmanage.config.Config;
|
||||
import com.bestsch.bschclassmanage.entity.SchDicSubject;
|
||||
import com.bestsch.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.bestsch.bschclassmanage.model.vo.SelectStrVO;
|
||||
import com.bestsch.bschclassmanage.service.ISchDicSubjectService;
|
||||
import com.bestsch.bschclassmanage.utils.UserContext;
|
||||
import com.yunhai.bschclassmanage.config.Config;
|
||||
import com.yunhai.bschclassmanage.entity.SchDicSubject;
|
||||
import com.yunhai.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.yunhai.bschclassmanage.model.vo.SelectStrVO;
|
||||
import com.yunhai.bschclassmanage.service.ISchDicSubjectService;
|
||||
import com.yunhai.bschclassmanage.utils.UserContext;
|
||||
import com.yunhai.platform.utils.model.BoaUser;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
+8
-8
@@ -1,13 +1,13 @@
|
||||
package com.bestsch.bschclassmanage.controller.api;
|
||||
package com.yunhai.bschclassmanage.controller.api;
|
||||
|
||||
|
||||
import com.bestsch.bschclassmanage.config.Config;
|
||||
import com.bestsch.bschclassmanage.controller.BaseController;
|
||||
import com.bestsch.bschclassmanage.entity.SchClassTeach;
|
||||
import com.bestsch.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.bestsch.bschclassmanage.model.vo.*;
|
||||
import com.bestsch.bschclassmanage.service.*;
|
||||
import com.bestsch.bschclassmanage.utils.UserContext;
|
||||
import com.yunhai.bschclassmanage.config.Config;
|
||||
import com.yunhai.bschclassmanage.controller.BaseController;
|
||||
import com.yunhai.bschclassmanage.entity.SchClassTeach;
|
||||
import com.yunhai.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.yunhai.bschclassmanage.model.vo.*;
|
||||
import com.yunhai.bschclassmanage.service.*;
|
||||
import com.yunhai.bschclassmanage.utils.UserContext;
|
||||
import com.yunhai.platform.utils.model.BoaUser;
|
||||
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
||||
import org.apache.poi.ss.usermodel.Row;
|
||||
+16
-16
@@ -1,23 +1,23 @@
|
||||
package com.bestsch.bschclassmanage.controller.api;
|
||||
package com.yunhai.bschclassmanage.controller.api;
|
||||
|
||||
|
||||
import cn.afterturn.easypoi.excel.ExcelExportUtil;
|
||||
import cn.afterturn.easypoi.excel.entity.ExportParams;
|
||||
import com.bestsch.bschclassmanage.config.Config;
|
||||
import com.bestsch.bschclassmanage.controller.BaseController;
|
||||
import com.bestsch.bschclassmanage.model.dto.SchTeacherDTO;
|
||||
import com.bestsch.bschclassmanage.model.dto.TeaTransferGroupDTO;
|
||||
import com.bestsch.bschclassmanage.model.dto.TeaTransferInGroupDTO;
|
||||
import com.bestsch.bschclassmanage.model.excel.TeacherExcelColumn;
|
||||
import com.bestsch.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.bestsch.bschclassmanage.model.vo.PageVO;
|
||||
import com.bestsch.bschclassmanage.model.vo.SchTeacherTOutVO;
|
||||
import com.bestsch.bschclassmanage.model.vo.SchTeacherVO;
|
||||
import com.bestsch.bschclassmanage.model.vo.SelectIntVO;
|
||||
import com.bestsch.bschclassmanage.service.IComSchTreeService;
|
||||
import com.bestsch.bschclassmanage.service.ISchTeacherService;
|
||||
import com.bestsch.bschclassmanage.utils.EasyPoiUtils;
|
||||
import com.bestsch.bschclassmanage.utils.UserContext;
|
||||
import com.yunhai.bschclassmanage.config.Config;
|
||||
import com.yunhai.bschclassmanage.controller.BaseController;
|
||||
import com.yunhai.bschclassmanage.model.dto.SchTeacherDTO;
|
||||
import com.yunhai.bschclassmanage.model.dto.TeaTransferGroupDTO;
|
||||
import com.yunhai.bschclassmanage.model.dto.TeaTransferInGroupDTO;
|
||||
import com.yunhai.bschclassmanage.model.excel.TeacherExcelColumn;
|
||||
import com.yunhai.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.yunhai.bschclassmanage.model.vo.PageVO;
|
||||
import com.yunhai.bschclassmanage.model.vo.SchTeacherTOutVO;
|
||||
import com.yunhai.bschclassmanage.model.vo.SchTeacherVO;
|
||||
import com.yunhai.bschclassmanage.model.vo.SelectIntVO;
|
||||
import com.yunhai.bschclassmanage.service.IComSchTreeService;
|
||||
import com.yunhai.bschclassmanage.service.ISchTeacherService;
|
||||
import com.yunhai.bschclassmanage.utils.EasyPoiUtils;
|
||||
import com.yunhai.bschclassmanage.utils.UserContext;
|
||||
import com.yunhai.platform.utils.model.BoaUser;
|
||||
import org.apache.poi.ss.usermodel.Workbook;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
+7
-7
@@ -1,12 +1,12 @@
|
||||
package com.bestsch.bschclassmanage.controller.api;
|
||||
package com.yunhai.bschclassmanage.controller.api;
|
||||
|
||||
|
||||
import com.bestsch.bschclassmanage.config.Config;
|
||||
import com.bestsch.bschclassmanage.model.tool.BaseTree;
|
||||
import com.bestsch.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.bestsch.bschclassmanage.model.vo.SchSystemTreeVO;
|
||||
import com.bestsch.bschclassmanage.model.vo.SelectIntVO;
|
||||
import com.bestsch.bschclassmanage.service.IComSchTreeService;
|
||||
import com.yunhai.bschclassmanage.config.Config;
|
||||
import com.yunhai.bschclassmanage.model.tool.BaseTree;
|
||||
import com.yunhai.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.yunhai.bschclassmanage.model.vo.SchSystemTreeVO;
|
||||
import com.yunhai.bschclassmanage.model.vo.SelectIntVO;
|
||||
import com.yunhai.bschclassmanage.service.IComSchTreeService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
+14
-14
@@ -1,19 +1,19 @@
|
||||
package com.bestsch.bschclassmanage.controller.api;
|
||||
package com.yunhai.bschclassmanage.controller.api;
|
||||
|
||||
|
||||
import com.bestsch.bschclassmanage.annotation.OperationLog;
|
||||
import com.bestsch.bschclassmanage.config.Config;
|
||||
import com.bestsch.bschclassmanage.entity.SchBinSchsystem;
|
||||
import com.bestsch.bschclassmanage.enums.UserRole;
|
||||
import com.bestsch.bschclassmanage.enums.UserType;
|
||||
import com.bestsch.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.bestsch.bschclassmanage.model.vo.AcademicStageSchsystemVO;
|
||||
import com.bestsch.bschclassmanage.model.vo.SelectIntVO;
|
||||
import com.bestsch.bschclassmanage.service.IComSchTreeService;
|
||||
import com.bestsch.bschclassmanage.service.ISchBinSchsystemService;
|
||||
import com.bestsch.bschclassmanage.utils.LogContextHolder;
|
||||
import com.bestsch.bschclassmanage.utils.OtherUtil;
|
||||
import com.bestsch.bschclassmanage.utils.UserContext;
|
||||
import com.yunhai.bschclassmanage.annotation.OperationLog;
|
||||
import com.yunhai.bschclassmanage.config.Config;
|
||||
import com.yunhai.bschclassmanage.entity.SchBinSchsystem;
|
||||
import com.yunhai.bschclassmanage.enums.UserRole;
|
||||
import com.yunhai.bschclassmanage.enums.UserType;
|
||||
import com.yunhai.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.yunhai.bschclassmanage.model.vo.AcademicStageSchsystemVO;
|
||||
import com.yunhai.bschclassmanage.model.vo.SelectIntVO;
|
||||
import com.yunhai.bschclassmanage.service.IComSchTreeService;
|
||||
import com.yunhai.bschclassmanage.service.ISchBinSchsystemService;
|
||||
import com.yunhai.bschclassmanage.utils.LogContextHolder;
|
||||
import com.yunhai.bschclassmanage.utils.OtherUtil;
|
||||
import com.yunhai.bschclassmanage.utils.UserContext;
|
||||
import com.yunhai.platform.utils.model.BoaUser;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
+8
-8
@@ -1,13 +1,13 @@
|
||||
package com.bestsch.bschclassmanage.controller.api;
|
||||
package com.yunhai.bschclassmanage.controller.api;
|
||||
|
||||
|
||||
import com.bestsch.bschclassmanage.config.Config;
|
||||
import com.bestsch.bschclassmanage.entity.BaseYearTerm;
|
||||
import com.bestsch.bschclassmanage.model.dto.BaseYearTermDTO;
|
||||
import com.bestsch.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.bestsch.bschclassmanage.model.vo.BaseYearTermVO;
|
||||
import com.bestsch.bschclassmanage.service.IBaseYearTermService;
|
||||
import com.bestsch.bschclassmanage.utils.UserContext;
|
||||
import com.yunhai.bschclassmanage.config.Config;
|
||||
import com.yunhai.bschclassmanage.entity.BaseYearTerm;
|
||||
import com.yunhai.bschclassmanage.model.dto.BaseYearTermDTO;
|
||||
import com.yunhai.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.yunhai.bschclassmanage.model.vo.BaseYearTermVO;
|
||||
import com.yunhai.bschclassmanage.service.IBaseYearTermService;
|
||||
import com.yunhai.bschclassmanage.utils.UserContext;
|
||||
import com.yunhai.platform.utils.model.BoaUser;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
+3
-3
@@ -1,8 +1,8 @@
|
||||
package com.bestsch.bschclassmanage.controller.api;
|
||||
package com.yunhai.bschclassmanage.controller.api;
|
||||
|
||||
|
||||
import com.bestsch.bschclassmanage.config.Config;
|
||||
import com.bestsch.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.yunhai.bschclassmanage.config.Config;
|
||||
import com.yunhai.bschclassmanage.model.tool.UserSysRole;
|
||||
import com.yunhai.platform.openapi.client.YschBaseOpenApi;
|
||||
import com.yunhai.platform.utils.model.BoaModule;
|
||||
import com.yunhai.platform.utils.model.BoaUser;
|
||||
+4
-4
@@ -1,8 +1,8 @@
|
||||
package com.bestsch.bschclassmanage.controller.oapi.oa;
|
||||
package com.yunhai.bschclassmanage.controller.oapi.oa;
|
||||
|
||||
import com.bestsch.bschclassmanage.config.Config;
|
||||
import com.bestsch.bschclassmanage.model.vo.oa.SchInfoVO;
|
||||
import com.bestsch.bschclassmanage.service.ISchInfoService;
|
||||
import com.yunhai.bschclassmanage.config.Config;
|
||||
import com.yunhai.bschclassmanage.model.vo.oa.SchInfoVO;
|
||||
import com.yunhai.bschclassmanage.service.ISchInfoService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
+4
-4
@@ -1,8 +1,8 @@
|
||||
package com.bestsch.bschclassmanage.controller.oapi.oa;
|
||||
package com.yunhai.bschclassmanage.controller.oapi.oa;
|
||||
|
||||
import com.bestsch.bschclassmanage.config.Config;
|
||||
import com.bestsch.bschclassmanage.model.vo.oa.SchInfoVO;
|
||||
import com.bestsch.bschclassmanage.service.ISchInfoService;
|
||||
import com.yunhai.bschclassmanage.config.Config;
|
||||
import com.yunhai.bschclassmanage.model.vo.oa.SchInfoVO;
|
||||
import com.yunhai.bschclassmanage.service.ISchInfoService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
+12
-12
@@ -1,16 +1,16 @@
|
||||
package com.bestsch.bschclassmanage.controller.oapi.oa;
|
||||
package com.yunhai.bschclassmanage.controller.oapi.oa;
|
||||
|
||||
import com.bestsch.bschclassmanage.Repository.SchTeacherRepository;
|
||||
import com.bestsch.bschclassmanage.config.Config;
|
||||
import com.bestsch.bschclassmanage.entity.SchTeacher;
|
||||
import com.bestsch.bschclassmanage.entity.SchTeacherGroup;
|
||||
import com.bestsch.bschclassmanage.enums.UserGender;
|
||||
import com.bestsch.bschclassmanage.enums.UserRole;
|
||||
import com.bestsch.bschclassmanage.model.oa.TeaInfoVO;
|
||||
import com.bestsch.bschclassmanage.model.vo.oa.SchInfoVO;
|
||||
import com.bestsch.bschclassmanage.service.ISchInfoService;
|
||||
import com.bestsch.bschclassmanage.service.ISchTeacherService;
|
||||
import com.bestsch.bschclassmanage.utils.OtherUtil;
|
||||
import com.yunhai.bschclassmanage.Repository.SchTeacherRepository;
|
||||
import com.yunhai.bschclassmanage.config.Config;
|
||||
import com.yunhai.bschclassmanage.entity.SchTeacher;
|
||||
import com.yunhai.bschclassmanage.entity.SchTeacherGroup;
|
||||
import com.yunhai.bschclassmanage.enums.UserGender;
|
||||
import com.yunhai.bschclassmanage.enums.UserRole;
|
||||
import com.yunhai.bschclassmanage.model.oa.TeaInfoVO;
|
||||
import com.yunhai.bschclassmanage.model.vo.oa.SchInfoVO;
|
||||
import com.yunhai.bschclassmanage.service.ISchInfoService;
|
||||
import com.yunhai.bschclassmanage.service.ISchTeacherService;
|
||||
import com.yunhai.bschclassmanage.utils.OtherUtil;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
+14
-14
@@ -1,18 +1,18 @@
|
||||
package com.bestsch.bschclassmanage.controller.oapi.oa;
|
||||
package com.yunhai.bschclassmanage.controller.oapi.oa;
|
||||
|
||||
import com.bestsch.bschclassmanage.Repository.SchStudentRepository;
|
||||
import com.bestsch.bschclassmanage.Repository.SchTeacherRepository;
|
||||
import com.bestsch.bschclassmanage.config.Config;
|
||||
import com.bestsch.bschclassmanage.entity.SchStudent;
|
||||
import com.bestsch.bschclassmanage.entity.SchTeacher;
|
||||
import com.bestsch.bschclassmanage.entity.SchTeacherGroup;
|
||||
import com.bestsch.bschclassmanage.enums.UserRole;
|
||||
import com.bestsch.bschclassmanage.enums.UserType;
|
||||
import com.bestsch.bschclassmanage.model.oa.UserInfoVO;
|
||||
import com.bestsch.bschclassmanage.model.vo.oa.SchInfoVO;
|
||||
import com.bestsch.bschclassmanage.service.ISchInfoService;
|
||||
import com.bestsch.bschclassmanage.service.ISchStudentService;
|
||||
import com.bestsch.bschclassmanage.service.ISchTeacherService;
|
||||
import com.yunhai.bschclassmanage.Repository.SchStudentRepository;
|
||||
import com.yunhai.bschclassmanage.Repository.SchTeacherRepository;
|
||||
import com.yunhai.bschclassmanage.config.Config;
|
||||
import com.yunhai.bschclassmanage.entity.SchStudent;
|
||||
import com.yunhai.bschclassmanage.entity.SchTeacher;
|
||||
import com.yunhai.bschclassmanage.entity.SchTeacherGroup;
|
||||
import com.yunhai.bschclassmanage.enums.UserRole;
|
||||
import com.yunhai.bschclassmanage.enums.UserType;
|
||||
import com.yunhai.bschclassmanage.model.oa.UserInfoVO;
|
||||
import com.yunhai.bschclassmanage.model.vo.oa.SchInfoVO;
|
||||
import com.yunhai.bschclassmanage.service.ISchInfoService;
|
||||
import com.yunhai.bschclassmanage.service.ISchStudentService;
|
||||
import com.yunhai.bschclassmanage.service.ISchTeacherService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
+5
-5
@@ -1,9 +1,9 @@
|
||||
package com.bestsch.bschclassmanage.controller.oapi.sync;
|
||||
package com.yunhai.bschclassmanage.controller.oapi.sync;
|
||||
|
||||
import com.bestsch.bschclassmanage.config.Config;
|
||||
import com.bestsch.bschclassmanage.model.tool.BaseGroup;
|
||||
import com.bestsch.bschclassmanage.service.ISyncGroupService;
|
||||
import com.bestsch.bschclassmanage.utils.OtherUtil;
|
||||
import com.yunhai.bschclassmanage.config.Config;
|
||||
import com.yunhai.bschclassmanage.model.tool.BaseGroup;
|
||||
import com.yunhai.bschclassmanage.service.ISyncGroupService;
|
||||
import com.yunhai.bschclassmanage.utils.OtherUtil;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
+9
-9
@@ -1,13 +1,13 @@
|
||||
package com.bestsch.bschclassmanage.controller.oapi.sync;
|
||||
package com.yunhai.bschclassmanage.controller.oapi.sync;
|
||||
|
||||
import com.bestsch.bschclassmanage.config.Config;
|
||||
import com.bestsch.bschclassmanage.model.tool.BaseGroup;
|
||||
import com.bestsch.bschclassmanage.model.tool.BaseUser;
|
||||
import com.bestsch.bschclassmanage.model.tool.DeleteUser;
|
||||
import com.bestsch.bschclassmanage.service.ISyncUserService;
|
||||
import com.bestsch.bschclassmanage.service.impl.sync.SyncGroupService;
|
||||
import com.bestsch.bschclassmanage.service.impl.sync.SyncUserService;
|
||||
import com.bestsch.bschclassmanage.utils.OtherUtil;
|
||||
import com.yunhai.bschclassmanage.config.Config;
|
||||
import com.yunhai.bschclassmanage.model.tool.BaseGroup;
|
||||
import com.yunhai.bschclassmanage.model.tool.BaseUser;
|
||||
import com.yunhai.bschclassmanage.model.tool.DeleteUser;
|
||||
import com.yunhai.bschclassmanage.service.ISyncUserService;
|
||||
import com.yunhai.bschclassmanage.service.impl.sync.SyncGroupService;
|
||||
import com.yunhai.bschclassmanage.service.impl.sync.SyncUserService;
|
||||
import com.yunhai.bschclassmanage.utils.OtherUtil;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage.entity;
|
||||
package com.yunhai.bschclassmanage.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage.entity;
|
||||
package com.yunhai.bschclassmanage.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.entity;
|
||||
package com.yunhai.bschclassmanage.entity;
|
||||
|
||||
import com.bestsch.bschclassmanage.model.entityField.DbFieldNames;
|
||||
import com.yunhai.bschclassmanage.model.entityField.DbFieldNames;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.persistence.*;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage.entity;
|
||||
package com.yunhai.bschclassmanage.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage.entity;
|
||||
package com.yunhai.bschclassmanage.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage.entity;
|
||||
package com.yunhai.bschclassmanage.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage.entity;
|
||||
package com.yunhai.bschclassmanage.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage.entity;
|
||||
package com.yunhai.bschclassmanage.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage.entity;
|
||||
package com.yunhai.bschclassmanage.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage.entity;
|
||||
package com.yunhai.bschclassmanage.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage.entity;
|
||||
package com.yunhai.bschclassmanage.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage.entity;
|
||||
package com.yunhai.bschclassmanage.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.entity;
|
||||
package com.yunhai.bschclassmanage.entity;
|
||||
|
||||
import com.bestsch.bschclassmanage.model.entityField.EntityFieldNames;
|
||||
import com.yunhai.bschclassmanage.model.entityField.EntityFieldNames;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage.entity;
|
||||
package com.yunhai.bschclassmanage.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage.entity;
|
||||
package com.yunhai.bschclassmanage.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage.entity;
|
||||
package com.yunhai.bschclassmanage.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.entity;
|
||||
package com.yunhai.bschclassmanage.entity;
|
||||
|
||||
import com.bestsch.bschclassmanage.model.entityField.EntityFieldNames;
|
||||
import com.yunhai.bschclassmanage.model.entityField.EntityFieldNames;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.entity;
|
||||
package com.yunhai.bschclassmanage.entity;
|
||||
|
||||
import com.bestsch.bschclassmanage.model.entityField.EntityFieldNames;
|
||||
import com.yunhai.bschclassmanage.model.entityField.EntityFieldNames;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.entity;
|
||||
package com.yunhai.bschclassmanage.entity;
|
||||
|
||||
import com.bestsch.bschclassmanage.model.entityField.EntityFieldNames;
|
||||
import com.yunhai.bschclassmanage.model.entityField.EntityFieldNames;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage.entity;
|
||||
package com.yunhai.bschclassmanage.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage.entity;
|
||||
package com.yunhai.bschclassmanage.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage.entity;
|
||||
package com.yunhai.bschclassmanage.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.entity;
|
||||
package com.yunhai.bschclassmanage.entity;
|
||||
|
||||
import com.bestsch.bschclassmanage.model.entityField.DbFieldNames;
|
||||
import com.yunhai.bschclassmanage.model.entityField.DbFieldNames;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.entity;
|
||||
package com.yunhai.bschclassmanage.entity;
|
||||
|
||||
import com.bestsch.bschclassmanage.model.entityField.DbFieldNames;
|
||||
import com.yunhai.bschclassmanage.model.entityField.DbFieldNames;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage.entity;
|
||||
package com.yunhai.bschclassmanage.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage.entity;
|
||||
package com.yunhai.bschclassmanage.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage.entity;
|
||||
package com.yunhai.bschclassmanage.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage.entity;
|
||||
package com.yunhai.bschclassmanage.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage.entity;
|
||||
package com.yunhai.bschclassmanage.entity;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.bestsch.bschclassmanage.enums;
|
||||
package com.yunhai.bschclassmanage.enums;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.bestsch.bschclassmanage.enums;
|
||||
package com.yunhai.bschclassmanage.enums;
|
||||
|
||||
import com.bestsch.bschclassmanage.model.vo.SelectIntVO;
|
||||
import com.yunhai.bschclassmanage.model.vo.SelectIntVO;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user