在线问答

hx-xmhjc/src/main/java/com/fjhx/xmhjc/controller/open/OpenCarouselController.java

@@ -21,7 +21,7 @@ public class OpenCarouselController {
     private CarouselManagerService carouselManagerService;
 
     @PostMapping("/list")
-    public Page<CarouselManagerVo> categoryList(CarouselManagerSelectDto dto) {
+    public Page<CarouselManagerVo> categoryList(@RequestBody CarouselManagerSelectDto dto) {
         Page<CarouselManagerVo> page = carouselManagerService.pageByOpen(dto);
         return page;
     }

hx-xmhjc/src/main/java/com/fjhx/xmhjc/controller/open/OpenTopicController.java

@@ -133,7 +133,7 @@ public class OpenTopicController {
         openTopicContentVO.setAuthorName(websiteUsersService.getAuthorName(topicContent.getAuthor()));
         //分页查出楼层回复
         dto.setTopicId(topicId);
-        Page<TopicRepliesVo> page = topicRepliesService.getPageByOpen(dto);
+        Page<TopicRepliesVo> page = topicRepliesService.getFloorPageByOpen(dto);
         List<TopicRepliesVo> records = page.getRecords();
         records.forEach(topicRepliesVo -> {
             topicRepliesVo.setAuthorName(websiteUsersService.getAuthorName(topicRepliesVo.getAuthor()));

hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/carousel/dto/CarouselManagerSelectDto.java

@@ -14,4 +14,5 @@ import lombok.Setter;
 @Setter
 public class CarouselManagerSelectDto extends BaseSelectDto {
     String modules;
+    String status;
 }

hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/topic/dto/TopicRepliesSelectDto.java

@@ -17,4 +17,6 @@ public class TopicRepliesSelectDto extends BaseSelectDto {
 
     private Long floorId;
 
+    private String sortType;
+
 }

hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/topic/vo/TopicRepliesVo.java

@@ -25,4 +25,6 @@ public class TopicRepliesVo extends TopicReplies {
     private String citeAuthorName;
 
     private Page<TopicRepliesVo> floorPage;
+
+    private Integer num;
 }

hx-xmhjc/src/main/java/com/fjhx/xmhjc/mapper/topic/TopicRepliesMapper.java

@@ -1,5 +1,6 @@
 package com.fjhx.xmhjc.mapper.topic;
 
+import com.fjhx.xmhjc.entity.topic.dto.TopicRepliesSelectDto;
 import com.fjhx.xmhjc.entity.topic.po.TopicReplies;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -29,4 +30,5 @@ public interface TopicRepliesMapper extends BaseMapper<TopicReplies> {
      */
     Page<TopicRepliesVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<TopicReplies> wrapper);
 
+    Page<TopicRepliesVo> getFloorPageByOpen(@Param("page") Page<Object> page, @Param("dto") TopicRepliesSelectDto dto);
 }

hx-xmhjc/src/main/java/com/fjhx/xmhjc/service/product/impl/ProductInfoServiceImpl.java

@@ -79,20 +79,14 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
         List<String> specList = new ArrayList<>();
         if(StringUtils.isNotBlank(productInfo.getSpec())){
 
-            specList = Arrays.stream(productInfo.getSpec().split(",")).map(dictMap::get).collect(Collectors.toList());
+            specList = Arrays.stream(productInfo.getSpec().split(",")).collect(Collectors.toList());
         }
-
-
-
         result.setSpecList(specList);
-
-
         //获取图片
         List<Long> businessIdList = new ArrayList<>();
         businessIdList.add(result.getId());
         Map<Long, List<FileInfoVo>> fileMap = ObsFileUtil.getFileMap(businessIdList, 1);
         result.setFileList(fileMap.get(result.getId()));
-
         return result;
     }
 

hx-xmhjc/src/main/java/com/fjhx/xmhjc/service/topic/TopicRepliesService.java

@@ -58,4 +58,6 @@ public interface TopicRepliesService extends BaseService<TopicReplies> {
     Boolean hasFloorReply(Long floorId);
 
     void deleteAndChild(Long id);
+
+    Page<TopicRepliesVo> getFloorPageByOpen(TopicRepliesSelectDto dto);
 }

hx-xmhjc/src/main/java/com/fjhx/xmhjc/service/topic/impl/TopicRepliesServiceImpl.java

@@ -125,4 +125,9 @@ public class TopicRepliesServiceImpl extends ServiceImpl<TopicRepliesMapper, Top
         lambdaUpdate().eq(TopicReplies::getFloorId, id).remove();
     }
 
+    @Override
+    public Page<TopicRepliesVo> getFloorPageByOpen(TopicRepliesSelectDto dto) {
+        Page<TopicRepliesVo> page = this.baseMapper.getFloorPageByOpen(dto.getPage(), dto);
+        return page;
+    }
 }

hx-xmhjc/src/main/resources/mapper/topic/TopicRepliesMapper.xml

@@ -35,4 +35,30 @@
             ${ew.customSqlSegment}
     </select>
 
+    <select id="getFloorPageByOpen" resultType="com.fjhx.xmhjc.entity.topic.vo.TopicRepliesVo">
+        select
+            tr.id,
+            tr.topic_id,
+            tr.content,
+            tr.floor_id,
+            tr.reply_id,
+            tr.create_user,
+            tr.create_time,
+            tr.update_user,
+            tr.update_time,
+            tr.author,
+            tr.cite_author,
+            IFNULL(trr.num ,0) as num
+        from topic_replies tr
+            left join (select count(1) num, trr.floor_id fid from topic_replies trr where trr.topic_id = #{dto.topicId} and floor_id is not null   group by trr.floor_id) trr on trr.fid = tr.id
+        WHERE
+            topic_id = #{dto.topicId}
+            and floor_id is null
+            AND tr.del_flag = 0
+        ORDER BY
+            <if test="dto.sortType != null and dto.sortType != ''">
+                num desc,
+            </if>
+            tr.floor_id DESC
+    </select>
 </mapper>