yt_platform_user 去掉多余字段

yt-agent/agent-service/src/main/resources/mapper/AgentUserMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="getCurrentUserInfo" resultType="com.ytpm.agent.view.AgentUserInfo">
         select
-            user_id, nick_name, head_image, login_name, encrypt_pwd, salt, phone, last_login_time, last_login_ip, phone_brand, phone_model, account_status, channel_id, user_type, login_days, total_income, app_id, registry_time, transfer_amount
+            user_id, nick_name, head_image, login_name, encrypt_pwd, salt, phone, last_login_time, account_status,  user_type, registry_time
         from yt_platform_user
         where account_status = 1
         and login_name = #{loginName}

yt-common/src/main/java/com/ytpm/middle/model/YtMiddleUser.java

@@ -0,0 +1,74 @@
+package com.ytpm.middle.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("易推ADS用户信息")
+public class YtMiddleUser {
+    /** 用户ID */
+    @ApiModelProperty(value = "用户ID")
+    private String userId;
+    /** 用户昵称 */
+    @ApiModelProperty(value = "用户昵称")
+    private String nickName;
+    /** 登录用户名 */
+    @ApiModelProperty(value = "登录用户名")
+    private String loginName;
+    /** 头像 */
+    @ApiModelProperty(value = "头像")
+    private String headImage;
+    /** 加密密码 */
+    @ApiModelProperty(value = "", hidden = true)
+    private String encryptPwd;
+    /** 盐 */
+    @ApiModelProperty(value = "",hidden = true)
+    private String salt;
+    /** 手机号 */
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+    /** 最新登录时间 */
+    @ApiModelProperty(value = "最新登录时间")
+    private Date lastLoginTime;
+    /** 最新登录IP */
+    @ApiModelProperty(value = "最新登录IP")
+    private String lastLoginIp;
+    /** 手机品牌 */
+    @ApiModelProperty(value = "",hidden = true)
+    private String phoneBrand;
+    /** 手机型号 */
+    @ApiModelProperty(value = "手机型号",hidden = true)
+    private String phoneModel;
+    /** 账户状态 */
+    @ApiModelProperty(value = "账户状态")
+    private Integer accountStatus;
+    /** 渠道ID */
+    @ApiModelProperty(value = "渠道ID")
+    private String channelId;
+    /** 用户类型 */
+    @ApiModelProperty(value = "用户类型")
+    private Integer userType;
+    /** 登录天数 */
+    @ApiModelProperty(value = "登录天数")
+    private Integer loginDays;
+    /** 总收入 */
+    @ApiModelProperty(value = "总收入",hidden = true)
+    private BigDecimal totalIncome;
+    /** 所属应用ID */
+    @ApiModelProperty(value = "所属应用ID")
+    private String appId;
+    /** 注册时间 */
+    @ApiModelProperty(value = "注册时间")
+    private Date registryTime;
+    /** 提现金额 */
+    @ApiModelProperty(value = "提现金额",hidden = true)
+    private BigDecimal transferAmount;
+}

yt-common/src/main/java/com/ytpm/middle/param/MiddleUserListParam.java

@@ -0,0 +1,26 @@
+package com.ytpm.middle.param;
+
+import com.ytpm.general.BaseParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("用户列表过滤")
+public class MiddleUserListParam extends BaseParam {
+
+    @ApiModelProperty("手机号")
+    private String phone;
+    @ApiModelProperty("用户昵称")
+    private String nickName;
+    @ApiModelProperty("登录用户名")
+    private String loginName;
+    @ApiModelProperty("账户状态")
+    private Integer accountStatus;
+}

yt-common/src/main/java/com/ytpm/middle/param/MiddleUserParam.java

@@ -0,0 +1,42 @@
+package com.ytpm.middle.param;
+
+import com.ytpm.middle.view.MiddleRoleVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("ADS用户表单")
+public class MiddleUserParam extends MiddleUserListParam{
+    @ApiModelProperty(value = "用户ID",required = false)
+    private String userId;
+    @ApiModelProperty(value = "用户昵称",required = true)
+    private String nickName;
+    @ApiModelProperty(value = "头像",required = false)
+    private String headImage;
+    @ApiModelProperty(value = "登录用户名",required = true)
+    private String loginName;
+    @ApiModelProperty(value = "手机号",required = true)
+    private String phone;
+    @ApiModelProperty(value = "最新登录时间")
+    private Date lastLoginTime;
+    @ApiModelProperty(value = "最新登录IP")
+    private String lastLoginIp;
+    @ApiModelProperty(value = "账户状态", hidden = true)
+    private Integer accountStatus;
+    @ApiModelProperty(value = "所属部门ID",required = true)
+    private Integer deptId;
+    @ApiModelProperty(value = "密码",required = true)
+    private String password;
+    @ApiModelProperty(value = "角色列表",required = false)
+    private List<MiddleRoleVO> roleList;
+}

