浏览代码

惠民通调试完毕(点赞除外)

qinhouyu 1 年之前
父节点
当前提交
f5ead61c54

+ 3 - 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/information/InformationController.java

@@ -41,7 +41,7 @@ public class InformationController extends BaseController
      * 点赞
      */
     @PostMapping("/like")
-    public AjaxResult like(Information information){
+    public AjaxResult like(@RequestBody Information information){
         return toAjax(informationService.likeById(information));
     }
 
@@ -50,7 +50,7 @@ public class InformationController extends BaseController
      * 浏览
      */
     @PostMapping("/watch")
-    public AjaxResult watchById(Information information){
+    public AjaxResult watchById(@RequestBody Information information){
         return toAjax(informationService.watchById(information));
     }
 
@@ -75,7 +75,7 @@ public class InformationController extends BaseController
     @GetMapping("/listWx")
     public AjaxResult listWx(Information information)
     {
-        List<Information> list = informationService.selectInformationListWx(information);
+        List<InformationUni> list = informationService.selectInformationListWx(information);
         return AjaxResult.success(list);
     }
 

+ 2 - 0
sooka-jnb/src/main/java/com/sooka/jnb/information/domain/InformationUni.java

@@ -1,6 +1,7 @@
 package com.sooka.jnb.information.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -38,6 +39,7 @@ public class InformationUni extends BaseEntity
 
     /** 是否置顶 */
     @Excel(name = "是否置顶", readConverterExp = "1=是,0=否")
+    @JsonProperty("top")
     private Integer isTop;
 
     /** 点赞数 */

+ 1 - 1
sooka-jnb/src/main/java/com/sooka/jnb/information/service/InformationService.java

@@ -33,7 +33,7 @@ public interface InformationService
      */
     public List<Information> selectInformationList(Information information);
 
-    public List<Information> selectInformationListWx(Information information);
+    public List<InformationUni> selectInformationListWx(Information information);
 
 
     /**

+ 8 - 2
sooka-jnb/src/main/java/com/sooka/jnb/information/service/impl/InformationServiceImpl.java

@@ -59,14 +59,20 @@ public class InformationServiceImpl implements InformationService
     }
 
     @Override
-    public List<Information> selectInformationListWx(Information information)
+    public List<InformationUni> selectInformationListWx(Information information)
     {
-        return informationMapper.selectInformationListWx(information);
+        List<Information> list = informationMapper.selectInformationListWx(information);
+        return list.stream().map(item -> {
+            InformationUni uni = new InformationUni();
+            BeanUtils.copyProperties(item, uni);
+            return uni;
+        }).collect(Collectors.toList());
     }
     @Override
     public TableDataInfo selectInformationListWxs(Information information, Integer pageNum, Integer pageSize)
     {
 //        List<Information> result = informationMapper.selectInformationListWxs(information,pageNum, pageSize);
+        System.out.println(information.getIsTop());
         List<Information> toolForAbsenteeism = informationMapper.selectInformationListWxs(information,pageNum, pageSize);
         TableDataInfo tableDataInfo = new TableDataInfo();
         tableDataInfo.setRows(toolForAbsenteeism.stream() .skip((long) (pageNum - 1) * pageSize)

+ 1 - 1
sooka-jnb/src/main/resources/mapper/information/InformationMapper.xml

@@ -107,8 +107,8 @@
         where a.del_flag = 0
             <if test="obj.titleName != null  and obj.titleName != ''">and a.title_name like concat('%', #{obj.titleName}, '%')</if>
             <if test="obj.type != null and obj.type != ''">and a.type = #{obj.type}</if>
+        <if test="obj.isTop!=null">and a.is_top = #{obj.isTop}</if>
             <if test="obj.isGovernment != null and obj.isGovernment != ''">and a.is_government = #{obj.isGovernment}</if>
-            <if test="obj.isTop != null and obj.isTop != ''">and a.is_top = #{obj.isTop}</if>
         <choose>
             <when test="obj.flag == 'like'">
                 ORDER BY a.like_num DESC