renkang/xj-platform
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用户信息查询

Browse Source
This commit is contained in:
pengjie
2026-02-10 15:45:36 +08:00
parent cd7f5661de
commit b6aecf4e64
5 changed files with 74 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
health-bank/health-bank-biz/src/main/java/com/renkang/bank/service/impl/UserPointsServiceImpl.java
+4 -4
View File
@@ -376,7 +376,6 @@ public class UserPointsServiceImpl extends ServiceImpl<UserPointsMapper, UserPoi
@Override
public boolean testUpdateUserPoints(UpdUserPointsDTO dto) {
LoginUser loginUser = GlobalUtils.getLoginUser();
List<String> sysUserIds = iSysBaseAPI.findSysUserIds(new SysUser());
List<LoginUser> loginUsers = iSysBaseAPI.listUserByIdsNew(sysUserIds);
loginUsers.forEach(user -> {
@@ -477,7 +476,8 @@ public class UserPointsServiceImpl extends ServiceImpl<UserPointsMapper, UserPoi
ExceptionAssertsUtil.fail("用户积分不存在");
}
userPoints.setDeductPointsSum(userPoints.getDeductPointsSum().add(dto.getPoints()));
userPoints.setPoints(userPoints.getPoints().subtract(dto.getPoints()));
BigDecimal subtract = userPoints.getPoints().subtract(dto.getPoints());
userPoints.setPoints(subtract.compareTo(BigDecimal.valueOf(0)) < 0 ? BigDecimal.valueOf(0) : subtract);
userPointsDetails.setPoints(dto.getPoints());
userPointsDetails.setRemark(dto.getRemark());
userPointsDetails.setSource(sourceEnum.getSource());
@@ -524,7 +524,7 @@ public class UserPointsServiceImpl extends ServiceImpl<UserPointsMapper, UserPoi
wrapper.between(UserPointsDetails::getCreateTime, startOfDay, endOfDay);
c = userPointsDetailsMapper.selectCount(wrapper);
if (c > 0) {
ExceptionAssertsUtil.fail("本日已获得该积分");
ExceptionAssertsUtil.fail("今日已获得该积分");
}
break;
// 周/次：检查用户本周是否已经获得过该积分
@@ -564,7 +564,7 @@ public class UserPointsServiceImpl extends ServiceImpl<UserPointsMapper, UserPoi
wrapper.between(UserPointsDetails::getCreateTime, startOfYear, endOfYear);
c = userPointsDetailsMapper.selectCount(wrapper);
if (c > 0) {
ExceptionAssertsUtil.fail("本年度已获得该积分");
ExceptionAssertsUtil.fail("本年已获得该积分");
}
break;
default:
jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/SysApiController.java
+11
View File
@@ -1,6 +1,7 @@
package org.jeecg.modules.api.controller;
import org.jeecg.base.UserBase;
import org.jeecg.bean.response.BaseEmployeeInfo;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.system.bean.response.ScalePersonalUserInfo;
import org.jeecg.modules.system.service.ISysUserService;
@@ -56,5 +57,15 @@ public class SysApiController {
return Result.ok(sysUserService.findUserByParam(findCode));
}
/**
* 根据token获取用户信息
*
* @return BaseEmployeeInfo
*/
@GetMapping("getUserInfo")
public Result<BaseEmployeeInfo> getUserInfo() {
return Result.ok(sysUserService.getUserInfo());
}
}
jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
+3
View File
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.base.UserBase;
import org.jeecg.bean.request.PeoplePsyAssessPlanVO;
import org.jeecg.bean.request.PeopleStatisticVO;
import org.jeecg.bean.response.BaseEmployeeInfo;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.bean.request.StatAllReq;
import org.jeecg.common.bean.request.StatReq;
@@ -650,4 +651,6 @@ public interface ISysUserService extends IService<SysUser> {
List<UserBase> findUserByParam(String findCode);
IPage<ScopeUserVO> scopeUserList(ScopeUserQuery query,IPage<ScopeUserVO> page);
BaseEmployeeInfo getUserInfo();
}
jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBannerServiceImpl.java
+13 -8
View File
@@ -1,12 +1,12 @@
package org.jeecg.modules.system.service.impl;
import cn.idev.excel.util.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.system.entity.SysBanner;
import org.jeecg.modules.system.mapper.SysBannerMapper;
import org.jeecg.modules.system.service.ISysBannerService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
@@ -18,14 +18,19 @@ import org.springframework.stereotype.Service;
@Service
public class SysBannerServiceImpl extends ServiceImpl<SysBannerMapper, SysBanner> implements ISysBannerService {
@Autowired
private SysBannerMapper sysBannerMapper;
// @Autowired
// private SysBannerMapper sysBannerMapper;
@Override
public IPage<SysBanner> queryPageList(IPage<SysBanner> page, SysBanner dto) {
SysBanner arcAssessValue = new SysBanner();
BeanUtils.copyProperties(dto, arcAssessValue);
IPage<SysBanner> conDoctorIPage = sysBannerMapper.queryPageList(page, dto);
return conDoctorIPage;
// SysBanner arcAssessValue = new SysBanner();
// BeanUtils.copyProperties(dto, arcAssessValue);
// IPage<SysBanner> conDoctorIPage = sysBannerMapper.queryPageList(page, dto);
LambdaQueryWrapper<SysBanner> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.like(StringUtils.isNotBlank(dto.getName()), SysBanner::getName, dto.getName());
queryWrapper.eq(StringUtils.isNotBlank(dto.getShowLocation()), SysBanner::getShowLocation, dto.getShowLocation());
queryWrapper.eq(StringUtils.isNotBlank(dto.getStatus()), SysBanner::getStatus, dto.getStatus());
queryWrapper.orderByAsc(SysBanner::getShowLocation, SysBanner::getSort);
return baseMapper.selectPage(page, queryWrapper);
}
}
jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
+43 -2
View File
@@ -17,7 +17,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.query.MPJLambdaQueryWrapper;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
@@ -35,6 +34,7 @@ import org.jeecg.bean.entity.UserDataRecordBmi;
import org.jeecg.bean.enums.UserDataSourceEnum;
import org.jeecg.bean.request.PeoplePsyAssessPlanVO;
import org.jeecg.bean.request.PeopleStatisticVO;
import org.jeecg.bean.response.BaseEmployeeInfo;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.bean.request.StatAllReq;
import org.jeecg.common.bean.request.StatReq;
@@ -3844,7 +3844,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
}
@Override
public IPage<ScopeUserVO> scopeUserList(ScopeUserQuery query, IPage<ScopeUserVO> page){
public IPage<ScopeUserVO> scopeUserList(ScopeUserQuery query, IPage<ScopeUserVO> page) {
// 构建 MPJ 查询包装器
MPJLambdaWrapper<SysUser> queryWrapper = new MPJLambdaWrapper<SysUser>()
.selectAs(SysUser::getId, ScopeUserVO::getUserId)
@@ -3899,4 +3899,45 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
return resultPage;
}
@Override
public BaseEmployeeInfo getUserInfo() {
LoginUser loginUser = GlobalUtils.getLoginUser();
if (null == loginUser) {
ExceptionAssertsUtil.fail("用户不存在！");
}
MPJLambdaWrapper<SysUser> queryWrapper = new MPJLambdaWrapper<SysUser>()
.selectAs(SysUser::getId, BaseEmployeeInfo::getUserId)
.selectAs(SysUser::getUsername, BaseEmployeeInfo::getUserName)
.selectAs(SysUser::getRealname, BaseEmployeeInfo::getRealName)
.selectAs(SysUser::getWorkNo, BaseEmployeeInfo::getWorkNo)
.selectAs(SysUser::getIdCard, BaseEmployeeInfo::getIdCard)
.selectAs(SysUser::getAvatar, BaseEmployeeInfo::getAvatar)
.selectAs(SysUser::getBirthday, BaseEmployeeInfo::getBirthday)
.selectAs(SysUser::getEmail, BaseEmployeeInfo::getEmail)
.selectAs(SysUser::getPhone, BaseEmployeeInfo::getPhone)
.selectAs(SysUser::getSex, BaseEmployeeInfo::getSex)
.selectAs(SysUser::getUserGroup, BaseEmployeeInfo::getUserGroup)
.selectAs(HealthUserEmployeeEx::getHeight, BaseEmployeeInfo::getHeight)
.selectAs(HealthUserEmployeeEx::getWeight, BaseEmployeeInfo::getWeight)
.selectAs(HealthUserEmployeeEx::getBmi, BaseEmployeeInfo::getBmi)
.selectAs(HealthUserEmployeeEx::getEmpNation, BaseEmployeeInfo::getEmpNation)
.selectAs(HealthUserEmployeeEx::getEmpPolitical, BaseEmployeeInfo::getEmpPolitical)
.selectAs(HealthUserEmployeeEx::getJobLevel, BaseEmployeeInfo::getJobLevel)
.selectAs(HealthUserEmployeeEx::getEmpMarriage, BaseEmployeeInfo::getEmpMarriage)
.leftJoin(HealthUserEmployeeEx.class, HealthUserEmployeeEx::getId, SysUser::getId)
.eq(SysUser::getId, loginUser.getId());
BaseEmployeeInfo baseEmployeeInfo = baseMapper.selectJoinOne(BaseEmployeeInfo.class, queryWrapper);
baseEmployeeInfo.setAge(ObjectUtils.isNotEmpty(loginUser.getAge()) && loginUser.getAge() > 0 ? loginUser.getAge() : null);
SysDepart secondDepart = sysCache.getDepartByOrgCode(GlobalUtils.getSecondDepartOrgCode(loginUser.getOrgCode()));
baseEmployeeInfo.setSecondDeptCode(secondDepart.getOrgCode());
baseEmployeeInfo.setSecondDeptName(secondDepart.getDepartName());
SysDepart thirdDepart = sysCache.getDepartByOrgCode(GlobalUtils.getThirdDepartOrgCode(loginUser.getOrgCode()));
baseEmployeeInfo.setThirdDeptCode(thirdDepart.getOrgCode());
baseEmployeeInfo.setThirdDeptName(thirdDepart.getDepartName());
baseEmployeeInfo.setThisDeptCode(loginUser.getOrgCode());
SysDepart departByOrgCode = sysCache.getDepartByOrgCode(loginUser.getOrgCode());
baseEmployeeInfo.setThisDeptName(departByOrgCode.getDepartName());
return baseEmployeeInfo;
}
}