1.物料追溯新增语言翻译和优化

src/main/java/com/neotel/smfcore/core/message/rest/MessageController.java

@@ -154,7 +154,7 @@ public class MessageController {
     @ApiOperation("根据type汇总总数量")
     @ApiOperation("根据type汇总总数量")
     @GetMapping("/typeTotalByDate")
     @GetMapping("/typeTotalByDate")
     @AnonymousAccess
     @AnonymousAccess
-    public ResultBean typeTotalByDate(MessageCriteria criteria) {
+    public ResultBean typeTotalByDate(MessageCriteria criteria, HttpServletRequest request) {
         //默认取7天的,如果客户端传的有,就用客户端的
         //默认取7天的,如果客户端传的有,就用客户端的
         Date endDate = new Date();
         Date endDate = new Date();
         Date startDate = DateUtil.offsetDay(endDate, -7);
         Date startDate = DateUtil.offsetDay(endDate, -7);
@@ -171,22 +171,29 @@ public class MessageController {
             }
             }
         }
         }
 
 
-        //只需要返回type 去统计数据
-        String field = "type";
-        List<Message> messageList = messageManager.findByUpdateAndFileds(startDate, endDate, field);
+        List<Message> messageList = messageManager.findByUpdateAndFileds(startDate, endDate, "");
+
+        Map<String, List<MessageDto>> resultMap = Maps.newConcurrentMap();
+        resultMap.put("INFO", new ArrayList<>());
+        resultMap.put("WARNING", new ArrayList<>());
+        resultMap.put("ERROR", new ArrayList<>());
+        resultMap.put("CRITICAL", new ArrayList<>());
 
 
-        Map<String, Integer> resultMap = Maps.newConcurrentMap();
         if (messageList != null && !messageList.isEmpty()) {
         if (messageList != null && !messageList.isEmpty()) {
             for (Message message : messageList) {
             for (Message message : messageList) {
+                MessageDto dto = messageMapper.toDto(message);
                 String type = message.getType();
                 String type = message.getType();
-                Integer count = resultMap.get(type);
-                if (count == null) {
-                    count = 0;
+                if (ObjectUtil.isNotEmpty(dto.getMsgCode())) {
+                    dto.setMsg(MessageUtils.getText(dto.getMsgCode(), dto.getMsgParams(), request.getLocale(), dto.getMsg()));
                 }
                 }
-                resultMap.put(type, count + 1);
+                List<MessageDto> list = resultMap.get(type);
+                if (list == null) {
+                    list = new ArrayList<>();
+                }
+                list.add(dto);
+                resultMap.put(type, list);
             }
             }
         }
         }
-
         return ResultBean.newOkResult(resultMap);
         return ResultBean.newOkResult(resultMap);
     }
     }
 
 

src/main/java/com/neotel/smfcore/core/message/service/manager/impl/MessageManagerImpl.java

@@ -5,6 +5,7 @@ import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.DateUtil;
 import com.neotel.smfcore.common.utils.DateUtil;
 import com.neotel.smfcore.common.utils.FileUtil;
 import com.neotel.smfcore.common.utils.FileUtil;
+import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.core.language.service.nanager.impl.LanguageMsgManagerImpl;
 import com.neotel.smfcore.core.language.service.nanager.impl.LanguageMsgManagerImpl;
 import com.neotel.smfcore.core.language.service.po.LanguageMsg;
 import com.neotel.smfcore.core.language.service.po.LanguageMsg;
 import com.neotel.smfcore.core.language.util.MessageUtils;
 import com.neotel.smfcore.core.language.util.MessageUtils;
@@ -16,6 +17,7 @@ import com.neotel.smfcore.core.message.service.po.Message;
 import com.neotel.smfcore.security.service.po.User;
 import com.neotel.smfcore.security.service.po.User;
 import lombok.Data;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
@@ -136,7 +138,9 @@ public class MessageManagerImpl implements IMessageManager {
         Query q = new Query();
         Query q = new Query();
         Criteria c = Criteria.where("updateDate").gte(startDate).lt(endDate);
         Criteria c = Criteria.where("updateDate").gte(startDate).lt(endDate);
         q.addCriteria(c);
         q.addCriteria(c);
+        if (StringUtils.isNotEmpty(field)) {
             q.fields().include(field);
             q.fields().include(field);
+        }
         return messageDao.findByQuery(q);
         return messageDao.findByQuery(q);
     }
     }
 
 

src/main/resources/messages.properties

