import com.tuoheng.model.param.CreateClientUserDto; | import com.tuoheng.model.param.CreateClientUserDto; | ||||
import com.tuoheng.model.param.UpdateUserClientRoleDto; | import com.tuoheng.model.param.UpdateUserClientRoleDto; | ||||
import com.tuoheng.model.param.UpdateUserPassDto; | import com.tuoheng.model.param.UpdateUserPassDto; | ||||
import com.tuoheng.model.query.UserQuery; | |||||
import com.tuoheng.service.ClientUserSevice; | import com.tuoheng.service.ClientUserSevice; | ||||
import com.tuoheng.service.CurrentUser; | import com.tuoheng.service.CurrentUser; | ||||
import com.tuoheng.until.JsonResult; | import com.tuoheng.until.JsonResult; | ||||
/** | /** | ||||
* 查询对应租户下的所有用户数据 | * 查询对应租户下的所有用户数据 | ||||
* @param tenantId | |||||
* @param query | |||||
* @return | * @return | ||||
*/ | */ | ||||
@GetMapping("/findUserList") | @GetMapping("/findUserList") | ||||
public JsonResult findUserList(Long tenantId){ | |||||
return clientUserSevice.findUserList(tenantId); | |||||
public JsonResult findUserList(UserQuery query){ | |||||
return clientUserSevice.findUserList(query); | |||||
} | } | ||||
} | } |
package com.tuoheng.mapper; | package com.tuoheng.mapper; | ||||
import com.baomidou.mybatisplus.core.metadata.IPage; | |||||
import com.tuoheng.model.po.UserPo; | import com.tuoheng.model.po.UserPo; | ||||
import com.tuoheng.model.vo.TenantVo; | |||||
import org.apache.ibatis.annotations.Mapper; | import org.apache.ibatis.annotations.Mapper; | ||||
import org.apache.ibatis.annotations.Param; | import org.apache.ibatis.annotations.Param; | ||||
UserPo selectByUserId(@Param("userId") Long userId); | UserPo selectByUserId(@Param("userId") Long userId); | ||||
List<UserPo> selectByTenantId(@Param("tenantId") Long id); | List<UserPo> selectByTenantId(@Param("tenantId") Long id); | ||||
IPage<UserPo> selectByTenantIdAndPage(Long tenantId, IPage<UserPo> page); | |||||
} | } |
package com.tuoheng.model.query; | |||||
import com.tuoheng.common.BaseQuery; | |||||
import lombok.Data; | |||||
/** | |||||
* @Author xiaoying | |||||
* @Date 2023/2/23 17:13 | |||||
*/ | |||||
@Data | |||||
public class UserQuery extends BaseQuery { | |||||
/** | |||||
* 租户id | |||||
*/ | |||||
private Long tenantId; | |||||
} |
import com.tuoheng.model.param.UpdateUserClientRoleDto; | import com.tuoheng.model.param.UpdateUserClientRoleDto; | ||||
import com.tuoheng.model.param.UpdateUserPassDto; | import com.tuoheng.model.param.UpdateUserPassDto; | ||||
import com.tuoheng.model.query.TenantQuery; | import com.tuoheng.model.query.TenantQuery; | ||||
import com.tuoheng.model.query.UserQuery; | |||||
import com.tuoheng.until.JsonResult; | import com.tuoheng.until.JsonResult; | ||||
/** | /** | ||||
JsonResult updateAuthorities(CreateClientUserDto createClientUserDto, LoginUser loginUser); | JsonResult updateAuthorities(CreateClientUserDto createClientUserDto, LoginUser loginUser); | ||||
/** | /** | ||||
* 查询对应租户下的所有用户数据 | * 查询对应租户下的所有用户数据 | ||||
* @param tenantId | |||||
* @param query | |||||
* @return | * @return | ||||
*/ | */ | ||||
JsonResult findUserList(Long tenantId); | |||||
JsonResult findUserList(UserQuery query); | |||||
} | } |
import com.tuoheng.model.po.TenantPo; | import com.tuoheng.model.po.TenantPo; | ||||
import com.tuoheng.model.po.UserPo; | import com.tuoheng.model.po.UserPo; | ||||
import com.tuoheng.model.query.TenantQuery; | import com.tuoheng.model.query.TenantQuery; | ||||
import com.tuoheng.model.query.UserQuery; | |||||
import com.tuoheng.model.vo.BusinessSystemVo; | import com.tuoheng.model.vo.BusinessSystemVo; | ||||
import com.tuoheng.model.vo.TenantVo; | import com.tuoheng.model.vo.TenantVo; | ||||
import com.tuoheng.service.ClientUserSevice; | import com.tuoheng.service.ClientUserSevice; | ||||
/** | /** | ||||
* 查询对应租户下的所有用户数据 | * 查询对应租户下的所有用户数据 | ||||
* | * | ||||
* @param tenantId | |||||
* @param query | |||||
* @return | * @return | ||||
*/ | */ | ||||
@Override | @Override | ||||
public JsonResult findUserList(Long tenantId) { | |||||
List<UserPo> userPos = clientUserMapper.selectByTenantId(tenantId); | |||||
return JsonResult.success(userPos); | |||||
public JsonResult findUserList(UserQuery query) { | |||||
if (ObjectUtil.isNull(query.getPage()) || ObjectUtil.isNull(query.getLimit())) { | |||||
return JsonResult.error("分页参数不能为空"); | |||||
} | |||||
//开启分页 | |||||
IPage<UserPo> page = new Page<>(query.getPage(), query.getLimit()); | |||||
IPage<UserPo> pageData = clientUserMapper.selectByTenantIdAndPage(query.getTenantId(), page); | |||||
return JsonResult.success(pageData); | |||||
} | } | ||||
/** | /** | ||||
String url = platform.getPlatformUrl(); | String url = platform.getPlatformUrl(); | ||||
//根据不同业务平台进行动态匹配 | //根据不同业务平台进行动态匹配 | ||||
switch (platform.getPlatformCode()){ | |||||
switch (platform.getPlatformCode()) { | |||||
//河湖长 | //河湖长 | ||||
case HhzUrlConstant.HHZ_CLIENT: | case HhzUrlConstant.HHZ_CLIENT: | ||||
url = url + HhzUrlConstant.CREATE_TENANT; | url = url + HhzUrlConstant.CREATE_TENANT; | ||||
default: | default: | ||||
break; | break; | ||||
} | } | ||||
log.info("请求url:{}",url); | |||||
log.info("请求url:{}", url); | |||||
ResponseEntity<JsonResult> response; | ResponseEntity<JsonResult> response; | ||||
try { | try { | ||||
response = restTemplate.exchange(url, HttpMethod.POST, httpEntity, JsonResult.class); | response = restTemplate.exchange(url, HttpMethod.POST, httpEntity, JsonResult.class); | ||||
//设置地址(hhz平台) | //设置地址(hhz平台) | ||||
String url = platform.getPlatformUrl(); | String url = platform.getPlatformUrl(); | ||||
//根据不同业务平台进行动态匹配 | //根据不同业务平台进行动态匹配 | ||||
switch (platform.getPlatformCode()){ | |||||
switch (platform.getPlatformCode()) { | |||||
//河湖长 | //河湖长 | ||||
case HhzUrlConstant.HHZ_CLIENT: | case HhzUrlConstant.HHZ_CLIENT: | ||||
url = url + HhzUrlConstant.UPDATE_TENANT; | url = url + HhzUrlConstant.UPDATE_TENANT; | ||||
default: | default: | ||||
break; | break; | ||||
} | } | ||||
log.info("请求url:{}",url); | |||||
log.info("请求url:{}", url); | |||||
ResponseEntity<JsonResult> response; | ResponseEntity<JsonResult> response; | ||||
try { | try { | ||||
log.info("请求url:{}",url); | |||||
log.info("请求url:{}", url); | |||||
response = restTemplate.exchange(url, HttpMethod.POST, httpEntity, JsonResult.class); | response = restTemplate.exchange(url, HttpMethod.POST, httpEntity, JsonResult.class); | ||||
} catch (Exception e) { | } catch (Exception e) { | ||||
throw new ServiceException(HttpStatus.BAD_REQUEST.value(), "业务平台更新租户失败"); | throw new ServiceException(HttpStatus.BAD_REQUEST.value(), "业务平台更新租户失败"); | ||||
//设置地址(hhz平台) | //设置地址(hhz平台) | ||||
String url = platform.getPlatformUrl(); | String url = platform.getPlatformUrl(); | ||||
//根据不同业务平台进行动态匹配 | //根据不同业务平台进行动态匹配 | ||||
switch (platform.getPlatformCode()){ | |||||
switch (platform.getPlatformCode()) { | |||||
//河湖长 | //河湖长 | ||||
case HhzUrlConstant.HHZ_CLIENT: | case HhzUrlConstant.HHZ_CLIENT: | ||||
url = url + HhzUrlConstant.DELETE_TENANT; | url = url + HhzUrlConstant.DELETE_TENANT; | ||||
default: | default: | ||||
break; | break; | ||||
} | } | ||||
log.info("请求url:{}",url); | |||||
log.info("请求url:{}", url); | |||||
ResponseEntity<JsonResult> response; | ResponseEntity<JsonResult> response; | ||||
try { | try { | ||||
response = restTemplate.exchange(url, HttpMethod.POST, httpEntity, JsonResult.class); | response = restTemplate.exchange(url, HttpMethod.POST, httpEntity, JsonResult.class); |
# 用户没有被删除 | # 用户没有被删除 | ||||
and enabled = 1 | and enabled = 1 | ||||
</select> | </select> | ||||
<select id="selectByTenantIdAndPage" resultType="com.tuoheng.model.po.UserPo"> | |||||
SELECT * | |||||
FROM users | |||||
WHERE tenant_id = #{tenantId} | |||||
# 用户没有被删除 | |||||
and enabled = 1 | |||||
</select> | |||||
<update id="updatePass" parameterType="com.tuoheng.model.po.UserPo"> | <update id="updatePass" parameterType="com.tuoheng.model.po.UserPo"> | ||||
update users | update users |
# 用户没有被删除 | # 用户没有被删除 | ||||
and enabled = 1 | and enabled = 1 | ||||
</select> | </select> | ||||
<select id="selectByTenantIdAndPage" resultType="com.tuoheng.model.po.UserPo"> | |||||
SELECT * | |||||
FROM users | |||||
WHERE tenant_id = #{tenantId} | |||||
# 用户没有被删除 | |||||
and enabled = 1 | |||||
</select> | |||||
<update id="updatePass" parameterType="com.tuoheng.model.po.UserPo"> | <update id="updatePass" parameterType="com.tuoheng.model.po.UserPo"> | ||||
update users | update users |