update db 去掉user、exam的schoolId

install/mysql/init/scan_central_db.sql

@@ -72,8 +72,6 @@ CREATE TABLE IF NOT EXISTS `sc_answer_card`
 CREATE TABLE IF NOT EXISTS `sc_exam`
 (
     `id`                         bigint       NOT NULL AUTO_INCREMENT,
-    `school_id`                  bigint       NOT NULL,
-    `school_name`                varchar(64)  NOT NULL,
     `name`                       varchar(128) NOT NULL,
     `enable`                     bit(1)       NOT NULL,
     `mode`                       varchar(16)  NOT NULL,
@@ -94,8 +92,7 @@ CREATE TABLE IF NOT EXISTS `sc_exam`
     `updater_id`                 bigint      DEFAULT NULL,
     `create_time`                bigint      DEFAULT NULL,
     `update_time`                bigint      DEFAULT NULL,
-    PRIMARY KEY (`id`),
-    INDEX `school_enable` (`enable`, `school_id`)
+    PRIMARY KEY (`id`)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4;
 
@@ -449,7 +446,6 @@ CREATE TABLE IF NOT EXISTS `sc_user`
     `password`    varchar(64) NOT NULL,
     `role`        varchar(16) NOT NULL,
     `enable`      tinyint(1)  NOT NULL,
-    `school_id`   bigint      NOT NULL,
     `device`      varchar(64) DEFAULT NULL,
     `creator_id`  bigint      DEFAULT NULL,
     `updater_id`  bigint      DEFAULT NULL,

src/main/java/cn/com/qmth/scancentral/ApiApplication.java → src/main/java/cn/com/qmth/scancentral/ScanApiApplication.java

@@ -17,10 +17,10 @@ import com.qmth.boot.core.retrofit.annotatioin.RetrofitScan;
 @Configuration
 @MapperScan("cn.com.qmth.scancentral.dao")
 @RetrofitScan("cn.com.qmth.scancentral.client")
-public class ApiApplication {
+public class ScanApiApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(ApiApplication.class, args);
+        SpringApplication.run(ScanApiApplication.class, args);
     }
 
 }

src/main/java/cn/com/qmth/scancentral/bean/SchoolSession.java

