plan-java v0.61

(cherry picked from commit c7a68465d8bda2e273cc738b149ae173cc7fb565)

launch-admin/src/main/java/com/webflux/launchadmin/mysql/controller/planNew/PlanNewOutController.java

@@ -93,9 +93,9 @@ public class PlanNewOutController {
     public Mono<RStatus<DataListsKefu>> kefuList(@RequestBody KefuRequest request){
         Mono<PlanNew> code = template.selectOne(Query.query(Criteria.where("code").is(request.getCode())), PlanNew.class);
         // //类型 1素材分类2清水分类
-        Mono<List<Domain>> domain = code.flatMap(plan -> template.select(Query.query(Criteria.where("group_type").is(1)), Domain.class).collectList());
-        Mono<List<Image>> image = template.select(Query.query(Criteria.where("type").is(1)), Image.class).collectList();
-        Mono<List<Material>> text = template.select(Query.query(Criteria.where("type").is(4)), Material.class).collectList();
+        Mono<List<Domain>> domain = code.flatMap(plan -> template.select(Query.query(Criteria.where("group_type").is(1).and("deleted_at").isNull()), Domain.class).collectList());
+        Mono<List<Image>> image = template.select(Query.query(Criteria.where("type").is(1).and("deleted_at").isNull()), Image.class).collectList();
+        Mono<List<Material>> text = template.select(Query.query(Criteria.where("type").is(4).and("deleted_at").isNull()), Material.class).collectList();
         Mono<List<H5ImageAndText>> arrayListMono = Mono.zip(code, domain, image, text).flatMap(f -> {
             //H5ImageAndText
             Integer integer = f.getT1().pageShow();//群数量
@@ -148,19 +148,25 @@ public class PlanNewOutController {
         Mono<PlanNew> code0 = template.selectOne(Query.query(Criteria.where("code").is(request.getCode())), PlanNew.class);
         Mono<DataLists> dataListsMono1 = code0.flatMap(planNew -> {
             Mono<PlanNew> code = Mono.just(planNew);
-            Mono<List<Domain>> domain = code.flatMap(plan -> template.select(Query.query(Criteria.where("group_type").is(1)), Domain.class).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"6"))).collectList());
+            Mono<List<Domain>> domain = code.flatMap(plan -> template.select(Query.query(Criteria.where("group_type").is(1).and("deleted_at").isNull()), Domain.class).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"6"))).collectList());
             // //类型 1素材分类2清水分类
-            Mono<List<Image>> image = template.select(Query.query(Criteria.where("type").is(1)), Image.class).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"7"))).collectList();
-            Mono<List<Material>> text = template.select(Query.query(Criteria.where("type").is(4)), Material.class).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"8"))).collectList();
+            Mono<List<Image>> image = template.select(Query.query(Criteria.where("type").is(1).and("deleted_at").isNull()), Image.class).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"7"))).collectList();
+            Mono<List<Material>> text = template.select(Query.query(Criteria.where("type").is(4).and("deleted_at").isNull()), Material.class).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"8"))).collectList();
             Mono<UserVisits> insert = template.insert(new UserVisits(null, request.getWx_user_id(), 1));
