Merge branch 'feature' into 'dev'

Feature

See merge request !349

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

@@ -100,20 +100,24 @@ public class AppHotController extends BaseController {
                                  @RequestParam(value = "type", defaultValue = "weibo") String type,
                                  @RequestParam(value = "sort", defaultValue = "endTime") String sort,
                                  @RequestParam(value = "startTime", required = false) Long startTime,
-                                 @RequestParam(value = "endTime", required = false) Long endTime) {
-        JSONObject result = searchHotHandler(pageSize, page, type, sort, startTime, endTime);
+                                 @RequestParam(value = "endTime", required = false) Long endTime,
+                                 @RequestParam(value = "contendId", required = false) String contendId) {
+        JSONObject result = searchHotHandler(pageSize, page, type, sort, startTime, endTime, contendId);
         if (Objects.isNull(result)) {
             return ResponseResult.success();
         }
         // 查询在榜数据
-        ResponseEntity<JSONObject> responseEntity = restTemplate.getForEntity(trendsListUrl, JSONObject.class, null, type, null);
         List<String> rankingIds = new ArrayList<>();
-        if (Objects.nonNull(responseEntity.getBody())) {
-            rankingIds = responseEntity.getBody().getJSONArray("data").stream().map(obj -> ((JSONObject) obj).getString("_id")).collect(Collectors.toList());
+        if (!allPlatform.equals(type)) {
+            ResponseEntity<JSONObject> responseEntity = restTemplate.getForEntity(trendsListUrl, JSONObject.class, null, type, null);
+            if (Objects.nonNull(responseEntity.getBody())) {
+                rankingIds = responseEntity.getBody().getJSONArray("data").stream().map(obj -> ((JSONObject) obj).getString("_id")).collect(Collectors.toList());
+            }
         }
         List<String> finalRankingIds = rankingIds;
         // 对比补录词
-        List<Object> valueList = redisUtil.getMapValueAll(RedisKeyPrefix.supplementWordKey(UserThreadLocal.getProjectId()));
+        String keyId = null == contendId ? UserThreadLocal.getProjectId() : contendId;
+        List<Object> valueList = redisUtil.getMapValueAll(RedisKeyPrefix.supplementWordKey(keyId));
         List<String> supplementList = valueList.stream().map(word -> JSON.parseObject((String) word, SupplementWord.class).getTitle()).collect(Collectors.toList());
         List<JSONObject> list = result.getJSONArray("data").stream().map(obj -> {
             JSONObject json = (JSONObject) obj;
@@ -131,24 +135,28 @@ public class AppHotController extends BaseController {
 
     @ApiOperation("热点库-品牌热点-关键词获取")
     @GetMapping("/keyword")
-    public ResponseResult getKeyword() {
-        String projectId = UserThreadLocal.getProjectId();
-        String key = RedisKeyPrefix.hotKeywordKey(projectId);
+    public ResponseResult getKeyword(@ApiParam(name = "竞品id")@RequestParam(required = false) String contendId) {
+        String keyId = null == contendId ? UserThreadLocal.getProjectId() : contendId;
+        String key = RedisKeyPrefix.hotKeywordKey(keyId);
         String keywordStr = redisUtil.get(key);
-        if (null == keywordStr) {
-            // 默认返回并设置品牌名
-            List<String> defaultKeyword = Collections.singletonList(projectService.getProjectById(projectId).getBrandName());
+        if (null != keywordStr) {
+            return ResponseResult.success(JSONArray.parseArray(keywordStr));
+        }
+        // 主品牌则默认返回并设置品牌名
+        if (null == contendId) {
+            List<String> defaultKeyword = Collections.singletonList(projectService.getProjectById(keyId).getBrandName());
             redisUtil.set(key, JSON.toJSONString(defaultKeyword));
             return ResponseResult.success(defaultKeyword);
         }
-        return ResponseResult.success(JSONArray.parseArray(keywordStr));
+        return ResponseResult.success();
     }
 
     @ApiOperation("热点库-品牌热点-关键词调整")
     @PutMapping("/keyword/update")
-    public ResponseResult updateKeyword(@RequestBody JSONObject json) {
+    public ResponseResult updateKeyword(@ApiParam(name = "json:{list:关键词数组,contendId:竞品id}") @RequestBody JSONObject json) {
         JSONArray list = json.getJSONArray("list");
-        redisUtil.set(RedisKeyPrefix.hotKeywordKey(UserThreadLocal.getProjectId()), list.toJSONString());
+        String contendId = json.getString("contendId");
+        redisUtil.set(RedisKeyPrefix.hotKeywordKey(null == contendId ? UserThreadLocal.getProjectId() : contendId), list.toJSONString());
         return ResponseResult.success();
     }
 
@@ -200,9 +208,10 @@ public class AppHotController extends BaseController {
     @ApiOperation("热点库-根据热搜平台和标题匹配查询条件")
     @GetMapping("/match-criteria")
     public ResponseResult matchSearchCriteria(@RequestParam String name, @RequestParam String type) {
-        Long[] timeRangeMonth = commonService.getTimeRangeMonth();
+        long endTime = System.currentTimeMillis();
+        long startTime = endTime - Constant.ONE_MONTH;
         int defaultPageSize = 5;
-        JSONObject result = searchHotHandler(10000, 1, HotPlatformEnum.convertFromName2Eng(type), "endTime", timeRangeMonth[0], timeRangeMonth[1]);
+        JSONObject result = searchHotHandler(10000, 1, HotPlatformEnum.convertFromName2Eng(type), "endTime", startTime, endTime);
         int index = 0;
         boolean matched = false;
         List<JSONObject> data = result.getJSONArray("data").toJavaList(JSONObject.class);
@@ -369,13 +378,14 @@ public class AppHotController extends BaseController {
      * @param endTime
      * @return
      */
-    private JSONObject searchHotHandler(int pageSize, int page, String type, String sort, Long startTime, Long endTime) {
-        String keywordStr = redisUtil.get(RedisKeyPrefix.hotKeywordKey(UserThreadLocal.getProjectId()));
+    private JSONObject searchHotHandler(int pageSize, int page, String type, String sort, Long startTime, Long endTime,String contendId) {
+        String keyId = null == contendId ? UserThreadLocal.getProjectId() : contendId;
+        String keywordStr = redisUtil.get(RedisKeyPrefix.hotKeywordKey(keyId));
         if (null == keywordStr) {
             return null;
         }
         String accurateWord = null;
-        List<Object> valueList = redisUtil.getMapValueAll(RedisKeyPrefix.supplementWordKey(UserThreadLocal.getProjectId()));
+        List<Object> valueList = redisUtil.getMapValueAll(RedisKeyPrefix.supplementWordKey(keyId));
         if (CollectionUtils.isNotEmpty(valueList)) {
             List<String> collect = valueList.stream().map(word -> JSON.parseObject((String) word, SupplementWord.class).getTitle()).collect(Collectors.toList());
             accurateWord = StringUtils.join(collect, "|");
@@ -390,6 +400,10 @@ public class AppHotController extends BaseController {
         return jsonObjectResponseEntity.getBody();
     }
 
+    private JSONObject searchHotHandler(int pageSize, int page, String type, String sort, Long startTime, Long endTime) {
+        return searchHotHandler(pageSize, page, type, sort, startTime, endTime, null);
+    }
+
     private JSONObject contrastReport(List<JSONObject> source, Long[] timeRange, Long space) {
         JSONObject result = new JSONObject();
         List<JSONObject> list = source.stream().filter(json -> json.getLong("startTime") >= timeRange[0]).collect(Collectors.toList());

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

@@ -166,6 +166,10 @@ public class CommonServiceImpl implements CommonService {
         Date date = Tools.truncDate(new Date(), Constant.DAY_PATTERN);
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(date);
+        // 如果是周日
+        if (calendar.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) {
+            calendar.add(Calendar.DAY_OF_YEAR, -1);
+        }
         calendar.set(Calendar.DAY_OF_WEEK, 1);
         startTime = calendar.getTime().getTime();
         calendar.set(Calendar.DAY_OF_WEEK, 7);

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

@@ -171,12 +171,12 @@ public class UserServiceImpl implements UserService {
                 newUser.setNickname(userDTO.getNickname());
                 newUser.setRoles(Collections.singletonList(UserRole.createFromUserDto(userDTO)));
                 newUser.setSuperAdmin(false);
-                userDao.insertOne(newUser);
-                userCenterService.addProduct(newUser.getId());
             } else {
                 newUser = User.createFromUserDTO(userDTO, nickname);
-                userDao.insertOne(newUser);
             }
+            userDao.insertOne(newUser);
+            // 通知用户中心开通权限
+            userCenterService.addProduct(newUser.getId());
             return ResponseResult.success();
         }
         List<UserRole> roles = user.getRoles();

src/main/resources/application-local.properties

@@ -87,8 +87,8 @@ crisis.event.url =https://crisis.zhiweidata.com/event/{1}/general?share={2}
 trends.longTimeInListSearchByInner.url=https://trends.zhiweidata.com/hotSearchTrend/inner/longTimeInListSearchByInner?sortType={1}&type={2}&day={3}
 trends.findHotSearchESDataInTimeByInner.url=https://hotsearch-manage.zhiweidata.com/hotsearch/hotSearch/findHotSearchESDataInTimeByInner?limit={1}&page={2}&type={3}&word={4}
 trends.longTimeInListSearch.url=https://trends.zhiweidata.com/hotSearchTrend/search/longTimeInListSearch?type={1}&sortType=realTime
-trends.getHotSearchFromEsInTimeAndTypeOrWord.url=http://192.168.0.192:9091/hotsearch/hotSearch/getHotSearchFromEsInTimeAndTypeOrWord?limit={1}&page={2}&type={3}&word={4}&sort={5}&accurateWord={6}
-trends.queryHotSearchTrendInner.url=http://192.168.27.203:9094/hotSearchTrend/inner/queryHotSearchTrendInner?name={1}&startTime={2}&type={3}
+trends.getHotSearchFromEsInTimeAndTypeOrWord.url=https://hotsearch-manage.zhiweidata.com/hotsearch/hotSearch/getHotSearchFromEsInTimeAndTypeOrWord?limit={1}&page={2}&type={3}&word={4}&sort={5\}&accurateWord={6}
+trends.queryHotSearchTrendInner.url=https://trends.zhiweidata.com/hotSearchTrend/inner/queryHotSearchTrendInner?name={1}&startTime={2}&type={3}
 trends.getHotSearchSnapshot.url=https://hotsearch-manage.zhiweidata.com/hotsearch/hotSearch/getHotSearchSnapshot?type={1}&time={2}&rank={3}
 
 #\u4E8B\u4EF6\u5E93\u5916\u90E8\u63A5\u53E3