From 27424b84ad79084e2286714ce002488852bebbc0 Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Mon, 25 Oct 2021 00:08:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B6=88=E6=81=AF=E5=8F=91?= =?UTF-8?q?=E9=80=81=E7=BB=9F=E8=AE=A1=E5=9B=BE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/INoticeService.java | 17 ++++++++ .../service/impl/NoticeServiceImpl.java | 15 +++++++ .../mybatis/mapper/notice-mapper.xml | 20 +++++++++ .../ink/wgink/module/sms/dao/sms/ISmsDao.java | 19 +++++++++ .../wgink/module/sms/pojo/pos/sms/SmsPO.java | 36 ++++++++++++++++ .../module/sms/service/sms/ISmsService.java | 42 +++++++++++++++++++ .../sms/service/sms/impl/SmsServiceImpl.java | 33 +++++++++++++++ .../resources/mybatis/mapper/sms-mapper.xml | 21 ++++++++++ 8 files changed, 203 insertions(+) diff --git a/module-instant-message/src/main/java/ink/wgink/module/instantmessage/service/INoticeService.java b/module-instant-message/src/main/java/ink/wgink/module/instantmessage/service/INoticeService.java index 82ed2b78..6376913b 100644 --- a/module-instant-message/src/main/java/ink/wgink/module/instantmessage/service/INoticeService.java +++ b/module-instant-message/src/main/java/ink/wgink/module/instantmessage/service/INoticeService.java @@ -203,4 +203,21 @@ public interface INoticeService { * @throws Exception */ void notice(NoticeSendVO noticeSendVO) throws Exception; + + /** + * 发送通知列表 + * + * @param date + * @return + */ + List listPOByDate(String date); + + /** + * 发送通知列表 + * + * @param startTime + * @param endTime + * @return + */ + List listPOByStartTimeAndEndTime(String startTime, String endTime); } diff --git a/module-instant-message/src/main/java/ink/wgink/module/instantmessage/service/impl/NoticeServiceImpl.java b/module-instant-message/src/main/java/ink/wgink/module/instantmessage/service/impl/NoticeServiceImpl.java index 3151303c..301ce2bb 100644 --- a/module-instant-message/src/main/java/ink/wgink/module/instantmessage/service/impl/NoticeServiceImpl.java +++ b/module-instant-message/src/main/java/ink/wgink/module/instantmessage/service/impl/NoticeServiceImpl.java @@ -283,6 +283,21 @@ public class NoticeServiceImpl extends DefaultBaseService implements INoticeServ notice.setUserIds(noticeUserIds); } + @Override + public List listPOByDate(String date) { + Map params = getHashMap(2); + params.put("date", date); + return listPO(params); + } + + @Override + public List listPOByStartTimeAndEndTime(String startTime, String endTime) { + Map params = getHashMap(4); + params.put("startTime", startTime); + params.put("endTime", endTime); + return listPO(params); + } + /** * 系统列表 * diff --git a/module-instant-message/src/main/resources/mybatis/mapper/notice-mapper.xml b/module-instant-message/src/main/resources/mybatis/mapper/notice-mapper.xml index 65fd1217..f48c3541 100644 --- a/module-instant-message/src/main/resources/mybatis/mapper/notice-mapper.xml +++ b/module-instant-message/src/main/resources/mybatis/mapper/notice-mapper.xml @@ -268,6 +268,10 @@ AND notice_service_id = #{serviceId} + + AND + LEFT(gmt_create, 10) = #{date} + AND notice_service_id IN @@ -275,6 +279,14 @@ #{serviceIds[${index}]} + + AND + LEFT(gmt_create, 10) = ]]> #{startTime} + + + AND + LEFT(gmt_create, 10) #{endTime} + @@ -345,6 +357,14 @@ #{serviceIds[${index}]} + + AND + LEFT(gmt_create, 10) = ]]> #{startTime} + + + AND + LEFT(gmt_create, 10) #{endTime} + diff --git a/module-sms/src/main/java/ink/wgink/module/sms/dao/sms/ISmsDao.java b/module-sms/src/main/java/ink/wgink/module/sms/dao/sms/ISmsDao.java index c30def6b..d33af4c9 100644 --- a/module-sms/src/main/java/ink/wgink/module/sms/dao/sms/ISmsDao.java +++ b/module-sms/src/main/java/ink/wgink/module/sms/dao/sms/ISmsDao.java @@ -6,6 +6,7 @@ import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.UpdateException; import ink.wgink.interfaces.init.IInitBaseTable; import ink.wgink.module.sms.pojo.dtos.sms.SmsDTO; +import ink.wgink.module.sms.pojo.pos.sms.SmsPO; import org.springframework.stereotype.Repository; import java.util.List; @@ -57,6 +58,15 @@ public interface ISmsDao extends IInitBaseTable { */ SmsDTO get(Map params) throws SearchException; + /** + * 短信详情 + * + * @param params + * @return + * @throws SearchException + */ + SmsPO getPO(Map params) throws SearchException; + /** * 短信列表 * @@ -66,4 +76,13 @@ public interface ISmsDao extends IInitBaseTable { */ List list(Map params) throws SearchException; + /** + * 短信列表 + * + * @param params + * @return + * @throws SearchException + */ + List listPO(Map params) throws SearchException; + } diff --git a/module-sms/src/main/java/ink/wgink/module/sms/pojo/pos/sms/SmsPO.java b/module-sms/src/main/java/ink/wgink/module/sms/pojo/pos/sms/SmsPO.java index e8511bba..2e782869 100644 --- a/module-sms/src/main/java/ink/wgink/module/sms/pojo/pos/sms/SmsPO.java +++ b/module-sms/src/main/java/ink/wgink/module/sms/pojo/pos/sms/SmsPO.java @@ -18,6 +18,10 @@ public class SmsPO { private Integer sendStatus; private String errorMessage; private String gmtCreate; + private String creator; + private String gmtModified; + private String modifier; + private Integer isDelete; public String getSmsId() { return smsId == null ? "" : smsId.trim(); @@ -82,4 +86,36 @@ public class SmsPO { public void setGmtCreate(String gmtCreate) { this.gmtCreate = gmtCreate; } + + public String getCreator() { + return creator == null ? "" : creator.trim(); + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public String getGmtModified() { + return gmtModified == null ? "" : gmtModified.trim(); + } + + public void setGmtModified(String gmtModified) { + this.gmtModified = gmtModified; + } + + public String getModifier() { + return modifier == null ? "" : modifier.trim(); + } + + public void setModifier(String modifier) { + this.modifier = modifier; + } + + public Integer getIsDelete() { + return isDelete == null ? 0 : isDelete; + } + + public void setIsDelete(Integer isDelete) { + this.isDelete = isDelete; + } } diff --git a/module-sms/src/main/java/ink/wgink/module/sms/service/sms/ISmsService.java b/module-sms/src/main/java/ink/wgink/module/sms/service/sms/ISmsService.java index ebeb7527..5f0c1d28 100644 --- a/module-sms/src/main/java/ink/wgink/module/sms/service/sms/ISmsService.java +++ b/module-sms/src/main/java/ink/wgink/module/sms/service/sms/ISmsService.java @@ -2,6 +2,7 @@ package ink.wgink.module.sms.service.sms; import ink.wgink.interfaces.sms.ISmsBaseService; import ink.wgink.module.sms.pojo.dtos.sms.SmsDTO; +import ink.wgink.module.sms.pojo.pos.sms.SmsPO; import ink.wgink.module.sms.pojo.vos.sms.SmsSendVO; import ink.wgink.module.sms.pojo.vos.sms.SmsVO; import ink.wgink.pojo.ListPage; @@ -53,6 +54,22 @@ public interface ISmsService extends ISmsBaseService { */ SmsDTO get(String smsId); + /** + * 短信详情 + * + * @param params + * @return + */ + SmsPO getPO(Map params); + + /** + * 短信详情 + * + * @param smsId + * @return + */ + SmsPO getPO(String smsId); + /** * 短信列表 * @@ -92,4 +109,29 @@ public interface ISmsService extends ISmsBaseService { * @param smsSendVO */ void send(SmsSendVO smsSendVO); + + /** + * 发送短信列表 + * + * @param params + * @return + */ + List listPO(Map params); + + /** + * 发送短信列表 + * + * @param date + * @return + */ + List listPOByDate(String date); + + /** + * 发送短信个列表 + * + * @param startTime + * @param endTime + * @return + */ + List listPOByStartTimeAndEndTime(String startTime, String endTime); } diff --git a/module-sms/src/main/java/ink/wgink/module/sms/service/sms/impl/SmsServiceImpl.java b/module-sms/src/main/java/ink/wgink/module/sms/service/sms/impl/SmsServiceImpl.java index dff8769e..cc4da8c4 100644 --- a/module-sms/src/main/java/ink/wgink/module/sms/service/sms/impl/SmsServiceImpl.java +++ b/module-sms/src/main/java/ink/wgink/module/sms/service/sms/impl/SmsServiceImpl.java @@ -10,6 +10,7 @@ import ink.wgink.module.sms.dao.sms.ISmsDao; import ink.wgink.module.sms.factory.sms.SmsSendFactory; import ink.wgink.module.sms.manager.VerifyCodeManager; import ink.wgink.module.sms.pojo.dtos.sms.SmsDTO; +import ink.wgink.module.sms.pojo.pos.sms.SmsPO; import ink.wgink.module.sms.pojo.vos.sms.SmsSendVO; import ink.wgink.module.sms.pojo.vos.sms.SmsVO; import ink.wgink.module.sms.service.sms.ISmsService; @@ -78,6 +79,18 @@ public class SmsServiceImpl extends DefaultBaseService implements ISmsService { return get(params); } + @Override + public SmsPO getPO(Map params) { + return smsDao.getPO(params); + } + + @Override + public SmsPO getPO(String smsId) { + Map params = getHashMap(2); + params.put("smsId", smsId); + return getPO(params); + } + @Override public List list(Map params) { return smsDao.list(params); @@ -157,6 +170,26 @@ public class SmsServiceImpl extends DefaultBaseService implements ISmsService { }, 3, TimeUnit.SECONDS); } + @Override + public List listPO(Map params) { + return smsDao.listPO(params); + } + + @Override + public List listPOByDate(String date) { + Map params = getHashMap(2); + params.put("date", date); + return listPO(params); + } + + @Override + public List listPOByStartTimeAndEndTime(String startTime, String endTime) { + Map params = getHashMap(4); + params.put("startTime", startTime); + params.put("endTime", endTime); + return listPO(params); + } + @Override public String getVerifyCode(String phone) { return VerifyCodeManager.getInstance().getVerifyCode(phone); diff --git a/module-sms/src/main/resources/mybatis/mapper/sms-mapper.xml b/module-sms/src/main/resources/mybatis/mapper/sms-mapper.xml index 0829bc54..d587a949 100644 --- a/module-sms/src/main/resources/mybatis/mapper/sms-mapper.xml +++ b/module-sms/src/main/resources/mybatis/mapper/sms-mapper.xml @@ -22,6 +22,10 @@ + + + + @@ -214,11 +218,28 @@ t1.content, t1.send_status, t1.error_message, + t1.creator, + t1.gmt_create, + t1.modifier, + t1.gmt_modified, + t1.is_delete, t1.sms_id FROM sms_sms t1 WHERE t1.is_delete = 0 + + AND + LEFT(t1.gmt_create, 10) = #{date} + + + AND + LEFT(t1.gmt_create, 10) = ]]> #{startTime} + + + AND + LEFT(t1.gmt_create, 10) #{endTime} + \ No newline at end of file