bug修复

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/PlatformStatusOverviewMapper.xml

@@ -185,7 +185,6 @@
             GROUP BY su.GRADES_ID
         ) r1 ON co.GRADES_ID = r1.GRADES_ID
         WHERE co.DELETE_FLAG = 'NOT_DELETE'
-        AND co.STATUS = 0
     </select>
 
 </mapper>

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/VideoAnalysisProgressMapper.xml

@@ -746,7 +746,10 @@
             SELECT
                 z1.userId AS userId,
                 z1.watchCount AS watchCount,
-                LPAD(FLOOR(z1.allStayTime / 3600000), 5, '0') || '小时' ||
+                CASE
+                    WHEN FLOOR(z1.allStayTime / 3600000) = 0 THEN '0'
+                    ELSE REGEXP_REPLACE(LPAD(FLOOR(z1.allStayTime / 3600000), 5, '0'), '^0+', '')
+                END  || '小时' ||
                 LPAD(FLOOR((z1.allStayTime % 3600000) / 60000), 2, '0') || '分钟' AS allStayTime
             FROM(
                 SELECT

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/param/footprint/ResourceFootprintAddParam.java

@@ -16,6 +16,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * RESOURCE_FOOTPRINT添加参数
  *
@@ -28,6 +30,7 @@ public class ResourceFootprintAddParam {
 
     /** 文件id */
     @ApiModelProperty(value = "文件id", position = 2)
+    @NotBlank(message = "文件id不能为空")
     private String userFileId;
 
     /** 扩展名 */

snowy-plugin/snowy-plugin-forum/snowy-plugin-forum-func/src/main/java/vip/xiaonuo/forum/modular/reportinfo/service/impl/ForumReportInfoServiceImpl.java

@@ -135,7 +135,7 @@ public class ForumReportInfoServiceImpl extends ServiceImpl<ForumReportInfoMappe
         // 执行更新操作
         forumReportInfo.setReportStatus(forumReportInfoEditParam.getReportStatus());
         this.updateById(forumReportInfo);
-        // 如果是关闭帖子，需要同步关闭
+        // 同步状态
         if (forumReportInfoEditParam.getReportStatus() == 1) {
             QueryWrapper<ForumPostInfo> queryWrapper = new QueryWrapper<>();
             queryWrapper.lambda().eq(ForumPostInfo::getPostId, forumReportInfo.getPostId());
@@ -144,6 +144,15 @@ public class ForumReportInfoServiceImpl extends ServiceImpl<ForumReportInfoMappe
                 forumPostInfo.setPostStatus(1);
                 forumPostInfoMapper.updateById(forumPostInfo);
             }
+        }else if(forumReportInfoEditParam.getReportStatus() == 2)
+        {
+            QueryWrapper<ForumPostInfo> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda().eq(ForumPostInfo::getPostId, forumReportInfo.getPostId());
+            ForumPostInfo forumPostInfo = forumPostInfoMapper.selectOne(queryWrapper);
+            if (forumPostInfo != null) {
+                forumPostInfo.setPostStatus(0);
+                forumPostInfoMapper.updateById(forumPostInfo);
+            }
         }
         return CommonResult.ok();
     }