Merge branch 'release' into 'master'

Release

See merge request !161

pom.xml

@@ -29,7 +29,7 @@
         <fastjson.version>1.2.47</fastjson.version>
         <easyexcel.version>3.0.5</easyexcel.version>
         <marker.client.version>1.1.9-SNAPSHOT</marker.client.version>
-        <base-objects.version>2.0.0-SNAPSHOT</base-objects.version>
+        <base-objects.version>2.1.4-SNAPSHOT</base-objects.version>
         <es.version>7.9.2</es.version>
         <dozer.version>5.5.1</dozer.version>
         <dubbo.version>2.7.4.1</dubbo.version>

src/main/java/com/zhiwei/brandkbs2/pojo/dto/MarkSearchDTO.java

@@ -105,6 +105,12 @@ public class MarkSearchDTO {
     @ApiModelProperty(value = "渠道关键词")
     private String sourceKeyword;
 
+    /**
+     * 域名关键词
+     */
+    @ApiModelProperty(value = "域名关键词")
+    private String hostKeyword;
+
     // sort
     /**
      * 排序字段

src/main/java/com/zhiwei/brandkbs2/pojo/dto/SearchFilterDTO.java

 package com.zhiwei.brandkbs2.pojo.dto;
 
+import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -83,6 +84,12 @@ public class SearchFilterDTO {
     private String source;
 
     /**
+     * 域名
+     */
+    @ApiModelProperty(value = "域名")
+    private String host;
+
+    /**
      * 过滤关键字
      */
     @ApiModelProperty(value = "过滤关键字")
@@ -127,6 +134,7 @@ public class SearchFilterDTO {
         map.put("startTime", startTime);
         map.put("endTime", endTime);
         map.put("source", source);
+        map.put("url",host);
         map.put("sort", Objects.nonNull(sorter) ? sorter : "DESC");
         map.put("page", page);
         map.put("pageSize", pageSize);
@@ -134,6 +142,7 @@ public class SearchFilterDTO {
         map.put("sensitiveChannels", sensitiveChannels);
         map.put("fans", fans);
         map.put("filterType", filterType);
+        System.out.println("map:"+ JSON.toJSONString(map));
         return map;
     }
 

src/main/java/com/zhiwei/brandkbs2/pojo/vo/ChannelVO.java

@@ -8,6 +8,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.ToString;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Map;
 
 @Data
@@ -80,14 +82,21 @@ public class ChannelVO {
         channelVO.setRealSource(json.getString("real_source"));
         channelVO.setEmotion(ChannelEmotion.getNameFromState(json.getInteger("emotion")));
         channelVO.setEmotionRank(ChannelEmotion.getEmotionRank(json.getDouble("emotion_index")));
-        channelVO.setAvatarUrl(json.getString("avatar_url"));
         channelVO.setEventCount(json.getLong("event_count"));
         channelVO.setArticleCount(json.getLong("article_count"));
-        channelVO.setInfluence(json.getDouble("influence"));
         channelVO.setMediaType(json.getString("media_type"));
         channelVO.setLastArticle(json.getJSONObject("last_article"));
+        // 修正部分avatarUrl和influence
+        String avatarUrl = json.getString("avatar_url");
+        if (null != avatarUrl && avatarUrl.contains("brandkbs/")) {
+            avatarUrl = avatarUrl.replace("brandkbs/", "");
+            channelVO.setAvatarUrl(avatarUrl);
+        }
+        Double influence = json.getDouble("influence");
+        if (null != influence && influence != -1) {
+            channelVO.setInfluence(new BigDecimal(influence).setScale(2, RoundingMode.UP).doubleValue());
+        }
         return channelVO;
-
     }
 
 }

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

@@ -434,7 +434,7 @@ public class ChannelServiceImpl implements ChannelService {
 		List<ChannelListVO> resList = new ArrayList<>();
 		try {
 			String projectId = UserThreadLocal.getProjectId();
-			String redisKey = RedisUtil.getChannelRecordList(projectId, startTime, endTime);
+			String redisKey = RedisUtil.getChannelRecordList(projectId, startTime, endTime, emotion);
 			String resultStr;
 			// 返回缓存
 			if (cache && StringUtils.isNotEmpty(resultStr = redisUtil.get(redisKey))) {
@@ -513,8 +513,8 @@ public class ChannelServiceImpl implements ChannelService {
 					resList.add(ChannelListVO.createFromChannel(record, record.getRecord().getArticles().size()));
 				}
 			});
-			// TODO 配合天级缓存开启
-//            redisUtil.set(redisKey, JSON.toJSONString(resList));
+			// 配合天级缓存开启
+			redisUtil.setExpire(redisKey, JSON.toJSONString(resList));
 		} catch (IOException e) {
 			ExceptionCast.cast(CommonCodeEnum.FAIL, "es查询异常");
 		}

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

@@ -132,4 +132,32 @@ public class CommonServiceImpl implements CommonService {
         return new Long[]{startTime, endTime};
     }
 
+    @Override
+    public Long[] getTimeRangeFormatWeek() {
+        long startTime;
+        long endTime;
+        Date date = Tools.truncDate(new Date(), Constant.DAY_PATTERN);
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.set(Calendar.DAY_OF_WEEK, 1);
+        startTime = calendar.getTime().getTime();
+        calendar.set(Calendar.DAY_OF_WEEK, 7);
+        endTime = DateUtils.addDays(calendar.getTime(), 1).getTime();
+        return new Long[]{startTime, endTime};
+    }
+
+    @Override
+    public Long[] getTimeRangeFormatMonth() {
+        long startTime;
+        long endTime;
+        Date date = Tools.truncDate(new Date(), Constant.DAY_PATTERN);
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.set(Calendar.DAY_OF_MONTH, 1);
+        startTime = calendar.getTime().getTime();
+        calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
+        endTime = DateUtils.addDays(calendar.getTime(), 1).getTime();
+        return new Long[]{startTime, endTime};
+    }
+
 }

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

