Merge branch 'master' of http://175.178.51.79:3000/lzx/answer-api

# Conflicts:
#	admin-pc/.env.development
#	applet-answer-api/src/main/java/org/jeecg/api/service/impl/AnswerAppletIndexServiceImpl.java

admin-pc/.env.development

@@ -1,7 +1,8 @@
-NODE_ENV=development
-VUE_APP_API_BASE_URL=http://localhost:8001/answer-api/
-VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
-VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
-
-# 微应用列表必须VUE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径
-VUE_APP_SUB_jeecg-app-1 = '//localhost:8092'
+NODE_ENV=development
+
+VUE_APP_API_BASE_URL=http://localhost:8001/answer-api/
+VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
+VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
+
+# 微应用列表必须VUE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径
+VUE_APP_SUB_jeecg-app-1 = '//localhost:8092'

applet-answer-api/src/main/java/org/jeecg/api/controller/AnswerAppletIndexController.java

@@ -29,6 +29,49 @@ public class AnswerAppletIndexController {
     }
 
 
+
+
+
+
+    //1、查询第一个题目接口（返回一个题目和答案列表）
+
+    @ApiOperation(value="1、查询第一个题目接口（返回一个题目和答案列表）", notes="1、查询第一个题目接口（返回一个题目和答案列表）")
+    @GetMapping(value = "/firstQuestion")
+    public Result<?> firstQuestion(){
+        return answerAppletIndexService.firstQuestion();
+    }
+
+    //2、根据题目id查询题目接口（返回一个题目和答案列表）
+
+    @ApiOperation(value="2、根据题目id查询题目接口（返回一个题目和答案列表）", notes="2、根据题目id查询题目接口（返回一个题目和答案列表）")
+    @GetMapping(value = "/getProblemById")
+    public Result<?> getProblemById(String id){
+        return answerAppletIndexService.getProblemById(id);
+    }
+
+
+
+    //3、根据用户选择的答案id列表查询出获得的称号接口（返回称号图片、文章列表）
+
+    @ApiOperation(value="3、根据用户选择的答案id列表查询出获得的称号接口（返回称号图片、文章列表）", notes="3、根据用户选择的答案id列表查询出获得的称号接口（返回称号图片、文章列表）")
+    @GetMapping(value = "/getTitleByIds")
+    public Result<?> getTitleByIds(String ids){
+        return answerAppletIndexService.getTitleByIds(ids);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     @ApiOperation(value="首页-文章列表接口", notes="首页-文章列表接口")
     @GetMapping(value = "/articleList")
 	public Result<?> articleList(){

applet-answer-api/src/main/java/org/jeecg/api/service/AnswerAppletIndexService.java

@@ -9,6 +9,15 @@ public interface AnswerAppletIndexService {
     //首页-出现问题列表接口
     Result<?> problemList();
 
+    //1、查询第一个题目接口（返回一个题目和答案列表）
+    Result<?> firstQuestion();
+
+    //2、根据题目id查询题目接口（返回一个题目和答案列表）
+    Result<?> getProblemById(String id);
+
+    //3、根据用户选择的答案id列表查询出获得的称号接口（返回称号图片、文章列表）
+    Result<?> getTitleByIds(String ids);
+
     //公共配置接口
     Result<?> commonConfig();
 

applet-answer-api/src/main/java/org/jeecg/api/service/impl/AnswerAppletIndexServiceImpl.java

@@ -9,10 +9,10 @@ import org.jeecg.modules.answerArticle.entity.AnswerArticle;
 import org.jeecg.modules.answerArticle.service.IAnswerArticleService;
 import org.jeecg.modules.answerIntroduce.entity.AnswerIntroduce;
 import org.jeecg.modules.answerIntroduce.service.IAnswerIntroduceService;
-import org.jeecg.modules.answerList.entity.AnswerList;
-import org.jeecg.modules.answerList.service.IAnswerListService;
-import org.jeecg.modules.answerListLog.entity.AnswerListLog;
-import org.jeecg.modules.answerListLog.service.IAnswerListLogService;
+import org.jeecg.modules.answerObject.entity.AnswerObject;
+import org.jeecg.modules.answerObject.entity.AnswerObjectSku;
+import org.jeecg.modules.answerObject.service.IAnswerObjectService;
+import org.jeecg.modules.answerObject.service.IAnswerObjectSkuService;
 import org.jeecg.modules.answerReservation.entity.AnswerReservation;
 import org.jeecg.modules.answerReservation.service.IAnswerReservationService;
 import org.jeecg.modules.answerTopiLog.entity.AnswerTopiLog;
@@ -24,6 +24,7 @@ import org.jeecg.modules.commonBanner.service.ICommonBannerService;
 import org.jeecg.modules.commonConfig.entity.CommonConfig;
 import org.jeecg.modules.commonConfig.service.ICommonConfigService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -62,19 +63,72 @@ public class AnswerAppletIndexServiceImpl implements AnswerAppletIndexService {
     @Resource
     private IAnswerListLogService answerListLogService;
 
+    //问题主表
+    @Autowired
+    private IAnswerObjectService answerObjectService;
+    //问题子表
+    @Autowired
+    private IAnswerObjectSkuService answerObjectSkuService;
+
 
     //首页-出现问题列表接口
     @Override
     public Result<?> problemList(){
-        List<AnswerTopic> list = answerTopicService
-                .lambdaQuery()
-                .orderByDesc(AnswerTopic::getSort)
-                .eq(AnswerTopic::getIsOpen, "Y")
+//        List<AnswerTopic> list = answerTopicService
+//                .lambdaQuery()
+//                .select(AnswerTopic::getId,AnswerTopic::getTitle)
+//                .orderByDesc(AnswerTopic::getSort)
+//                .eq(AnswerTopic::getIsOpen, "Y")
+//                .list();
+//        return Result.OK(list);
+
+
+        List<AnswerObject> list = answerObjectService.lambdaQuery()
+                .orderByDesc(AnswerObject::getSort)
                 .list();
+
+
+
         return Result.OK(list);
+
     }
 
 
+    //1、查询第一个题目接口（返回一个题目和答案列表）
+    @Override
+    public Result<?> firstQuestion(){
+        AnswerObject bean = answerObjectService.lambdaQuery()
+                .orderByAsc(AnswerObject::getSort)
+                .last("limit 1")
+                .one();
+        bean.setAnswerObjectSkuList(answerObjectSkuService.lambdaQuery()
+                .eq(AnswerObjectSku::getMainId, bean.getId())
+                .list());
+
+        return Result.OK(bean);
+    }
+
+    //2、根据题目id查询题目接口（返回一个题目和答案列表）
+    @Override
+    public Result<?> getProblemById(String id){
+        AnswerObject bean = answerObjectService.getById(id);
+        bean.setAnswerObjectSkuList(answerObjectSkuService.lambdaQuery()
+                .eq(AnswerObjectSku::getMainId, bean.getId())
+                .list());
+        return Result.OK(bean);
+    }
+
+    //3、根据用户选择的答案id列表查询出获得的称号接口（返回称号图片、文章列表）
+    @Override
+    public  Result<?> getTitleByIds(String ids){
+        List<AnswerObjectSku> list = answerObjectSkuService.lambdaQuery()
+                .in(AnswerObjectSku::getId, ids.split(","))
+                .list();
+        return Result.OK(list);
+    }
+
+
+
     //公共配置接口
     @Override
     public Result<?> commonConfig(){

module-system/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8000
+  port: 8001
   tomcat:
     max-swallow-size: -1
   error: