Merge branch 'feature' into 'dev'

2022/10/11 15:15

See merge request !51

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

@@ -3,6 +3,7 @@ package com.zhiwei.brandkbs2.dao.impl;
 import com.zhiwei.brandkbs2.dao.QbjcPojoDao;
 import com.zhiwei.qbjc.bean.pojo.common.MessagePlatform;
 import com.zhiwei.qbjc.bean.pojo.common.Tag;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Component;
@@ -24,7 +25,7 @@ public class QbjcPojoDaoImpl implements QbjcPojoDao {
 
     @Override
     public List<MessagePlatform> findMessagePlatformAll() {
-        return mongoTemplate.find(new Query(), MessagePlatform.class);
+        return mongoTemplate.find(new Query().with(Sort.by(Sort.Order.asc("_id"))), MessagePlatform.class);
     }
 
     @Override

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

@@ -75,7 +75,7 @@ public class BehaviorServiceImpl implements BehaviorService {
         String[] collectionNames = behaviorDao.generateCollectionNames(start, end);
         Query query = new Query();
         query.addCriteria(Criteria.where("cTime").gte(startTime).lt(endTime).and("backstage").is(backstage));
-        behaviorDao.addSort(query, "{\"cTime\":\"ascend\"}");
+        behaviorDao.addSort(query, "{\"cTime\":\"descend\"}");
         if (StringUtils.isNotEmpty(nickname)) {
             userDao.addKeywordFuzz(query, nickname, "nickname");
             List<User> userList = userDao.findList(query);

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

@@ -681,7 +681,8 @@ public class EventServiceImpl implements EventService {
                 String yearStr = String.valueOf(yearInfo);
                 result.put("name", yearStr);
                 result.put("startTime", Tools.DF_YEAR.parse(yearStr).getTime());
-                result.put("endTime", Tools.DF_YEAR.parse(yearStr).getTime());
+                String nextYear = String.valueOf(++yearInfo);
+                result.put("endTime", Tools.DF_YEAR.parse(nextYear).getTime());
             } catch (ParseException e) {
                 throw new RuntimeException(e);
             }

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

@@ -1264,18 +1264,7 @@ public class MarkDataServiceImpl implements MarkDataService {
             }
         } else {
             result.put("origin", "舆情");
-            ResponseEntity<String> responseEntity = restTemplate.getForEntity(wholeSearchCriteriaUrl, String.class);
-            JSONObject jsonObject = JSON.parseObject(responseEntity.getBody());
-            Map data = (Map) jsonObject.get("data");
-            List<JSONObject> list = (List) data.get("list");
-            //发布平台删掉脉脉
-            List<JSONObject> collect = list.stream().filter(s -> !s.get("name").equals("脉脉")).collect(Collectors.toList());
-            for (JSONObject object : collect) {
-                JSONObject platformJSONObject = new JSONObject();
-                platformJSONObject.put("name", object.get("name"));
-                platformJSONObject.put("id", object.get("id"));
-                platformList.add(platformJSONObject);
-            }
+            platformList = commonService.getQbjcPlatform("id","name").stream().filter(s -> !s.get("name").equals("脉脉")).collect(Collectors.toList());
         }
         result.put("platformList", platformList);
         return result;