排行榜

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserController.java

@@ -70,8 +70,10 @@ public class UserController extends BaseController {
     public AjaxResult infoAttached() {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         int collectTotal = iUserService.getCollectTotal(loginUser.getUser().getUserId());
+        int rank = iUserService.getRank(loginUser.getUser().getUserId());
         Map<String,Object> map = new HashMap<>();
         map.put("collectTotal",collectTotal);
+        map.put("rank",rank);
         return AjaxResult.success(map);
     }
 

zhongzheng-api/src/main/resources/application-prod.yml

@@ -77,16 +77,28 @@ spring:
                 max-active: 8
                 # #连接池最大阻塞等待时间（使用负值表示没有限制）
                 max-wait: -1ms
+#aliyun:
+#    oss:
+#        endpoint: https://file.xyyxt.net  # oss对外服务的访问域名
+#        accessKeyId: LTAIgC8O2WUXvXuR  # 访问身份验证中用到用户标识
+#        accessKeySecret: 1yyCazuT1M6MruBXzgFjP0p9gdMlwX # 用户用于加密签名字符串和oss用来验证签名字符串的密钥
+#        bucketName: zhongzheng-prod # oss的存储空间
+#        policy:
+#            expire: 30 # 签名有效期(S)
+#        maxSize: 10 # 上传文件大小(M)
+#        callback: https://cloud.xyyxt.net/aliyun/oss/callback # 文件上传成功后的回调地址
+#        dir:
+#            prefix: oss/images/ # 上传文件夹路径前缀 `
 aliyun:
     oss:
-        endpoint: https://file.xyyxt.net  # oss对外服务的访问域名
+        endpoint: https://file-dev.xyyxt.net # oss对外服务的访问域名
         accessKeyId: LTAIgC8O2WUXvXuR  # 访问身份验证中用到用户标识
         accessKeySecret: 1yyCazuT1M6MruBXzgFjP0p9gdMlwX # 用户用于加密签名字符串和oss用来验证签名字符串的密钥
-        bucketName: zhongzheng-prod # oss的存储空间
+        bucketName: zhongzheng-test # oss的存储空间
         policy:
             expire: 30 # 签名有效期(S)
         maxSize: 10 # 上传文件大小(M)
-        callback: https://cloud.xyyxt.net/aliyun/oss/callback # 文件上传成功后的回调地址
+        callback: http://120.79.166.78:7072/aliyun/oss/callback # 文件上传成功后的回调地址
         dir:
             prefix: oss/images/ # 上传文件夹路径前缀 `
 poliv:
@@ -94,4 +106,5 @@ poliv:
         userid: d5f6d309fe
         writetoken: 8f14a371-9d02-4ec1-922d-54d7b4f79dca
         readtoken: f2c397b4-e2a3-46dc-9266-e6a43ac26a35
-        secretkey: xpPrYdcbA1
+        secretkey: xpPrYdcbA1
+

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -179,6 +179,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             query.setStartTime(zero);
             query.setEndTime(tt);
             ranKingUser= baseMapper.selectByRank(query);
+            Integer rank = baseMapper.selectByRankOne(ranKingUser.getHourse());
+            ranKingUser.setRank(rank);
             List<RanKingUser> ranKingUsers = baseMapper.selectByRanks(query);
             ranKingUser.setRanKingUsers(ranKingUsers);
         }else {
@@ -196,6 +198,23 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
     }
 
+    @Override
+    public int getRank(Long userId) {
+        RanKingUserQuery query =new RanKingUserQuery();
+        query.setUserId(userId);
+        Long time = System.currentTimeMillis();
+        long zero1 = time / (1000 * 3600 * 24) * (1000 * 3600 * 24) - TimeZone.getDefault().getRawOffset();
+        long zero = zero1 / 1000;
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH), 23, 59, 59);
+        long tt = calendar.getTime().getTime() / 1000;
+        query.setStartTime(zero);
+        query.setEndTime(tt);
+        RanKingUser ranKingUser= baseMapper.selectByRank(query);
+        Integer rank = baseMapper.selectByRankOne(ranKingUser.getHourse());
+        return rank;
+    }
+
     /**
      * 获取当前月第一天
      * @param month

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserMapper.java

@@ -18,4 +18,6 @@ public interface UserMapper extends BaseMapper<User> {
     RanKingUser selectByRank(RanKingUserQuery query);
 
     List<RanKingUser> selectByRanks(RanKingUserQuery query);
+
+    Integer selectByRankOne(Integer hourse);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserService.java

@@ -60,4 +60,6 @@ public interface IUserService extends IService<User> {
 	Integer getCollectTotal(Long userId);
 
 	RanKingUser rankingList(RanKingUserQuery bo);
+
+	int getRank(Long userId);
 }

zhongzheng-system/src/main/resources/mapper/modules/user/UserMapper.xml

@@ -81,5 +81,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ) A ,(SELECT @rank:=0) B
     </select>
 
+    <select id="selectByRankOne" parameterType="integer" resultType="int">
+        SELECT
+            COUNT(s.sum_study)
+        FROM
+            (SELECT sum( s.study_duration ) AS sum_study FROM user_study_record s WHERE 1 = 1 GROUP BY s.user_id) s
+        WHERE s.sum_study >= #{hourse}
+    </select>
+
 
 </mapper>