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/ProblemServiceImpl.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ProblemServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ProblemServiceImpl.java
index 1441b80..79d84d6 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ProblemServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ProblemServiceImpl.java
@@ -7,7 +7,10 @@
import com.stylefeng.guns.modular.system.model.Problem;
import com.stylefeng.guns.modular.system.model.SensitiveWords;
import com.stylefeng.guns.modular.system.service.IProblemService;
+import com.stylefeng.guns.modular.system.service.IUserInfoService;
+import com.stylefeng.guns.modular.system.util.DateUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -25,6 +28,9 @@
@Resource
private SensitiveWordsMapper sensitiveWordsMapper;
+ @Autowired
+ private IUserInfoService userInfoService;
+
/**
@@ -35,10 +41,11 @@
* @throws Exception
*/
@Override
- public ResultUtil leaveMessage(String content, Integer uid) throws Exception {
+ public ResultUtil leaveMessage(String content, Integer uid, Integer language) throws Exception {
if(ToolUtil.isNotEmpty(content)){
if(content.length() > 200){
- return ResultUtil.error("留言内容过长");
+ language = userInfoService.queryLanguage(uid, language);
+ return ResultUtil.error(language == 1 ? "留言内容过长" : language == 2 ? "Message-content is overlong." : "Le contenu du message est trop long.");
}
List<SensitiveWords> sensitiveWords = sensitiveWordsMapper.selectList(null);
for(SensitiveWords s : sensitiveWords){
@@ -65,8 +72,15 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryProblems(Integer pageNum, Integer size, Integer uid) throws Exception {
+ public List<Map<String, Object>> queryProblems(Integer pageNum, Integer size, Integer uid, Integer language) throws Exception {
pageNum = (pageNum - 1) * size;
- return problemMapper.queryProblems(pageNum, size, uid);
+ List<Map<String, Object>> list = problemMapper.queryProblems(pageNum, size, uid);
+ for (Map<String, Object> map : list) {
+ if(null != map.get("insertTime")){
+ String insertTime = map.get("insertTime").toString();
+ map.put("insertTime", DateUtil.conversionFormat(language, insertTime));
+ }
+ }
+ return list;
}
}
--
Gitblit v1.7.1