Merge branch 'feature' into 'dev'

2024/08/14 ai搜索 test

See merge request !569

pom.xml

@@ -269,7 +269,7 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>3.8.0</version>
+            <version>3.12.0</version>
         </dependency>
         <!-- dubbo -->
         <dependency>
@@ -324,6 +324,12 @@
             <artifactId>ansj_seg</artifactId>
             <version>5.0.2</version>
         </dependency>
+        <!--火山引擎 豆包大模型-->
+        <dependency>
+            <groupId>com.volcengine</groupId>
+            <artifactId>volcengine-java-sdk-ark-runtime</artifactId>
+            <version>0.1.121</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

src/main/java/com/zhiwei/brandkbs2/common/DoubaoAIAccountFactor.java

+package com.zhiwei.brandkbs2.common;
+
+import com.volcengine.ark.runtime.service.ArkService;
+import com.zhiwei.brandkbs2.pojo.ai.AccessModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @ClassName: DoubaoAIAccountFactor
+ * @Description DoubaoAIAccountFactor
+ * @author: sjj
+ * @date: 2024-07-24 14:01
+ */
+public class DoubaoAIAccountFactor {
+
+    public static Account getCompanyAccount() {
+        String apiKey = "607764fc-c9d9-47e4-a673-a310852917a0";
+        List<AccessModel> modelList = new ArrayList<>();
+        modelList.add(new AccessModel("ep-20240617061616-8d2ls", AccessModel.Model.DOUBAO_PRO_4K));
+        modelList.add(new AccessModel("ep-20240618021538-t6dpf", AccessModel.Model.DOUBAO_PRO_32K));
+        return new Account(apiKey, modelList);
+    }
+
+    @Data
+    @AllArgsConstructor
+    public static class Account {
+        String apiKey;
+        List<AccessModel> modelList;
+    }
+
+    public static ArkService arkService;
+
+    static {
+        arkService = new ArkService(getCompanyAccount().getApiKey());
+    }
+}

src/main/java/com/zhiwei/brandkbs2/common/GlobalPojo.java

@@ -2,6 +2,7 @@ package com.zhiwei.brandkbs2.common;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.zhiwei.brandkbs2.dao.ChannelRecordRefreshTaskDao;
 import com.zhiwei.brandkbs2.pojo.*;
 import com.zhiwei.brandkbs2.service.ChannelService;
 import com.zhiwei.brandkbs2.service.SystemInfoService;
