From cf487b4baf05048e8929b47d73efc83d6a09162c Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期二, 30 一月 2024 17:12:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemNoticeServiceImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemNoticeServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemNoticeServiceImpl.java
index 509814b..273fab8 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemNoticeServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemNoticeServiceImpl.java
@@ -5,6 +5,7 @@
import com.stylefeng.guns.modular.system.dao.TNoticesMapper;
import com.stylefeng.guns.modular.system.model.SystemNotice;
import com.stylefeng.guns.modular.system.service.ISystemNoticeService;
+import com.stylefeng.guns.modular.system.util.DateUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -63,7 +64,7 @@
* @return
*/
@Override
- public List<Map<String, Object>> queryList(Integer type, Integer pageNum, Integer size, Integer uid) {
+ public List<Map<String, Object>> queryList(Integer type, Integer pageNum, Integer size, Integer uid, Integer language) {
pageNum = (pageNum - 1) * size;
List<Map<String, Object>> list = null;
if(type == 1){//系统公告
@@ -72,9 +73,17 @@
if(type == 2){//系统消息
list = systemNoticeMapper.queryList(type, pageNum, size, uid);
for(Map<String, Object> map : list){
+ map.put("title", language == 1 ? "系统提示" : language == 2 ? "Message" : "Rappel du système");
systemNoticeMapper.readSystemNotice(Integer.valueOf(String.valueOf(map.get("id"))), uid);
}
}
+ for (Map<String, Object> map : list) {
+ if(null != map.get("time")){
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
+ }
+
return list;
}
--
Gitblit v1.7.1