Przeglądaj źródła

feat:change return value type

shc 1 rok temu
rodzic
commit
14dc4d8fbe

+ 6 - 6
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmQuizController.java

@@ -231,11 +231,11 @@ public class WmQuizController {
 	 */
 	@SysLog("创建试卷项(添加试题)")
 	@PostMapping(value = "/quiz/item/create")
-	public R<Boolean> createQuizItem(@Valid @RequestBody WmQuizDTO.OnItemCreate resource) {
+	public R<WmQuizItem> createQuizItem(@Valid @RequestBody WmQuizDTO.OnItemCreate resource) {
 
-		Boolean succ = quizItemService.createItem(resource, SecurityUtils.getUser());
+		WmQuizItem item = quizItemService.createItem(resource, SecurityUtils.getUser());
 
-		return succ ? R.ok(true, "添加试卷项成功") : R.failed(false, "添加试卷项失败");
+		return item != null ? R.ok(item, "添加试卷项成功") : R.failed(item, "添加试卷项失败");
 	}
 
 	/**
@@ -246,11 +246,11 @@ public class WmQuizController {
 	 */
 	@SysLog("批量创建试卷项(添加试题)")
 	@PostMapping(value = "/quiz/item/batch/create")
-	public R<Boolean> createQuizItems(@Valid @RequestBody List<WmQuizDTO.OnItemCreate> resources) {
+	public R<List<WmQuizItem>> createQuizItems(@Valid @RequestBody List<WmQuizDTO.OnItemCreate> resources) {
 
-		Boolean succ = quizItemService.createItems(resources, SecurityUtils.getUser());
+		List<WmQuizItem> items = quizItemService.createItems(resources, SecurityUtils.getUser());
 
-		return succ ? R.ok(true, "批量添加试卷项成功") : R.failed(false, "批量添加试卷项失败");
+		return CollUtil.isNotEmpty(items) ? R.ok(items, "批量添加试卷项成功") : R.failed(items, "批量添加试卷项失败");
 	}
 
 	/**

+ 4 - 4
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/WmQuizItemService.java

@@ -29,18 +29,18 @@ public interface WmQuizItemService extends IService<WmQuizItem> {
 	 *
 	 * @param resource 试卷项信息
 	 * @param user     操作人
-	 * @return 创建结果
+	 * @return 试卷项
 	 */
-	Boolean createItem(WmQuizDTO.OnItemCreate resource, HnqzUser user);
+	WmQuizItem createItem(WmQuizDTO.OnItemCreate resource, HnqzUser user);
 
 	/**
 	 * 批量创建试卷项
 	 *
 	 * @param resources 试卷项集合
 	 * @param user      操作人
-	 * @return 创建结果
+	 * @return 试卷项列表
 	 */
-	Boolean createItems(List<WmQuizDTO.OnItemCreate> resources, HnqzUser user);
+	List<WmQuizItem> createItems(List<WmQuizDTO.OnItemCreate> resources, HnqzUser user);
 
 	/**
 	 * 更新试卷项

+ 11 - 8
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmQuizItemServiceImpl.java

@@ -49,11 +49,14 @@ public class WmQuizItemServiceImpl extends ServiceImpl<WmQuizItemMapper, WmQuizI
 	 *
 	 * @param resource 试卷项信息
 	 * @param user     操作人
-	 * @return 创建结果
+	 * @return 试卷项
 	 */
 	@Override
-	public Boolean createItem(WmQuizDTO.OnItemCreate resource, HnqzUser user) {
-		return this.createItems(Collections.singletonList(resource), user);
+	public WmQuizItem createItem(WmQuizDTO.OnItemCreate resource, HnqzUser user) {
+		List<WmQuizItem> quizItems = this.createItems(Collections.singletonList(resource), user);
+
+		return CollUtil.isEmpty(quizItems) ? null : quizItems.get(0);
+
 	}
 
 	/**
@@ -61,11 +64,11 @@ public class WmQuizItemServiceImpl extends ServiceImpl<WmQuizItemMapper, WmQuizI
 	 *
 	 * @param resources 试卷项集合
 	 * @param user      操作人
-	 * @return 创建结果
+	 * @return 试卷项列表
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public Boolean createItems(List<WmQuizDTO.OnItemCreate> resources, HnqzUser user) {
+	public List<WmQuizItem> createItems(List<WmQuizDTO.OnItemCreate> resources, HnqzUser user) {
 
 		List<WmQuizItem> quizItems = resources.stream().map(item -> {
 			WmQuizItem quizItem = new WmQuizItem();
@@ -88,8 +91,8 @@ public class WmQuizItemServiceImpl extends ServiceImpl<WmQuizItemMapper, WmQuizI
 			return quizItem;
 		}).collect(Collectors.toList());
 
-
-		return this.saveBatch(quizItems);
+		boolean saved = this.saveBatch(quizItems);
+		return saved ? quizItems : Collections.emptyList();
 	}
 
 	/**
@@ -124,7 +127,7 @@ public class WmQuizItemServiceImpl extends ServiceImpl<WmQuizItemMapper, WmQuizI
 			quizItem.setWidget(resource.getWidget());
 		}
 
-		if (resource.getMark() != null){
+		if (resource.getMark() != null) {
 			quizItem.setMark(resource.getMark());
 		}