mozhe
/
mental-health-api
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

档案统计接口添加用户id

This commit is contained in:
cjw 2024-08-08 10:09:59 +08:00
parent d91f1eeaa4
commit a4ad16516e
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ArchiveController.java
View File

@ -54,8 +54,8 @@ public class ArchiveController {
*/ */
@SaCheckPermission("scale:archive:statistic") @SaCheckPermission("scale:archive:statistic")
@GetMapping("/statistic/scale") @GetMapping("/statistic/scale")
public R<List<StatisticScaleVo>> statisticScale() { public R<List<StatisticScaleVo>> statisticScale(Long userId) {
return R.ok(archiveService.queryStatisticScale()); return R.ok(archiveService.queryStatisticScale(userId));
} }
/** /**
@ -63,8 +63,8 @@ public class ArchiveController {
*/ */
@SaCheckPermission("scale:archive:statistic") @SaCheckPermission("scale:archive:statistic")
@GetMapping("/statistic/warn") @GetMapping("/statistic/warn")
public R<StatisticWarnVo> statisticWarn() { public R<StatisticWarnVo> statisticWarn(Long userId) {
return R.ok(archiveService.queryStatisticWarn()); return R.ok(archiveService.queryStatisticWarn(userId));
} }
} }

3
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ArchiveMapper.java
View File

@ -23,7 +23,8 @@ public interface ArchiveMapper {
Page<ArchiveStatisticVo> selectStatisticVoPage(@Param("page") Page<ArchiveStatisticVo> page, @Param("userId") Long userId); Page<ArchiveStatisticVo> selectStatisticVoPage(@Param("page") Page<ArchiveStatisticVo> page, @Param("userId") Long userId);
List<SysEvaluationRecordVo> selectScaleRecordByUserId(@Param("userId") Long userId); List<SysEvaluationRecordVo> selectScaleRecordByUserId(@Param("userId") Long userId);
StatisticWarnVo selectWarnByUserId(@Param("userId") Long userId);
StatisticWarnVo selectWarnByUserId(@Param("userId") Long userId);
} }

4
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IArchiveService.java
View File

@ -15,7 +15,7 @@ public interface IArchiveService {
TableDataInfo<ArchiveStatisticVo> queryStatisticPageList(Long usetId, PageQuery pageQuery); TableDataInfo<ArchiveStatisticVo> queryStatisticPageList(Long usetId, PageQuery pageQuery);
List<StatisticScaleVo> queryStatisticScale(); List<StatisticScaleVo> queryStatisticScale(Long userId);
StatisticWarnVo queryStatisticWarn(); StatisticWarnVo queryStatisticWarn(Long userId);
} }

7
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ArchiveServiceImpl.java
View File

@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.scale.domain.vo.*; import org.dromara.scale.domain.vo.*;
import org.dromara.scale.mapper.ArchiveMapper; import org.dromara.scale.mapper.ArchiveMapper;
import org.dromara.scale.service.IArchiveService; import org.dromara.scale.service.IArchiveService;
@ -46,8 +45,7 @@ public class ArchiveServiceImpl implements IArchiveService {
} }
@Override @Override
public List<StatisticScaleVo> queryStatisticScale() { public List<StatisticScaleVo> queryStatisticScale(Long userId) {
Long userId = LoginHelper.getUserId();
List<SysEvaluationRecordVo> list = archiveMapper.selectScaleRecordByUserId(userId); List<SysEvaluationRecordVo> list = archiveMapper.selectScaleRecordByUserId(userId);
Map<String, List<Instant>> groupedTimes = list.stream() Map<String, List<Instant>> groupedTimes = list.stream()
.sorted(Comparator.comparing(e -> e.getCreateTime().toInstant())) // 先排序 .sorted(Comparator.comparing(e -> e.getCreateTime().toInstant())) // 先排序
@ -81,8 +79,7 @@ public class ArchiveServiceImpl implements IArchiveService {
} }
@Override @Override
public StatisticWarnVo queryStatisticWarn() { public StatisticWarnVo queryStatisticWarn(Long userId) {
Long userId = LoginHelper.getUserId();
return archiveMapper.selectWarnByUserId(userId); return archiveMapper.selectWarnByUserId(userId);
} }
} }