From 1f390084141f8dc4cee02e232016e52f7d4c9592 Mon Sep 17 00:00:00 2001
From: m1991 <shenglonghua@1rock.net>
Date: Mon, 29 Mar 2021 16:12:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=8E=A5=E5=8F=A3=E2=80=94?=
 =?UTF-8?q?=E2=80=94=E7=94=A8=E6=88=B7=E4=B8=8E=E8=B5=84=E8=AE=AF=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/wisenergy/mapper/ShopZxMapper.java     |  3 +-
 .../main/resources/mapper/ShopZxMapper.xml    |  4 +-
 .../cn/wisenergy/model/dto/ZxUserDto.java     | 71 +++++++++++++++++++
 .../wisenergy/service/app/UploadService.java  |  2 +-
 .../service/app/impl/UploadServiceImpl.java   | 51 ++++++++++++-
 .../controller/app/UploadController.java      |  6 +-
 6 files changed, 127 insertions(+), 10 deletions(-)
 create mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/dto/ZxUserDto.java

diff --git a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/ShopZxMapper.java b/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/ShopZxMapper.java
index 5fd6ace..4241e70 100644
--- a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/ShopZxMapper.java
+++ b/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/ShopZxMapper.java
@@ -2,6 +2,7 @@ package cn.wisenergy.mapper;
 
 
 import cn.wisenergy.model.app.shopZx;