-            Mono<UserVisits> wx_user_id = template.selectOne(Query.query(Criteria.where("wx_user_id").is(request.getWx_user_id())), UserVisits.class).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"9")))
-                    .flatMap(f -> {
-                        if (f.num() >= 4) {
-                            return Mono.just(f);
-                        } else {
-                            return template.update(new UserVisits(f.id(), f.wxUserId(), f.num() + 1)).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"10")));
-                        }
-                    }).switchIfEmpty(insert);
+            Mono<UserVisits> wx_user_id ;
+            if (Objects.isNull(request.getWx_user_id()) || "".equals(request.getWx_user_id())) {
+                wx_user_id=Mono.just(new UserVisits(null,null,null));
+            }else{
+                 wx_user_id = template.selectOne(Query.query(Criteria.where("wx_user_id").is(request.getWx_user_id())), UserVisits.class).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"9")))
+                        .flatMap(f -> {
+                            if (f.num() >= 4) {
+                                return Mono.just(f);
+                            } else {
+                                return template.update(new UserVisits(f.id(), f.wxUserId(), f.num() + 1)).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"10")));
+                            }
+                        }).switchIfEmpty(insert);
+            }
+
             Mono<List<H5ImageAndText>> arrayListMono = Mono.zip(code, domain, image, text).flatMap(f -> {
                 //H5ImageAndText
                 Integer integer = f.getT1().pageShow();//群数量
@@ -187,21 +193,21 @@ public class PlanNewOutController {
                     return Mono.just(new Audio(null,null,null,null,null,null,null,null));
                 }else {
                     return  template.selectOne(
-                            Query.query(Criteria.where("id").is(plan.listAudioId())),
+                            Query.query(Criteria.where("id").is(plan.listAudioId()).and("deleted_at").isNull()),
                             Audio.class);
                 } }
             ).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"1")));
             Mono<Audio> retAudioId = code.flatMap(plan -> template.selectOne(Query.query(Criteria.where("id")
-                    .is(plan.retAudioId())), Audio.class)).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"2")));
+                    .is(plan.retAudioId()).and("deleted_at").isNull()), Audio.class)).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"2")));
             Mono<ReturnLoop> returnLoop = code.flatMap(plan -> {
                 if (Objects.isNull(plan.returnLoopId())) {
                     return Mono.just(getReturnLoop());
                 } else {
-                    return template.selectOne(Query.query(Criteria.where("id").is(plan.returnLoopId())), ReturnLoop.class).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"3")));
+                    return template.selectOne(Query.query(Criteria.where("id").is(plan.returnLoopId()).and("deleted_at").isNull()), ReturnLoop.class).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"3")));
                 }
             }).switchIfEmpty(Mono.just(getReturnLoop()));