yt-common/src/main/java/com/ytpm/middle/view/MiddleUserInfo.java

@@ -33,8 +33,8 @@ public class MiddleUserInfo {
     private String phone;
     @ApiModelProperty("最新登录时间")
     private Date lastLoginTime;
-    @ApiModelProperty("最新登录IP")
-    private String lastLoginIp;
+    @ApiModelProperty("账户状态")
+    private Integer accountStatus;
     @ApiModelProperty("角色列表")
     private List<MiddleRoleVO> roleList;
 

yt-common/src/main/java/com/ytpm/oauth/model/YtPlatformUser.java

@@ -16,6 +16,7 @@ import java.util.Date;
 @AllArgsConstructor
 public class YtPlatformUser implements UserDetails {
     private String userId;
+    private Integer deptId;
     private String nickName;
     private String loginName;
     private String headImage;
@@ -23,17 +24,9 @@ public class YtPlatformUser implements UserDetails {
     private String salt;
     private String phone;
     private Date lastLoginTime;
-    private String lastLoginIp;
-    private String phoneBrand;
-    private String phoneModel;
     private Integer accountStatus;
-    private String channelId;
     private Integer userType;
-    private Integer loginDays;
-    private BigDecimal totalIncome;
-    private String appId;
     private Date registryTime;
-    private BigDecimal transferAmount;
 
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {

yt-middle/middle-platform/src/main/java/com/ytpm/middle/controller/UserController.java

@@ -0,0 +1,39 @@
+package com.ytpm.middle.controller;
+
+import com.ytpm.general.Result;
+import com.ytpm.general.ResultTable;
+import com.ytpm.middle.param.MiddleUserListParam;
+import com.ytpm.middle.param.MiddleUserParam;
+import com.ytpm.middle.service.UserService;
+import com.ytpm.middle.view.MiddleUserInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RequestMapping("/user")
+@RestController
+@Api(tags = "用户管理模块")
+public class UserController {
+
+    @Resource
+    private UserService userService;
+
+
+    @ApiOperation("查询系统用户列表")
+    @PostMapping("/queryList")
+    public ResultTable<MiddleUserInfo> queryList(@RequestBody MiddleUserListParam param) {
+        return userService.queryList(param);
+    }
+
+    @ApiOperation("新增用户")
+    @PostMapping("/addOne")
+    public Result<MiddleUserParam> addOne(@RequestBody MiddleUserParam param) {
+        return userService.addOne(param);
+    }
+
+}

yt-middle/middle-platform/src/main/java/com/ytpm/middle/dao/MiddleUserMapper.java

@@ -1,7 +1,9 @@
 package com.ytpm.middle.dao;
 
+import com.ytpm.middle.param.MiddleUserListParam;
 import com.ytpm.middle.view.MiddleRoleVO;
 import com.ytpm.middle.view.MiddleUserInfo;
+import com.ytpm.oauth.model.YtPlatformUser;
 import org.apache.ibatis.annotations.Param;
 import org.mapstruct.Mapper;
 
@@ -14,8 +16,28 @@ public interface MiddleUserMapper {
      */
     MiddleUserInfo getByLoginName(@Param("userName") String userName);
 
+    /**
+     * 手机号查询用户
+     */
+    MiddleUserInfo getByPhone(@Param("phone") String phone);
+
     /**
      * 根据用户ID查询用户角色
      */
     List<MiddleRoleVO> getRoleList(@Param("userId") String userId);
+
+    /**
+     * 查询用户列表
+     */
+    List<MiddleUserInfo> queryList(MiddleUserListParam param);
+
+    /**
+     * 新增用户
+     */
+    void insertOne(YtPlatformUser user);
+
+    /**
+     * 修改用户
+     */
+    void updateById(YtPlatformUser user);
 }

yt-middle/middle-platform/src/main/java/com/ytpm/middle/service/UserService.java

@@ -0,0 +1,19 @@
+package com.ytpm.middle.service;
+
+import com.ytpm.general.Result;
+import com.ytpm.general.ResultTable;
+import com.ytpm.middle.param.MiddleUserListParam;
+import com.ytpm.middle.param.MiddleUserParam;
+import com.ytpm.middle.view.MiddleUserInfo;
+
+public interface UserService {
+    /**
+     * 查询用户列表
+     */
+    ResultTable<MiddleUserInfo> queryList(MiddleUserListParam param);
+
+    /**
+     * 新增用户
+     */
+    Result<MiddleUserParam> addOne(MiddleUserParam param);
+}

yt-middle/middle-platform/src/main/java/com/ytpm/middle/service/impl/UserServiceImpl.java

@@ -0,0 +1,56 @@
+package com.ytpm.middle.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.ytpm.general.RepMessage;
+import com.ytpm.general.Result;
+import com.ytpm.general.ResultTable;
+import com.ytpm.middle.dao.MiddleUserMapper;
+import com.ytpm.middle.param.MiddleUserListParam;
+import com.ytpm.middle.param.MiddleUserParam;
+import com.ytpm.middle.service.UserService;
+import com.ytpm.middle.view.MiddleUserInfo;
+import com.ytpm.oauth.model.YtPlatformUser;
+import com.ytpm.util.IDUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.Objects;
+
+@Service
+public class UserServiceImpl implements UserService {
+
+    @Resource
+    private MiddleUserMapper userMapper;
+
+    /**
+     * 查询用户列表
+     */
+    @Override
+    public ResultTable<MiddleUserInfo> queryList(MiddleUserListParam param) {
+        PageHelper.startPage(param.getPage(), param.getLimit());
+        return ResultTable.resultTableOk(new PageInfo<>(userMapper.queryList(param)));
+    }
+
+    /**
+     * 新增用户
+     */
+    @Override
+    public Result<MiddleUserParam> addOne(MiddleUserParam param) {
+        MiddleUserInfo byPhone = userMapper.getByPhone(param.getPhone());
+        if(Objects.nonNull(byPhone)){
+            return Result.resultErr(RepMessage.OBJECT_ALREADY_EXIST);
+        }
+        //新增用户角色信息
+        YtPlatformUser user = new YtPlatformUser();
+        BeanUtils.copyProperties(param, user);
+        user.setUserId(IDUtil.generateFlowID("middle_"));
+        user.setUserType(99);
+        user.setRegistryTime(new Date());
+        userMapper.insertOne(user);
+        //新增用户信息
+        return null;
+    }
+}

yt-middle/middle-platform/src/main/resources/mapper/AgentMapper.xml

@@ -12,17 +12,9 @@
          salt,
          phone,
          last_login_time,
-         last_login_ip,
-         phone_brand,
-         phone_model,
          account_status,
-         channel_id,
          user_type,
-         login_days,
-         total_income,
-         app_id,
-         registry_time,
-         transfer_amount
+         registry_time
         )
         values
         (
@@ -34,17 +26,9 @@
          #{salt},
          #{phone},
          #{lastLoginTime},
-         #{lastLoginIp},
-         #{phoneBrand},
-         #{phoneModel},
          #{accountStatus},
-         #{channelId},
          #{userType},
-         #{loginDays},
-         #{totalIncome},
-         #{appId},
-         #{registryTime},
-         #{transferAmount}
+         #{registryTime}
         );
     </insert>
     <update id="resetPwd">

yt-middle/middle-platform/src/main/resources/mapper/MiddleUserMapper.xml

@@ -1,12 +1,43 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ytpm.middle.dao.MiddleUserMapper">
+    <insert id="insertOne">
+        INSERT INTO yt_platform_user (
+            user_id,
+            nick_name,
+            head_image,
+            login_name,
+            encrypt_pwd,
+            salt,
+            phone,
+            last_login_time,
+            account_status,
+            user_type,
+            registry_time,
+            dept_id
+        )
+        VALUES
+        (
+            #{userId},
+            #{nickName},
+            #{headImage},
+            #{loginName},
+            #{encryptPwd},
+            #{salt},
+            #{phone},
+            #{lastLoginTime},
+            #{accountStatus},
+            #{userType},
+            #{registryTime},
+            #{deptId}
+        );
+    </insert>
 
     <select id="getByLoginName" resultType="com.ytpm.middle.view.MiddleUserInfo">
         select
-            user_id, nick_name, head_image, login_name, encrypt_pwd, salt, phone, last_login_time, last_login_ip, phone_brand, phone_model, account_status, channel_id, user_type, login_days, total_income, app_id, registry_time, transfer_amount
+            user_id, nick_name, head_image, login_name, encrypt_pwd, salt, phone, last_login_time,  account_status,  user_type, registry_time
         from yt_platform_user
-        where login_name = #{userName}
+        where user_type = 99 and login_name = #{userName}
     </select>
     <select id="getRoleList" resultType="com.ytpm.middle.view.MiddleRoleVO">
         select
@@ -18,4 +49,52 @@
         join yt_middle_role ymr on ymur.role_id = ymr.role_id
         where ymur.user_id = #{userId}
     </select>
+    <resultMap id="MiddleUserMap" type="com.ytpm.middle.view.MiddleUserInfo">
+        <id column="user_id" property="userId" />
+        <result column="" property="nickName" />
+        <result column="" property="headImage" />
+        <result column="" property="loginName" />
+        <result column="" property="phone" />
+        <result column="" property="lastLoginTime" />
+        <collection property="roleList" ofType="com.ytpm.middle.view.MiddleRoleVO">
+            <id column="role_id" property="roleId" />
+            <result column="roleName" property="roleName" />
+        </collection>
+    </resultMap>
+    <select id="queryList" resultMap="MiddleUserMap">
+        select
+            ypu.user_id,
+            ypu.dept_id,
+            ymd.dept_id,
+            ymur.role_id,
+            (select role_name from yt_middle_role where role_id = ymur.role_id) roleName,
+            ypu.nick_name,
+            ypu.head_image,
+            ypu.login_name,
+            ypu.phone,
+            ypu.last_login_time,
+            ypu.last_login_ip
+        from yt_platform_user ypu
+        left join yt_middle_user_role ymur on ypu.user_id = ymur.user_id
+        left join yt_middle_dept ymd on ypu.dept_id = ymd.dept_id
+        where ypu.user_type = 99
+        <if test=" nickName!= null and nickName!= ''">
+            and ypu.nick_name like concat('%', #{nickName} ,'%')
+        </if>
+        <if test="loginName != null and loginName!= ''">
+            and ypu.login_name like concat('%', #{loginName} ,'%')
+        </if>
+        <if test="phone != null and phone!= ''">
+            and ypu.phone like concat('%', #{phone} ,'%')
+        </if>
+        <if test="accountStatus != null">
+            and ypu.account_status = #{accountStatus}
+        </if>
+    </select>
+    <select id="getByPhone" resultType="com.ytpm.middle.view.MiddleUserInfo">
+        select
+            user_id, nick_name, head_image, login_name, encrypt_pwd, salt, phone, last_login_time,  account_status,  user_type,  registry_time
+        from yt_platform_user
+        where user_type = 99 and account_status = 1 and phone = #{phone}
+    </select>
 </mapper>

yt-oauth/oauth-service/src/main/resources/mapper/YtPlatformUserMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="selectByLoginName" resultType="com.ytpm.oauth.model.YtPlatformUser">
         select
-            user_id, nick_name, head_image, login_name, encrypt_pwd, salt, phone, last_login_time, last_login_ip, phone_brand, phone_model, account_status, channel_id, user_type, login_days, total_income, app_id, registry_time, transfer_amount
+            user_id, nick_name, head_image, login_name, encrypt_pwd, salt, phone, last_login_time,  account_status,  user_type, registry_time
         from yt_platform_user
         where account_status = 1 and login_name = #{loginName}
     </select>

yt-risk/risk-manage/src/main/resources/mapper/AgentUserMapper.xml

@@ -7,6 +7,7 @@
             user_id, nick_name, head_image, login_name, encrypt_pwd, salt, phone, last_login_time, last_login_ip, phone_brand, phone_model, account_status, channel_id, user_type, login_days, total_income, app_id, registry_time, transfer_amount
         from yt_platform_user
         where account_status = 1
+        and user_type in (1,2,99)
         and login_name = #{loginName}
     </select>
 </mapper>