Просмотр исходного кода

读书计划-v0.03

(cherry picked from commit ec424509fdfee3b2baf8d8070dd2ff57e52eb08a)
MOKASZ\lw12420 2 лет назад
Родитель
Сommit
79125e43f8

+ 2 - 2
launch-admin/src/main/java/com/webflux/launchadmin/mysql/controller/readbook/ReadBookPlanOutController.java

@@ -26,8 +26,8 @@ public class ReadBookPlanOutController {
      * @return {@link Mono}<{@link RStatus}<{@link ReadBookGetOneMaterialRes}>>
      */
     @GetMapping("readBookGetOneMaterial")
-    public Mono<RStatus<ReadBookGetOneMaterialRes>> readBookGetOneMaterial(@RequestParam("code") String code){
-        return RStatus.success(readBookPlanServicesInterface.readBookGetOneMaterial(code));
+    public Mono<RStatus<ReadBookGetOneMaterialRes>> readBookGetOneMaterial(@RequestParam("code") String code,@RequestParam("type") Integer type){
+        return RStatus.success(readBookPlanServicesInterface.readBookGetOneMaterial(code,type));
     }
     /**
      * 读书计划获取【第二部】图片

+ 2 - 2
launch-admin/src/main/java/com/webflux/launchadmin/mysql/service/readBookPlan/ReadBookPlanServicesImpl.java

@@ -79,12 +79,12 @@ public class ReadBookPlanServicesImpl implements ReadBookPlanServicesInterface{
     }
 
     @Override
-    public Mono<ReadBookGetOneMaterialRes> readBookGetOneMaterial(String code) {
+    public Mono<ReadBookGetOneMaterialRes> readBookGetOneMaterial(String code,Integer type) {
        return template.selectOne(Query.query(Criteria.where("code").is(code)), PlanNewCommon.class)
                 .switchIfEmpty(Mono.error(new BaseException("计划code异")))
                 .onErrorResume(throwable -> Mono.error(new BaseException("计划code异"))).flatMap(f -> {
             Mono<ReadBookGetOneMaterialRes> readBookGetOneMaterialResMono = template
-                    .select(Query.query(Criteria.where("type").is(15)
+                    .select(Query.query(Criteria.where("type").is(type)
                     .and("deleted_at").isNull()
                     .and("group_type_id").is(f.groupId())), Material.class)
                     .onErrorResume(throwable -> Mono.error(new BaseException("获取分享文案异常Err"+throwable.getMessage())))

+ 1 - 1
launch-admin/src/main/java/com/webflux/launchadmin/mysql/service/readBookPlan/ReadBookPlanServicesInterface.java

@@ -10,7 +10,7 @@ public interface ReadBookPlanServicesInterface {
 
     Mono<ReadBookGetPosterImageRes> readBookGetPoster(ReadBookPlanGetImageReq request);
 
-    Mono<ReadBookGetOneMaterialRes> readBookGetOneMaterial(String code);
+    Mono<ReadBookGetOneMaterialRes> readBookGetOneMaterial(String code,Integer type);
 
     Mono<ReadBookImageRes> getRandomQWGroup( String code);
 }