|
|
@@ -50,12 +50,12 @@ public class AdminLectureApiController extends BaseApiController {
|
|
|
res.setData(lectureService.listHot());
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 科技明星页面展示列表
|
|
|
*/
|
|
|
@RequestMapping(value = "/dynamic", method = RequestMethod.GET)
|
|
|
- public Result dynamic(){
|
|
|
+ public Result dynamic() {
|
|
|
Result res = new Result();
|
|
|
res.setData(lectureService.listDynamic());
|
|
|
return res;
|
|
|
@@ -86,7 +86,8 @@ public class AdminLectureApiController extends BaseApiController {
|
|
|
* 新增
|
|
|
*/
|
|
|
@RequestMapping(value = "/add", method = RequestMethod.POST)
|
|
|
- public Result add(@Valid InputLecture il, BindingResult bindingResult, String lectureTimeFormattedDate) {
|
|
|
+ public Result add(@Valid InputLecture il, BindingResult bindingResult, String lectureTimeFormattedDate,
|
|
|
+ String endTimeFormattedDate) {
|
|
|
Result res = new Result();
|
|
|
if (bindingResult.hasErrors()) {
|
|
|
res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|
|
|
@@ -94,13 +95,13 @@ public class AdminLectureApiController extends BaseApiController {
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
- if (!disposeLecture(res, il, lectureTimeFormattedDate).getError().isEmpty()) {
|
|
|
+ if (!disposeLecture(res, il, lectureTimeFormattedDate, endTimeFormattedDate).getError().isEmpty()) {
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
Lecture l = new Lecture();
|
|
|
BeanUtils.copyProperties(il, l);
|
|
|
- lectureService.save(l, lectureTimeFormattedDate);
|
|
|
+ lectureService.save(l, lectureTimeFormattedDate, endTimeFormattedDate);
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
@@ -108,7 +109,8 @@ public class AdminLectureApiController extends BaseApiController {
|
|
|
* 修改
|
|
|
*/
|
|
|
@RequestMapping(value = "/update", method = RequestMethod.POST)
|
|
|
- public Result update(@Valid InputLecture il, BindingResult bindingResult, String lectureTimeFormattedDate) {
|
|
|
+ public Result update(@Valid InputLecture il, BindingResult bindingResult, String lectureTimeFormattedDate,
|
|
|
+ String endTimeFormattedDate) {
|
|
|
Result res = new Result();
|
|
|
if (bindingResult.hasErrors()) {
|
|
|
res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|
|
|
@@ -121,13 +123,13 @@ public class AdminLectureApiController extends BaseApiController {
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
- if (!disposeLecture(res, il, lectureTimeFormattedDate).getError().isEmpty()) {
|
|
|
+ if (!disposeLecture(res, il, lectureTimeFormattedDate, endTimeFormattedDate).getError().isEmpty()) {
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
Lecture l = new Lecture();
|
|
|
BeanUtils.copyProperties(il, l);
|
|
|
- lectureService.update(l, lectureTimeFormattedDate);
|
|
|
+ lectureService.update(l, lectureTimeFormattedDate, endTimeFormattedDate);
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
@@ -184,7 +186,8 @@ public class AdminLectureApiController extends BaseApiController {
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
- private Result disposeLecture(Result res, InputLecture il, String lectureTimeFormattedDate) {
|
|
|
+ private Result disposeLecture(Result res, InputLecture il, String lectureTimeFormattedDate,
|
|
|
+ String endTimeFormattedDate) {
|
|
|
if (StringUtils.isBlank(il.getUid())) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "讲堂开展人ID"));
|
|
|
return res;
|
|
|
@@ -200,6 +203,11 @@ public class AdminLectureApiController extends BaseApiController {
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
+ if (StringUtils.isBlank(endTimeFormattedDate)) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "讲堂结束时间"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
if (null == il.getHot()) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "是否展示在大咖说页面标记"));
|
|
|
return res;
|