钟来 / Luhui · 提交

转到一个项目

作者 钟来
提交 48d1cd8050e1218f00767a93b7c19809eedd1f2b 1 个父辈 1510f7d8

流水鱼登陆合并整理

内嵌 并排对比
正在显示 11 个修改的文件 包含 311 行增加 和 47 行删除
... ... @@ -24,8 +24,6 @@ public class UserLogin extends BaseEntity
@ApiModelProperty(value="用户主键id")
private Integer userId;
@ApiModelProperty(value="用户主键id")
private String loginName;
/** 用户密码 */
@ApiModelProperty(value="用户密码")
... ... @@ -72,14 +70,6 @@ public class UserLogin extends BaseEntity
return userLoginPassKey;
}
public String getLoginName() {
return loginName;
}
public void setLoginName(String loginName) {
this.loginName = loginName;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
... ...
... ... @@ -18,7 +18,7 @@ public interface UserLoginMapper
* @return 用户登录
*/
public UserLogin selectUserLoginById(Integer id);
public UserLogin selectUserLoginByUserId(Integer userId);
/**
* 查询用户登录列表
*
... ...
... ... @@ -19,6 +19,7 @@ public interface IUserLoginService
*/
public UserLogin selectUserLoginById(Integer id);
public UserLogin selectUserLoginByUserId(Integer userId);
/**
* 查询用户登录列表
*
... ...
... ... @@ -35,6 +35,11 @@ public class UserLoginServiceImpl implements IUserLoginService
return userLoginMapper.selectUserLoginById(id);
}
@Override
public UserLogin selectUserLoginByUserId(Integer userId)
{
return userLoginMapper.selectUserLoginByUserId(userId);
}
@Override
public UserLogin selectUserLoginByLoginName(String loginName)
... ...
... ... @@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="UserBaseInfo" id="UserBaseInfoResult">
<result property="id" column="id" />
<result property="name" column="name" />
<result property="loginName" column="login_name" />
<result property="nickname" column="nickname" />
<result property="gender" column="gender" />
<result property="phone" column="phone" />
... ... @@ -16,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectUserBaseInfoVo">
select id, name, nickname, gender, phone, email, img_url, FROM_UNIXTIME(create_time) AS create_time from user_base_info
select id,login_name, `name`, nickname, gender, phone, email, img_url, FROM_UNIXTIME(create_time) AS create_time from user_base_info
</sql>
<select id="selectUserBaseInfoList" parameterType="UserBaseInfo" resultMap="UserBaseInfoResult">
... ... @@ -40,7 +41,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertUserBaseInfo" parameterType="UserBaseInfo" useGeneratedKeys="true" keyProperty="id">
insert into user_base_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="name != null">name,</if>
<if test="loginName != null">loginName,</if>
<if test="name != null">`name`,</if>
<if test="nickname != null">nickname,</if>
<if test="gender != null">gender,</if>
<if test="phone != null">phone,</if>
... ... @@ -49,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createTime != null">create_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="loginName != null">#{loginName},</if>
<if test="name != null">#{name},</if>
<if test="nickname != null">#{nickname},</if>
<if test="gender != null">#{gender},</if>
... ... @@ -62,7 +65,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updateUserBaseInfo" parameterType="UserBaseInfo">
update user_base_info
<trim prefix="SET" suffixOverrides=",">
<if test="name != null">name = #{name},</if>
<if test="loginName != null">login_name = #{loginName},</if>
<if test="name != null">`name` = #{name},</if>
<if test="nickname != null">nickname = #{nickname},</if>
<if test="gender != null">gender = #{gender},</if>
<if test="phone != null">phone = #{phone},</if>
... ...
... ... @@ -7,13 +7,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="UserLogin" id="UserLoginResult">
<result property="id" column="id" />
<result property="userId" column="user_id" />
<result property="loginName" column="login_name" />
<result property="loginPass" column="login_pass" />
<result property="userLoginPassKey" column="user_login_pass_key" />
</resultMap>
<sql id="selectUserLoginVo">
select id, user_id, login_name, login_pass, user_login_pass_key from user_login
select id, user_id, login_pass, user_login_pass_key from user_login
</sql>
<select id="selectUserLoginList" parameterType="UserLogin" resultMap="UserLoginResult">
... ... @@ -21,7 +20,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="id != null "> and id = #{id}</if>
<if test="userId != null "> and user_id = #{userId}</if>
<if test="loginName != null and loginName != ''"> and login_name like concat('%', #{loginName}, '%')</if>
<if test="loginPass != null and loginPass != ''"> and login_pass = #{loginPass}</if>
<if test="userLoginPassKey != null and userLoginPassKey != ''"> and user_login_pass_key = #{userLoginPassKey}</if>
</where>
... ... @@ -31,7 +29,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
a.id ,
a.user_id ,
a.login_name,
a.login_pass,
a.user_login_pass_key
... ... @@ -39,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN user_base_info b ON a.user_id = b.id
<where>
b.phone = #{loginName}
OR a.login_name = #{loginName}
OR b.login_name = #{loginName}
OR b.email = #{loginName}
</where>
LIMIT 1
... ... @@ -50,17 +47,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id}
</select>
<select id="selectUserLoginByUserId" parameterType="Integer" resultMap="UserLoginResult">
<include refid="selectUserLoginVo"/>
where user_id = #{userId}
</select>
<insert id="insertUserLogin" parameterType="UserLogin" useGeneratedKeys="true" keyProperty="id">
insert into user_login
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="userId != null">user_id,</if>
<if test="loginName != null and loginName != ''">login_name,</if>
<if test="loginPass != null and loginPass != ''">login_pass,</if>
<if test="userLoginPassKey != null and userLoginPassKey != ''">user_login_pass_key,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="userId != null">#{userId},</if>
<if test="loginName != null and loginName != ''">#{loginName},</if>
<if test="loginPass != null and loginPass != ''">#{loginPass},</if>
<if test="userLoginPassKey != null and userLoginPassKey != ''">#{userLoginPassKey},</if>
</trim>
... ... @@ -70,7 +70,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update user_login
<trim prefix="SET" suffixOverrides=",">
<if test="userId != null">user_id = #{userId},</if>
<if test="loginName != null and loginName != ''">login_name = #{loginName},</if>
<if test="loginPass != null and loginPass != ''">login_pass = #{loginPass},</if>
<if test="userLoginPassKey != null and userLoginPassKey != ''">user_login_pass_key = #{userLoginPassKey},</if>
</trim>
... ...
package com.zhonglai.luhui.sys.service.impl;
import com.zhonglai.luhui.dao.service.PublicService;
import com.zhonglai.luhui.dao.service.PublicTemplateService;
import com.zhonglai.luhui.sys.mapper.SysDictDataMapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
* 地区业务
* @author zhonglai
*
*/
@Service("areaService")
public class AreaService {
@Autowired
private PublicService publicService;
public List<Map<String,Object>> getChildrenAddressList(String parentId)
{
String select = "id,name";
String order = "id asc";
String where = "";
if(null==parentId || "0".equals(parentId) || "".equals(parentId)) //查询省
{
where += " and type=0 ";
}else{
if((parentId.length()-12)!=0)
{
parentId = StringUtils.rightPad(parentId,12,'0');
}
if(parentId.substring(2, 4).equals("00")) //查询市
{
where += " and type=1 and id like '"+parentId.substring(0,2)+"%'";
}
else if(parentId.substring(4, 6).equals("00")){ //查询县
where += " and type=2 and id like '"+parentId.substring(0,4)+"%'";
}else if(parentId.substring(6, 8).equals("00")){ //街道
where += " and type=3 and id like '"+parentId.substring(0,6)+"%'";
}else if(parentId.substring(8, 12).equals("0000")){ //居委会
where += " and type=4 and id like '"+parentId.substring(0,8)+"%'";
}
}
return publicService.getObjectListBySQL("select "+select + " from liu_yu_le.sys_area where 1=1 "+where + " order by " + order);
}
}
... ...
package com.zhonglai.luhui.admin.controller.system;
import com.ruoyi.common.core.domain.AjaxResult;
import com.zhonglai.luhui.sys.service.impl.AreaService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@Api(tags = "后台地区选择")
@RequestMapping(value = "/mapper/system/area")
@RestController
public class SysAreaController {
@Autowired
private AreaService sysAreaService;
/**
* 中国id-0
* 根据父类获取子类
* @param parentId
* @return
*/
@ApiOperation("根据父类获取子类")
@RequestMapping(value = "getChildrenAddressList/{parentId}", method = RequestMethod.GET)
public AjaxResult getChildrenAddressList(@PathVariable("parentId") String parentId) {
return AjaxResult.success(sysAreaService.getChildrenAddressList(parentId));
}
}
... ...
package com.zhonglai.luhui.admin.controller.user;
import java.util.List;
import com.ruoyi.common.utils.DESUtil;
import com.ruoyi.common.utils.StringUtils;
import com.zhonglai.luhui.admin.dto.AddAllUserDto;
import com.zhonglai.luhui.datasource.enums.DataSource;
import com.zhonglai.luhui.datasource.enums.DataSourceType;
import javax.servlet.http.HttpServletResponse;
import com.zhonglai.luhui.user.domain.*;
import com.zhonglai.luhui.user.service.IUserBaseInfoService;
import com.zhonglai.luhui.user.service.IUserLoginService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
... ... @@ -23,7 +29,6 @@ import com.zhonglai.luhui.action.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.zhonglai.luhui.dao.service.PublicTemplateService;
import com.zhonglai.luhui.user.domain.UserBaseInfo;
import com.zhonglai.luhui.sys.utils.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
... ... @@ -40,7 +45,9 @@ import com.ruoyi.common.core.page.TableDataInfo;
public class UserBaseInfoController extends BaseController
{
@Autowired
private IUserBaseInfoService publicTemplateService;
private IUserBaseInfoService userBaseInfoService;
@Autowired
private PublicTemplateService publicTemplateService;
@ApiOperation(value ="查询基础用户信息列表",notes="\n" +
"公共参数描述：\n" +
... ... @@ -59,7 +66,7 @@ public class UserBaseInfoController extends BaseController
public TableDataInfo list(UserBaseInfo userBaseInfo)
{
startPage();
List<UserBaseInfo> list = publicTemplateService.selectUserBaseInfoList(userBaseInfo);
List<UserBaseInfo> list = userBaseInfoService.selectUserBaseInfoList(userBaseInfo);
return getDataTable(list);
}
... ... @@ -70,7 +77,7 @@ public class UserBaseInfoController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, UserBaseInfo userBaseInfo)
{
List<UserBaseInfo> list = publicTemplateService.selectUserBaseInfoList(userBaseInfo);
List<UserBaseInfo> list = userBaseInfoService.selectUserBaseInfoList(userBaseInfo);
ExcelUtil<UserBaseInfo> util = new ExcelUtil<UserBaseInfo>(UserBaseInfo.class);
util.exportExcel(response, list, "基础用户信息数据");
}
... ... @@ -81,17 +88,7 @@ public class UserBaseInfoController extends BaseController
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Integer id)
{
return success(publicTemplateService.selectUserBaseInfoById(id));
}
@ApiOperation("新增基础用户信息")
@DataSource(DataSourceType.SLAVE)
@PreAuthorize("@ss.hasPermi('user:base_info:add')")
@Log(title = "基础用户信息", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody UserBaseInfo userBaseInfo)
{
return toAjax(publicTemplateService.insertUserBaseInfo(userBaseInfo));
return success(userBaseInfoService.selectUserBaseInfoById(id));
}
@ApiOperation("修改基础用户信息")
... ... @@ -101,7 +98,7 @@ public class UserBaseInfoController extends BaseController
@PutMapping
public AjaxResult edit(@RequestBody UserBaseInfo userBaseInfo)
{
return toAjax(publicTemplateService.updateUserBaseInfo((userBaseInfo)));
return toAjax(userBaseInfoService.updateUserBaseInfo((userBaseInfo)));
}
@ApiOperation("删除基础用户信息")
... ... @@ -111,6 +108,61 @@ public class UserBaseInfoController extends BaseController
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Integer[] ids)
{
return toAjax(publicTemplateService.deleteUserBaseInfoByIds(ids));
return toAjax(userBaseInfoService.deleteUserBaseInfoByIds(ids));
}
@ApiOperation("新增全量用户信息")
@DataSource(DataSourceType.SLAVE)
@PreAuthorize("@ss.hasPermi('user:base_info:add')")
@Log(title = "基础用户信息", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult addAll(@RequestBody AddAllUserDto addAllUserDto)
{
UserBaseInfo userBaseInfo = addAllUserDto.getUserBaseInfo();
userBaseInfoService.insertUserBaseInfo(userBaseInfo);
if (null != addAllUserDto.getUserAccountInfo())
{
addAllUserDto.getUserAccountInfo().setId(userBaseInfo.getId());
publicTemplateService.add(addAllUserDto.getUserAccountInfo());
}
if (null != addAllUserDto.getUserAddressInfo())
{
addAllUserDto.getUserAddressInfo().setId(userBaseInfo.getId());
publicTemplateService.add(addAllUserDto.getUserAddressInfo());
}
if (null != addAllUserDto.getUserAuthInfo())
{
addAllUserDto.getUserAuthInfo().setId(userBaseInfo.getId());
publicTemplateService.add(addAllUserDto.getUserAuthInfo());
}
if (null != addAllUserDto.getUserExtraInfo())
{
addAllUserDto.getUserExtraInfo().setId(userBaseInfo.getId());
publicTemplateService.add(addAllUserDto.getUserExtraInfo());
}
if (null != addAllUserDto.getUserLogin() && StringUtils.isNotEmpty(addAllUserDto.getUserLogin().getLoginPass()))
{
addAllUserDto.getUserLogin().setUserId(userBaseInfo.getId());
String userLoginPassKey = DESUtil.randomString(9);
addAllUserDto.getUserLogin().setLoginPass(DESUtil.encode(addAllUserDto.getUserLogin().getLoginPass(), userLoginPassKey));
addAllUserDto.getUserLogin().setUserLoginPassKey(userLoginPassKey);
publicTemplateService.add(addAllUserDto.getUserLogin());
}
if (null != addAllUserDto.getUserLoginInfo())
{
addAllUserDto.getUserLoginInfo().setId(userBaseInfo.getId());
publicTemplateService.add(addAllUserDto.getUserLoginInfo());
}
if (null != addAllUserDto.getUserOfficialInfo())
{
addAllUserDto.getUserOfficialInfo().setId(userBaseInfo.getId());
publicTemplateService.add(addAllUserDto.getUserOfficialInfo());
}
if (null != addAllUserDto.getUserSocialInfo())
{
addAllUserDto.getUserSocialInfo().setId(userBaseInfo.getId());
publicTemplateService.add(addAllUserDto.getUserSocialInfo());
}
return AjaxResult.success(addAllUserDto);
}
}
... ...
package com.zhonglai.luhui.admin.controller.user;
import java.util.List;
import com.ruoyi.common.utils.DESUtil;
import com.zhonglai.luhui.datasource.enums.DataSource;
import com.zhonglai.luhui.datasource.enums.DataSourceType;
import javax.servlet.http.HttpServletResponse;
import com.zhonglai.luhui.security.dto.LoginToken;
import com.zhonglai.luhui.user.domain.UserBaseInfo;
import com.zhonglai.luhui.user.domain.UserExtraInfo;
import com.zhonglai.luhui.user.service.IUserBaseInfoService;
import com.zhonglai.luhui.user.service.IUserExtraInfoService;
import com.zhonglai.luhui.user.service.IUserLoginService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log;
import com.zhonglai.luhui.action.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
... ... @@ -42,6 +44,12 @@ public class UserLoginController extends BaseController
@Autowired
private IUserLoginService publicTemplateService;
@Autowired
private IUserBaseInfoService userBaseInfoService;
@Autowired
private IUserExtraInfoService userExtraInfoService;
@ApiOperation(value ="查询用户登录列表",notes="\n" +
"公共参数描述：\n" +
"条件参数：\n" +
... ... @@ -113,4 +121,33 @@ public class UserLoginController extends BaseController
{
return toAjax(publicTemplateService.deleteUserLoginByIds(ids));
}
@ApiOperation("查看密码")
@DataSource(DataSourceType.SLAVE)
@PreAuthorize("@ss.hasPermi('user:login:getpass')")
@GetMapping(value = "getpass/{id}")
public AjaxResult getpass(@PathVariable("id") Integer id)
{
UserLogin userLogin = publicTemplateService.selectUserLoginById(id);
return success(DESUtil.decode( userLogin.getLoginPass(),userLogin.getUserLoginPassKey()));
}
@ApiOperation("获取用户长期token")
@ApiImplicitParams({
@ApiImplicitParam(value = "用户id",name = "userInfoId"),
})
@RequestMapping(value = "getLongToken/{userInfoId}", method = RequestMethod.GET)
public AjaxResult getLongToken(@PathVariable Integer userInfoId)
{
UserLogin userLogin = publicTemplateService.selectUserLoginByUserId(userInfoId);
if(null == userLogin)
{
return AjaxResult.error("用户不存在");
}
UserExtraInfo userExtraInfo = userExtraInfoService.selectUserExtraInfoById(userInfoId);
UserBaseInfo userBaseInfo = userBaseInfoService.selectUserBaseInfoById(userInfoId);
LoginToken loginToken = new LoginToken(userLogin.getUserId(),userBaseInfo.getLoginName(),userBaseInfo.getNickname(),null == userExtraInfo?"0":userExtraInfo.getUserType()+"");
loginToken.setCreateTime(-1);
return AjaxResult.success("获取成功",loginToken.get());
}
}
... ...
package com.zhonglai.luhui.admin.dto;
import com.zhonglai.luhui.user.domain.*;
import io.swagger.annotations.ApiModel;
@ApiModel("用户全量添加")
public class AddAllUserDto {
private UserAccountInfo userAccountInfo;
private UserAddressInfo userAddressInfo;
private UserAuthInfo userAuthInfo;
private UserBaseInfo userBaseInfo;
private UserExtraInfo userExtraInfo;
private UserLogin userLogin;
private UserLoginInfo userLoginInfo;
private UserOfficialInfo userOfficialInfo;
private UserSocialInfo userSocialInfo;
public UserAccountInfo getUserAccountInfo() {
return userAccountInfo;
}
public void setUserAccountInfo(UserAccountInfo userAccountInfo) {
this.userAccountInfo = userAccountInfo;
}
public UserAddressInfo getUserAddressInfo() {
return userAddressInfo;
}
public void setUserAddressInfo(UserAddressInfo userAddressInfo) {
this.userAddressInfo = userAddressInfo;
}
public UserAuthInfo getUserAuthInfo() {
return userAuthInfo;
}
public void setUserAuthInfo(UserAuthInfo userAuthInfo) {
this.userAuthInfo = userAuthInfo;
}
public UserBaseInfo getUserBaseInfo() {
return userBaseInfo;
}
public void setUserBaseInfo(UserBaseInfo userBaseInfo) {
this.userBaseInfo = userBaseInfo;
}
public UserExtraInfo getUserExtraInfo() {
return userExtraInfo;
}
public void setUserExtraInfo(UserExtraInfo userExtraInfo) {
this.userExtraInfo = userExtraInfo;
}
public UserLogin getUserLogin() {
return userLogin;
}
public void setUserLogin(UserLogin userLogin) {
this.userLogin = userLogin;
}
public UserLoginInfo getUserLoginInfo() {
return userLoginInfo;
}
public void setUserLoginInfo(UserLoginInfo userLoginInfo) {
this.userLoginInfo = userLoginInfo;
}
public UserOfficialInfo getUserOfficialInfo() {
return userOfficialInfo;
}
public void setUserOfficialInfo(UserOfficialInfo userOfficialInfo) {
this.userOfficialInfo = userOfficialInfo;
}
public UserSocialInfo getUserSocialInfo() {
return userSocialInfo;
}
public void setUserSocialInfo(UserSocialInfo userSocialInfo) {
this.userSocialInfo = userSocialInfo;
}
}
... ...