|
|
@@ -29,7 +29,7 @@ func (c *MessageCommon) SummaryMessageList() {
|
|
|
sysUserId := sysUser.AdminId
|
|
|
|
|
|
//SummaryMessageListResp := message.SummaryMessageListResp{}
|
|
|
- sourceTypeList := [...]int{1, 2, 3}
|
|
|
+ sourceTypeList := [...]int{1, 2, 3, 5, 6}
|
|
|
messageMap := make(map[int]message.SummaryMessage)
|
|
|
timeList := make([]int, 0)
|
|
|
for _, sourceType := range sourceTypeList {
|
|
|
@@ -51,13 +51,18 @@ func (c *MessageCommon) SummaryMessageList() {
|
|
|
c.FailWithMessage("获取失败", "获取未读消息数失败，Err:"+err.Error())
|
|
|
return
|
|
|
}
|
|
|
- CompanyMessage := message.SummaryMessage{
|
|
|
+ companyMessage := message.SummaryMessage{
|
|
|
Message: tmpMessage,
|
|
|
Total: int(notReadTotal),
|
|
|
SourceType: sourceType,
|
|
|
}
|
|
|
+
|
|
|
timeInt := int(messageInfo.CreateTime.Unix())
|
|
|
- messageMap[timeInt] = CompanyMessage
|
|
|
+ //这么做避免时间重复了
|
|
|
+ timeStr := fmt.Sprintf("%d%d", timeInt, messageInfo.Id)
|
|
|
+ timeInt, _ = strconv.Atoi(timeStr)
|
|
|
+
|
|
|
+ messageMap[timeInt] = companyMessage
|
|
|
timeList = append(timeList, timeInt)
|
|
|
|
|
|
//switch sourceType {
|
|
|
@@ -236,6 +241,10 @@ func (c *MessageCommon) MessageList() {
|
|
|
c.OkDetailed(resp, "获取成功")
|
|
|
}
|
|
|
|
|
|
+func getMessageItem(source int) {
|
|
|
+
|
|
|
+}
|
|
|
+
|
|
|
// @Title 消息已读
|
|
|
// @Description 消息已读接口
|
|
|
// @Param request body company.CompanyApprovalMessageReadReq true "type json string"
|