+import cn.wisenergy.model.dto.ZxUserDto;
 import cn.wisenergy.model.vo.ShopZxUserVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -34,7 +35,7 @@ public interface ShopZxMapper extends BaseMapper<shopZx> {
     /**
      * 倒叙查询资讯与用户发布数据
      */
-    List<ShopZxUserVo> selectPage(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
+    List<ZxUserDto> selectPage(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
 //
 //    /**
 //     * 用于查询资讯单表全部信息
diff --git a/wisenergy-mapper/src/main/resources/mapper/ShopZxMapper.xml b/wisenergy-mapper/src/main/resources/mapper/ShopZxMapper.xml
index 28074ba..4054127 100644
--- a/wisenergy-mapper/src/main/resources/mapper/ShopZxMapper.xml
+++ b/wisenergy-mapper/src/main/resources/mapper/ShopZxMapper.xml
@@ -55,7 +55,8 @@
 
 
     <!--资讯内容倒叙查询-->
-    <select id="selectPage" parameterType="java.lang.Integer" resultType="cn.wisenergy.model.vo.UserVo">
+    <!--资讯内容倒叙查询-->
+    <select id="selectPage" parameterType="java.lang.Integer" resultType="cn.wisenergy.model.dto.ZxUserDto">
        select
       b.zx_id as zxid,
       b.zx_url as zxUrl,
@@ -68,7 +69,6 @@
       from shop_zx b left join user_info a ON a.invite_code=b.invite_code
       WHERE zx_to_examine != 0
       AND a.user_id !=0
-      and  a.user_id !=null
       order by zxid desc limit #{pageNum},#{pageSize}
     </select>
     <!--资讯总记录数查询-->
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/dto/ZxUserDto.java b/wisenergy-model/src/main/java/cn/wisenergy/model/dto/ZxUserDto.java
new file mode 100644
index 0000000..c97d874
--- /dev/null
+++ b/wisenergy-model/src/main/java/cn/wisenergy/model/dto/ZxUserDto.java
@@ -0,0 +1,71 @@
+package cn.wisenergy.model.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+/**
+ * Created by m1991 on 2021/3/29 15:38
+ */
+@Data
+public class ZxUserDto {
+    /**
+     * 手机号作为用户账号
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(name = "user_id", value = "用户id")
+    private String userId;
+    /*
+     * 用户头像
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(name = "headImage", value = "用户头像")
+    private String headImage;
+    /**
+     * 资讯主键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;
+
+
+
+    @TableField(exist = false)
+    private List<String> askImgList;
+}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/UploadService.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/UploadService.java
index e8b2d12..ff08d0f 100644
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/UploadService.java
+++ b/wisenergy-service/src/main/java/cn/wisenergy/service/app/UploadService.java
@@ -52,7 +52,7 @@ public interface UploadService {
      * @param pageSize
      * @return
      */
-    Map selectPage(Integer pageNum, Integer pageSize,String inviteCode);
+    Map selectPage(int pageNum, int pageSize,String inviteCode);
 
     /**
      * TODO 资讯单表分页全部信息展示
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UploadServiceImpl.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UploadServiceImpl.java
index eff0746..6a924dd 100644
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UploadServiceImpl.java
+++ b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UploadServiceImpl.java
@@ -10,6 +10,7 @@ import cn.wisenergy.mapper.UsersMapper;
 import cn.wisenergy.mapper.userLikesMapper;
 import cn.wisenergy.model.app.*;
 import cn.wisenergy.model.dto.ShopZxUserDto;
+import cn.wisenergy.model.dto.ZxUserDto;
 import cn.wisenergy.model.vo.ShopZxUserVo;
 import com.github.pagehelper.PageInfo;
 import org.springframework.core.io.Resource;
@@ -334,12 +335,12 @@ public class UploadServiceImpl implements UploadService {
      * 资讯文件展示
      */
     @Override
-    public Map selectPage(Integer pageNum, Integer pageSize, String inviteCode) {
+    public Map selectPage(int pageNum, int pageSize, String inviteCode) {
         Map map = new HashMap();
         pageNum = pageNum - 1;
-        List<ShopZxUserVo> shopZxList = shopZxMapper.selectPage(pageNum, pageSize);
+        List<ZxUserDto> shopZxList = shopZxMapper.selectPage(pageNum, pageSize);
 
-        for (ShopZxUserVo shopZx : shopZxList) {
+        for (ZxUserDto shopZx : shopZxList) {
             String[] zxUrl = shopZx.getZxUrl().split(",");
             ArrayList list = new ArrayList();
             if (null != zxUrl) {
@@ -377,6 +378,50 @@ public class UploadServiceImpl implements UploadService {
         map.put("data", shopZxList);
         return map;
     }
+//    @Override
+//    public Map selectPage(int pageNum, int pageSize, String inviteCode) {
+//        Map map = new HashMap();
+//        pageNum = pageNum - 1;
+//        List<ZxUserDto> shopZxList = shopZxMapper.selectPage(pageNum,pageSize);
+//
+//        for (ZxUserDto shopZx : shopZxList) {
+//            String[] zxUrl = shopZx.getZxUrl().split(",");
+//            ArrayList list = new ArrayList();
+//            if (null != zxUrl) {
+//                for (String split : zxUrl) {
+//                    boolean arrayList = Collections.addAll(list, split);
+//                    shopZx.setAskImgList(list);
+//                }
+//            }
+//
+//            int likedId = shopZx.getZxid();
+//            if (shopZx.getUserId() == null && "" != shopZx.getUserId()) {
+//                map.put("code", 1);
+//                map.put("msg", "用户不存在！请重新开始！");
+//                return map;
+//            }
+//            shopZx.setUserId(shopZx.getUserId().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
+//
+//            if (null != inviteCode && "" != inviteCode) {
+//                //用户个人邀请码查询用户数据
+//                User user = usersMapper.InvitedCode2(inviteCode);
+//                String userLikeId = user.getUserId();
+//                if (null == userLikeId) {
+//                    map.put("code", 1);
+//                    map.put("msg", "用户不存在,请重新登陆!");
+//                    return map;
+//                }
+//                userLikes d = LikesMapper.selectlikes(userLikeId, likedId);
+//                if (null == d) {
+//                    shopZx.setLikedStatus(0);
+//                } else {
+//                    shopZx.setLikedStatus(1);
+//                }
+//            }
+//        }
+//        map.put("data", shopZxList);
+//        return map;
+//    }
 
     @Override
     public R<PageInfo<ShopZxUserVo>> getShopZxUserList(ShopZxUserDto shopZxUserDto) {
diff --git a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UploadController.java b/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UploadController.java
index d3646b1..e2bfb2c 100644
--- a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UploadController.java
+++ b/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UploadController.java
@@ -102,11 +102,11 @@ public class UploadController {
      * @param pageSize
      * @return
      */
-    @ApiOperation(value = "用户发布已审核资讯信息倒叙展示", notes = "倒叙展示", httpMethod = "POST", produces = "application/json; charset=UTF-8")
+    @ApiOperation(value = "用户发布已审核资讯信息倒叙展示", notes = "倒叙展示", httpMethod = "GET", produces = "application/json; charset=UTF-8")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "从几开始", required = true,dataType = "integer"),
+            @ApiImplicitParam(name = "pageNum", value = "从几开始", required = true,dataType = "Integer"),
             @ApiImplicitParam(name = "inviteCode", value = "用户本人邀请码（发布人）", required = false, dataType = "String"),
-            @ApiImplicitParam(name = "pageSize", value = "一页展示数量", required = true, dataType = "Integger")})
+            @ApiImplicitParam(name = "pageSize", value = "一页展示数量", required = true, dataType = "Integer")})
     @RequestMapping(method = RequestMethod.GET, value = "/zxAll")
     public Map selectPage(int pageNum, int pageSize,String inviteCode){
 
-- 
2.18.1