资讯模块——邀请码过滤特殊字符功能功能修复

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

@@ -236,4 +236,11 @@ public interface UsersMapper extends BaseMapper<User> {
      */
     User getUserByUserId(String userId);
 
+    /**
+     * 分页查询所有用户信息
+     * @param map
+     * @return
+     */
+    List<User> getUserList(Map<String, Object> map);
+
 }

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

@@ -438,4 +438,32 @@
         user_id = #{userId}
     </select>
 
+    <select id="getUserList" resultType="cn.wisenergy.model.app.User">
+        select
+        <include refid="cols_all"/>
+        from
+        <include refid="table"/>
+        <where>
+            <if test="userId != null and userId != ''">
+                user_id = #{userId}
+            </if>
+        </where>
+        order by create_time desc
+        limit #{startNum},#{endNum}
+    </select>
+
+    <select id="count" resultType="java.lang.Integer">
+        select count(1)
+        from
+        <include refid="table"/>
+        <where>
+            <if test="userId != null and userId != ''">
+                user_id=#{userId}
+            </if>
+            <if test="queryTime != null and queryTime != ''">
+                and `year_month` = #{queryTime}
+            </if>
+        </where>
+    </select>
+
 </mapper>

wisenergy-model/src/main/java/cn/wisenergy/model/dto/UserDto.java

+package cn.wisenergy.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Created by m1991 on 2021/3/25 11:16
+ */
+@Data
+@ApiModel("UserDto")
+public class UserDto {
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id", name = "userId")
+    private String userId;
+
+    /**
+     * 查询时间 格式(yyyy-MM-dd)
+     */
+    @ApiModelProperty(value = "查询时间 格式(yyyy-MM-dd)", name = "queryTime")
+    private String queryTime;
+
+    /**
+     * 页码
+     */
+    @ApiModelProperty(value = "页码", name = "pageNo")
+    private Integer pageNo;
+
+    /**
+     * 页条数
+     */
+    @ApiModelProperty(value = "页条数", name = "pageSize")
+    private Integer pageSize;
+
+
+    private Integer startNum;
+
+    private Integer endNum;
+}

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

@@ -3,8 +3,9 @@ package cn.wisenergy.service.app;
 import cn.wisenergy.common.utils.R;
 import cn.wisenergy.model.app.User;
 import cn.wisenergy.model.app.UsersDto;
+import cn.wisenergy.model.dto.TeamQueryDto;
 import cn.wisenergy.model.vo.AerialDeliveryVo;
-import cn.wisenergy.model.vo.UserRegisterVo;
+import com.github.pagehelper.PageInfo;
 
 import java.util.Map;
 
@@ -96,4 +97,12 @@ public interface UserService {
      */
     R<Boolean> fillInInviteCode(String userId, String inviteCode);
 
+    /**
+     * 分页查询所有用户信息
+     *
+     * @param queryDto 查询参数
+     * @return 列表
+     */
+    R<PageInfo<User>> getUserList(TeamQueryDto queryDto);
+
 }

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

 package cn.wisenergy.service.app.impl;
 
+import cn.wisenergy.common.constant.CommonAttributes;
 import cn.wisenergy.common.utils.*;
 import cn.wisenergy.mapper.*;
 import cn.wisenergy.model.app.*;
 import cn.wisenergy.model.app.UsersDto;
+import cn.wisenergy.model.dto.TeamQueryDto;
 import cn.wisenergy.model.vo.AerialDeliveryVo;
 import cn.wisenergy.model.vo.UserPoolVo;
 import cn.wisenergy.service.Manager.RegistUserMoudleInitManager;
 import cn.wisenergy.service.app.AerialDeliveryUserService;
-import cn.wisenergy.service.app.UserLevelService;
 import cn.wisenergy.service.app.UserService;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.Data;
+import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.aspectj.weaver.ast.Var;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -375,4 +371,59 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         }
         return succ;
     }
+
+    /**
+     * 用户分页查询
+     * @param queryDto 查询参数
+     * @return
+     */
+    @Override
+    public R<PageInfo<User>> getUserList(TeamQueryDto queryDto) {
+        log.info("shop-mall[]UserServiceImpl[]getList[]input.param.query:" + queryDto);
+        if (null == queryDto) {
+            return R.error("入参不能为空!");
+        }
+        pageHandle(queryDto);
+        Map<String, Object> map = new HashMap<>(8);
+
+        map.put("userId", queryDto.getUserId());
+        if (!StringUtils.isBlank(queryDto.getQueryTime())) {
+            Date date = DateUtil.convertStrToDate(queryDto.getQueryTime(), "yyyy-MM-dd");
+            map.put("queryTime", date);
+        }
+
+
+        map.put("startNum", queryDto.getStartNum());
+        map.put("endNum", queryDto.getEndNum());
+        List<User> list = usersMapper.getList(map);
+        PageInfo<User> info = new PageInfo<>();
+        info.setPageSize(queryDto.getPageSize());
+        info.setPageNum(queryDto.getPageNo());
+        info.setList(list);
+
+        return R.ok(info);
+    }
+
+    /**
+     * 分页处理方法
+     *
+     * @param schemeVo 参数
+     */
+    private void pageHandle(TeamQueryDto schemeVo) {
+        Integer pageNum = schemeVo.getPageNo();
+        Integer pageSize = schemeVo.getPageSize();
+        if (null == pageSize || pageSize == 0) {
+            pageSize = 10;
+        }
+        if (null == pageNum || pageNum == 0) {
+            pageNum = 1;
+        }
+        Integer endNum = pageSize;
+        Integer startNum = (pageNum - CommonAttributes.NUM_ONE) * pageSize;
+        schemeVo.setEndNum(endNum);
+        schemeVo.setStartNum(startNum);
+        schemeVo.setPageNo(pageNum);
+        schemeVo.setPageSize(pageSize);
+    }
+
 }

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

@@ -6,6 +6,7 @@ import cn.wisenergy.common.utils.RedisUtils;
 import cn.wisenergy.model.app.RecommendUser;
 import cn.wisenergy.model.app.TeamUserInfo;
 import cn.wisenergy.model.app.User;
+import cn.wisenergy.model.dto.TeamQueryDto;
 import cn.wisenergy.model.vo.AerialDeliveryVo;
 import cn.wisenergy.model.vo.UserAndRecommendVo;
 import cn.wisenergy.service.app.RecommendUserService;
@@ -15,6 +16,7 @@ import cn.wisenergy.service.app.UserService;
 import cn.wisenergy.web.common.BaseController;
 import cn.wisenergy.web.config.JwtConfig;
 import cn.wisenergy.web.shiro.JwtUtil;
+import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -170,4 +172,11 @@ public class UserController extends BaseController {
         return userService.fillInInviteCode(userId, inviteCode);
     }
 
+    @ApiOperation(value = "用户列表", notes = "用户列表", httpMethod = "GET")
+    @ApiImplicitParam(name = "query", value = "查询参数", dataType = "TeamQueryDto")
+    @GetMapping("/queryUserList")
+    public R<PageInfo<User>> queryList(TeamQueryDto queryDto) {
+        log.info("shop-mall[]UserController[]queryList[]input.param.query:" + queryDto);
+        return userService.getUserList(queryDto);
+    }
 }