@@ -52,7 +52,7 @@ public class SchoolSession{
     
     public static SchoolSession of(User user) {
     	SchoolSession s=new SchoolSession();
-    	s.setId(user.getSchoolId());
+    	// s.setId(user.getSchoolId());
     	s.setAccount(user.getAccount());
     	s.setMarkingCloudToken(user.getMarkingCloudToken());
     	s.setRole(user.getRole());

src/main/java/cn/com/qmth/scancentral/bean/User.java

@@ -20,8 +20,6 @@ public class User implements AccessEntity {
 
     private Long activeTime;
 
-    private Long schoolId;
-
     private String markingCloudToken;
 
     public String buildKey() {
@@ -85,14 +83,6 @@ public class User implements AccessEntity {
         this.id = id;
     }
 
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
     @Override
     public String getIdentity() {
         return sessionId;

src/main/java/cn/com/qmth/scancentral/config/InitData.java

@@ -60,7 +60,6 @@ public class InitData implements CommandLineRunner {
         // 按照学校ID=1创建管理员账号
         if (userService.count() == 0) {
             UserEntity user = new UserEntity();
-            user.setSchoolId(1L);
             user.setLoginName("admin");
             user.setName("学校管理员");
             user.setPassword("123456");

src/main/java/cn/com/qmth/scancentral/controller/admin/AuditorController.java

@@ -33,7 +33,7 @@ public class AuditorController extends BaseController {
     @PostMapping("list")
     public List<AuditorVo> list() {
         User user = getAccessUser();
-        return userService.findAuditor(user.getSchoolId());
+        return userService.findAuditor();
     }
 
     @ApiOperation(value = "审核员修改密码")
@@ -47,7 +47,7 @@ public class AuditorController extends BaseController {
     public CreateCountVo create(@RequestParam String prefix, @RequestParam Integer count,
             @RequestParam String password) {
         User user = getAccessUser();
-        return userService.create(user.getSchoolId(),prefix, count, password);
+        return userService.create(prefix, count, password);
     }
 
 }

src/main/java/cn/com/qmth/scancentral/controller/admin/ExamController.java

@@ -49,12 +49,6 @@ public class ExamController extends BaseController {
     @Autowired
     private StudentService studentService;
 
-    @Resource
-    private ConcurrentService concurrentService;
-
-    @Autowired
-    private AsyncTaskExecutor taskExecutor;
-
     @Autowired
     private SubjectService subjectService;
 
@@ -81,9 +75,7 @@ public class ExamController extends BaseController {
         if (exam == null) {
             throw ParameterExceptions.EXAM_NOT_FOUND;
         }
-        if (!exam.getSchoolId().equals(user.getSchoolId())) {
-            throw ParameterExceptions.EXAM_NOT_FOUND;
-        }
+
         exam.setEnable(enable);
         exam.setUpdaterId(user.getId());
         exam.setUpdateTime(System.currentTimeMillis());
@@ -109,9 +101,7 @@ public class ExamController extends BaseController {
         if (exam == null) {
             throw ParameterExceptions.EXAM_NOT_FOUND;
         }
-        if (!exam.getSchoolId().equals(user.getSchoolId())) {
-            throw ParameterExceptions.EXAM_NOT_FOUND;
-        }
+
         exam.setEnableUpload(enable);
         examService.saveOrUpdate(exam);
         vo.setEnable(exam.getEnableUpload());

src/main/java/cn/com/qmth/scancentral/controller/admin/ExamStatusCheckController.java

@@ -72,9 +72,7 @@ public class ExamStatusCheckController extends BaseController {
         if (exam == null) {
             throw ParameterExceptions.EXAM_NOT_FOUND;
         }
-        if (!exam.getSchoolId().equals(user.getSchoolId())) {
-            throw ParameterExceptions.EXAM_NOT_FOUND;
-        }
+
         if (!concurrentService.isLocked(LockType.EXAM_STATUS_RESET + "-" + examId)) {
             taskExecutor.submit(new ExamStatusImportThread( examId,mode, file.getInputStream(), studentService, concurrentService));
         } else {
@@ -94,9 +92,7 @@ public class ExamStatusCheckController extends BaseController {
         if (exam == null) {
             throw ParameterExceptions.EXAM_NOT_FOUND;
         }
-        if (!exam.getSchoolId().equals(user.getSchoolId())) {
-            throw ParameterExceptions.EXAM_NOT_FOUND;
-        }
+
         Map<String, Object> result = new HashMap<String, Object>();
         result.put("synching", concurrentService.isLocked(LockType.EXAM_STATUS_RESET + "-" + examId));
         return result;
@@ -110,9 +106,7 @@ public class ExamStatusCheckController extends BaseController {
         if (exam == null) {
             throw ParameterExceptions.EXAM_NOT_FOUND;
         }
-        if (!exam.getSchoolId().equals(user.getSchoolId())) {
-            throw ParameterExceptions.EXAM_NOT_FOUND;
-        }
+
         if (!concurrentService.isLocked(LockType.EXAM_STATUS_RESET + "-" + examId)) {
             taskExecutor.submit(new ExamStatusResetThread( examId,examNumberFillCount, studentService, concurrentService));
         } else {
@@ -131,9 +125,7 @@ public class ExamStatusCheckController extends BaseController {
         if (exam == null) {
             throw ParameterExceptions.EXAM_NOT_FOUND;
         }
-        if (!exam.getSchoolId().equals(user.getSchoolId())) {
-            throw ParameterExceptions.EXAM_NOT_FOUND;
-        }
+
         Map<String, Object> result = new HashMap<String, Object>();
         result.put("synching", concurrentService.isLocked(LockType.EXAM_STATUS_RESET + "-" + examId));
         return result;

src/main/java/cn/com/qmth/scancentral/controller/admin/UserController.java

@@ -28,7 +28,7 @@ public class UserController extends BaseController {
     @PostMapping("list")
     public List<UserVo> list() {
         User user = getAccessUser();
-        return userService.findAdmin(user.getSchoolId());
+        return userService.findAdmin();
     }
 
 }

src/main/java/cn/com/qmth/scancentral/dao/ExamDao.java

@@ -18,5 +18,5 @@ public interface ExamDao extends BaseMapper<ExamEntity> {
 
     List<ScanExamListVo> getExamList(@Param("query") ScanExamListQuery query);
 
-    IPage<ExamVo> pageExam(Page<ExamVo> page, @Param("query") ExamQuery query,@Param("schoolId")Long schoolId);
+    IPage<ExamVo> pageExam(Page<ExamVo> page, @Param("query") ExamQuery query);
 }

src/main/java/cn/com/qmth/scancentral/entity/ExamEntity.java

@@ -17,10 +17,6 @@ public class ExamEntity extends AuditingWithoutIdEntity {
     @TableId(type = IdType.INPUT)
     private Long id;
 
-    private Long schoolId;
-
-    private String schoolName;
-
     private String name;
 
     private Boolean enable;
@@ -65,22 +61,6 @@ public class ExamEntity extends AuditingWithoutIdEntity {
         this.id = id;
     }
 
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public String getSchoolName() {
-        return schoolName;
-    }
-
-    public void setSchoolName(String schoolName) {
-        this.schoolName = schoolName;
-    }
-
     public String getName() {
         return name;
     }

src/main/java/cn/com/qmth/scancentral/entity/UserEntity.java

@@ -20,7 +20,6 @@ public class UserEntity extends AuditingEntity {
 	private String password;
 	private Role role;
 	private Boolean enable;
-	private Long schoolId;
 	private String device;
 	
 	
@@ -54,13 +53,7 @@ public class UserEntity extends AuditingEntity {
 	public void setEnable(Boolean enable) {
 		this.enable = enable;
 	}
-	public Long getSchoolId() {
-		return schoolId;
-	}
-	public void setSchoolId(Long schoolId) {
-		this.schoolId = schoolId;
-	}
-    
+
     public String getDevice() {
         return device;
     }

src/main/java/cn/com/qmth/scancentral/service/UserService.java

@@ -18,16 +18,16 @@ public interface UserService extends IService<UserEntity> {
 
     int importUser(List<ImportUserDomain> users);
 
-    List<UserEntity> findByRole(Long schoolId,Role... role);
+    List<UserEntity> findByRole(Role... role);
 
-    List<AuditorVo> findAuditor(Long schoolId);
+    List<AuditorVo> findAuditor();
 
     UpdateCountVo updatePassword(List<Long> ids, String password);
 
-    CreateCountVo create(Long schoolId, String prefix, Integer count, String password);
+    CreateCountVo create(String prefix, Integer count, String password);
 
-    int countByRole(Long schoolId, Role role);
+    int countByRole(Role role);
 
-    List<UserVo> findAdmin(Long schoolId);
+    List<UserVo> findAdmin();
 
 }

src/main/java/cn/com/qmth/scancentral/service/impl/AuthServiceImpl.java

@@ -105,7 +105,6 @@ public class AuthServiceImpl implements AuthorizationService<User>, AuthService
             user.buildKey();
             user.setId(userEntity.getId());
             user.setName(userEntity.getName());
-            user.setSchoolId(userEntity.getSchoolId());
             sessionService.userLogin(user);
             return user;
     }

src/main/java/cn/com/qmth/scancentral/service/impl/ExamServiceImpl.java

@@ -96,11 +96,8 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
 
     @Override
     public PageResult<ExamVo> pageQuery(ExamQuery query, User user) {
-        if (query.getEnable() == null) {
-            throw new ParameterException("是否启用不能为空");
-        }
-        IPage<ExamVo> iPage = this.baseMapper.pageExam(new Page<>(query.getPageNumber(), query.getPageSize()), query,
-                user.getSchoolId());
+        query.setEnable(true);
+        IPage<ExamVo> iPage = this.baseMapper.pageExam(new Page<>(query.getPageNumber(), query.getPageSize()), query);
         return PageUtil.of(iPage);
     }
 
@@ -115,15 +112,12 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
         if (exam == null) {
             throw ParameterExceptions.EXAM_NOT_FOUND;
         }
-        if (!exam.getSchoolId().equals(accessUser.getSchoolId())) {
-            throw ParameterExceptions.EXAM_NOT_FOUND;
-        }
+
         // ScanAnswerInfoVo info = studentService.scanAnswerInfo(examId);
         ExamInfoVo vo = new ExamInfoVo();
         ExamSummaryEntity es = examSummaryService.find(examId);
         vo.setId(examId);
         vo.setName(exam.getName());
-        vo.setSchoolName(exam.getSchoolName());
         vo.getExamConfig().setAllowUnexistPaper(exam.getAllowUnexistPaper());
         vo.getExamConfig().setAnswerFrontCardType(exam.getAnswerFrontCardType());
         vo.getExamConfig().setImageTransferMode(exam.getImageTransferMode());
@@ -188,7 +182,7 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
                 .setTodoCount(batchService.getCheckCountByExamId(examId, CheckStatus.WAITING, accessUser));
 
         vo.getAuditor().setOnlineCount(sessionService.getOnlineAuditorCount());
-        vo.getAuditor().setUserCount(userService.countByRole(accessUser.getSchoolId(), Role.AUDITOR));
+        vo.getAuditor().setUserCount(userService.countByRole(Role.AUDITOR));
 
         vo.getExamStatusCheck().setExamNumberFillCount(exam.getExamNumberFillCount());
 
@@ -211,7 +205,7 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
         ScanExamInfoVo vo = new ScanExamInfoVo();
         vo.setId(id);
         vo.setName(exam.getName());
-        vo.setSchoolName(exam.getSchoolName());
+
         vo.getExamConfig().setAllowUnexistPaper(exam.getAllowUnexistPaper());
         vo.getExamConfig().setAnswerFrontCardType(exam.getAnswerFrontCardType());
         vo.getExamConfig().setImageTransferMode(exam.getImageTransferMode());
@@ -258,9 +252,6 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
         if (exam == null) {
             throw ParameterExceptions.EXAM_NOT_FOUND;
         }
-        if (!exam.getSchoolId().equals(user.getSchoolId())) {
-            throw ParameterExceptions.EXAM_NOT_FOUND;
-        }
         if (domain.getAllowUnexistPaper() != null) {
             exam.setAllowUnexistPaper(domain.getAllowUnexistPaper());
         }
@@ -344,8 +335,6 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
         }
         ExamEntity exam = new ExamEntity();
         exam.setId(domain.getId());
-        exam.setSchoolId(domain.getSchoolId());
-        exam.setSchoolName(domain.getSchoolName());
         exam.setName(domain.getName());
         exam.setEnable(true);
         exam.setEnableUpload(false);

src/main/java/cn/com/qmth/scancentral/service/impl/SessionServiceImpl.java

@@ -61,12 +61,12 @@ public class SessionServiceImpl implements SessionService {
     }
 
     private void updateSchoolSession(User user) {
-        SchoolSession s = schoolSessionData.get(user.getSchoolId());
-        if (s == null) {
-            schoolSessionData.put(user.getSchoolId(), SchoolSession.of(user));
-        } else if (Role.SCAN_ADMIN.equals(s.getRole()) || Role.SCHOOL_ADMIN.equals(user.getRole())) {
-            schoolSessionData.put(user.getSchoolId(), SchoolSession.of(user));
-        }
+        // SchoolSession s = schoolSessionData.get(user.getSchoolId());
+        // if (s == null) {
+        //     schoolSessionData.put(user.getSchoolId(), SchoolSession.of(user));
+        // } else if (Role.SCAN_ADMIN.equals(s.getRole()) || Role.SCHOOL_ADMIN.equals(user.getRole())) {
+        //     schoolSessionData.put(user.getSchoolId(), SchoolSession.of(user));
+        // }
     }
 
     @Override

src/main/java/cn/com/qmth/scancentral/service/impl/UserServiceImpl.java

@@ -55,7 +55,6 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
                 user.setLoginName(importUserDomain.getLoginName());
                 user.setRole(importUserDomain.getRole());
                 user.setName(importUserDomain.getName());
-                user.setSchoolId(importUserDomain.getSchoolId());
                 // byte[] bytes =
                 // DigestUtils.sha256(importUserDomain.getPassword());
                 // String encodePassword = CodecUtils.toHexString(bytes);
@@ -68,20 +67,18 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
     }
 
     @Override
-    public int countByRole(Long schoolId,Role role) {
+    public int countByRole(Role role) {
         QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
         LambdaQueryWrapper<UserEntity> lw = wrapper.lambda();
         lw.eq(UserEntity::getRole, role);
-        lw.eq(UserEntity::getSchoolId, schoolId);
         return this.count(wrapper);
     }
 
     @Override
-    public List<UserEntity> findByRole( Long schoolId,Role... role) {
+    public List<UserEntity> findByRole(Role... role) {
         QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
         LambdaQueryWrapper<UserEntity> lw = wrapper.lambda();
         lw.in(UserEntity::getRole, Arrays.asList(role));
-        lw.eq(UserEntity::getSchoolId, schoolId);
         return baseMapper.selectList(wrapper);
     }
 
@@ -99,7 +96,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
     }
 
     @Override
-    public CreateCountVo create(Long schoolId, String prefix, Integer saveCount, String password) {
+    public CreateCountVo create(String prefix, Integer saveCount, String password) {
         if (saveCount >= 100) {
             throw new ParameterException("创建个数请小于100");
         }
@@ -117,7 +114,6 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
                 user.setLoginName(loginName);
                 user.setRole(Role.AUDITOR);
                 user.setName(loginName);
-                user.setSchoolId(schoolId);
                 user.setPassword(password);
                 list.add(user);
             }
@@ -130,9 +126,9 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
     }
 
     @Override
-    public List<AuditorVo> findAuditor(Long schoolId) {
+    public List<AuditorVo> findAuditor() {
         List<AuditorVo> list = new ArrayList<AuditorVo>();
-        List<UserEntity> users = this.findByRole(schoolId,Role.AUDITOR);
+        List<UserEntity> users = this.findByRole(Role.AUDITOR);
         for (UserEntity user : users) {
             AuditorVo vo = new AuditorVo(user);
             vo.setOnline(sessionService.checkAuditorOnline(user.getLoginName()));
@@ -142,9 +138,9 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
     }
 
     @Override
-    public List<UserVo> findAdmin(Long schoolId) {
+    public List<UserVo> findAdmin() {
         List<UserVo> list = new ArrayList<UserVo>();
-        List<UserEntity> users = this.findByRole(schoolId,Role.AUDITOR,Role.SCHOOL_ADMIN,Role.SCAN_ADMIN);
+        List<UserEntity> users = this.findByRole(Role.AUDITOR,Role.SCHOOL_ADMIN,Role.SCAN_ADMIN);
         for (UserEntity user : users) {
             UserVo vo = new UserVo(user);
             vo.setOnline(sessionService.checkAuditorOnline(user.getLoginName()));

src/main/java/cn/com/qmth/scancentral/vo/ExamVo.java

@@ -6,10 +6,6 @@ public class ExamVo {
 
     private Long id;
 
-    private Long schoolId;
-
-    private String schoolName;
-
     private String name;
 
     private ExamMode mode;
@@ -26,22 +22,6 @@ public class ExamVo {
         this.id = id;
     }
 
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public String getSchoolName() {
-        return schoolName;
-    }
-
-    public void setSchoolName(String schoolName) {
-        this.schoolName = schoolName;
-    }
-
     public String getName() {
         return name;
     }

src/main/java/cn/com/qmth/scancentral/vo/examinfo/ExamInfoVo.java

@@ -7,8 +7,6 @@ public class ExamInfoVo {
 
     private Long id;
 
-    private String schoolName;
-
     private String name;
 
     private ExamConfig examConfig;
@@ -67,14 +65,6 @@ public class ExamInfoVo {
         this.id = id;
     }
 
-    public String getSchoolName() {
-        return schoolName;
-    }
-
-    public void setSchoolName(String schoolName) {
-        this.schoolName = schoolName;
-    }
-
     public String getName() {
         return name;
     }

src/main/java/cn/com/qmth/scancentral/vo/examinfo/ExamQuery.java

@@ -1,9 +1,11 @@
 package cn.com.qmth.scancentral.vo.examinfo;
 
 import cn.com.qmth.scancentral.util.PagerQuery;
+import io.swagger.annotations.ApiModelProperty;
 
 public class ExamQuery extends PagerQuery {
 
+    @ApiModelProperty(value = "是否启用", hidden = true)
     private Boolean enable;
 
     public Boolean getEnable() {
@@ -13,4 +15,5 @@ public class ExamQuery extends PagerQuery {
     public void setEnable(Boolean enable) {
         this.enable = enable;
     }
+
 }

src/main/resources/mapper/ExamMapper.xml

@@ -4,7 +4,7 @@
 
 	<select id="getExamList"
 		resultType="cn.com.qmth.scancentral.vo.scanexamlist.ScanExamListVo">
-		SELECT t.id,t.name,t.school_name,t.mode
+		SELECT t.id,t.name,t.mode
 		FROM
 		sc_exam t
 		WHERE 1=1
@@ -17,15 +17,15 @@
  	<select id="pageExam" resultType="cn.com.qmth.scancentral.vo.ExamVo">
         SELECT
             pe.id,
-            pe.school_name,
             pe.name,
             pe.enable,
             pe.mode,
             pe.update_time
         FROM
             sc_exam pe
-        where
-            pe.enable = #{query.enable}
-            and pe.school_id=#{schoolId}
+        where 1=1
+		<if test="query.enable != null">
+			AND pe.enable = #{query.enable}
+		</if>
     </select>
 </mapper>