@@ -604,6 +604,10 @@ public class MarkDataServiceImpl implements MarkDataService {
         if (StringUtils.isNotEmpty(dto.getSourceKeyword())) {
             postFilter.must(EsQueryTools.assembleSourceQuery(dto.getSourceKeyword()));
         }
+        // hostKeyword
+        if (StringUtils.isNotEmpty(dto.getHostKeyword())) {
+            postFilter.must(EsQueryTools.assembleFiledKeywordQuery("host", dto.getHostKeyword()));
+        }
         helper.setPostFilter(postFilter);
 //        helper.setQuery(query);
         // sort
@@ -1015,6 +1019,10 @@ public class MarkDataServiceImpl implements MarkDataService {
         if (StringUtils.isNotEmpty(dto.getSourceKeyword())) {
             postFilter.must(EsQueryTools.assembleSourceQuery(dto.getSourceKeyword()));
         }
+        // hostKeyword
+        if (StringUtils.isNotEmpty(dto.getHostKeyword())) {
+            postFilter.must(EsQueryTools.assembleFiledKeywordQuery("host", dto.getHostKeyword()));
+        }
         helper.setPostFilter(postFilter);
 //        helper.setQuery(query);
         // sort
@@ -1352,6 +1360,11 @@ public class MarkDataServiceImpl implements MarkDataService {
             }
             result.put("url", url);
             result.put("time", list.get("time"));
+            result.put("avatarUrl", list.get("avatar_url"));
+            result.put("source", list.get("source"));
+            result.put("followersNum", list.get("followers_num"));
+            result.put("realSource", list.get("real_source"));
+            result.put("ipLocation", list.get("ip_location"));
             resultList.add(result);
         }
         jsonObject.put("list", resultList);

src/main/java/com/zhiwei/brandkbs2/task/ControlCenter.java

@@ -30,7 +30,7 @@ public class ControlCenter {
         log.info("定时按天录入渠道进量-启动");
         try {
             taskService.messageFlowCount(1);
-//            taskService.channelRecordListCache();
+            taskService.channelRecordListCache();
         } catch (Exception e) {
             log.error("定时按天录入渠道进量-出错", e);
         } finally {

src/main/java/com/zhiwei/brandkbs2/util/RedisUtil.java

@@ -53,8 +53,8 @@ public class RedisUtil {
         return RedisKeyPrefix.INDEX_SPREAD + Tools.concat(projectId, startTime, endTime);
     }
 
-    public static String getChannelRecordList(String projectId, Long startTime, Long endTime) {
-        return RedisKeyPrefix.CHANNEL_RECORD_LIST + Tools.concat(projectId, startTime, endTime);
+    public static String getChannelRecordList(String projectId, Long startTime, Long endTime, int emotion) {
+        return RedisKeyPrefix.CHANNEL_RECORD_LIST + Tools.concat(projectId, startTime, endTime, emotion);
     }
 
     public static String getNewCrisisCaseListAllKey() {