Merge branch 'release' into 'master'

Release

See merge request !244

pom.xml

@@ -35,7 +35,7 @@
         <dubbo.version>2.7.4.1</dubbo.version>
         <curator.version>2.12.0</curator.version>
         <push.log.version>2.17.0-SNAPSHOT</push.log.version>
-        <event-client.version>1.0.8-SNAPSHOT</event-client.version>
+        <event-client.version>1.0.9-SNAPSHOT</event-client.version>
     </properties>
 
     <dependencies>

src/main/java/com/zhiwei/brandkbs2/controller/app/AppEventController.java

@@ -239,8 +239,9 @@ public class AppEventController extends BaseController {
                                              @RequestParam(value = "type", defaultValue = "重要渠道") String type,
                                              @RequestParam(value = "page", defaultValue = "1") int page,
                                              @RequestParam(value = "pageSize", defaultValue = "10") int pageSize,
-                                             @RequestParam(value = "sorter", required = false) String sorter){
-        return ResponseResult.success(eventService.eventChannelVoices(eventId, type, page, pageSize, sorter));
+                                             @RequestParam(value = "sorter", required = false) String sorter,
+                                             @RequestParam(value = "aggregation", required = false) Boolean aggregation){
+        return ResponseResult.success(eventService.eventChannelVoices(eventId, type, page, pageSize, sorter, aggregation));
     }
 
     @ApiOperation("前台事件库-事件详情-热门文章分析")

src/main/java/com/zhiwei/brandkbs2/dao/EventMiddlewareDao.java

@@ -73,7 +73,7 @@ public interface EventMiddlewareDao {
      * @param sorter
      * @return
      */
-    PageData<JSONObject> eventChannelVoices(String eventId, String type, int page, int pageSize, String sorter);
+    PageData<JSONObject> eventChannelVoices(String eventId, String type, int page, int pageSize, String sorter, Boolean aggregation);
     /**
      * 统计事件数量
      * @param eventIds

src/main/java/com/zhiwei/brandkbs2/dao/impl/EventMiddlewareDaoImpl.java

@@ -72,8 +72,8 @@ public class EventMiddlewareDaoImpl implements EventMiddlewareDao {
     }
 
     @Override
-    public PageData<JSONObject> eventChannelVoices(String eventId, String type, int page, int pageSize, String sorter) {
-        return eventClient.eventChannelVoices(eventId, type, page, pageSize, sorter);
+    public PageData<JSONObject> eventChannelVoices(String eventId, String type, int page, int pageSize, String sorter, Boolean aggregation) {
+        return eventClient.eventChannelVoices(eventId, type, page, pageSize, sorter, aggregation);
     }
 
     @Override

src/main/java/com/zhiwei/brandkbs2/service/EventService.java

@@ -398,7 +398,7 @@ public interface EventService {
      * @param sorter        排序方式
      * @return
      */
-    PageData<JSONObject> eventChannelVoices(String eventId, String type, int page, int pageSize, String sorter);
+    PageData<JSONObject> eventChannelVoices(String eventId, String type, int page, int pageSize, String sorter, Boolean aggregation);
 
     /**
      * 事件中间件获取热门文章分析

src/main/java/com/zhiwei/brandkbs2/service/impl/EventServiceImpl.java

@@ -855,8 +855,8 @@ public class EventServiceImpl implements EventService {
     }
 
     @Override
-    public PageData<JSONObject> eventChannelVoices(String eventId, String type, int page, int pageSize, String sorter) {
-        return eventMiddlewareDao.eventChannelVoices(eventId, type, page, pageSize, sorter);
+    public PageData<JSONObject> eventChannelVoices(String eventId, String type, int page, int pageSize, String sorter, Boolean aggregation) {
+        return eventMiddlewareDao.eventChannelVoices(eventId, type, page, pageSize, sorter, aggregation);
     }
 
     @Override