diff --git a/flyfish-web/src/main/resources/templates/ViewController.tpl b/flyfish-web/src/main/resources/templates/ViewController.tpl index 027dffd..6ad49e2 100644 --- a/flyfish-web/src/main/resources/templates/ViewController.tpl +++ b/flyfish-web/src/main/resources/templates/ViewController.tpl @@ -8,26 +8,27 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; -import java.util.stream.Collectors; import com.flyfish.framework.bean.Result; import com.flyfish.framework.configuration.annotations.PagedQuery; import com.flyfish.framework.domain.base.Vo; -import com.flyfish.framework.service.BaseService; +import com.flyfish.framework.service.BaseReactiveService; @RestController @RequestMapping("#{uri}") public class #{className} { @Autowired - protected BaseService<#{beanClassName}> service; + protected BaseReactiveService<#{beanClassName}> service; @GetMapping("views") - public Result>> getVoList(@PagedQuery #{queryBeanClassName}#{queryBeanSuffix} qo) { + public Mono>>> getVoList(@PagedQuery #{queryBeanClassName}#{queryBeanSuffix} qo) { if (null != qo.getPageable()) { - return Result.accept(service.getPageList(qo).map(item -> new #{listViewClassName}().from(item))); + return service.getPageList(qo).map(page -> page.map(item -> new #{listViewClassName}().from(item))) + .map(Result::accept); } - return Result.accept(service.getList(qo).stream() - .map(item -> new #{listViewClassName}().from(item)).collect(Collectors.toList())); + return service.getList(qo).map(item -> new #{listViewClassName}().from(item)) + .collectList() + .map(Result::accept); } }