@@ -10,11 +11,13 @@ import com.zhiwei.middleware.automaticmark.graphs.Graphs;
 import com.zhiwei.qbjc.bean.pojo.common.MessagePlatform;
 import com.zhiwei.qbjc.bean.pojo.common.Tag;
 import com.zhiwei.brandkbs2.dao.HighlightWordDao;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -45,6 +48,9 @@ public class GlobalPojo {
     @Resource(name = "highlightWordDao")
     private HighlightWordDao highlightWordDao;
 
+    @Resource(name = "channelRecordRefreshTaskDao")
+    private ChannelRecordRefreshTaskDao channelRecordRefreshTaskDao;
+
     @Resource(name = "channelServiceImpl")
     private ChannelService channelService;
 
@@ -143,6 +149,7 @@ public class GlobalPojo {
             COMMON_SENSITIVE_CHANNEL = systemInfoService.getCommonSensitiveChannel();
             BYTEDANCE_CHANNEL_INFLUENCE = systemInfoService.getByteDanceChannelInfluence();
             updateHighlightGraphs();
+            updateIncompleteChannelRecordTask();
             log.info("{}-获取PLATFORMS-size:{},TAGS-size:{},LINKED_GROUP_ID_TAGS:{},CHANNEL_TAGS:{},MEDIA_TYPE:{},PROJECT_MAP:{},YUQING-PROJECTS-size:{},PROJECT_EMOTION_CHANNEL_DATA-size:{},PROJECT_SENSITIVE_CHANNEL-size:{}, COMMON_SENSITIVE_CHANNEL-size:{},BYTEDANCE_CHANNEL_INFLUENCE-size:{}", logMsg, PLATFORMS.size(), TAGS.size(),
                     LINKED_GROUP_ID_TAGS.size(), CHANNEL_TAGS.size(), MEDIA_TYPE.size(), PROJECT_MAP.size(), YU_QING_PROJECTS.size(), PROJECT_EMOTION_CHANNEL_DATA.size(), PROJECT_SENSITIVE_CHANNEL.size(), COMMON_SENSITIVE_CHANNEL.size(), BYTEDANCE_CHANNEL_INFLUENCE.size());
         } catch (Exception e) {
@@ -150,6 +157,19 @@ public class GlobalPojo {
         }
     }
 
+    private void updateIncompleteChannelRecordTask(){
+        List<ChannelRecordRefreshTask> tasks = channelRecordRefreshTaskDao.findList(new Query(Criteria.where("status").is(ChannelRecordRefreshTask.TaskStatus.UPDATING.getStatus())));
+        if (CollectionUtils.isEmpty(tasks)){
+            return;
+        }
+        for (ChannelRecordRefreshTask task : tasks) {
+            Update update = new Update();
+            update.set("status", ChannelRecordRefreshTask.TaskStatus.NOT_START.getStatus());
+            update.set("uTime", System.currentTimeMillis());
+            channelRecordRefreshTaskDao.updateOneByIdWithField(task.getId(), update);
+        }
+    }
+
     private void updateHighlightGraphs() {
         PROJECT_MAP.forEach((key, project) -> {
             String id = project.getId();

src/main/java/com/zhiwei/brandkbs2/common/RedisKeyPrefix.java

@@ -121,8 +121,13 @@ public class RedisKeyPrefix {
 
     public static final String CUSTOM_YUQING_ANALYZE_HIGH_WORD = "BRANDKBS:CUSTOM:YUQING:ANALYZE:HIGH:WORD:";
 
+    /**
+     * 搜索相关缓存
+     */
     public static final String SEARCH_KEYWORD = "BRANDKBS:SEARCH:KEYWORD:";
 
+    public static final String AI_SEARCH_QUESTION = "BRANDKBS:AI:SEARCH:QUESTION:";
+
     public static String projectWarnHotTopKeyAll(String projectId, String type) {
         return RedisKeyPrefix.generateRedisKey(RedisKeyPrefix.PROJECT_WARN_HOT_TOP, projectId, Tools.concat(type, "*"));
     }

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.zhiwei.brandkbs2.model.ResponseResult;
 import com.zhiwei.brandkbs2.pojo.external.*;
 import com.zhiwei.brandkbs2.pojo.vo.CrisisCaseWarnVO;
+import com.zhiwei.brandkbs2.service.ChannelService;
 import com.zhiwei.brandkbs2.service.ProjectService;
 import com.zhiwei.brandkbs2.service.ProjectWarnService;
 import com.zhiwei.brandkbs2.util.TextUtil;
@@ -32,6 +33,9 @@ public class InterfaceController {
     @Resource(name = "projectWarnServiceImpl")
     private ProjectWarnService projectWarnService;
 
+    @Resource(name = "channelServiceImpl")
+    private ChannelService channelService;
+
     @Autowired
     TextUtil textUtil;
 
@@ -125,4 +129,16 @@ public class InterfaceController {
     public ResponseResult getUserProjectList(String userId) {
         return projectService.getUserProject(userId);
     }
+
+    @ApiOperation("数据回传标注库品见数据更新-生成刷新任务")
+    @PostMapping("/channel/refresh-task")
+    public ResponseResult createChannelRecordRefreshTask(@RequestBody JSONObject json) {
+        long startTime = json.getLongValue("startTime");
+        long endTime = json.getLongValue("endTime");
+        List<JSONObject> brandkbsInfos = json.getJSONArray("brandkbsInfo").toJavaList(JSONObject.class);
+        String mgroupId = json.getString("mgroupId");
+        String submitter = json.getString("submitter");
+        channelService.createChannelRecordRefreshTask(startTime, endTime, brandkbsInfos, mgroupId, submitter);
+        return ResponseResult.success();
+    }
 }

src/main/java/com/zhiwei/brandkbs2/controller/admin/UserController.java

 package com.zhiwei.brandkbs2.controller.admin;
 
+import com.alibaba.fastjson.JSONObject;
 import com.zhiwei.brandkbs2.auth.Auth;
 import com.zhiwei.brandkbs2.controller.BaseController;
 import com.zhiwei.brandkbs2.enmus.RoleEnum;
@@ -7,10 +8,7 @@ import com.zhiwei.brandkbs2.model.ResponseResult;
 import com.zhiwei.brandkbs2.pojo.dto.UserDTO;
 import com.zhiwei.brandkbs2.service.UserService;
 import com.zhiwei.middleware.auth.pojo.CenterUser;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -124,4 +122,46 @@ public class UserController extends BaseController {
         return ResponseResult.success();
     }
 
+    @ApiOperation("分页查询所有用户列表")
+    @GetMapping("/all-user/list")
+    @Auth(role = RoleEnum.SUPER_ADMIN)
+    public ResponseResult findAllUserList(@RequestParam(value = "page", defaultValue = "1") int page,
+                                          @RequestParam(value = "size", defaultValue = "10") int size,
+                                          @RequestParam(value = "keyword", defaultValue = "") String keyword) {
+        return ResponseResult.success(userService.findAllUserList(keyword, page, size));
+    }
+
+    @ApiOperation("根据用户名或手机号查询用户项目权限")
+    @GetMapping("/all-user/find")
+    @Auth(role = RoleEnum.SUPER_ADMIN)
+    public ResponseResult getUserByNickNameOrPhone(@RequestParam(value = "nickname", required = false) String nickname,
+                                                   @RequestParam(value = "phoneNumber", required = false) String phoneNumber) {
+        return userService.getUserByNickNameOrPhone(nickname, phoneNumber);
+    }
+
+    @ApiOperation("编辑单条项目权限")
+    @PostMapping("/all-user/single-update")
+    @Auth(role = RoleEnum.SUPER_ADMIN)
+    public ResponseResult updateOneUserRoles(@ApiParam(name = "json",
+            value = "json:{id:用户id,nickname:用户名,roleId:权限,expiredTime:过期时间,exportAmount:舆情导出数量,projectId:权限项目id,key:唯一key原封不动传回来即可}",
+            required = true) @RequestBody JSONObject json) {
+        return userService.updateOneUserRoles(json);
+    }
+
+    @ApiOperation("批量编辑项目权限")
+    @PostMapping("/all-user/batch-update")
+    @Auth(role = RoleEnum.SUPER_ADMIN)
+    public ResponseResult updateBatchUserRoles(@ApiParam(name = "json", value = "json:{id:用户id,roles:[{projectId:权限项目id,roleId:权限,exportAmount:舆情导出数量,expiredTime:过期时间},{},...]}",
+            required = true)
+                                                   @RequestBody JSONObject json) {
+        return userService.updateBatchUserRoles(json);
+    }
+
+    @ApiOperation("删除用户权限")
+    @DeleteMapping("/all-user/delete")
+    @Auth(role = RoleEnum.SUPER_ADMIN)
+    public ResponseResult deleteUserRole(@RequestParam(value = "id") String id,
+                                         @RequestParam(value = "key") String key) {
+        return userService.deleteUserRole(id, key);
+    }
 }
\ No newline at end of file

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

@@ -352,6 +352,25 @@ public class AppSearchController extends BaseController {
         return ResponseResult.success(markDataService.getContendSearchCriteria(contendId));
     }
 
+    @ApiOperation("搜索-AI搜索")
+    @GetMapping("/ai/answer")
+    public ResponseResult getAISearchResult(@RequestParam(value = "question") String question) {
+        return ResponseResult.success(markDataService.getAISearchResult(question));
+    }
+
+    @ApiOperation("搜索-AI推荐提问")
+    @GetMapping("/ai/question")
+    public ResponseResult getAIReferenceQuestion(@RequestParam(value = "question") String question,
+                                                 @RequestParam(value = "size") int size) {
+        return ResponseResult.success(markDataService.getAIReferenceQuestion(question, size));
+    }
+
+    @ApiOperation("搜索-AI参考提问")
+    @GetMapping("/ai/question-cache")
+    public ResponseResult getAIReferenceQuestion() {
+        return ResponseResult.success(markDataService.getAIReferenceQuestionCache(true));
+    }
+
     @ApiOperation("搜索-搜索关键词历史记录")
     @GetMapping("/keyword/cache")
     public ResponseResult getSearchKeywordCache(@ApiParam(name = "searchType",

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

+package com.zhiwei.brandkbs2.dao;
+
+import com.zhiwei.brandkbs2.pojo.AISearchQuestionRecord;
+
+import java.util.List;
+
+/**
+ * @ClassName: AISearchQuestionRecordDao
+ * @Description AISearchQuestionRecordDao
+ * @author: cjz
+ * @date: 2024-08-12 17:07
+ */
+public interface AISearchQuestionRecordDao extends BaseMongoDao<AISearchQuestionRecord>{
+
+    List<String> findDistinctQuestion(String projectId);
+}

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

+package com.zhiwei.brandkbs2.dao;
+
+import com.zhiwei.brandkbs2.pojo.ChannelRecordRefreshTask;
+import org.springframework.data.mongodb.core.query.Query;
+
+/**
+ * @ClassName: ChannelRecordRefreshTaskDao
+ * @Description 渠道记录更新任务dao
+ * @author: cjz
+ * @date: 2024-07-22 11:37
+ */
+public interface ChannelRecordRefreshTaskDao extends BaseMongoDao<ChannelRecordRefreshTask>{
+    ChannelRecordRefreshTask findOne(Query query);
+}

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

+package com.zhiwei.brandkbs2.dao;
+
+import com.zhiwei.brandkbs2.pojo.CustomInteractionUpdateRecord;
+
+/**
+ * @ClassName: MonthlyInteractionUpdateRecordDao
+ * @Description MonthlyInteractionUpdateRecordDao
+ * @author: cjz
+ * @date: 2024-07-09 10:30
+ */
+public interface CustomInteractionUpdateRecordDao extends BaseMongoDao<CustomInteractionUpdateRecord> {
+
+    CustomInteractionUpdateRecord findLastRecord(String projectId);
+}

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

 package com.zhiwei.brandkbs2.dao;
 
 import com.zhiwei.brandkbs2.pojo.User;
+import org.springframework.data.mongodb.core.query.Query;
 
 /**
  * @ClassName: UserDao
@@ -9,5 +10,5 @@ import com.zhiwei.brandkbs2.pojo.User;
  * @date: 2022-04-28 18:10
  */
 public interface UserDao extends BaseMongoDao<User>{
-
+    User findOne(Query query);
 }

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

+package com.zhiwei.brandkbs2.dao.impl;
+
+import com.zhiwei.brandkbs2.dao.AISearchQuestionRecordDao;
+import com.zhiwei.brandkbs2.pojo.AISearchQuestionRecord;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @ClassName: AISearchQuestionRecordDao
+ * @Description AISearchQuestionRecordDao
+ * @author: cjz
+ * @date: 2024-08-12 17:07
+ */
+@Component("aiSearchQuestionRecordDao")
+public class AISearchQuestionRecordDaoImpl extends BaseMongoDaoImpl<AISearchQuestionRecord> implements AISearchQuestionRecordDao {
+    private static final String COLLECTION_NAME = "brandkbs_ai_search_question_record";
+
+    public AISearchQuestionRecordDaoImpl() {
+        super(COLLECTION_NAME);
+    }
+
+    @Override
+    public List<String> findDistinctQuestion(String projectId) {
+        Query query = new Query().addCriteria(Criteria.where("projectId").is(projectId)).with(Sort.by(Sort.Order.desc("cTime"))).limit(10);
+        return mongoTemplate.findDistinct(query, "question", COLLECTION_NAME, String.class);
+    }
+}

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

+package com.zhiwei.brandkbs2.dao.impl;
+
+import com.zhiwei.brandkbs2.dao.ChannelRecordRefreshTaskDao;
+import com.zhiwei.brandkbs2.pojo.ChannelRecordRefreshTask;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.stereotype.Component;
+
+/**
+ * @ClassName: ChannelRecordRefreshTaskDaoImpl
+ * @Description 渠道记录更新任务dao
+ * @author: cjz
+ * @date: 2024-07-22 11:37
+ */
+@Component("channelRecordRefreshTaskDao")
+public class ChannelRecordRefreshTaskDaoImpl extends BaseMongoDaoImpl<ChannelRecordRefreshTask> implements ChannelRecordRefreshTaskDao {
+    private static final String COLLECTION_NAME = "brandkbs_channel_record_refresh_task";
+
+    public ChannelRecordRefreshTaskDaoImpl() {
+        super(COLLECTION_NAME);
+    }
+
+    @Override
+    public ChannelRecordRefreshTask findOne(Query query) {
+        return mongoTemplate.findOne(query, ChannelRecordRefreshTask.class, COLLECTION_NAME);
+    }
+}

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

+package com.zhiwei.brandkbs2.dao.impl;
+
+import com.zhiwei.brandkbs2.dao.CustomInteractionUpdateRecordDao;
+import com.zhiwei.brandkbs2.pojo.CustomInteractionUpdateRecord;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.stereotype.Component;
+
+/**
+ * @ClassName: MonthlyInteractionUpdateRecordDao
+ * @Description MonthlyInteractionUpdateRecordDao
+ * @author: cjz
+ * @date: 2024-07-09 10:30
+ */
+@Component("customInteractionUpdateRecordDao")
+public class CustomInteractionUpdateRecordDaoImpl extends BaseMongoDaoImpl<CustomInteractionUpdateRecord> implements CustomInteractionUpdateRecordDao {
+    private static final String COLLECTION_NAME = "brandkbs_custom_interaction_update_record";
+
+    public CustomInteractionUpdateRecordDaoImpl() {
+        super(COLLECTION_NAME);
+    }
+
+    @Override
+    public CustomInteractionUpdateRecord findLastRecord(String projectId) {
+        return mongoTemplate.findOne(new Query().addCriteria(Criteria.where("projectId").is(projectId))
+                .with(Sort.by(Sort.Order.desc("cTime"))).limit(1), CustomInteractionUpdateRecord.class, COLLECTION_NAME);
+    }
+}

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

@@ -2,6 +2,7 @@ package com.zhiwei.brandkbs2.dao.impl;
 
 import com.zhiwei.brandkbs2.dao.UserDao;
 import com.zhiwei.brandkbs2.pojo.User;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Component;
 
 /**
@@ -18,4 +19,9 @@ public class UserDaoImpl extends BaseMongoDaoImpl<User> implements UserDao {
     public UserDaoImpl() {
         super(COLLECTION_NAME);
     }
+
+    @Override
+    public User findOne(Query query) {
+        return mongoTemplate.findOne(query, User.class, COLLECTION_NAME);
+    }
 }

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

 package com.zhiwei.brandkbs2.es;
 
+import com.alibaba.fastjson.JSONObject;
 import com.zhiwei.brandkbs2.common.GenericAttribute;
 import com.zhiwei.brandkbs2.pojo.ChannelIndex;
 import com.zhiwei.brandkbs2.pojo.ChannelRecord;
@@ -10,23 +11,26 @@ import org.apache.logging.log4j.Logger;
 import org.elasticsearch.action.bulk.BulkRequest;
 import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.index.IndexRequest;
+import org.elasticsearch.action.search.SearchRequest;
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
+import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.search.sort.SortBuilders;
 import org.elasticsearch.search.sort.SortOrder;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
 
@@ -111,6 +115,87 @@ public class ChannelEsDao extends EsClientDao {
         }
     }
 
+    public Integer removeChannelRecordBatch(List<JSONObject> list) {
+        AtomicInteger update = new AtomicInteger();
+        AtomicInteger total = new AtomicInteger(list.size());
+        List<CompletableFuture<Boolean>> futures = new ArrayList<>(list.size());
+        list.forEach(json -> futures.add(CompletableFuture.supplyAsync(() -> removeChannelRecordByCondition(json, total), executor)));
+        CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).whenComplete((r, e) -> {
+            futures.forEach(f -> {
+                if (f.join()) {
+                    update.incrementAndGet();
+                }
+            });
+        }).join();
+
+//                list.forEach(json -> {
+//            removeChannelRecordByCondition(json, total);
+//        });
+        return update.get();
+    }
+
+    private boolean removeChannelRecordByCondition(JSONObject json, AtomicInteger total) {
+        String index = getChannelRecordIndexes().get(0);
+        String id = json.getString("id");
+        AtomicInteger searchCount = new AtomicInteger();
+        AtomicInteger updateCount = new AtomicInteger();
+        boolean update = false;
+        SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+        BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
+        boolQuery.must(QueryBuilders.termQuery("record.articles.id", id));
+        if (json.containsKey("projectId")) {
+            boolQuery.must(QueryBuilders.termQuery("project_id.keyword", json.getString("projectId")));
+        }
+        if (json.containsKey("contendIds")) {
+            BoolQueryBuilder contendBoolQuery = QueryBuilders.boolQuery();
+            json.getJSONArray("contendIds").toJavaList(String.class).forEach(contendId -> {
+                contendBoolQuery.should(QueryBuilders.termQuery("contend_id.keyword", contendId));
+            });
+            boolQuery.must(contendBoolQuery);
+        }
+        searchSourceBuilder.query(boolQuery);
+        searchSourceBuilder.size(1000);
+        SearchResponse response = retryTemplate.execute(context -> {
+            try {
+                return channelEsClient.search(new SearchRequest().indices(index).source(searchSourceBuilder), RequestOptions.DEFAULT);
+            } catch (IOException e) {
+                log.info("resetChannelRecordById:{},查询失败,尝试重试第{}次-", id, context.getRetryCount() + 1, e);
+                return null;
+            }
+        });
+        if (null != response) {
+            searchCount.addAndGet(response.getHits().getHits().length);
+            for (SearchHit hit : response.getHits().getHits()) {
+                JSONObject record = new JSONObject((Map<String, Object>) hit.getSourceAsMap().get("record"));
+                Long lastTime = record.getLong("last_time");
+                AtomicBoolean valid = new AtomicBoolean(false);
+                List<ChannelIndex.Article> articles = record.getJSONArray("articles").toJavaList(JSONObject.class).stream().map(article -> {
+                    // 移除id相同的数据
+                    if (article.getString("id").equals(id)) {
+                        valid.set(true);
+                        return null;
+                    }
+                    return ChannelIndex.Article.fromRecordMap(article);
+                }).filter(Objects::nonNull).collect(Collectors.toList());
+                // 有效更新
+                if (valid.get()) {
+                    Map<String, Object> updateMap = new HashMap<>();
+                    updateMap.put("record", new ChannelIndex.Record(lastTime, articles).toEsMap());
+                    updateMap.put("article_count", articles.size());
+                    try {
+                        channelEsClient.update(new UpdateRequest().index(index).id(hit.getId()).doc(updateMap), RequestOptions.DEFAULT);
+                        updateCount.getAndIncrement();
+                        update = true;
+                    } catch (Exception e) {
+                        log.info("resetChannelRecordById:{},更新失败", id, e);
+                    }
+                }
+            }
+        }
+        log.info("resetChannelRecordById:{},本次查询到{}条,更新{}条,剩余id数:{}", id, searchCount.get(), updateCount.get(), total.decrementAndGet());
+        return update;
+    }
+
     private BulkResponse upsertChannelRecordLimit(List<ChannelRecord> records, String index, int limit) {
         AtomicBoolean res = new AtomicBoolean(true);
         BulkResponse bulkResponse = null;

src/main/java/com/zhiwei/brandkbs2/pojo/AISearchQuestionRecord.java

+package com.zhiwei.brandkbs2.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @ClassName: AISearchQuestionRecord
+ * @Description ai搜索问题记录
+ * @author: cjz
+ * @date: 2024-8-12 14:58
+ */
+@Getter
+@Setter
+@AllArgsConstructor
+public class AISearchQuestionRecord extends AbstractBaseMongo {
+    /**
+     * 问题
+     */
+    private String question;
+
+    /**
+     * 项目id
+     */
+    private String projectId;
+
+    /**
+     * 创建时间
+     */
+    private Long cTime;
+}

src/main/java/com/zhiwei/brandkbs2/pojo/ChannelRecordRefreshTask.java

+package com.zhiwei.brandkbs2.pojo;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @ClassName: ChannelRecordRefreshTask
+ * @Description 渠道记录更新任务
+ * @author: cjz
+ * @date: 2024-07-22 10:37
+ */
+@Getter
+@Setter
+@AllArgsConstructor
+public class ChannelRecordRefreshTask extends AbstractBaseMongo{
+    /**
+     * 受影响数据最小时间
+     */
+    private Long startTime;
+    /**
+     * 受影响数据最大时间
+     */
+    private Long endTime;
+    /**
+     * 品见信息：[{projectId:,brandId:}]
+     */
+    List<JSONObject> brandkbsInfo;
+    /**
+     * mgroupId
+     */
+    private String mgroupId;
+    /**
+     * 任务状态
+     */
+    private String status;
+    /**
+     * 创建者
+     */
+    private String submitter;
+    /**
+     * 创建时间
+     */
+    private Long cTime;
+    /**
+     * 修改时间
+     */
+    private Long uTime;
+
+    @Getter
+    public enum TaskStatus {
+        NOT_START("未开始"), UPDATING("进行中"), ERROR("出错"), COMPLETED("已完成");
+        private String status;
+
+        TaskStatus(String status) {
+            this.status = status;
+        }
+    }
+}

src/main/java/com/zhiwei/brandkbs2/pojo/CustomInteractionUpdateRecord.java

+package com.zhiwei.brandkbs2.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @ClassName: MonthlyInteractionUpdateRecord
+ * @Description 每月互动量更新记录
+ * @author: cjz
+ * @date: 2024-07-09 9:48
+ */
+@Getter
+@Setter
+@AllArgsConstructor
+public class CustomInteractionUpdateRecord extends AbstractBaseMongo{
+    /**
+     * 拉取数据的开始时间
+     */
+    private Long startTime;
+    /**
+     * 拉取数据的结束时间
+     */
+    private Long endTime;
+
+    /**
+     * 项目id
+     */
+    private String projectId;
+
+    /**
+     * 数据更新节点开始时间
+     */
+    private Long dataStartTime;
+
+    /**
+     * 状态：完成|
+     */
+    private String status;
+
+    private Long cTime;
+
+    private Long uTime;
+}

src/main/java/com/zhiwei/brandkbs2/pojo/ai/AccessModel.java

+package com.zhiwei.brandkbs2.pojo.ai;
+
+import lombok.Data;
+import lombok.Getter;
+
+/**
+ * @ClassName: AccessModel
+ * @Description AccessModel
+ * @author: sjj
+ * @date: 2024-07-24 14:05
+ */
+@Data
+public class AccessModel {
+    // 模型名称
+    private String modelName;
+    // 接入点id
+    private String modelId;
+    // 输入单价(每千个token)
+    private Double inputPrice;
+    // 输出单价(每千个token)
+    private Double outputPrice;
+
+    public AccessModel(String modelId, Model model) {
+        this.modelId = modelId;
+        this.modelName = model.modelName;
+        this.inputPrice = model.inputPrice;
+        this.outputPrice = model.outputPrice;
+    }
+
+    public enum Model {
+        DOUBAO_PRO_4K("Doubao-pro-4k", 0.0008, 0.0020),
+        DOUBAO_PRO_32K("Doubao-pro-32k", 0.0008, 0.0020),
+        DOUBAO_PRO_128K("Doubao-pro-128k", 0.0090, 0.0500),
+        DOUBAO_LITE_4K("doubao-lite-4k", 0.0003, 0.0006),
+        DOUBAO_LITE_32K("Doubao-lite-32k", 0.0003, 0.0006),
+        DOUBAO_LITE_128K("Doubao-lite-128k", 0.0008, 0.0010);
+
+        @Getter
+        private final String modelName;
+        // 输入单价(每千个token)
+        @Getter
+        private final Double inputPrice;
+        // 输出单价(每千个token)
+        @Getter
+        private final Double outputPrice;
+
+        Model(String modelName, Double inputPrice, Double outputPrice) {
+            this.modelName = modelName;
+            this.inputPrice = inputPrice;
+            this.outputPrice = outputPrice;
+        }
+    }
+
+}

src/main/java/com/zhiwei/brandkbs2/pojo/ai/FieldMapping.java

+package com.zhiwei.brandkbs2.pojo.ai;
+
+import com.zhiwei.brandkbs2.common.GlobalPojo;
+import com.zhiwei.brandkbs2.config.Constant;
+import com.zhiwei.brandkbs2.es.EsQueryTools;
+import com.zhiwei.brandkbs2.pojo.AbstractProject;
+import com.zhiwei.brandkbs2.pojo.Contend;
+import com.zhiwei.brandkbs2.pojo.Project;
+import lombok.Data;
+import lombok.Getter;
+import org.apache.lucene.search.join.ScoreMode;
+import org.elasticsearch.index.query.*;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @ClassName: FieldMap
+ * @Description FieldMap
+ * @author: sjj
+ * @date: 2024-08-02 14:01
+ */
+@Data
+public class FieldMapping {
+
+    private FieldMap fieldMap;
+    private Object value;
+
+    public FieldMapping(FieldMap fieldMap, Object value) {
+        this.fieldMap = fieldMap;
+        this.value = value;
+    }
+
+    public QueryBuilder buildQuery(FieldMapping fieldMapping) {
+        boolean existsAnd = null != fieldMapping;
+        RangeQueryBuilder timeRangeBuilder;
+        String contendId = "0";
+        // 项目组需绑定查询
+        switch (fieldMap) {
+            case START_TIME:
+                timeRangeBuilder = QueryBuilders.rangeQuery(fieldMap.databaseName).gte(value);
+                if (existsAnd && fieldMapping.fieldMap.equals(FieldMap.END_TIME)) {
+                    timeRangeBuilder.lt(fieldMapping.value);
+                }
+                return timeRangeBuilder;
+            case END_TIME:
+                timeRangeBuilder = QueryBuilders.rangeQuery(fieldMap.databaseName).lt(value);
+                if (existsAnd && fieldMapping.fieldMap.equals(FieldMap.START_TIME)) {
+                    timeRangeBuilder.gte(fieldMapping.value);
+                }
+                return timeRangeBuilder;
+            case PROJECT:
+                if (existsAnd && fieldMapping.fieldMap == FieldMap.BRAND) {
+                    contendId = (String) fieldMapping.value;
+                }
+                BoolQueryBuilder nestedBoolBuilder = QueryBuilders.boolQuery();
+                // 必要条件
+                nestedBoolBuilder.must(QueryBuilders.termQuery(fieldMap.databaseName, value + "_" + contendId));
+                return new NestedQueryBuilder("brandkbs_cache_maps", nestedBoolBuilder, ScoreMode.None);
+            case BRAND:
+                if (!existsAnd || fieldMapping.fieldMap != FieldMap.PROJECT) {
+                    throw new IllegalStateException("项目条件缺失");
+                }
+                return fieldMapping.buildQuery(this);
+            case IND_FULL_TEXT:
+                return EsQueryTools.assembleNormalKeywordQuery(String.valueOf(value), new String[]{fieldMap.databaseName});
+//                return QueryBuilders.matchPhraseQuery(fieldMap.databaseName, value);
+            case SOURCE:
+            case MTAG:
+                return QueryBuilders.termQuery(fieldMap.databaseName, value);
+        }
+        return null;
+    }
+
+    public enum FieldMap {
+
+        START_TIME("起始时间", "时间", "time"),
+        END_TIME("结束时间", "时间", "time"),
+        PROJECT("项目", "项目", "brandkbs_cache_maps.key.keyword"),
+        BRAND("品牌", "项目", "brandkbs_cache_maps.key.keyword"),
+        SOURCE("渠道", "渠道", "source"),
+        MTAG("标签", "标签", "mark_cache_maps.name.keyword"),
+        IND_FULL_TEXT("搜索条件", "搜索条件", "ind_full_text");
+
+        @Getter
+        private final String name;
+        @Getter
+        private final String fatherName;
+        @Getter
+        private final String databaseName;
+
+        FieldMap(String name, String fatherName, String databaseName) {
+            this.name = name;
+            this.fatherName = fatherName;
+            this.databaseName = databaseName;
+        }
+    }
+
+    public static FieldMapping createFromNameAndValue(String name, Object value, List<FieldMapping> fieldMappings) {
+        FieldMap fieldMap = null;
+        // TODO 字段转换待完善,引入数据库
+        for (FieldMap f : FieldMap.values()) {
+            if (name.equals(f.getName())) {
+                // 项目名需要转成id
+                if (FieldMap.PROJECT == f) {
+                    Map<String, Project> projectMap = GlobalPojo.PROJECT_MAP.values().stream().collect(Collectors.toMap(AbstractProject::getProjectName, o -> o));
+                    if (projectMap.containsKey(String.valueOf(value))) {
+                        value = projectMap.get(String.valueOf(value)).getId();
+                    }
+                }
+                // 品牌需要转换
+                if (FieldMap.BRAND == f) {
+                    if ("主品牌".equals(value)) {
+                        value = Constant.PRIMARY_CONTEND_ID;
+                    } else {
+                        // 寻找对应的竞品id
+                        Optional<FieldMapping> project = fieldMappings.stream().filter(field -> Objects.equals(FieldMap.PROJECT, field.getFieldMap())).findFirst();
+                        if (project.isPresent()){
+                            List<Contend> contendList = GlobalPojo.PROJECT_MAP.get(String.valueOf(project.get().getValue())).getContendList();
+                            Object finalValue = value;
+                            Optional<Contend> contendOptional = contendList.stream().filter(contend -> Objects.equals(contend.getBrandName(), finalValue)).findFirst();
+                            if (contendOptional.isPresent()){
+                                value = contendOptional.get().getId();
+                            }else {
+                                value = Constant.PRIMARY_CONTEND_ID;
+                            }
+                        }else {
+                            value = Constant.PRIMARY_CONTEND_ID;
+                        }
+                    }
+                }
+                // 标签只包含正负中
+                if (FieldMap.MTAG == f) {
+                    if (!Arrays.asList("正面", "中性", "负面").contains(String.valueOf(value))) {
+                        return null;
+                    }
+                }
+                fieldMap = f;
+                break;
+            }
+        }
+        if (null == fieldMap) {
+            return null;
+        }
+        return new FieldMapping(fieldMap, value);
+    }
+
+}

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

@@ -333,4 +333,13 @@ public interface ChannelService {
      * @return
      */
     JSONObject getImportantChannelListDetail(String type, String name, String keyword);
+
+    /**
+     * 生成渠道记录更新任务
+     * @param startTime
+     * @param endTime
+     * @param yuqingProjectId
+     * @param submitter
+     */
+    void createChannelRecordRefreshTask(Long startTime, Long endTime, List<JSONObject> brandkbsInfos, String yuqingProjectId, String submitter);
 }

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

@@ -2,10 +2,7 @@ package com.zhiwei.brandkbs2.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.zhiwei.brandkbs2.model.ResponseResult;
-import com.zhiwei.brandkbs2.pojo.BaseMap;
-import com.zhiwei.brandkbs2.pojo.DailyReport;
-import com.zhiwei.brandkbs2.pojo.Event;
-import com.zhiwei.brandkbs2.pojo.MarkFlowEntity;
+import com.zhiwei.brandkbs2.pojo.*;
 import com.zhiwei.brandkbs2.pojo.dto.*;
 import com.zhiwei.brandkbs2.pojo.vo.LineVO;
 import com.zhiwei.brandkbs2.pojo.vo.PageVO;
@@ -836,4 +833,25 @@ public interface MarkDataService {
      * @return
      */
     List<String> expandOriginRange(MarkSearchDTO dto);
+
+    /**
+     * AI搜索-推荐提问
+     * @param question
+     * @return
+     */
+    List<String> getAIReferenceQuestion(String question, int size);
+
+    /**
+     * AI搜索-参考提问
+     * @param cache
+     * @return
+     */
+    List<String> getAIReferenceQuestionCache(boolean cache);
+
+    /**
+     * AI搜索-搜索结果
+     * @param question
+     * @return
+     */
+    JSONObject getAISearchResult(String question);
 }

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

@@ -64,12 +64,17 @@ public interface TaskService{
     void generateDailyReport();
 
     /**
-     * 每月互动量更新 时间范围近六个月
+     * 每日互动量更新 时间范围近10天
      */
-    void monthlyCustomXhsInteractionUpdate();
+    void dailyCustomXhsInteractionUpdate();
 
     /**
-     * 每日互动量更新 时间范围近10天
+     * 定时拉取并进行渠道库更新任务
      */
-    void dailyCustomXhsInteractionUpdate();
+    void refreshChannelRecord();
+
+    /**
+     * 生成ai搜索参考提问缓存
+     */
+    void cacheAIQuestion();
 }

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

@@ -42,7 +42,7 @@ public interface UserService {
     UserInfo queryUserInfo(String userId, String pid);
 
     /**
-     * 分页查询所有用户
+     * 分页查询所有用户（当前项目的用户）
      *
      * @param page    页码
      * @param size    大小
@@ -55,14 +55,14 @@ public interface UserService {
     PageVO<JSONObject> findUserList(int page, int size, String keyword, String pid, int role, String sorter);
 
     /**
-     * 添加用户
+     * 添加用户（当前项目的用户）
      *
      * @param userDTO
      */
     ResponseResult addUser(UserDTO userDTO);
 
     /**
-     * 删除用户
+     * 删除用户（当前项目的用户）
      *
      * @param userId
      * @param pid
@@ -70,7 +70,7 @@ public interface UserService {
     void deleteUser(String userId, String pid);
 
     /**
-     * 编辑用户
+     * 编辑用户（当前项目的用户）
      *
      * @param userDTO
      */
@@ -135,4 +135,40 @@ public interface UserService {
      */
     ResponseResult mobileCutLogin(String userId,String projectId);
 
+    /**
+     * 项目管理员-所有项目用户权限列表
+     * @param page
+     * @param pageSize
+     * @return
+     */
+    PageVO<JSONObject> findAllUserList(String keyword, int page, int pageSize);
+
+    /**
+     * 项目管理员-所有项目用户权限列表-通过用户名或手机号查询品见用户项目权限
+     * @param nickName
+     * @param phoneNumber
+     * @return
+     */
+    ResponseResult getUserByNickNameOrPhone(String nickName, String phoneNumber);
+
+    /**
+     * 项目管理员-所有项目用户权限列表-编辑单条项目权限
+     *
+     * @param json
+     */
+    ResponseResult updateOneUserRoles(JSONObject json);
+
+    /**
+     * 项目管理员-所有项目用户权限列表-批量编辑项目权限
+     *
+     * @param json
+     */
+    ResponseResult updateBatchUserRoles(JSONObject json);
+
+    /**
+     * 项目管理员-所有项目用户列表-删除用户权限
+     * @param id
+     * @return
+     */
+    ResponseResult deleteUserRole(String id, String key);
 }

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

@@ -127,6 +127,9 @@ public class ChannelServiceImpl implements ChannelService {
 	@Resource(name = "importantChannelOverviewDao")
 	private ImportantChannelOverviewDao importantChannelOverviewDao;
 
+	@Resource(name = "channelRecordRefreshTaskDao")
+	private ChannelRecordRefreshTaskDao channelRecordRefreshTaskDao;
+
 	@Resource(name = "mongoUtil")
 	MongoUtil mongoUtil;
 
@@ -529,11 +532,14 @@ public class ChannelServiceImpl implements ChannelService {
 				return null;
 			}
 			articles.sort(Comparator.comparingLong(ChannelIndex.Article::getTime).reversed());
+			// 重置符合条件的文章及数目
 			channelRecord.getRecord().setArticles(articles);
+			channelRecord.setArticleCount(articles.size());
 			return channelRecord;
 		}).filter(Objects::nonNull).collect(Collectors.groupingBy(ChannelRecord::getPlatform));
 		for (String platformName : PLATFORMS) {
-			List<ChannelRecord> channelRecordList = channelRecords.getOrDefault(platformName, Collections.emptyList()).stream().limit(size).collect(Collectors.toList());
+			List<ChannelRecord> channelRecordList =
+					channelRecords.getOrDefault(platformName, Collections.emptyList()).stream().sorted((x, y) -> Long.compare(y.getArticleCount(), x.getArticleCount())).limit(size).collect(Collectors.toList());
 			List<ChannelListVO> list = new ArrayList<>(size);
 			Map<String, ChannelRecord> map = Maps.uniqueIndex(channelRecordList, ChannelRecord::getChannelFid);
 			Map<String, Channel> fidChannel = channelDao.queryUniqueAsync(map.keySet());
@@ -545,14 +551,14 @@ public class ChannelServiceImpl implements ChannelService {
 					list.add(ChannelListVO.createFromChannel(record, record.getRecord().getArticles().size()));
 				}
 			});
-			List<ChannelListVO> resList;
-			// 排序
-			if (Objects.nonNull(sorter) && sorter.contains("index")){
-				resList = list.stream().sorted(Comparator.comparingDouble(ChannelListVO::getEmotionIndex).reversed()).collect(Collectors.toList());
-			}else {
-				resList = list.stream().sorted(Comparator.comparingDouble(ChannelListVO::getArticleCount).reversed()).collect(Collectors.toList());
-			}
-			res.put(platformName, resList);
+//			List<ChannelListVO> resList;
+//			// 排序
+//			if (Objects.nonNull(sorter) && sorter.contains("index")){
+//				resList = list.stream().sorted(Comparator.comparingDouble(ChannelListVO::getEmotionIndex).reversed()).collect(Collectors.toList());
+//			}else {
+//				resList = list.stream().sorted(Comparator.comparingDouble(ChannelListVO::getArticleCount).reversed()).collect(Collectors.toList());
+//			}
+			res.put(platformName, list);
 		}
 		return res;
 	}
@@ -817,6 +823,12 @@ public class ChannelServiceImpl implements ChannelService {
 		}
 	}
 
+	@Override
+	public void createChannelRecordRefreshTask(Long startTime, Long endTime, List<JSONObject> brandkbsInfos, String yuqingProjectId, String submitter) {
+		channelRecordRefreshTaskDao.insertOne(new ChannelRecordRefreshTask(startTime, endTime, brandkbsInfos, yuqingProjectId,
+				ChannelRecordRefreshTask.TaskStatus.NOT_START.getStatus(), submitter, System.currentTimeMillis(), System.currentTimeMillis()));
+	}
+
 	private JSONObject provinceDataProcess(List<ImportantChannel> sortList){
 		List<JSONObject> resList = new ArrayList<>();
 		JSONObject jsonObject = new JSONObject(new LinkedHashMap<>());

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

@@ -3,6 +3,7 @@ package com.zhiwei.brandkbs2.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.zhiwei.brandkbs2.auth.UserThreadLocal;
+import com.zhiwei.brandkbs2.common.GlobalPojo;
 import com.zhiwei.brandkbs2.config.Constant;
 import com.zhiwei.brandkbs2.dao.ProjectDao;
 import com.zhiwei.brandkbs2.dao.UserDao;
@@ -13,6 +14,7 @@ import com.zhiwei.brandkbs2.enmus.response.LoginCodeEnum;
 import com.zhiwei.brandkbs2.exception.ExceptionCast;
 import com.zhiwei.brandkbs2.model.CommonCodeEnum;
 import com.zhiwei.brandkbs2.model.ResponseResult;
+import com.zhiwei.brandkbs2.pojo.Project;
 import com.zhiwei.brandkbs2.pojo.User;
 import com.zhiwei.brandkbs2.pojo.UserInfo;
 import com.zhiwei.brandkbs2.pojo.UserRole;
@@ -418,6 +420,154 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
+    public PageVO<JSONObject> findAllUserList(String keyword, int page, int pageSize) {
+        Query query = new Query(Criteria.where("superAdmin").is(false));
+        userDao.addKeywordFuzz(query, keyword, "nickname");
+        userDao.addSort(query, "{\"cTime\":\"descend\"}");
+        // roles总量
+        List<User> list = userDao.findList(new Query(Criteria.where("superAdmin").is(false)));
+        long count = list.stream().map(User::getRoles).filter(Objects::nonNull).mapToLong(Collection::size).sum();
+        List<User> userList = userDao.findList(query);
+        Map<User, List<UserRole>> userRolesMap = userList.stream().collect(Collectors.toMap(o -> o, User::getRoles));
+        List<JSONObject> resList = new ArrayList<>();
+        for (Map.Entry<User, List<UserRole>> entry : userRolesMap.entrySet()) {
+            User user = entry.getKey();
+            List<UserRole> roles = entry.getValue();
+            for (UserRole role : roles) {
+                String projectId = role.getProjectId();
+                // 已终止/已删除的项目不返回
+                Project project = GlobalPojo.PROJECT_MAP.get(projectId);
+                project = Objects.isNull(project) ? projectDao.findOneById(projectId) : project;
+                if (Objects.isNull(project) || !project.isStart()){
+                    continue;
+                }
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("projectId", projectId);
+                jsonObject.put("projectName", project.getProjectName());
+                jsonObject.put("id", user.getId());
+                jsonObject.put("nickname", user.getNickname());
+                jsonObject.put("username", user.getUsername());
+                jsonObject.put("cTime", user.getCTime());
+                jsonObject.put("phoneNumber", user.getPhoneNumber());
+                jsonObject.put("submitter", user.getSubmitter());
+                jsonObject.put("roleId", role.getRoleId());
+                jsonObject.put("expiredTime", role.getExpiredTime());
+                jsonObject.put("exportAmount", role.getExportAmount());
+                jsonObject.put("key", role.getKey());
+                resList.add(jsonObject);
+            }
+        }
+        return PageVO.createPageVo(count, page, pageSize, resList.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList()));
+    }
+
+    @Override
+    public ResponseResult updateOneUserRoles(JSONObject json) {
+        String id = json.getString("id");
+        String nickname = json.getString("nickname");
+        int roleId = json.getIntValue("roleId");
+        long expiredTime = json.getLongValue("expiredTime");
+        int exportAmount = json.getIntValue("exportAmount");
+        String projectId = json.getString("projectId");
+        String key = json.getString("key");
+        User user = userDao.findOneById(id);
+        List<UserRole> roles = user.getRoles();
+        if (CollectionUtils.isNotEmpty(roles)){
+            List<String> existProject = roles.stream().filter(r -> !Objects.equals(r.getKey(), key)).map(UserRole::getProjectId).collect(Collectors.toList());
+            if (existProject.contains(projectId)){
+                return ResponseResult.failure("用户已拥有此项目的权限");
+            }
+        }
+        user.getRoles().stream().filter(userRoles -> userRoles.getKey().equals(key)).findAny().ifPresent(userRole -> {
+            // 更新原userRole
+            userRole.setRoleId(roleId);
+            userRole.setProjectId(projectId);
+            userRole.setKey(Tools.concat(projectId, roleId));
+            // 权限用户以上则清空过期时间
+            if (roleId < RoleEnum.CUSTOMER.getState()) {
+                userRole.setExpiredTime(null);
+            } else {
+                OptionalLong.of(expiredTime).ifPresent(userRole::setExpiredTime);
+            }
+            OptionalInt.of(exportAmount).ifPresent(userRole::setExportAmount);
+            userDao.updateOneByIdWithField(id, new Update().set("roles", roles));
+        });
+        Optional.of(nickname).ifPresent(nickName -> userDao.updateOneByIdWithField(id, new Update().set("nickname", nickName)));
+        return ResponseResult.success();
+    }
+
+    @Override
+    public ResponseResult getUserByNickNameOrPhone(String nickName, String phoneNumber) {
+        Query query = new Query();
+        if (Objects.isNull(nickName) && Objects.isNull(phoneNumber)){
+            return ResponseResult.failure("用户名和手机号为空");
+        }
+        if (Objects.nonNull(nickName)){
+            query.addCriteria(Criteria.where("nickname").is(nickName));
+        }
+        if (Objects.nonNull(phoneNumber)){
+            query.addCriteria(Criteria.where("phoneNumber").is(Long.parseLong(phoneNumber)));
+        }
+        query.addCriteria(Criteria.where("superAdmin").is(false));
+        User user = userDao.findOne(query);
+        if (Objects.isNull(user)){
+            return ResponseResult.failure("不存在此项目用户");
+        }
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("id", user.getId());
+        jsonObject.put("nickname", user.getNickname());
+        jsonObject.put("phoneNumber", user.getPhoneNumber());
+        List<JSONObject> roles = user.getRoles().stream().map(role -> {
+            JSONObject json = new JSONObject();
+            String projectId = role.getProjectId();
+            // 已终止/已删除的项目不返回
+            Project project = GlobalPojo.PROJECT_MAP.get(projectId);
+            project = Objects.isNull(project) ? projectDao.findOneById(projectId) : project;
+            if (Objects.isNull(project) || !project.isStart()){
+                return null;
+            }
+            json.put("projectName", project.getProjectName());
+            json.put("key", role.getKey());
+            json.put("projectId", projectId);
+            json.put("roleId", role.getRoleId());
+            json.put("exportAmount", role.getExportAmount());
+            json.put("expiredTime", role.getExpiredTime());
+            return json;
+        }).filter(Objects::nonNull).collect(Collectors.toList());
+        jsonObject.put("roles", roles);
+        return ResponseResult.success(jsonObject);
+    }
+
+    @Override
+    public ResponseResult updateBatchUserRoles(JSONObject json) {
+        String id = json.getString("id");
+        User user = userDao.findOneById(id);
+        List<UserRole> newRoles = json.getJSONArray("roles").toJavaList(UserRole.class);
+        List<String> keys = newRoles.stream().map(UserRole::getKey).collect(Collectors.toList());
+        // 无需被修改的权限列表
+        List<UserRole> oldRoles = user.getRoles().stream().filter(role -> !keys.contains(role.getKey())).collect(Collectors.toList());
+        for (UserRole role : newRoles) {
+            if (Objects.isNull(role.getExportAmount())) {
+                role.setExportAmount(1000);
+            }
+            role.setKey(Tools.concat(role.getProjectId(), role.getRoleId()));
+        }
+        oldRoles.addAll(newRoles);
+        userDao.updateOneByIdWithField(id, new Update().set("roles", oldRoles));
+        return ResponseResult.success();
+    }
+
+    @Override
+    public ResponseResult deleteUserRole(String id, String key) {
+        User user = userDao.findOneById(id);
+        List<UserRole> roles = user.getRoles().stream().filter(userRole -> !userRole.getKey().equals(key)).collect(Collectors.toList());
+        Update update = new Update();
+        update.set("roles", roles);
+        update.set("submitter", UserThreadLocal.getNickname());
+        userDao.updateOneByIdWithField(id, update);
+        return ResponseResult.success();
+    }
+
+    @Override
     public Map<String, Object> getLoginInfo() {
 //        String userId = UserThreadLocal.getUserId();
 //        String projectId = UserThreadLocal.getProjectId();

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

@@ -47,6 +47,7 @@ public class ControlCenter {
 //            taskService.customEventCache();
             taskService.eventAggTitleCache();
             taskService.yuqingAnalyzeHighWordCache();
+            taskService.cacheAIQuestion();
         } catch (Exception e) {
             log.error("定时按天缓存数据-出错", e);
         } finally {
@@ -120,28 +121,28 @@ public class ControlCenter {
     }
 
     @Async("scheduledExecutor")
-    @Scheduled(cron = "0 30 3 1 * ?")
-    public void monthlyCustomXhsInteractionUpdate() {
-        log.info("每月互动量更新-启动");
+    @Scheduled(cron = "0 0 5 * * ?")
+    public void dailyCustomXhsInteractionUpdate() {
+        log.info("每日互动量更新-启动");
         try {
-            taskService.monthlyCustomXhsInteractionUpdate();
+            taskService.dailyCustomXhsInteractionUpdate();
         } catch (Exception e) {
-            log.error("每月互动量更新-出错", e);
+            log.error("每日互动量更新-出错", e);
         } finally {
-            log.info("每月互动量更新-结束");
+            log.info("每日互动量更新-结束");
         }
     }
 
     @Async("scheduledExecutor")
-    @Scheduled(cron = "0 0 5 * * ?")
-    public void dailyCustomXhsInteractionUpdate() {
-        log.info("每日互动量更新-启动");
+    @Scheduled(cron = "0 0/10 * * * ?")
+    public void refreshChannelRecord() {
+        log.info("每十分钟拉取并进行渠道库更新任务-启动");
         try {
-            taskService.dailyCustomXhsInteractionUpdate();
+            taskService.refreshChannelRecord();
         } catch (Exception e) {
-            log.error("每日互动量更新-出错", e);
+            log.error("每十分钟拉取并进行渠道库更新任务-出错", e);
         } finally {
-            log.info("每日互动量更新-结束");
+            log.info("每十分钟拉取并进行渠道库更新任务-结束");
         }
     }
 }

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

@@ -6,6 +6,7 @@ import org.springframework.data.redis.core.HashOperations;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
@@ -129,6 +130,10 @@ public class RedisUtil {
         return RedisKeyPrefix.SEARCH_KEYWORD + Tools.concat(projectId, userId, searchType);
     }
 
+    public static String getAISearchQuestionCacheKey(String projectId){
+        return RedisKeyPrefix.AI_SEARCH_QUESTION + projectId;
+    }
+
     public void setExpire(String key, String value, long timeout, TimeUnit unit) {
         stringRedisTemplate.opsForValue().set(key, value, timeout, unit);
     }
@@ -186,4 +191,8 @@ public class RedisUtil {
     public void remove(String key) {
         setExpire(key, "-1", 1, TimeUnit.SECONDS);
     }
+
+    public void delete(Collection<String> key) {
+        stringRedisTemplate.delete(key);
+    }
 }