资讯模块——数据API功能修复

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/ShopZxMapper.java

@@ -3,6 +3,7 @@ package cn.wisenergy.mapper;
 
 import cn.wisenergy.model.app.shopZx;
 import cn.wisenergy.model.app.zxUserDto;
+import cn.wisenergy.model.app.zxUserVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -31,10 +32,18 @@ public interface ShopZxMapper extends BaseMapper<shopZx> {
     int zxadd1(@Param("headImage") String headImage,@Param("userId") String userId);
 
     /**
-     * 查询资讯数据
+     * 倒叙查询资讯与用户发布数据
      */
     List<zxUserDto> selectPage(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
 
+    /**
+     * 用于查询资讯单表全部信息
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    List<zxUserVo> selectAll(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
+
     /**
      * 点赞接口专用
      */

wisenergy-mapper/src/main/resources/mapper/ShopZxMapper.xml

@@ -105,5 +105,19 @@
             zx_id = #{zxid}
         </where>
     </update>
+    <!--资讯内容与用户内容倒叙查询-->
+    <select id="selectAll" parameterType="java.lang.Integer" resultType="cn.wisenergy.model.app.zxUserVo">
+      select
+      b.zx_id as zxid,
+      b.zx_url as zxUrl,
+      b.zx_likes as zxLikes,
+      b.zx_field as zxField,
+      b.zx_date as zxDate,
+      b.invite_code as inviteCode,
+      a.user_id as userId,
+      a.head_image as headImage
+      from shop_zx b left join user_info a ON a.invite_code=b.invite_code
+      order by zx_id desc limit #{pageNum},#{pageSize}
+    </select>
 
 </mapper>
\ No newline at end of file

wisenergy-model/src/main/java/cn/wisenergy/model/app/zxUserVo.java

+package cn.wisenergy.model.app;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 用于存放返回后台页面数据的类
+ * Created by m1991 on 2021/3/22 11:06
+ */
+@Data
+public class zxUserVo {
+    /**
+     * 手机号作为用户账号
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(name = "user_id", value = "用户id")
+    private String userId;
+
+    /**
+     * 资讯主键id
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(name = "zx_id", value = "资讯主键id")
+    private Integer zxid;
+    /**
+     * 视频存放地址
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(name = "zx_url", value = "视频/图片存放地址")
+    private String zxUrl;
+    /**
+     * 用户本人邀请码
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(name = "invite_code", value = "用户本人邀请码")
+    private String inviteCode;
+    /**
+     * 获赞数
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(name = "zx_likes", value = "获赞数")
+    private Integer zxLikes;
+
+    @ApiModelProperty(name = "liked_status", value = "点赞状态")
+    private Integer likedStatus;
+
+    /**
+     * 资讯文字输入字段
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(name = "zx_field", value = "资讯文字输入字段")
+    private String zxField;
+
+    /**
+     * 资讯数据创建时间
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(name = "zx_date", value = "资讯数据创建时间")
+    private Long zxDate;
+
+
+
+
+}

wisenergy-service/src/main/java/cn/wisenergy/service/app/UploadService.java

 package cn.wisenergy.service.app;
 
 
+import cn.wisenergy.model.app.shopZx;
+import cn.wisenergy.model.app.zxUserVo;
 import org.springframework.core.io.Resource;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -43,13 +46,21 @@ public interface UploadService {
 
 
     /**
-     * TODO 资讯信息展示
+     * TODO 资讯已审核信息展示
      * @param pageNum
      * @param pageSize
      * @return
      */
     Map selectPage(Integer pageNum, Integer pageSize,String inviteCode);
 
+    /**
+     * TODO 资讯单表分页全部信息展示
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    List<zxUserVo> selectAll(Integer pageNum, Integer pageSize);
+
     /**
      * TODO 资讯点赞
      * @param zxid

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UploadServiceImpl.java

@@ -5,10 +5,7 @@ import cn.wisenergy.common.utils.*;
 
 import cn.wisenergy.mapper.UsersMapper;
 import cn.wisenergy.mapper.userLikesMapper;
-import cn.wisenergy.model.app.User;
-import cn.wisenergy.model.app.shopZx;
-import cn.wisenergy.model.app.userLikes;
-import cn.wisenergy.model.app.zxUserDto;
+import cn.wisenergy.model.app.*;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
 import org.springframework.stereotype.Service;
@@ -356,6 +353,12 @@ public class UploadServiceImpl implements UploadService {
         return map;
     }
 
+    @Override
+    public List<zxUserVo> selectAll(Integer pageNum, Integer pageSize) {
+
+        return shopZxMapper.selectAll(pageNum,pageSize);
+    }
+
     /**
      * 资讯点赞实现
      *

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UploadController.java

 package cn.wisenergy.web.admin.controller.app;
 
+import cn.wisenergy.model.app.shopZx;
+import cn.wisenergy.model.app.zxUserVo;
 import cn.wisenergy.service.app.UploadService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -13,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 import java.util.Map;
 
 
@@ -95,11 +98,12 @@ public class UploadController {
     }
 
     /**
-     * 资讯展示
+     *  TODO 资讯展示
      * @param pageNum
      * @param pageSize
      * @return
      */
+    @ApiOperation(value = "用户发布已审核资讯信息倒叙展示", notes = "倒叙展示", httpMethod = "POST", produces = "application/json; charset=UTF-8")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "从几开始", required = true,dataType = "integer"),
             @ApiImplicitParam(name = "inviteCode", value = "用户本人邀请码（发布人）", required = false, dataType = "String"),
@@ -111,24 +115,37 @@ public class UploadController {
     }
 
     /**
-     * 点赞接口
+     *  TODO 点赞接口
      */
+    @ApiOperation(value = "用户发布资讯信息点赞接口", notes = "点赞接口", httpMethod = "POST", produces = "application/json; charset=UTF-8")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "zxid", value = "资讯ID", required = true,dataType = "integer"),
             @ApiImplicitParam(name = "inviteCode", value = "用户本人邀请码（发布人）", required = true, dataType = "String")})
     @RequestMapping(method = RequestMethod.POST, value = "/thumbUp")
     public Map like(int zxid,String inviteCode){
-
         return uploadService.Ilike(zxid,inviteCode);
     }
 
     /**
-     * 审核接口
+     *  TODO 审核接口
      */
+    @ApiOperation(value = "用户发布资讯信息审核接口", notes = "审核接口",produces = "application/json; charset=UTF-8")
     @ApiImplicitParam(name = "zxid", value = "资讯ID", required = true,dataType = "integer")
     @RequestMapping(method = RequestMethod.POST, value = "/toExamine")
     public Map ToExamine(int zxid){
 
         return uploadService.toExamine(zxid);
     }
+
+    /**
+     *  TODO 查询资讯单表全部数据的API
+     */
+    @ApiOperation(value = "查询资讯单表全部数据的API", notes = "单表全部数据的API")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "从几开始", required = true,dataType = "int"),
+            @ApiImplicitParam(name = "pageSize", value = "一页展示数量", required = true, dataType = "int")})
+    @RequestMapping(method = RequestMethod.GET, value = "/shopzxAll")
+    public List<zxUserVo> shopzxAll(Integer pageNum, Integer pageSize){
+        return uploadService.selectAll(pageNum,pageSize);
+    }
 }
\ No newline at end of file