资讯模块数据——视频功能修复

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

@@ -2,11 +2,11 @@ package cn.wisenergy.mapper;
 
 
 import cn.wisenergy.model.app.shopZx;
+import cn.wisenergy.model.app.zxUserDto;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.math.BigInteger;
 import java.util.List;
 
 
@@ -26,5 +26,5 @@ public interface ShopZxMapper extends BaseMapper<shopZx> {
     /**
      * 查询资讯数据
      */
-    List<shopZx> selectPage(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
+    List<zxUserDto> selectPage(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
 }

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

@@ -145,4 +145,11 @@ public interface UsersMapper extends BaseMapper<User> {
      * @return 等级用户列表
      */
     List<User> getByLevel(@Param("userLevel") Integer userLevel);
+
+    /**
+     *
+     * @param
+     * @return
+     */
+    User biInvitedCode1(@Param("inviteCode") String inviteCode);
 }

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

@@ -38,7 +38,7 @@
     </insert>
 
     <!--资讯内容倒叙查询-->
-    <select id="selectPage" parameterType="java.lang.Integer" resultType="cn.wisenergy.model.app.shopZx">
+    <select id="selectPage" parameterType="java.lang.Integer" resultType="cn.wisenergy.model.app.zxUserDto">
       select
       b.zx_id as zxid,
       b.zx_url as zxUrl,
@@ -50,7 +50,7 @@
       a.user_id as userId,
       a.head_image as headImage
       from shop_zx b inner join user_info a ON a.invite_code=b.invite_code
-      WHERE zx_to_examine!=0
+      WHERE zx_to_examine != 1
       order by zxid desc limit #{pageNum},#{pageSize}
     </select>
 

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

 package cn.wisenergy.service.app;
 
 
-import cn.wisenergy.model.app.shopZx;
 import org.springframework.core.io.Resource;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import java.math.BigInteger;
 import java.util.List;
 import java.util.Map;
 
@@ -53,7 +51,7 @@ public interface UploadService {
      * @param pageSize
      * @return
      */
-    List<shopZx> selectPage(Integer pageNum, Integer pageSize);
+    Map selectPage(Integer pageNum, Integer pageSize);
 
 
 }

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

@@ -2,7 +2,8 @@ package cn.wisenergy.service.app.impl;
 
 import cn.wisenergy.common.utils.*;
 
-import cn.wisenergy.model.app.shopZx;
+import cn.wisenergy.mapper.UsersMapper;
+import cn.wisenergy.model.app.zxUserDto;
 import com.alibaba.fastjson.JSON;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
@@ -38,6 +39,9 @@ public class UploadServiceImpl implements UploadService {
     @Autowired
     private ShopZxMapper shopZxMapper;
 
+    @Autowired
+    private UsersMapper usersMapper;
+
     @Value("${file.upload.path:#{null}}")
     private String path;
 
@@ -266,19 +270,21 @@ public class UploadServiceImpl implements UploadService {
      *  资讯文件展示
      */
     @Override
-    public List selectPage(Integer pageNum, Integer pageSize) {
-        List<shopZx> shopZxList = shopZxMapper.selectPage(pageNum,pageSize);
-        for (shopZx shopZx : shopZxList) {
+    public Map selectPage(Integer pageNum, Integer pageSize) {
+        Map map = new HashMap();
+        List<zxUserDto> shopZxList = shopZxMapper.selectPage(pageNum,pageSize);
+        for (zxUserDto shopZx : shopZxList) {
             String zxUrl = shopZx.getZxUrl();
+            ;
+            shopZx.setUserId(shopZx.getUserId().replaceAll("(\\d{3})\\d{4}(\\d{4})","$1****$2"));
             String[] split = StringUtils.split(zxUrl, ",");
             if (null != split){
                 List<String> strings = Arrays.asList(split);
                 shopZx.setAskImgList(strings);
-
             }
-
-        }
-        return shopZxList;
         }
+        map.put("data",shopZxList);
 
+        return map;
+    }
 }

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

 package cn.wisenergy.web.admin.controller.app;
 
-import cn.wisenergy.common.utils.PageRequest;
-import cn.wisenergy.common.utils.Result;
-import cn.wisenergy.model.app.shopZx;
 import cn.wisenergy.service.app.UploadService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -109,7 +106,8 @@ public class UploadController {
             @ApiImplicitParam(name = "pageNum", value = "从几开始", required = true,dataType = "integer"),
             @ApiImplicitParam(name = "pageSize", value = "一页展示数量", required = true, dataType = "Integger")})
     @RequestMapping(method = RequestMethod.GET, value = "/zxAll")
-    public List<shopZx> selectPage(int pageNum, int pageSize){
+    public Map selectPage(int pageNum, int pageSize){
+
         return uploadService.selectPage(pageNum,pageSize);
     }
 }
\ No newline at end of file