joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

理论试题管理代码调整

Browse Source
This commit is contained in:
tiger_zhou 2022-09-23 17:31:22 +08:00
parent 1ecd05be32
commit 6ff6eeffec
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/club/joylink/rtss/services/completition/question/QuestionBankService.java
View File

@ -7,6 +7,7 @@ import club.joylink.rtss.entity.RaceQuestion;
import club.joylink.rtss.entity.RaceQuestionExample; import club.joylink.rtss.entity.RaceQuestionExample;
import club.joylink.rtss.entity.RaceQuestionOption; import club.joylink.rtss.entity.RaceQuestionOption;
import club.joylink.rtss.entity.RaceQuestionOptionExample; import club.joylink.rtss.entity.RaceQuestionOptionExample;
import club.joylink.rtss.entity.project.Project; import club.joylink.rtss.entity.project.Project;
import club.joylink.rtss.exception.BusinessExceptionAssertEnum; import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
import club.joylink.rtss.services.completition.IUserQuestionProgressService; import club.joylink.rtss.services.completition.IUserQuestionProgressService;

9
src/main/java/club/joylink/rtss/services/papger/PagerQuestionService.java
View File

@ -1,10 +1,11 @@
package club.joylink.rtss.services.papger; package club.joylink.rtss.services.papger;
import club.joylink.rtss.constants.BusinessConsts; import club.joylink.rtss.constants.BusinessConsts;
import club.joylink.rtss.constants.Project;
import club.joylink.rtss.dao.paper.PagerQuestionDAO; import club.joylink.rtss.dao.paper.PagerQuestionDAO;
import club.joylink.rtss.entity.paper.question.PaperQuestion; import club.joylink.rtss.entity.paper.question.PaperQuestion;
import club.joylink.rtss.entity.paper.question.PaperQuestionExample; import club.joylink.rtss.entity.paper.question.PaperQuestionExample;
import club.joylink.rtss.entity.project.Project;
import club.joylink.rtss.exception.BusinessExceptionAssertEnum; import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.AccountVO;
import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.PageVO;
@ -50,7 +51,7 @@ public class PagerQuestionService {
criteria.andTypeEqualTo(queryVO.getType()); criteria.andTypeEqualTo(queryVO.getType());
} }
criteria.andIsDelEqualTo(BusinessConsts.DBLogicDelete.NORMAL.ordinal()); criteria.andIsDelEqualTo(BusinessConsts.DBLogicDelete.NORMAL.ordinal());
boolean isDefault = Project.isDefault(Project.valueOf(queryVO.getProjectCode())); boolean isDefault = Project.isDefault(queryVO.getProjectCode());
if (isDefault) { if (isDefault) {
criteria.andProjectCodeIsNull(); criteria.andProjectCodeIsNull();
if (Objects.nonNull(queryVO.getCompanyId())) { if (Objects.nonNull(queryVO.getCompanyId())) {
@ -142,7 +143,7 @@ public class PagerQuestionService {
public Collection<String> findAllLable(String projectCode){ public Collection<String> findAllLable(String projectCode){
PaperQuestionExample example = new PaperQuestionExample(); PaperQuestionExample example = new PaperQuestionExample();
PaperQuestionExample.Criteria criteria = example.createCriteria(); PaperQuestionExample.Criteria criteria = example.createCriteria();
boolean isDefault = Project.isDefault(Project.valueOf(projectCode)); boolean isDefault = Project.isDefault(projectCode);
// criteria.andCompanyIdEqualTo(companyId); // criteria.andCompanyIdEqualTo(companyId);
if(isDefault){ if(isDefault){
criteria.andProjectCodeIsNull(); criteria.andProjectCodeIsNull();
@ -247,7 +248,7 @@ public class PagerQuestionService {
} }
}); });
boolean isDefault = Project.isDefault(Project.valueOf(projectCode)); boolean isDefault = Project.isDefault(projectCode);
//默认项目导入题考虑是否有单位关联 //默认项目导入题考虑是否有单位关联
PaperQuestionExample example = new PaperQuestionExample(); PaperQuestionExample example = new PaperQuestionExample();
PaperQuestionExample.Criteria criteria = example.createCriteria(); PaperQuestionExample.Criteria criteria = example.createCriteria();

3
src/main/java/club/joylink/rtss/websocket/WebsocketConfig.java
View File

@ -1,5 +1,6 @@
package club.joylink.rtss.websocket; package club.joylink.rtss.websocket;
import club.joylink.rtss.services.ISysUserService;
import club.joylink.rtss.services.LoginSessionManager; import club.joylink.rtss.services.LoginSessionManager;
import club.joylink.rtss.services.SysUserService; import club.joylink.rtss.services.SysUserService;
import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.AccountVO;
@ -32,7 +33,7 @@ public class WebsocketConfig implements WebSocketMessageBrokerConfigurer {
@Autowired @Autowired
private LoginSessionManager loginSessionManager; private LoginSessionManager loginSessionManager;
@Resource @Resource
private SysUserService sysUserService; private ISysUserService sysUserService;
@Resource @Resource
private PresenceChannelInterceptor presenceChannelInterceptor; private PresenceChannelInterceptor presenceChannelInterceptor;
@Override @Override

5
src/main/java/club/joylink/rtss/websocket/interceptor/VSimpleInterceptor.java
View File

@ -1,6 +1,7 @@
package club.joylink.rtss.websocket.interceptor; package club.joylink.rtss.websocket.interceptor;
import club.joylink.rtss.entity.project.Project; import club.joylink.rtss.entity.project.Project;
import club.joylink.rtss.services.ISysUserService;
import club.joylink.rtss.services.SysUserService; import club.joylink.rtss.services.SysUserService;
import club.joylink.rtss.vo.AccountVO; import club.joylink.rtss.vo.AccountVO;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -13,9 +14,9 @@ import java.util.Objects;
@Slf4j @Slf4j
public class VSimpleInterceptor extends BaseInterceptor { public class VSimpleInterceptor extends BaseInterceptor {
private SysUserService sysUserService; private ISysUserService sysUserService;
public VSimpleInterceptor(SysUserService sysUserService) { public VSimpleInterceptor(ISysUserService sysUserService) {
this.sysUserService = sysUserService; this.sysUserService = sysUserService;
} }