From 2ba21016d66c8d987193e0b7f79d6d8703007d92 Mon Sep 17 00:00:00 2001 From: zhangjinli Date: Fri, 8 Jul 2022 15:40:48 +0800 Subject: [PATCH] zh --- .../com/zh/project0512/controller/UtilsController.java | 3 +-- .../controller/wxApp/AppMessageController.java | 6 ++++++ .../zh/project0512/controller/wxApp/RankUController.java | 2 +- .../java/com/zh/project0512/mapper/AppMessageMapper.java | 7 +++++++ .../com/zh/project0512/service/IAppMessageService.java | 3 ++- .../project0512/serviceImpl/AppMessageServiceImpl.java | 9 ++++++++- 6 files changed, 25 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zh/project0512/controller/UtilsController.java b/src/main/java/com/zh/project0512/controller/UtilsController.java index 14caf38..6c8c926 100644 --- a/src/main/java/com/zh/project0512/controller/UtilsController.java +++ b/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( RegexUtils.get("(http|https)://[A-Za-z0-9_\\-\\+.:?&@=/%#,;]*",url,0)); + System.out.println(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM"))); // String a = m.find() ? m.group(1) : url; // System.out.println(a); // int b = StringUtils.countOccurrencesOf(a, "https://v.douyin"); diff --git a/src/main/java/com/zh/project0512/controller/wxApp/AppMessageController.java b/src/main/java/com/zh/project0512/controller/wxApp/AppMessageController.java index 845d565..1fff6a3 100644 --- a/src/main/java/com/zh/project0512/controller/wxApp/AppMessageController.java +++ b/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 diff --git a/src/main/java/com/zh/project0512/controller/wxApp/RankUController.java b/src/main/java/com/zh/project0512/controller/wxApp/RankUController.java index 0a5a078..c746874 100644 --- a/src/main/java/com/zh/project0512/controller/wxApp/RankUController.java +++ b/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 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(), "请求成功"); } diff --git a/src/main/java/com/zh/project0512/mapper/AppMessageMapper.java b/src/main/java/com/zh/project0512/mapper/AppMessageMapper.java index c5ca43d..d5839f0 100644 --- a/src/main/java/com/zh/project0512/mapper/AppMessageMapper.java +++ b/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 { + @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); } diff --git a/src/main/java/com/zh/project0512/service/IAppMessageService.java b/src/main/java/com/zh/project0512/service/IAppMessageService.java index f77b51e..d35fe94 100644 --- a/src/main/java/com/zh/project0512/service/IAppMessageService.java +++ b/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 { - + JSONObject countUnsettledMsg(String openid); } diff --git a/src/main/java/com/zh/project0512/serviceImpl/AppMessageServiceImpl.java b/src/main/java/com/zh/project0512/serviceImpl/AppMessageServiceImpl.java index e837728..e4d1d7e 100644 --- a/src/main/java/com/zh/project0512/serviceImpl/AppMessageServiceImpl.java +++ b/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; /** *

- * 服务实现类 + * 服务实现类 *

* * @author zh @@ -16,5 +18,10 @@ import org.springframework.stereotype.Service; */ @Service public class AppMessageServiceImpl extends ServiceImpl implements IAppMessageService { + @Autowired + private AppMessageMapper appMessageMapper; + public JSONObject countUnsettledMsg(String openid) { + return appMessageMapper.countUnsettledMsg(openid); + } }