新增消息发送统计图表

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<NoticePO> listPOByDate(String date);
+
+    /**
+     * 发送通知列表
+     *
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    List<NoticePO> listPOByStartTimeAndEndTime(String startTime, String endTime);
 }

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<NoticePO> listPOByDate(String date) {
+        Map<String, Object> params = getHashMap(2);
+        params.put("date", date);
+        return listPO(params);
+    }
+
+    @Override
+    public List<NoticePO> listPOByStartTimeAndEndTime(String startTime, String endTime) {
+        Map<String, Object> params = getHashMap(4);
+        params.put("startTime", startTime);
+        params.put("endTime", endTime);
+        return listPO(params);
+    }
+
     /**
      * 系统列表
      *

module-instant-message/src/main/resources/mybatis/mapper/notice-mapper.xml

@@ -268,6 +268,10 @@
         AND
             notice_service_id = #{serviceId}
         </if>
+        <if test="date != null and date != ''">
+        AND
+            LEFT(gmt_create, 10) = #{date}
+        </if>
         <if test="serviceIds != null and serviceIds.size > 0">
         AND
             notice_service_id IN
@@ -275,6 +279,14 @@
                 #{serviceIds[${index}]}
             </foreach>
         </if>
+        <if test="startTime != null and startTime != ''">
+        AND
+            LEFT(gmt_create, 10) <![CDATA[ >= ]]> #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+        AND
+            LEFT(gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
+        </if>
     </select>
 
     <!-- 列表 -->
@@ -345,6 +357,14 @@
                 #{serviceIds[${index}]}
             </foreach>
         </if>
+        <if test="startTime != null and startTime != ''">
+        AND
+            LEFT(gmt_create, 10) <![CDATA[ >= ]]> #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+        AND
+            LEFT(gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
+        </if>
     </select>
 
     <!-- 系统列表 -->

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<String, Object> params) throws SearchException;
 
+    /**
+     * 短信详情
+     *
+     * @param params
+     * @return
+     * @throws SearchException
+     */
+    SmsPO getPO(Map<String, Object> params) throws SearchException;
+
     /**
      * 短信列表
      *
@@ -66,4 +76,13 @@ public interface ISmsDao extends IInitBaseTable {
      */
     List<SmsDTO> list(Map<String, Object> params) throws SearchException;
 
+    /**
+     * 短信列表
+     *
+     * @param params
+     * @return
+     * @throws SearchException
+     */
+    List<SmsPO> listPO(Map<String, Object> params) throws SearchException;
+
 }

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;
+    }
 }

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<String, Object> 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<SmsPO> listPO(Map<String, Object> params);
+
+    /**
+     * 发送短信列表
+     *
+     * @param date
+     * @return
+     */
+    List<SmsPO> listPOByDate(String date);
+
+    /**
+     * 发送短信个列表
+     *
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    List<SmsPO> listPOByStartTimeAndEndTime(String startTime, String endTime);
 }

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<String, Object> params) {
+        return smsDao.getPO(params);
+    }
+
+    @Override
+    public SmsPO getPO(String smsId) {
+        Map<String, Object> params = getHashMap(2);
+        params.put("smsId", smsId);
+        return getPO(params);
+    }
+
     @Override
     public List<SmsDTO> list(Map<String, Object> params) {
         return smsDao.list(params);
@@ -157,6 +170,26 @@ public class SmsServiceImpl extends DefaultBaseService implements ISmsService {
         }, 3, TimeUnit.SECONDS);
     }
 
+    @Override
+    public List<SmsPO> listPO(Map<String, Object> params) {
+        return smsDao.listPO(params);
+    }
+
+    @Override
+    public List<SmsPO> listPOByDate(String date) {
+        Map<String, Object> params = getHashMap(2);
+        params.put("date", date);
+        return listPO(params);
+    }
+
+    @Override
+    public List<SmsPO> listPOByStartTimeAndEndTime(String startTime, String endTime) {
+        Map<String, Object> 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);

module-sms/src/main/resources/mybatis/mapper/sms-mapper.xml

@@ -22,6 +22,10 @@
         <result column="send_status" property="sendStatus"/>
         <result column="error_message" property="errorMessage"/>
         <result column="gmt_create" property="gmtCreate"/>
+        <result column="creator" property="creator"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="modifier" property="modifier"/>
+        <result column="is_delete" property="isDelete"/>
     </resultMap>
 
     <!-- 建表 -->
@@ -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
+        <if test="date != null and date != ''">
+        AND
+            LEFT(t1.gmt_create, 10) = #{date}
+        </if>
+        <if test="startTime != null and startTime != ''">
+        AND
+            LEFT(t1.gmt_create, 10) <![CDATA[ >= ]]> #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+        AND
+            LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
+        </if>
     </select>
 
 </mapper>