-            Mono<List<Ad>> adtop = template.select(Query.query(Criteria.where("type").is(1)), Ad.class).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"4"))).collectList();////广告类型1顶部2底部3返回4安卓，ios的返回
-            Mono<List<Ad>> bottom = template.select(Query.query(Criteria.where("type").is(2)), Ad.class).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"5"))).collectList();
+            Mono<List<Ad>> adtop = template.select(Query.query(Criteria.where("type").is(1).and("deleted_at").isNull()), Ad.class).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"4"))).collectList();////广告类型1顶部2底部3返回4安卓，ios的返回
+            Mono<List<Ad>> bottom = template.select(Query.query(Criteria.where("type").is(2).and("deleted_at").isNull()), Ad.class).onErrorResume(throwable -> Mono.error(new Exception(throwable.getMessage()+"5"))).collectList();
             Mono<DataLists> dataListsMono = Mono.zip(code, listAudio, retAudioId, returnLoop, arrayListMono, adtop, bottom, wx_user_id).flatMap(f -> {
                 DataLists dataLists = new DataLists();
                 dataLists.setPlanNew(f.getT1());
@@ -213,7 +219,8 @@ public class PlanNewOutController {
                     dataLists.setReturnLoop(null);
                 }
                 dataLists.setImages(f.getT5());
-                if (f.getT8().num() >= 4) {
+
+                if (f.getT8().num() >= 4 && Objects.nonNull(request.getWx_user_id()) && !"".equals(request.getWx_user_id())) {
                     dataLists.setIsRet(1);
                 } else {
                     dataLists.setIsRet(-1);
@@ -410,12 +417,12 @@ public class PlanNewOutController {
             if (Objects.nonNull(request.getWx_user_id()) && !"".equals(request.getWx_user_id())) {
                 PlanNewBackgroupPoster qsSetting = f.getQsSetting();
                 if (Objects.nonNull(qsSetting) && Objects.nonNull(qsSetting.audioId()) && 0 != qsSetting.audioId()) {
-                    id = template.selectOne(Query.query(Criteria.where("id").is(qsSetting.audioId())), Audio.class);
+                    id = template.selectOne(Query.query(Criteria.where("id").is(qsSetting.audioId()).and("deleted_at").isNull()), Audio.class);
                 }
             } else {
                 PlanNewBackgroupPoster fxSetting = f.getFxSetting();
                 if (Objects.nonNull(fxSetting) && Objects.nonNull(fxSetting.audioId()) && 0 != fxSetting.audioId()) {
-                    id = template.selectOne(Query.query(Criteria.where("id").is(fxSetting.audioId())), Audio.class);
+                    id = template.selectOne(Query.query(Criteria.where("id").is(fxSetting.audioId()).and("deleted_at").isNull()), Audio.class);
                 }
             }
             if (Objects.isNull(id)) {

launch-admin/src/main/java/com/webflux/launchadmin/mysql/service/planNew/goGenerate/GoGenerateService.java

@@ -121,17 +121,17 @@ public class GoGenerateService {
      * @return
      */
     private Mono<List<Image>> getImageType1(){
-        return template.select(Query.query(Criteria.where("type").is(1)), Image.class).collectList();
+        return template.select(Query.query(Criteria.where("type").is(1).and("deleted_at").isNull()), Image.class).collectList();
     }
 
     private Mono<List<Material>> getTextLists() {
-        return template.select(Query.query(Criteria.where("type").is(14)), Material.class)
+        return template.select(Query.query(Criteria.where("type").is(14).and("deleted_at").isNull()), Material.class)
                .collectList();
     }
 
     //背景
     private Mono<List<Image>> getBgImage() {
-        return template.select(Query.query(Criteria.where("type").is(2)), Image.class)
+        return template.select(Query.query(Criteria.where("type").is(2).and("deleted_at").isNull()), Image.class)
                 .collectList();
     }
 
@@ -150,32 +150,32 @@ public class GoGenerateService {
         return    getStringMonoOut(goRequest, stringBuilderMono, getBgImageQs(), getFmImageListsQs(), getTextListsQs(),getImageTypeQs());
     }
     private Mono<List<Image>> getBgImageQs() {
-        return template.select(Query.query(Criteria.where("type").is(2).and("group_type").is(2)), Image.class).collectList();
+        return template.select(Query.query(Criteria.where("type").is(2).and("group_type").is(2).and("deleted_at").isNull()), Image.class).collectList();
     }
 
     private Mono<List<Image>> getFmImageListsQs() {
-        return template.select(Query.query(Criteria.where("type").is(10).and("group_type").is(2)), Image.class).collectList();
+        return template.select(Query.query(Criteria.where("type").is(10).and("group_type").is(2).and("deleted_at").isNull()), Image.class).collectList();
     }
 
     private Mono<List<Material>> getTextListsQs() {
-        return template.select(Query.query(Criteria.where("type").is(14).and("group_type").is(2)), Material.class).collectList();
+        return template.select(Query.query(Criteria.where("type").is(14).and("group_type").is(2).and("deleted_at").isNull()), Material.class).collectList();
     }
     private Mono<List<Image>> getImageTypeQs(){
-        return template.select(Query.query(Criteria.where("type").is(1).and("group_type").is(2)), Image.class).collectList();
+        return template.select(Query.query(Criteria.where("type").is(1).and("group_type").is(2).and("deleted_at").isNull()), Image.class).collectList();
     }
 
 
     private Mono<List<Material>> getTextListsYx() {
-        return template.select(Query.query(Criteria.where("type").is(14).and("group_type").is(1)), Material.class).collectList();
+        return template.select(Query.query(Criteria.where("type").is(14).and("group_type").is(1).and("deleted_at").isNull()), Material.class).collectList();
     }
     private Mono<List<Image>> getBgImageYx() {
-        return template.select(Query.query(Criteria.where("type").is(2).and("group_type").is(1)), Image.class).collectList();
+        return template.select(Query.query(Criteria.where("type").is(2).and("group_type").is(1).and("deleted_at").isNull()), Image.class).collectList();
     }
     private Mono<List<Image>> getFmImageListsYx() {
-        return template.select(Query.query(Criteria.where("type").is(10).and("group_type").is(1)), Image.class).collectList();
+        return template.select(Query.query(Criteria.where("type").is(10).and("group_type").is(1).and("deleted_at").isNull()), Image.class).collectList();
     }
     private Mono<List<Image>> getImageTypeYx(){
-        return template.select(Query.query(Criteria.where("type").is(1).and("group_type").is(1)), Image.class).collectList();
+        return template.select(Query.query(Criteria.where("type").is(1).and("group_type").is(1).and("deleted_at").isNull()), Image.class).collectList();
     }
 
 
@@ -320,7 +320,7 @@ public class GoGenerateService {
         if (Objects.isNull(saveRequest.getPlanNewId())) {
 
            return template.select(Query.query(Criteria.where("group_type_id").is(saveRequest.getGroupId())
-                    .and("status").is(1).and("type").is(1)), DomainSelect.class)
+                    .and("status").is(1).and("type").is(1).and("deleted_at").isNull()), DomainSelect.class)
                     .collectList()
                     .switchIfEmpty(Mono.just(List.of())).flatMap(b->{
                 StringBuilder stringBuilder = new StringBuilder();
@@ -340,7 +340,7 @@ public class GoGenerateService {
         }else{
             Mono<StringBuilder> stringBuilderMono1 = template.selectOne(Query.query(Criteria.where("plan_new_id").is(saveRequest.getPlanNewId())), PlanNew.class)
                     .flatMap(f9 -> Mono.zip(Mono.just(f9), template.select(Query.query(Criteria.where("group_type_id").is(f9.groupId())
-                                    .and("status").is(1).and("type").is(1)), DomainSelect.class)
+                                    .and("status").is(1).and("type").is(1).and("deleted_at").isNull()), DomainSelect.class)
                                     .collectList()
                                     .switchIfEmpty(Mono.just(List.of())), (a, b) -> {
                                 StringBuilder stringBuilder = new StringBuilder();
@@ -364,7 +364,7 @@ public class GoGenerateService {
     }
     public Mono<StringBuilder> getStringBuilderMonoQs( Mono<PlanNew> code) {
         return code.flatMap(f9 -> Mono.zip(code, template.select(Query.query(Criteria.where("group_type_id").is(f9.groupIdQs())
-                                .and("status").is(1).and("type").is(1).and("group_type").is(2)), DomainSelect.class)
+                                .and("status").is(1).and("type").is(1).and("group_type").is(2).and("deleted_at").isNull()), DomainSelect.class)
                                 .collectList()
                                 .switchIfEmpty(Mono.just(List.of())), (a, b) -> {
                             StringBuilder stringBuilder = new StringBuilder();
@@ -385,7 +385,7 @@ public class GoGenerateService {
     }
     public Mono<StringBuilder> getStringBuilderMonoYx( Mono<PlanNew> code) {
         return code.flatMap(f9 -> Mono.zip(code, template.select(Query.query(Criteria.where("group_type_id").is(f9.groupId())
-                                .and("status").is(1).and("type").is(1).and("group_type").is(1)), DomainSelect.class)
+                                .and("status").is(1).and("type").is(1).and("group_type").is(1).and("deleted_at").isNull()), DomainSelect.class)
                                 .collectList()
                                 .switchIfEmpty(Mono.just(List.of())), (a, b) -> {
                             StringBuilder stringBuilder = new StringBuilder();
@@ -454,7 +454,7 @@ public class GoGenerateService {
             List<Long> collect1 = collect.stream().map(Item::getPlanId).collect(Collectors.toList());
              stringBuilderMono = template.select(Query.query(Criteria.where("plan_new_id").in(collect1)), PlanNew.class)
                     .flatMap(f -> Mono.zip(Mono.just(f), template.select(Query.query(Criteria.where("group_type_id").is(f.groupId())
-                                    .and("status").is(1).and("type").is(1)), DomainSelect.class)
+                                    .and("status").is(1).and("type").is(1).and("deleted_at").isNull()), DomainSelect.class)
                                     .collectList()
                                     .switchIfEmpty(Mono.just(List.of())), (a, b) -> {
                                 StringBuilder stringBuilder = new StringBuilder();
@@ -626,7 +626,7 @@ public class GoGenerateService {
     }
 
     private Mono<List<Image>> getFmImageLists0() {
-        return template.select(Query.query(Criteria.where("type").is(10)), Image.class)
+        return template.select(Query.query(Criteria.where("type").is(10).and("deleted_at").isNull()), Image.class)
                .collectList();
     }