大版本更新1

gis_domain/src/main/java/com/gis/domain/dto/QuestionDto.java

@@ -26,4 +26,7 @@ public class QuestionDto {
 
     @ApiModelProperty(value = "排序" )
     private Integer sort;
+
+    @ApiModelProperty(value = "类型： radio:单选， multiple ：多选" )
+    private String type;
 }

gis_domain/src/main/java/com/gis/domain/dto/QuestionInDto.java

@@ -0,0 +1,11 @@
+package com.gis.domain.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class QuestionInDto {
+
+    private List<QuestionDto> question;
+}

gis_service/src/main/java/com/gis/service/QuestionService.java

@@ -3,6 +3,7 @@ package com.gis.service;
 
 import com.gis.common.util.Result;
 import com.gis.domain.dto.QuestionDto;
+import com.gis.domain.dto.QuestionInDto;
 import com.gis.domain.po.QuestionEntity;
 
 import java.util.List;
@@ -20,7 +21,7 @@ public interface QuestionService extends IBaseService<QuestionEntity, Long> {
 
 //    Result<QuestionEntityEntity> detail(Long id);
 
-    Result saveEntitys(List<QuestionDto> param);
+    Result saveEntitys(QuestionInDto param);
 
     void removeByQuestionGroupId(Long questionGroupId);
 

gis_service/src/main/java/com/gis/service/impl/CountAnswerServiceImpl.java

@@ -64,9 +64,15 @@ public class CountAnswerServiceImpl extends IBaseServiceImpl<CountAnswerEntity,
     public Result findByQuestionGroupId(Long questionGroupId, Integer type) {
         QuestionGroupEntity groupEntity = questionGroupService.findById(questionGroupId);
 
-        List<CountAnswerVo> answers = entityMapper.findByQuestionGroupId(questionGroupId);
+        if (groupEntity == null) {
+            return Result.failure(2001, "没有数据");
+        }
 
+        List<CountAnswerVo> answers = entityMapper.findByQuestionGroupId(questionGroupId);
 
+        if (answers.size() == 0) {
+            return Result.failure(2001, "没有数据");
+        }
 
 
         CountAnswerVo vo = answers.get(0);

gis_service/src/main/java/com/gis/service/impl/QuestionGroupServiceImpl.java

@@ -164,7 +164,7 @@ public class QuestionGroupServiceImpl extends IBaseServiceImpl<QuestionGroupEnti
         QuestionGroupEntity entity = null;
         if (id == null) {
             entity = new QuestionGroupEntity();
-            entity.setDisplay(1);
+//            entity.setDisplay(1);
             entity.setName(param.getName());
             entity.setUserName(getTokenUserName(request));
             this.save(entity);

gis_service/src/main/java/com/gis/service/impl/QuestionServiceImpl.java

@@ -3,6 +3,7 @@ package com.gis.service.impl;
 import com.gis.common.exception.BaseRuntimeException;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.QuestionDto;
+import com.gis.domain.dto.QuestionInDto;
 import com.gis.domain.po.QuestionEntity;
 import com.gis.mapper.IBaseMapper;
 import com.gis.mapper.QuestionMapper;
@@ -39,10 +40,11 @@ public class QuestionServiceImpl extends IBaseServiceImpl<QuestionEntity, Long>
     }
 
     @Override
-    public Result saveEntitys(List<QuestionDto> param) {
+    public Result saveEntitys(QuestionInDto param) {
         ArrayList<Object> resList = new ArrayList<>();
 //        List<QuestionEntityDto> answer = param.getAnswer();
-        for (QuestionDto questionAnswerDto : param) {
+        List<QuestionDto> question = param.getQuestion();
+        for (QuestionDto questionAnswerDto : question) {
             Result result = saveEntity(questionAnswerDto);
             resList.add(result.getData());
         }

gis_web/src/main/java/com/gis/web/controller/ProfileController.java

@@ -31,7 +31,7 @@ public class ProfileController extends BaseController {
 
     @ApiOperation("列表")
     @PostMapping("list/{type}")
-    public Result<PageInfo<ProfileEntity>> findByType(@PathVariable String type) {
+    public Result<ProfileEntity> findByType(@PathVariable String type) {
         return entityService.findByType(type);
     }
 

gis_web/src/main/java/com/gis/web/controller/QuestionGroupController.java

@@ -4,6 +4,7 @@ import com.gis.common.util.Result;
 import com.gis.domain.dto.PageDateDto;
 import com.gis.domain.dto.QuestionDto;
 import com.gis.domain.dto.QuestionGroupDto;
+import com.gis.domain.dto.QuestionInDto;
 import com.gis.domain.po.QuestionGroupEntity;
 import com.gis.service.QuestionGroupService;
 import com.gis.service.QuestionService;
@@ -37,7 +38,7 @@ public class QuestionGroupController {
     @ApiOperation("题组管理-列表")
     @PostMapping("list")
     public Result<QuestionGroupEntity> search(@Valid @RequestBody PageDateDto param) {
-        return entityService.search(param, 1);
+        return entityService.search(param, null);
     }
 
     @WebControllerLog(description = "题组管理-新增/修改", addDb = true)
@@ -95,7 +96,7 @@ public class QuestionGroupController {
     @WebControllerLog(description = "题组管理-问题新增/修改", addDb = true)
     @ApiOperation(value = "问题-新增/修改", notes = "数组，允许多个提交")
     @PostMapping("question/save")
-    public Result saveQuestionEntity(@Valid @RequestBody List<QuestionDto> param) {
+    public Result saveQuestionEntity(@Valid @RequestBody QuestionInDto param) {
         return questionService.saveEntitys(param);
     }
 

gis_web/src/main/java/com/gis/web/controller/WebController.java

@@ -3,8 +3,11 @@ package com.gis.web.controller;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.*;
 import com.gis.domain.po.CommentEntity;
+import com.gis.domain.po.ProfileEntity;
+import com.gis.domain.po.SlideshowEntity;
 import com.gis.domain.po.VisitEntity;
 import com.gis.service.*;
+import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -19,7 +22,7 @@ import javax.validation.Valid;
  * Created by owen on 2021/6/18 0018 14:50
  */
 @Slf4j
-@Api(tags = "展示页")
+@Api(tags = "门户网站")
 @RestController
 @RequestMapping("api/web")
 public class WebController {
@@ -53,6 +56,19 @@ public class WebController {
     @Autowired
     WebService webService;
 
+    @Autowired
+    SlideshowService slideshowService;
+
+    @Autowired
+    ProfileService profileService;
+
+
+    @ApiOperation("轮播图")
+    @PostMapping("slideshow/list")
+    public Result<SlideshowEntity> slideshowList() {
+        return slideshowService.list();
+    }
+
     @ApiOperation(value = "保存网站访问记录", notes = "type, web:管网, scene:线上史馆")
     @GetMapping("addVisitWeb/{type}")
     public Result addVisitWeb(@PathVariable String type) {
@@ -68,18 +84,26 @@ public class WebController {
         return newsService.addVisit(id);
     }
 
-    @ApiOperation(value = "博物馆信息")
-    @GetMapping("museum/info")
-    public Result museumInfo(){
-        return Result.success(museumInfoService.findById(1L));
-    }
+//
+//    @ApiOperation("列表")
+//    @PostMapping("profile/list")
+//    public Result<ProfileEntity> profileList() {
+//        return profileService.findAll();
+//    }
 
 
-    @ApiOperation(value = "博物馆访问量")
-    @GetMapping("museum/getVisit")
-    public Result museumGetVisit(){
-        return museumInfoService.getVisitByModule("web");
-    }
+//    @ApiOperation(value = "博物馆信息")
+//    @GetMapping("museum/info")
+//    public Result museumInfo(){
+//        return Result.success(museumInfoService.findById(1L));
+//    }
+
+
+//    @ApiOperation(value = "博物馆访问量")
+//    @GetMapping("museum/getVisit")
+//    public Result museumGetVisit(){
+//        return museumInfoService.getVisitByModule("web");
+//    }
 
 
     @ApiOperation(value = "本馆资讯", notes = "type, news：新闻， info:信息， activity：活动")
@@ -126,18 +150,18 @@ public class WebController {
         return Result.success();
     }
 
-    @ApiOperation(value = "搜索")
-    @PostMapping("search")
-    public Result search(@RequestBody SearchDto param){
-        return webService.search(param);
-    }
-
-
-    @ApiOperation(value = "搜索详情")
-    @PostMapping("search/detail")
-    public Result searchDetail(@RequestBody ModuleDto param){
-        return webService.searchDetail(param);
-    }
+//    @ApiOperation(value = "搜索")
+//    @PostMapping("search")
+//    public Result search(@RequestBody SearchDto param){
+//        return webService.search(param);
+//    }
+//
+//
+//    @ApiOperation(value = "搜索详情")
+//    @PostMapping("search/detail")
+//    public Result searchDetail(@RequestBody ModuleDto param){
+//        return webService.searchDetail(param);
+//    }