Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java

@@ -56,7 +56,7 @@ public class I3CoreQueueConfig {
      * @throws Exception
      */
     @Bean
-    public Queue getQueueSwebNoticeQueue(){
+    public Queue getQueueSwebNoticeQuery(){
         return new Queue(PlatformConstWords.QUEUE_SWEB_NOTICE);
     }
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java

@@ -178,6 +178,7 @@ public class NoSqlPack {
         ElasticSearchPack result = packElasticSearchPack(bean);
 
         result.andNumberEquals("softType",bean.getSoftType());
+        result.andNumberEquals("requestId",bean.getRequestId());
         result.andStringLeftLike("logHost",bean.getLogHost());
         result.andStringLike("userLoginName",bean.getUserLoginName());
         result.andStringEquals("logGroup",bean.getLogGroup());