Merge branch 'release' into 'master'

Release

See merge request !262

src/main/java/com/zhiwei/brandkbs2/controller/CommonController.java

@@ -30,7 +30,7 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("/common")
 @Api(tags = "基础信息接口", description = "提供基础信息查询")
-@Auth(role = RoleEnum.COMMON_ADMIN)
+@Auth(role = RoleEnum.CUSTOMER)
 public class CommonController extends BaseController {
 
     @Resource(name = "commonServiceImpl")

src/main/java/com/zhiwei/brandkbs2/controller/mobile/MobileSearchController.java

@@ -55,14 +55,14 @@ public class MobileSearchController {
             @ApiImplicitParam(name = "size", value = "每页记录数", required = false, defaultValue = "10", paramType = "query", dataType = "int"),
             @ApiImplicitParam(name = "keyword", value = "关键字", required = false, defaultValue = "", paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "platform", value = "平台筛选", required = false, defaultValue = "全部", paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "emotion", value = "情感倾向", required = false, defaultValue = "0", paramType = "query", dataType = "int")
+            @ApiImplicitParam(name = "emotion", value = "情感倾向", required = false, defaultValue = "-1", paramType = "query", dataType = "int")
     })
     @GetMapping("/channel")
     public ResponseResult searchChannelList(@RequestParam(value = "page", defaultValue = "1") int page,
                                             @RequestParam(value = "size", defaultValue = "10") int size,
                                             @RequestParam(value = "keyword", defaultValue = "") String keyword,
                                             @RequestParam(value = "platform", defaultValue = "全部") String platform,
-                                            @RequestParam(value = "emotion", defaultValue = "0") int emotion) {
+                                            @RequestParam(value = "emotion", defaultValue = "-1") int emotion) {
         JSONObject sorter = new JSONObject();
         sorter.put("last_time","descend");
         return ResponseResult.success(channelService.getChannelListNew(page, size, keyword, Collections.singletonList(platform),

src/main/java/com/zhiwei/brandkbs2/enmus/RoleEnum.java

@@ -25,7 +25,7 @@ public enum RoleEnum {
     CUSTOMER(4, "客户"),
 
     /**
-     * 客户
+     * 无需权限
      */
     NO_AUTHORISE(-1, "无需权限");
 

src/main/java/com/zhiwei/brandkbs2/es/EsQueryTools.java

@@ -12,6 +12,7 @@ import org.apache.lucene.search.join.ScoreMode;
 import org.elasticsearch.index.query.*;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static com.zhiwei.brandkbs2.common.GenericAttribute.ES_BRANDKBS_CACHE_MAPS;
 import static com.zhiwei.brandkbs2.util.Tools.concat;
@@ -82,11 +83,15 @@ public class EsQueryTools {
      * @return
      */
     public static BoolQueryBuilder assembleTagQuery(List<String> tagIds) {
+        // groupId分组处理
+        Map<String, List<String>> groupTagIds = tagIds.stream().collect(Collectors.groupingBy(tagId -> tagId.substring(0, 4)));
+        BoolQueryBuilder tagBoolQuery = QueryBuilders.boolQuery();
+        groupTagIds.forEach((group, list) -> {
             BoolQueryBuilder tagQuery = QueryBuilders.boolQuery();
-        tagIds.forEach(e -> {
-            tagQuery.should(QueryBuilders.termQuery("brandkbs_mark_cache_maps.unique_id.keyword", e));
+            list.forEach(e -> tagQuery.should(QueryBuilders.termQuery("brandkbs_mark_cache_maps.unique_id.keyword", e)));
+            tagBoolQuery.must(tagQuery);
         });
-        return tagQuery;
+        return tagBoolQuery;
     }
 
     public static BoolQueryBuilder assembleCacheMapsQuery(String projectId, String linkedGroupId, String contendId) {

src/main/java/com/zhiwei/brandkbs2/interceptor/InterceptorConfig.java

@@ -22,6 +22,6 @@ public class InterceptorConfig implements WebMvcConfigurer {
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
 		// 自定义拦截器，添加拦截路径和排除拦截路径
-		registry.addInterceptor(mainAuthInterceptor).addPathPatterns("/app/**","/admin/**").excludePathPatterns("/app/event/detail/**");
+		registry.addInterceptor(mainAuthInterceptor).addPathPatterns("/common/**", "/app/**", "/admin/**", "/mobile/**").excludePathPatterns("/app/event/detail/**");
 	}
 }

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

@@ -1041,7 +1041,7 @@ public class ChannelServiceImpl implements ChannelService {
 		Long endTime = timeRangeWeek[1];
 		String contendId = Constant.PRIMARY_CONTEND_ID;
 		JSONObject result = getSpreadingTend(channelId, type,contendId, startTime, endTime);
-		if ("稿件".equals(type)) {
+		if (!"事件".equals(type)) {
 			List<ChannelIndex.Article> dataList = getSourceContendMap(channelId, Collections.singletonList(contendId),startTime,endTime).get(contendId);
 			int dataSize = dataList.size();
 			long positiveArticle = dataList.stream().filter(data -> EmotionEnum.POSITIVE.getState() == data.getEmotion()).count();
@@ -1061,7 +1061,7 @@ public class ChannelServiceImpl implements ChannelService {
 					}, esSearchExecutor)).collect(Collectors.toList());
 			CompletableFuture.allOf(futureList.toArray(new CompletableFuture[0])).join();
 			result.put("recentlyArticles", futureList.stream().map(CompletableFuture::join).collect(Collectors.toList()));
-		} else if ("事件".equals(type)) {
+		} else {
 			Map<Long,List<Event>> eventMap = eventMiddlewareDao.getEventDay(new ChannelIndex(channelDao.findOneById(channelId), contendId).getFid(), startTime,
 					endTime);
 			List<Event> events = new ArrayList<>();