theluyuan/xzs-mysql
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wushaofeng
2020-12-30 16:39:53 +08:00
parent 25371bad43 8be8ca7cb4
commit 6ab33b7c64
10 changed files with 94 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/xzs/src/main/java/com/mindskip/xzs/configuration/spring/security/RestAuthenticationSuccessHandler.java
View File

@@ -34,7 +34,7 @@ public class RestAuthenticationSuccessHandler extends SimpleUrlAuthenticationSuc
User springUser = (User) authentication.getPrincipal();
com.mindskip.xzs.domain.User user = userService.getUserByUserName(springUser.getUsername());
UserEventLog userEventLog = new UserEventLog(user.getId(), user.getUserName(), user.getRealName(), new Date());
userEventLog.setContent(user.getUserName() + " 登录了学之思考试系统");
userEventLog.setContent(user.getUserName() + " 登录了Tek Systems出题系统");
eventPublisher.publishEvent(new UserEvent(userEventLog));
com.mindskip.xzs.domain.User newUser = new com.mindskip.xzs.domain.User();
newUser.setUserName(user.getUserName());

30
source/xzs/src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java
View File

@@ -5,9 +5,14 @@ import com.mindskip.xzs.base.RestResponse;
import com.mindskip.xzs.base.SystemCode;
import com.mindskip.xzs.domain.Question;
import com.mindskip.xzs.domain.TextContent;
import com.mindskip.xzs.domain.User;
import com.mindskip.xzs.domain.UserEventLog;
import com.mindskip.xzs.domain.enums.QuestionTypeEnum;
import com.mindskip.xzs.domain.question.QuestionObject;
import com.mindskip.xzs.event.UserEvent;
import com.mindskip.xzs.service.IndustryService;
import com.mindskip.xzs.service.QuestionService;
import com.mindskip.xzs.service.SkillService;
import com.mindskip.xzs.service.TextContentService;
import com.mindskip.xzs.utility.*;
import com.mindskip.xzs.viewmodel.admin.question.QuestionEditRequestVM;
@@ -17,9 +22,11 @@ import com.github.pagehelper.PageInfo;
import com.mindskip.xzs.utility.*;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.Date;
@RestController("AdminQuestionController")
@RequestMapping(value = "/api/admin/question")
@@ -28,6 +35,9 @@ public class QuestionController extends BaseApiController {
private final QuestionService questionService;
private final TextContentService textContentService;
private final ApplicationEventPublisher eventPublisher;
private final IndustryService industryService;
private final SkillService skillService;
@RequestMapping(value = "/page", method = RequestMethod.POST)
public RestResponse<PageInfo<QuestionResponseVM>> pageList(@RequestBody QuestionPageRequestVM model) {
@@ -51,13 +61,24 @@ public class QuestionController extends BaseApiController {
if (validQuestionEditRequestResult.getCode() != SystemCode.OK.getCode()) {
return validQuestionEditRequestResult;
}
User user = getCurrentUser();
UserEventLog userEventLog = new UserEventLog(user.getId(), user.getUserName(), user.getRealName(), new Date());
String content = "";
if (null == model.getId()) {
questionService.insertFullQuestion(model, getCurrentUser().getId());
Question question = questionService.insertFullQuestion(model, getCurrentUser().getId());
content = user.getUserName() + "增加 [题号——>"+question.getId()+"] " +
"[industry——>"+industryService.selectById(model.getIndustryId()).getName()+"] " +
"[skill——>"+skillService.selectById(model.getSkillId()).getName()+"]";
} else {
questionService.updateFullQuestion(model);
content = user.getUserName() + "更新 [题号——>"+model.getId()+"] " +
"[industry——>"+industryService.selectById(model.getIndustryId()).getName()+"] " +
"[skill——>"+skillService.selectById(model.getSkillId()).getName()+"]";
}
userEventLog.setContent(content);
eventPublisher.publishEvent(new UserEvent(userEventLog));
return RestResponse.ok();
}
@@ -73,6 +94,13 @@ public class QuestionController extends BaseApiController {
Question question = questionService.selectById(id);
question.setDeleted(true);
questionService.updateByIdFilter(question);
User user = getCurrentUser();
UserEventLog userEventLog = new UserEventLog(user.getId(), user.getUserName(), user.getRealName(), new Date());
String content = user.getUserName() + "删除 [题号——>"+question.getId()+"] " +
"[industry——>"+industryService.selectById(question.getIndustryId()).getName()+"] " +
"[skill——>"+skillService.selectById(question.getSkillId()).getName()+"]";
userEventLog.setContent(content);
eventPublisher.publishEvent(new UserEvent(userEventLog));
return RestResponse.ok();
}

2
source/xzs/src/main/java/com/mindskip/xzs/controller/student/UserController.java
View File

@@ -69,7 +69,7 @@ public class UserController extends BaseApiController {
user.setDeleted(false);
userService.insertByFilter(user);
UserEventLog userEventLog = new UserEventLog(user.getId(), user.getUserName(), user.getRealName(), new Date());
userEventLog.setContent("欢迎 " + user.getUserName() + " 注册来到学之思考试系统");
userEventLog.setContent("欢迎 " + user.getUserName() + " 注册来到Tek Systems出题系统");
eventPublisher.publishEvent(new UserEvent(userEventLog));
return RestResponse.ok();
}

2
source/xzs/src/main/java/com/mindskip/xzs/controller/wx/student/UserController.java
View File

@@ -71,7 +71,7 @@ public class UserController extends BaseWXApiController {
user.setDeleted(false);
userService.insertByFilter(user);
UserEventLog userEventLog = new UserEventLog(user.getId(), user.getUserName(), user.getRealName(), new Date());
userEventLog.setContent("欢迎 " + user.getUserName() + " 注册来到学之思考试系统");
userEventLog.setContent("欢迎 " + user.getUserName() + " 注册来到Tek Systems出题系统");
eventPublisher.publishEvent(new UserEvent(userEventLog));
return RestResponse.ok();
}