Antiloveg лет назад: 8
Родитель
Сommit
6a08f6d23f

+ 17 - 9
src/main/java/com/goafanti/admin/controller/AdminLectureApiController.java

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

+ 2 - 2
src/main/java/com/goafanti/lecture/service/LectureService.java

@@ -9,9 +9,9 @@ import com.goafanti.lecture.bo.LectureListBo;
 
 
 public interface LectureService {
 public interface LectureService {
 
 
-	void save(Lecture l, String lectureTimeFormattedDate);
+	void save(Lecture l, String lectureTimeFormattedDate, String endTimeFormattedDate);
 
 
-	void update(Lecture l, String lectureTimeFormattedDate);
+	void update(Lecture l, String lectureTimeFormattedDate, String endTimeFormattedDate);
 
 
 	int batchDeleteByPrimaryKey(List<String> asList);
 	int batchDeleteByPrimaryKey(List<String> asList);
 
 

+ 4 - 2
src/main/java/com/goafanti/lecture/service/impl/LectureServiceImpl.java

@@ -28,10 +28,11 @@ public class LectureServiceImpl extends BaseMybatisDao<LectureMapper> implements
 	private LectureMapper lectureMapper;
 	private LectureMapper lectureMapper;
 
 
 	@Override
 	@Override
-	public void save(Lecture l, String lectureTimeFormattedDate) {
+	public void save(Lecture l, String lectureTimeFormattedDate, String endTimeFormattedDate) {
 		l.setId(UUID.randomUUID().toString());
 		l.setId(UUID.randomUUID().toString());
 		try {
 		try {
 			l.setLectureTime(DateUtils.parseDate(lectureTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 			l.setLectureTime(DateUtils.parseDate(lectureTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
+			l.setEndTime(DateUtils.parseDate(endTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 		} catch (ParseException e) {
 		} catch (ParseException e) {
 		}
 		}
 		Calendar now = Calendar.getInstance();
 		Calendar now = Calendar.getInstance();
@@ -43,9 +44,10 @@ public class LectureServiceImpl extends BaseMybatisDao<LectureMapper> implements
 	}
 	}
 
 
 	@Override
 	@Override
-	public void update(Lecture l, String lectureTimeFormattedDate) {
+	public void update(Lecture l, String lectureTimeFormattedDate, String endTimeFormattedDate) {
 		try {
 		try {
 			l.setLectureTime(DateUtils.parseDate(lectureTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 			l.setLectureTime(DateUtils.parseDate(lectureTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
+			l.setEndTime(DateUtils.parseDate(endTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 		} catch (ParseException e) {
 		} catch (ParseException e) {
 		}
 		}
 		Calendar now = Calendar.getInstance();
 		Calendar now = Calendar.getInstance();