zh

src/main/java/com/zh/project0512/controller/UtilsController.java

@@ -257,8 +257,7 @@ public class UtilsController {
     }
 
     public static void main(String[] args) {
-        String url = "0.79 NjP:/ 测试1  https://v.douyin.com/FuhWaKvhkhkhttps://v.douyin.com/FuhWaKvhkh";
+        System.out.println(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM")));
-      System.out.println( RegexUtils.get("(http|https)://[A-Za-z0-9_\\-\\+.:?&@=/%#,;]*",url,0));
 //        String a = m.find() ? m.group(1) : url;
 //        System.out.println(a);
 //        int b = StringUtils.countOccurrencesOf(a, "https://v.douyin");

src/main/java/com/zh/project0512/controller/wxApp/AppMessageController.java

@@ -40,6 +40,12 @@ public class AppMessageController {
     @Autowired
     private IAppMessageService appMessageService;
 
+    @Operation(summary = "消息数量")
+    @PostMapping("/count")
+    @TokenValid
+    public Result total( @RequestHeader(value = "token") @Parameter(name = "登录token") String token) {
+        return Result.success(appMessageService.countUnsettledMsg(new JwtUtil().parseOpenid(token)));
+    }
     @Operation(summary = "消息列表")
     @PostMapping("/list")
     @TokenValid

src/main/java/com/zh/project0512/controller/wxApp/RankUController.java

@@ -76,7 +76,7 @@ public class RankUController {
         Page pg = MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize());
         QueryWrapper<UserEffectRecords> qw = new QueryWrapper<>();
         LocalDateTime now = param.getDateTime() != null ? LocalDateTime.now() : param.getDateTime();
-        qw.eq("date_format(t1.createAt, '%Y-%m')", now.toLocalDate());
+        qw.eq("date_format(t1.createAt, '%Y-%m')", now.format(DateTimeFormatter.ofPattern("yyyy-MM")));
         IPage page = (param.getType() != null && param.getType() == 1) ? userEffectRecordsMapper.rankByDepartment(pg, qw) : userEffectRecordsMapper.rankByUser(pg, qw);
         return Result.success(page.getRecords(), "请求成功");
     }

src/main/java/com/zh/project0512/mapper/AppMessageMapper.java

@@ -1,7 +1,14 @@
 package com.zh.project0512.mapper;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zh.project0512.model.AppMessage;
+import org.apache.ibatis.annotations.Select;
 
 public interface AppMessageMapper extends BaseMapper<AppMessage> {
+    @Select("SELECT IFNULL(SUM(settled = 0),0) as unSettledNum,IFNULL(SUM(settled = 1),0) as settledNum,IFNULL(SUM(settled in (0,1)),0) as total\n" +
+        "FROM appMessage as t1\n" +
+        "LEFT JOIN user as t2 on t1.receiverId = t2.id\n" +
+        "WHERE settled = 0 and t2.openid =#{openid}")
+    JSONObject countUnsettledMsg(String openid);
 }

src/main/java/com/zh/project0512/service/IAppMessageService.java

@@ -1,5 +1,6 @@
 package com.zh.project0512.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.zh.project0512.model.AppMessage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -12,5 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2022-06-29
  */
 public interface IAppMessageService extends IService<AppMessage> {
-
+    JSONObject countUnsettledMsg(String openid);
 }

src/main/java/com/zh/project0512/serviceImpl/AppMessageServiceImpl.java

@@ -1,14 +1,16 @@
 package com.zh.project0512.serviceImpl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.zh.project0512.model.AppMessage;
 import com.zh.project0512.mapper.AppMessageMapper;
 import com.zh.project0512.service.IAppMessageService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author zh
@@ -16,5 +18,10 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class AppMessageServiceImpl extends ServiceImpl<AppMessageMapper, AppMessage> implements IAppMessageService {
+    @Autowired
+    private AppMessageMapper appMessageMapper;
 
+    public JSONObject countUnsettledMsg(String openid) {
+        return appMessageMapper.countUnsettledMsg(openid);
+    }
 }