bug修改

无关风月

2024-07-03 53b1659091b7f4ae4a519ea5bf5522493d5be484

bug修改

 ruoyi-service/ruoyi-management/pom.xml

@@ -16,6 +16,15 @@

    <dependencies>
        <dependency>

            <groupId>org.openeuler</groupId>

            <artifactId>bgmprovider</artifactId>

            <version>1.0.4</version>

        </dependency>
        <dependency>
            <groupId>com.huawei.apigateway</groupId>
            <artifactId>java-sdk-core</artifactId>
            <version>3.2.4</version>

 ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java

@@ -106,7 +106,15 @@
    public static String convertSecondsToHoursMinutes(int seconds) {
        int hours = seconds / 3600;
        int minutes = (seconds % 3600) / 60;
        return String.format("%d小时%d分钟", hours, minutes);
        if (hours == 0){
            if (minutes == 0){
                return String.format("%d秒", seconds);
            }else{
                return String.format("%d分钟", minutes);
            }
        }else{
            return String.format("%d小时%d分钟", hours, minutes);
        }
    }
    public static String convertToChineseOrdinal(int number) {
        if (number <= 0 || number > 50) {

 ruoyi-service/ruoyi-study/pom.xml

@@ -16,7 +16,15 @@

    <dependencies>

        <dependency>

            <groupId>org.openeuler</groupId>

            <artifactId>bgmprovider</artifactId>

            <version>1.0.4</version>

        </dependency>

        <dependency>
            <groupId>redis.clients</groupId>

 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java

@@ -1041,14 +1041,16 @@
        studyRecord.setMonthStudy(Math.round((float) monthStudy / 3600));
        // 总时长还需计算上游戏测试成绩时长
        List<TGameRecord> gameRecordList = gameRecordService.lambdaQuery().eq(TGameRecord::getUserId, dto.getId())
                .eq(TGameRecord::getDisabled, 0).list();
                .eq(TGameRecord::getDisabled, 0)
                .orderByDesc(TGameRecord::getCreateTime)
                .list();
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy.MM.dd HH:mm");
        for (TGameRecord tGameRecord : gameRecordList) {
            tGameRecord.setTime(simpleDateFormat.format(tGameRecord.getCreateTime()));
        }
        int sum = gameRecordList.stream().map(TGameRecord::getUseTime).mapToInt(Integer::intValue).sum();
        Integer totalStudy = studyRecord.getTotalStudy();
        studyRecord.setTotalStudy(Math.round((float) (totalStudy + sum) / 3600));
        studyRecord.setTotalStudy(Math.round((float) (totalStudy) / 3600));
        res.setCurrent(studyRecord.getWeek()+"");
        // 剩余周目
        List<TStudy> studyList = studyService.lambdaQuery().eq(TStudy::getDisabled, 0)