gxwebsoft/core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增园区内用户数接口

Browse Source
This commit is contained in:
b2894lxlx
2024-11-10 15:50:37 +08:00
parent 810d0c140b
commit bb2d911bb2
4 changed files with 236 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/gxwebsoft/common/system/controller/UserController.java
View File

@@ -456,4 +456,10 @@ public class UserController extends BaseController {
return fail("更新失败");
}
@ApiOperation("园区内用户数")
@GetMapping("/userNumInPark")
public ApiResult<?> userNumInPark(@RequestBody UserParam param) {
return success(userService.userNumInPark(param));
}
}

4
src/main/java/com/gxwebsoft/common/system/param/UserParam.java
View File

@@ -259,4 +259,8 @@ public class UserParam extends BaseParam {
@ApiModelProperty(value = "商户LOGO")
@QueryField(type = QueryType.EQ)
private String merchantAvatar;
@ApiModelProperty(value = "工业园区")
@TableField(exist = false)
private String park;
}

1
src/main/java/com/gxwebsoft/common/system/service/UserService.java
View File

@@ -113,4 +113,5 @@ public interface UserService extends IService<User>, UserDetailsService {
User getAdminByPhone(String phone);
Integer userNumInPark(UserParam param);
}

36
src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java
View File

@@ -2,7 +2,6 @@ package com.gxwebsoft.common.system.service.impl;
import cn.hutool.core.util.DesensitizedUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -12,10 +11,7 @@ import com.gxwebsoft.common.core.utils.CommonUtil;
import com.gxwebsoft.common.core.utils.RedisUtil;
import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.PageResult;
import com.gxwebsoft.common.system.entity.Company;
import com.gxwebsoft.common.system.entity.Role;
import com.gxwebsoft.common.system.entity.User;
import com.gxwebsoft.common.system.entity.UserRole;
import com.gxwebsoft.common.system.entity.*;
import com.gxwebsoft.common.system.mapper.UserMapper;
import com.gxwebsoft.common.system.param.UserParam;
import com.gxwebsoft.common.system.service.*;
@@ -27,12 +23,9 @@ import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import static com.gxwebsoft.common.core.constants.PlatformConstants.MP_WEIXIN;
import static com.gxwebsoft.common.core.constants.PlatformConstants.WEB;
/**
@@ -57,6 +50,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
private CompanyService companyService;
@Resource
private RedisUtil redisUtil;
@Resource
private OrganizationService organizationService;
@Override
public PageResult<User> pageRel(UserParam param) {
@@ -177,7 +172,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
throw new BusinessException("邮箱已存在");
}
// 更新用户等级
if (user.getGradeId() != null && !user.getGradeId().equals(0)){
if (user.getGradeId() != null && !user.getGradeId().equals(0)) {
userService.updateById(user);
}
boolean result = baseMapper.updateById(user) > 0;
@@ -245,15 +240,15 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
addUser.setNickname(DesensitizedUtil.mobilePhone(userParam.getPhone()));
addUser.setPlatform(WEB);
addUser.setGradeId(2);
if(userParam.getGradeId() != null){
if (userParam.getGradeId() != null) {
addUser.setGradeId(userParam.getGradeId());
}
if(userParam.getPhone() != null){
if (userParam.getPhone() != null) {
addUser.setPhone(userParam.getPhone());
}
if(userParam.getPassword() != null){
if (userParam.getPassword() != null) {
addUser.setPassword(encodePassword(userParam.getPassword()));
}else {
} else {
addUser.setPassword(encodePassword(CommonUtil.randomUUID16()));
}
addUser.setTenantId(userParam.getTenantId());
@@ -292,4 +287,19 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
}
}
}
@Override
public Integer userNumInPark(UserParam param) {
List<Organization> organizationList = organizationService.list(
new LambdaQueryWrapper<Organization>()
.eq(Organization::getPark, param.getPark())
);
if (organizationList != null && !organizationList.isEmpty()) {
return count(
new LambdaQueryWrapper<User>()
.in(User::getOrganizationId, organizationList.stream().map(Organization::getOrganizationId).collect(Collectors.toList()))
);
}
return 0;
}
}