@@ -422,3 +422,4 @@ smfcore.language.displayLanName.ja-JP=\u65E5\u672C\u8A9E
 smfcore.language.displayLanName.fr-FR=Fran\u00E7ais
 smfcore.language.displayLanName.fr-FR=Fran\u00E7ais
 smfcore.language.displayLanName.de-DE=Deutsch
 smfcore.language.displayLanName.de-DE=Deutsch
 smfcore.logMonitor=\u65E5\u5FD7\u76D1\u63A7
 smfcore.logMonitor=\u65E5\u5FD7\u76D1\u63A7
+smfcore.materialTrace=\u7269\u6599\u8FFD\u6EAF
\ No newline at end of file

src/main/resources/messages_de_DE.properties

@@ -412,3 +412,4 @@ smfcore.language.displayLanName.ja-JP=\u65E5\u672C\u8A9E
 smfcore.language.displayLanName.fr-FR=Fran\u00E7ais
 smfcore.language.displayLanName.fr-FR=Fran\u00E7ais
 smfcore.language.displayLanName.de-DE=Deutsch
 smfcore.language.displayLanName.de-DE=Deutsch
 smfcore.logMonitor=Log-\u00DCberwachung
 smfcore.logMonitor=Log-\u00DCberwachung
+smfcore.materialTrace=Materialverfolgung
\ No newline at end of file

src/main/resources/messages_en_US.properties

@@ -413,3 +413,4 @@ smfcore.language.displayLanName.ja-JP=\u65E5\u672C\u8A9E
 smfcore.language.displayLanName.fr-FR=Fran\u00E7ais
 smfcore.language.displayLanName.fr-FR=Fran\u00E7ais
 smfcore.language.displayLanName.de-DE=Deutsch
 smfcore.language.displayLanName.de-DE=Deutsch
 smfcore.logMonitor=Log Monitoring
 smfcore.logMonitor=Log Monitoring
+smfcore.materialTrace=Material Trace
\ No newline at end of file

src/main/resources/messages_fr_FR.properties

@@ -412,3 +412,4 @@ smfcore.language.displayLanName.ja-JP=\u65E5\u672C\u8A9E
 smfcore.language.displayLanName.fr-FR=Fran\u00E7ais
 smfcore.language.displayLanName.fr-FR=Fran\u00E7ais
 smfcore.language.displayLanName.de-DE=Deutsch
 smfcore.language.displayLanName.de-DE=Deutsch
 smfcore.logMonitor=Surveillance des Journaux
 smfcore.logMonitor=Surveillance des Journaux
+smfcore.materialTrace=Tra\u00E7abilit\u00E9 des mati\u00E8res
\ No newline at end of file

src/main/resources/messages_ja_JP.properties

@@ -409,3 +409,4 @@ smfcore.language.displayLanName.ja-JP=\u65E5\u672C\u8A9E
 smfcore.language.displayLanName.fr-FR=Fran\u00E7ais
 smfcore.language.displayLanName.fr-FR=Fran\u00E7ais
 smfcore.language.displayLanName.de-DE=Deutsch
 smfcore.language.displayLanName.de-DE=Deutsch
 smfcore.logMonitor=\u30ED\u30B0\u76E3\u8996
 smfcore.logMonitor=\u30ED\u30B0\u76E3\u8996
+smfcore.materialTrace=\u30DE\u30C6\u30EA\u30A2\u30EB\u30C8\u30EC\u30FC\u30B9
\ No newline at end of file

src/main/resources/messages_zh_CN.properties

@@ -409,3 +409,4 @@ smfcore.language.displayLanName.ja-JP=\u65E5\u672C\u8A9E
 smfcore.language.displayLanName.fr-FR=Fran\u00E7ais
 smfcore.language.displayLanName.fr-FR=Fran\u00E7ais
 smfcore.language.displayLanName.de-DE=Deutsch
 smfcore.language.displayLanName.de-DE=Deutsch
 smfcore.logMonitor=\u65E5\u5FD7\u76D1\u63A7
 smfcore.logMonitor=\u65E5\u5FD7\u76D1\u63A7
+smfcore.materialTrace=\u7269\u6599\u8FFD\u6EAF
\ No newline at end of file

src/main/resources/messages_zh_TW.properties

@@ -409,3 +409,4 @@ smfcore.language.displayLanName.ja-JP=\u65E5\u672C\u8A9E
 smfcore.language.displayLanName.fr-FR=Fran\u00E7ais
 smfcore.language.displayLanName.fr-FR=Fran\u00E7ais
 smfcore.language.displayLanName.de-DE=Deutsch
 smfcore.language.displayLanName.de-DE=Deutsch
 smfcore.logMonitor=\u65E5\u8A8C\u76E3\u63A7
 smfcore.logMonitor=\u65E5\u8A8C\u76E3\u63A7
+smfcore.materialTrace=\u7269\u6599\u8FFD\u6EAF
\ No newline at end of file