From aa5e71b065c696f3653e9fa5461f1a01e4960831 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Wed, 27 Dec 2023 10:28:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=B6=88=E6=81=AF=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/mapper/WxUserScriptLogMapper.java | 4 ++ .../mapper/WxUserScriptLogMapper.xml | 24 +++++++- .../controller/WxUserScriptLogController.java | 55 +++++++++++++++++++ .../service/IWxUserScriptLogService.java | 14 +++++ .../impl/WxUserScriptLogServiceImpl.java | 53 ++++++++++++++++++ 5 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxUserScriptLogController.java create mode 100644 flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxUserScriptLogService.java create mode 100644 flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserScriptLogServiceImpl.java diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserScriptLogMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserScriptLogMapper.java index 1843563..3e31263 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserScriptLogMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxUserScriptLogMapper.java @@ -62,4 +62,8 @@ public interface WxUserScriptLogMapper { public int deleteWxUserScriptLogByIds(Long[] ids); void deleteWxUserScriptLogByWxUserId(@Param("userId") Long userId); + + Integer getNoReadMessageNum(WxUserScriptLog query); + + void hasBeenRead(WxUserScriptLog query); } diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserScriptLogMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserScriptLogMapper.xml index e57d80d..b83b2d8 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserScriptLogMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserScriptLogMapper.xml @@ -56,13 +56,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and tag_ids = #{tagIds} and status = #{status} + order by create_time desc - + + + insert into wx_user_script_log @@ -141,6 +151,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + + update wx_user_script_log set + `is_read` = 1 + + and wx_user_id = #{wxUserId} + and is_read = #{isRead} + and status = #{status} + + + delete from wx_user_script_log where id = #{id} @@ -154,4 +174,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from wx_user_script_log where wx_user_id = #{userId} + + \ No newline at end of file diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxUserScriptLogController.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxUserScriptLogController.java new file mode 100644 index 0000000..bbc1d67 --- /dev/null +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/WxUserScriptLogController.java @@ -0,0 +1,55 @@ +package com.flossom.miniProgram.controller; + +import com.flossom.common.core.domain.R; +import com.flossom.common.core.domain.entity.WxUserScriptLog; +import com.flossom.common.core.web.controller.BaseController; +import com.flossom.common.core.web.page.TableDataInfo; +import com.flossom.miniProgram.service.IWxUserScriptLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 发送话术记录Controller + * + * @author flossom + * @date 2023-12-20 + */ +@RestController +@RequestMapping("/userScriptLog") +public class WxUserScriptLogController extends BaseController { + + @Autowired + private IWxUserScriptLogService wxUserScriptLogService; + + + /** + * 查询发送话术记录列表 + */ + @GetMapping("/list") + public TableDataInfo list() { + startPage(); + List list = wxUserScriptLogService.selectWxUserScriptLogList(); + return getDataTable(list); + } + + /** + * 查询是否有没未读消息 + */ + @GetMapping("getNoReadMessageNum") + public R getNoReadMessageNum() { + return R.ok(wxUserScriptLogService.getNoReadMessageNum()); + } + + /** + * 触发所有已读 + */ + @GetMapping("/hasBeenRead") + public R hasBeenRead() { + wxUserScriptLogService.hasBeenRead(); + return R.ok(); + } + + +} diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxUserScriptLogService.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxUserScriptLogService.java new file mode 100644 index 0000000..e3fd68f --- /dev/null +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/IWxUserScriptLogService.java @@ -0,0 +1,14 @@ +package com.flossom.miniProgram.service; + +import com.flossom.common.core.domain.entity.WxUserScriptLog; + +import java.util.List; + +public interface IWxUserScriptLogService { + List selectWxUserScriptLogList(); + + Integer getNoReadMessageNum(); + + void hasBeenRead(); + +} diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserScriptLogServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserScriptLogServiceImpl.java new file mode 100644 index 0000000..8c84254 --- /dev/null +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxUserScriptLogServiceImpl.java @@ -0,0 +1,53 @@ +package com.flossom.miniProgram.service.impl; + +import com.flossom.common.core.domain.entity.WxUserScriptLog; +import com.flossom.common.core.enums.Status; +import com.flossom.common.core.mapper.WxUserScriptLogMapper; +import com.flossom.common.security.utils.SecurityUtils; +import com.flossom.miniProgram.service.IWxUserScriptLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + + +@Service +public class WxUserScriptLogServiceImpl implements IWxUserScriptLogService { + + @Autowired + private WxUserScriptLogMapper wxUserScriptLogMapper; + + @Override + public List selectWxUserScriptLogList() { + WxUserScriptLog query = new WxUserScriptLog(); + // 消息归属人 + query.setWxUserId(SecurityUtils.getWxUserId()); + // 消息状态正常 + query.setStatus(Status.OK.getCode()); + return wxUserScriptLogMapper.selectWxUserScriptLogList(query); + } + + @Override + public Integer getNoReadMessageNum() { + WxUserScriptLog query = new WxUserScriptLog(); + // 消息归属人 + query.setWxUserId(SecurityUtils.getWxUserId()); + // 消息状态正常 + query.setStatus(Status.OK.getCode()); + // 未读 + query.setIsRead(0); + return wxUserScriptLogMapper.getNoReadMessageNum(query); + } + + @Override + public void hasBeenRead() { + WxUserScriptLog query = new WxUserScriptLog(); + // 消息归属人 + query.setWxUserId(20L); + // 消息状态正常 + query.setStatus(Status.OK.getCode()); + // 未读 + query.setIsRead(0); + wxUserScriptLogMapper.hasBeenRead(query); + } +}