Merge branch 'release' into 'master'

Release

See merge request !596

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

@@ -70,7 +70,7 @@ public class BehaviorController extends BaseController {
                                    @RequestParam(value = "behavior", defaultValue = "true") boolean behavior) {
         List<ExportBehaviorDTO> downloadList = behaviorService.download(startTime, endTime, behavior);
         String behaviorName = behavior ? "后台" : "前台";
-        String sheetName = ProjectService.getProjectVOById(UserThreadLocal.getProjectId()).getProjectName() + "_" + behaviorName;
+        String sheetName = ProjectService.getProjectVOById(UserThreadLocal.getProjectId()).getExtraProjectName() + "_" + behaviorName;
         EasyExcelUtil.download(sheetName + "用户行为", sheetName, ExportBehaviorDTO.class, downloadList, response);
         return ResponseResult.success();
     }
@@ -111,7 +111,7 @@ public class BehaviorController extends BaseController {
     public ResponseResult downloadLogRecordList(@RequestParam("startTime") long startTime,
                                                 @RequestParam("endTime") long endTime) {
         List<ExportUserLogRecordDTO> list = behaviorService.downloadUserLogRecord(startTime, endTime);
-        String sheetName = ProjectService.getProjectVOById(UserThreadLocal.getProjectId()).getProjectName() + "_操作记录";
+        String sheetName = ProjectService.getProjectVOById(UserThreadLocal.getProjectId()).getExtraProjectName() + "_操作记录";
         EasyExcelUtil.download(sheetName, sheetName, ExportUserLogRecordDTO.class, list, response);
         return ResponseResult.success();
     }

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

@@ -2,6 +2,7 @@ package com.zhiwei.brandkbs2.controller.admin;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.zhiwei.brandkbs2.aop.LogRecord;
 import com.zhiwei.brandkbs2.auth.Auth;
 import com.zhiwei.brandkbs2.auth.UserThreadLocal;
 import com.zhiwei.brandkbs2.controller.BaseController;
@@ -89,6 +90,7 @@ public class ProjectController extends BaseController {
 
     @ApiOperation("修改项目")
     @PutMapping("/update")
+    @LogRecord(values = "extraProjectName", description = "修改项目-修改别名", arguments = true, entity = true)
     public ResponseResult updateProject(@RequestBody ProjectVO projectVO) {
         return ProjectService.updateProject(projectVO);
     }

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

@@ -392,6 +392,7 @@ public class AppHotController extends BaseController {
         CompletableFuture.allOf(resultList.stream().map(json -> CompletableFuture.supplyAsync(() -> {
             try {
                 BaseMap firstArticle = markDataService.getFirstArticle(startDate.getTime(), endDate.getTime(), json.getString("title"), projectId, Constant.PRIMARY_CONTEND_ID, include);
+                json.put("title", firstArticle.getTitleNullOptionalContent());
                 json.put("content", firstArticle.getContent());
                 json.put("url", firstArticle.getUrl());
                 json.put("realSource", firstArticle.getRealSource());

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

@@ -98,7 +98,7 @@ public class AppSearchController extends BaseController {
     RedisUtil redisUtil;
 
     @ApiOperation("搜索-查热点")
-    @LogRecord(values = "keyword", description = "查热点", arguments = true, entity = false)
+    @LogRecord(values = {"keyword", "startTime", "endTime"}, description = "查热点", arguments = true, entity = false)
     @GetMapping("/hot/list")
     public ResponseResult searchHotList(@RequestParam(value = "pageSize", defaultValue = "10") Integer limit,
                                         @RequestParam(value = "page", defaultValue = "1") Integer page,
@@ -118,7 +118,7 @@ public class AppSearchController extends BaseController {
     }
 
     @ApiOperation("搜索-查危机")
-    @LogRecord(values = "keyword", description = "查危机", arguments = true, entity = false)
+    @LogRecord(values = {"keyword", "startTime", "endTime"}, description = "查危机", arguments = true, entity = false)
     @GetMapping("/crisisSearch")
     public ResponseResult crisisSearch(@RequestParam(value = "page", defaultValue = "1") Integer page,
                                        @RequestParam(value = "pageSize", defaultValue = "3") Integer pageSize,
@@ -161,7 +161,7 @@ public class AppSearchController extends BaseController {
     }
 
     @ApiOperation("搜索-全网搜")
-    @LogRecord(values = {"fans", "sensitiveChannels:father,son", "keyword", "search"}, description = "全网搜", arguments = true, entity = true)
+    @LogRecord(values = {"keyword", "search", "fans", "sensitiveChannels:father,son", "startTime", "endTime"}, description = "全网搜", arguments = true, entity = true)
     @PostMapping("/searchWhole")
     public ResponseResult searchWholeNetwork(@RequestBody SearchFilterDTO dto) {
 //        if (StringUtils.isNotEmpty(dto.getKeyword()) && Tools.checkUniteString(dto.getKeyword())){
@@ -201,7 +201,7 @@ public class AppSearchController extends BaseController {
 
     @ApiOperation("搜索-全网搜-舆情导出")
     @PostMapping("/exportSearchWhole")
-    @LogRecord(description = "全网搜-舆情导出", values = {"startTime", "endTime", "fans", "filterType", "filterWords", "search", "keyword", "platforms", "sensitiveChannels", "sourceKeyword"}, entity = true, arguments = true)
+    @LogRecord(description = "全网搜-舆情导出", values = {"search", "keyword", "startTime", "endTime", "fans", "filterType", "filterWords", "platforms", "sensitiveChannels", "sourceKeyword"}, entity = true, arguments = true)
     public ResponseResult exportSearchWhole(@RequestBody SearchFilterDTO dto) {
 //        if (StringUtils.isNotEmpty(dto.getKeyword()) && Tools.checkUniteString(dto.getKeyword())){
 //            return ResponseResult.failure("不支持特殊符号字段查询");
@@ -231,7 +231,7 @@ public class AppSearchController extends BaseController {
     }
 
     @ApiOperation("舆情列表")
-    @LogRecord(values = {"searchType", "keyword"}, description = "查舆情", arguments = true, entity = true)
+    @LogRecord(values = {"searchType", "keyword", "startTime", "endTime"}, description = "查舆情", arguments = true, entity = true)
     @PostMapping("/mark/list")
     public ResponseResult getYuqingMarkList(@RequestBody MarkSearchDTO markSearchDTO) {
 //        if (StringUtils.isNotEmpty(markSearchDTO.getKeyword()) && Tools.checkUniteString(markSearchDTO.getKeyword())){
@@ -292,7 +292,7 @@ public class AppSearchController extends BaseController {
 
 
     @ApiOperation("搜索-渠道列表")
-    @LogRecord(values = "keyword", description = "查渠道", arguments = true, entity = true)
+    @LogRecord(values = {"keyword", "startTime", "endTime"}, description = "查渠道", arguments = true, entity = true)
     @PostMapping(value = "/channel/channelList")
     public ResponseResult getChannelList(@RequestBody ChannelSearchDTO channelSearchDTO) {
         cacheSearchKeyword(channelSearchDTO.getKeyword(), "channel");
@@ -331,7 +331,7 @@ public class AppSearchController extends BaseController {
     }
 
     @ApiOperation("搜索-前台事件库-品牌事件库-新")
-    @LogRecord(values = "keyword", description = "查事件", arguments = true, entity = true)
+    @LogRecord(values = {"keyword", "startTime", "endTime"}, description = "查事件", arguments = true, entity = true)
     @PostMapping("/event/newList")
     public ResponseResult getEventListMiddleware(@RequestBody BrandkbsEventSearchDTO dto){
         cacheSearchKeyword(dto.getKeyword(), "event");
@@ -339,7 +339,7 @@ public class AppSearchController extends BaseController {
     }
 
     @ApiOperation("搜索-查竞品")
-    @LogRecord(values = "keyword", description = "查竞品",arguments = true, entity = true)
+    @LogRecord(values = {"keyword", "startTime", "endTime"}, description = "查竞品",arguments = true, entity = true)
     @PostMapping("/contend/list")
     public ResponseResult getContendSearchList(@RequestBody MarkSearchDTO markSearchDTO) {
 //        if (StringUtils.isNotEmpty(markSearchDTO.getKeyword()) && Tools.checkUniteString(markSearchDTO.getKeyword())){

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

@@ -48,7 +48,7 @@ public class MobileReportController {
         dto.setPage(page);
         dto.setPageSize(size);
         dto.setType("月报");
-        String projectName = projectService.getProjectById(UserThreadLocal.getProjectId()).getProjectName();
+        String projectName = projectService.getProjectById(UserThreadLocal.getProjectId()).getExtraProjectName();
         PageVO<JSONObject> reportList = reportService.findReportList(dto);
         reportList.getList().forEach(json -> {
             Long startTime = json.getLong("endTime");

src/main/java/com/zhiwei/brandkbs2/easyexcel/dto/ExportWholeSearchRecordDTO.java

@@ -37,7 +37,6 @@ public class ExportWholeSearchRecordDTO {
         dto.setKeyword(json.getString("keyword"));
         dto.setUsedType(json.getString("usedType"));
         dto.setUsedCount(json.getInteger("usedCount"));
-        ;
         dto.setCTime(new Date(json.getLong("cTime")));
         dto.setSubmitter(json.getString("submitter"));
         return dto;

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

@@ -17,6 +17,10 @@ import java.util.*;
 @Setter
 @Document(collection = "brandkbs_project")
 public class Project extends AbstractProject {
+    /**
+     * 项目别名
+     */
+    private String extraProjectName;
 
     /**
      * 数据起始时间(能够绑定关联关系的时间点)
@@ -124,6 +128,7 @@ public class Project extends AbstractProject {
         projectVO.setId(this.getId());
         // 主品牌
         projectVO.setProjectName(this.getProjectName());
+        projectVO.setExtraProjectName(this.getExtraProjectName());
         projectVO.setImportTime(new Date(this.getImportTime()));
         projectVO.setBrandName(this.getBrandName());
         projectVO.setBrandLinkedGroup(this.getBrandLinkedGroup());

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

@@ -36,6 +36,12 @@ public class ProjectVO {
     private String projectName;
 
     /**
+     * 项目别名
+     */
+    @ApiModelProperty("项目别名")
+    private String extraProjectName;
+
+    /**
      * 数据起始时间
      */
     @ApiModelProperty("数据起始时间")
@@ -135,6 +141,7 @@ public class ProjectVO {
         Project project = new Project();
         project.setId(this.getId());
         project.setProjectName(this.getProjectName());
+        project.setExtraProjectName(this.getExtraProjectName());
         project.setBrandName(this.getBrandName());
         project.setBrandLinkedGroup(this.getBrandLinkedGroup());
         project.setBrandLinkedGroupId(this.getBrandLinkedGroupId());
@@ -190,6 +197,7 @@ public class ProjectVO {
         Project project = new Project();
         project.setId(vo.getId());
         project.setProjectName(vo.getProjectName());
+        project.setExtraProjectName(vo.getExtraProjectName());
         project.setBrandName(vo.getBrandName());
         project.setBrandLinkedGroup(vo.getBrandLinkedGroup());
         project.setBrandLinkedGroupId(vo.getBrandLinkedGroupId());

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

@@ -1884,7 +1884,7 @@ public class MarkDataServiceImpl implements MarkDataService {
         }
         List<ExportYuqingInteractionUpdateDTO> exportList = markInteractionUpdate(list);
         // excel输出到指定路径
-        String projectName = projectService.getProjectById(UserThreadLocal.getProjectId()).getProjectName();
+        String projectName = projectService.getProjectById(UserThreadLocal.getProjectId()).getExtraProjectName();
         String filePath = EasyExcelUtil.generateExcelFilePath(brandkbsFilePath, projectName, UserThreadLocal.getNickname(), "舆情库互动量更新结果");
         EasyExcelUtil.write(filePath, "sheet1", ExportYuqingInteractionUpdateDTO.class, exportList);
         JSONObject res = new JSONObject();
@@ -2481,7 +2481,7 @@ public class MarkDataServiceImpl implements MarkDataService {
         }
         List<ExportYuqingInteractionUpdateDTO> exportList = markInteractionUpdate(list);
         // excel输出到指定路径
-        String projectName = projectService.getProjectById(UserThreadLocal.getProjectId()).getProjectName();
+        String projectName = projectService.getProjectById(UserThreadLocal.getProjectId()).getExtraProjectName();
         String filePath = EasyExcelUtil.generateExcelFilePath(brandkbsFilePath, projectName, UserThreadLocal.getNickname(), "舆情库互动量更新结果");
         EasyExcelUtil.write(filePath, "sheet1", ExportYuqingInteractionUpdateDTO.class, exportList);
         JSONObject res = new JSONObject();
@@ -3497,6 +3497,7 @@ public class MarkDataServiceImpl implements MarkDataService {
             CompletableFuture.allOf(markTopTitleList.stream().map(json -> CompletableFuture.supplyAsync(() -> {
                 try {
                     BaseMap firstArticle = getAnalyzeFirstArticle(dto, json.getString("title"));
+                    json.put("title", firstArticle.getTitleNullOptionalContent());
                     json.put("content", firstArticle.getContent());
                     json.put("url", firstArticle.getUrl());
                     json.put("realSource", firstArticle.getRealSource());
@@ -4039,7 +4040,7 @@ public class MarkDataServiceImpl implements MarkDataService {
             // 选用的模型名称
             AccessModel.Model model = AccessModel.Model.DOUBAO_PRO_32K;
             String modelName = model.getModelName();
-            String projectName = GlobalPojo.PROJECT_MAP.get(projectId).getProjectName();
+            String projectName = GlobalPojo.PROJECT_MAP.get(projectId).getExtraProjectName();
             Pair<String, long[]> pair = standardRequest(question, modelName, MessageFormat.format(REFERENCE_QUESTION_PROMPT, size, projectName));
             if (Objects.isNull(pair)){
                 return getAIReferenceQuestionTemplate(projectName);
@@ -4066,7 +4067,7 @@ public class MarkDataServiceImpl implements MarkDataService {
             return JSONObject.parseArray(resultStr).toJavaList(String.class);
         }
         List<String> questionList = aiSearchQuestionRecordDao.findDistinctQuestion(projectId);
-        String projectName = GlobalPojo.PROJECT_MAP.get(projectId).getProjectName();
+        String projectName = GlobalPojo.PROJECT_MAP.get(projectId).getExtraProjectName();
         if (CollectionUtils.isEmpty(questionList)){
             return getAIReferenceQuestionTemplate(projectName);
         }
@@ -4122,7 +4123,7 @@ public class MarkDataServiceImpl implements MarkDataService {
                 list = esClientDao.findSearch(question, keyword, startTime, endTime);
             }else { // 未填辅助信息，则根据AI生成条件
                 Project project = GlobalPojo.PROJECT_MAP.get(UserThreadLocal.getProjectId());
-                StringBuilder brandStr = new StringBuilder(project.getProjectName());
+                StringBuilder brandStr = new StringBuilder(project.getExtraProjectName());
                 if (CollectionUtils.isNotEmpty(project.getContendList())){
                     project.getContendList().forEach(contend -> brandStr.append("、").append(contend.getBrandName()));
                 }
@@ -4318,7 +4319,7 @@ public class MarkDataServiceImpl implements MarkDataService {
         Project project = GlobalPojo.PROJECT_MAP.get(UserThreadLocal.getProjectId());
         fieldMappings.add(new FieldMapping(FieldMapping.FieldMap.PROJECT, UserThreadLocal.getProjectId()));
         List<String> projectBandNames = new ArrayList<>();
-        projectBandNames.add(project.getProjectName());
+        projectBandNames.add(project.getExtraProjectName());
         projectBandNames.add(project.getBrandName());
 
         if (CollectionUtils.isNotEmpty(project.getContendList())){

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

@@ -109,7 +109,7 @@ public class ProjectServiceImpl implements ProjectService {
             //抛出非法参数异常
             ExceptionCast.cast(CommonCodeEnum.INVALID_PARAM);
         }
-        if (!Tools.isEmpty(projectVO.getHitKeywords()) && projectVO.getModuleShowList().contains(2)) {
+        if (!Tools.isEmpty(projectVO.getHitKeywords()) && projectVO.getModuleShowList().contains("2")) {
             return ResponseResult.failure("关键字和原始数据配置异常");
         }
         Project existsProject = projectDao.findOne("projectName", projectVO.getProjectName());
@@ -145,7 +145,10 @@ public class ProjectServiceImpl implements ProjectService {
     public PageVO<JSONObject> findProjectList(int page, int size, String keyword) {
         Query query = new Query();
         query.addCriteria(Criteria.where("isManual").is(true));
-        projectDao.addKeywordFuzz(query, keyword, "projectName");
+//        projectDao.addKeywordFuzz(query, keyword, "extraProjectName", "projectName");
+        Criteria extraProjectName = Criteria.where("extraProjectName").regex(keyword, "i");
+        Criteria projectName = Criteria.where("projectName").regex(keyword, "i");
+        query.addCriteria(new Criteria().orOperator(extraProjectName, projectName));
         long count = projectDao.count(query);
         projectDao.addSort(query, "{\"cTime\":\"descend\"}");
         mongoUtil.start(page, size, query);
@@ -156,6 +159,7 @@ public class ProjectServiceImpl implements ProjectService {
             result.put("importTime", project.getImportTime());
             result.put("cTime", project.getCTime());
             result.put("projectName", project.getProjectName());
+            result.put("extraProjectName", project.getExtraProjectName());
             result.put("brandName", project.getBrandName());
             result.put("isStart", project.isStart());
             result.put("isShow", project.isShow());
@@ -335,13 +339,16 @@ public class ProjectServiceImpl implements ProjectService {
             return projectDao.findList(null).stream().map(project -> {
                 JSONObject json = new JSONObject();
                 json.put("name", project.getProjectName());
+                json.put("extraProjectName", project.getExtraProjectName());
                 json.put("id", project.getId());
                 return json;
             }).collect(Collectors.toList());
         }
         return user.getRoles().stream().map(userRole -> {
             JSONObject json = new JSONObject();
-            json.put("name", projectDao.findOne("_id", userRole.getProjectId()).getProjectName());
+            Project project = projectDao.findOne("_id", userRole.getProjectId());
+            json.put("name", project.getProjectName());
+            json.put("extraProjectName", project.getExtraProjectName());
             json.put("id", userRole.getProjectId());
             return json;
         }).collect(Collectors.toList());
@@ -572,7 +579,10 @@ public class ProjectServiceImpl implements ProjectService {
     public PageVO<JSONObject> findNonManualProjectList(int page, int size, String sorter, String keyword) {
         Query query = new Query();
         query.addCriteria(Criteria.where("isManual").is(false));
-        projectDao.addKeywordFuzz(query, keyword, "projectName");
+//        projectDao.addKeywordFuzz(query, keyword, "extraProjectName", "projectName");
+        Criteria extraProjectName = Criteria.where("extraProjectName").regex(keyword, "i");
+        Criteria projectName = Criteria.where("projectName").regex(keyword, "i");
+        query.addCriteria(new Criteria().orOperator(extraProjectName, projectName));
         long count = projectDao.count(query);
         if (Objects.isNull(sorter) || Objects.isNull(JSONObject.parseObject(sorter)) || JSONObject.parseObject(sorter).isEmpty()){
             projectDao.addSort(query, "{\"cTime\":\"descend\"}");
@@ -587,6 +597,7 @@ public class ProjectServiceImpl implements ProjectService {
             result.put("importTime", project.getImportTime());
             result.put("cTime", project.getCTime());
             result.put("projectName", project.getProjectName());
+            result.put("extraProjectName", project.getExtraProjectName());
             result.put("brandName", project.getBrandName());
             result.put("isStart", project.isStart());
             result.put("isShow", project.isShow());
@@ -648,6 +659,7 @@ public class ProjectServiceImpl implements ProjectService {
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("id", project.getId());
             jsonObject.put("name", project.getProjectName());
+            jsonObject.put("extraProjectName", project.getExtraProjectName());
             return jsonObject;
         }).collect(Collectors.toList());
         return ResponseResult.success(res);
@@ -659,7 +671,10 @@ public class ProjectServiceImpl implements ProjectService {
         projectDao.addSort(query, "{\"_id\":\"asc\"}");
         // 项目名关键词模糊
         if (StringUtils.isNotBlank(keyword)){
-            projectDao.addKeywordFuzz(query, keyword, "projectName");
+//            projectDao.addKeywordFuzz(query, keyword, "extraProjectName", "projectName");
+            Criteria extraProjectName = Criteria.where("extraProjectName").regex(keyword, "i");
+            Criteria projectName = Criteria.where("projectName").regex(keyword, "i");
+            query.addCriteria(new Criteria().orOperator(extraProjectName, projectName));
         }
         // 用户拥有权限的项目
         if (StringUtils.isNotBlank(userId) && !userDao.findOneById(userId).isSuperAdmin()){
@@ -675,6 +690,7 @@ public class ProjectServiceImpl implements ProjectService {
             JSONObject result = new JSONObject();
             result.put("id", project.getId());
             result.put("projectName", project.getProjectName());
+            result.put("extraProjectName", project.getExtraProjectName());
             return result;
         }).collect(Collectors.toList());
         return ResponseResult.success(PageVO.createPageVo(total, page, pageSize, resList));
@@ -765,6 +781,7 @@ public class ProjectServiceImpl implements ProjectService {
             json.put("id", project.getId());
             json.put("brands", getBrands(project.getId(), true));
             json.put("name", project.getProjectName());
+            json.put("extraProjectName", project.getExtraProjectName());
             json.put("group", project.getBrandLinkedGroup());
             json.put("avatarUrl", project.getAvatarUrl());
             json.put("permission", getPermissionList(project));

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

@@ -220,13 +220,13 @@ public class ProjectWarnServiceImpl implements ProjectWarnService {
         return ResponseResult.success();
     }
 
-    private BrandkbsWarnTemplate brandkbsWarnTemplate4Yuqing(BrandkbsYuQingConfigNew config, List<BaseMap> datas, long start, long end, AbstractProject project) {
+    private BrandkbsWarnTemplate brandkbsWarnTemplate4Yuqing(BrandkbsYuQingConfigNew config, List<BaseMap> datas, long start, long end, Project project) {
         if (datas.isEmpty()) {
             return null;
         }
         int firstCount = datas.size();
         // key1
-        String key1 = "【品见】舆情动态-" + project.getProjectName();
+        String key1 = "【品见】舆情动态-" + project.getExtraProjectName();
         // key2
 //        String key2Header = "全部";
         String key2Header = "";
@@ -292,13 +292,13 @@ public class ProjectWarnServiceImpl implements ProjectWarnService {
         return new BrandkbsWarnTemplate(firstCount, key1, key2, key3, key4, new BrandkbsYuQingWarn(collect));
     }
 
-    private BrandkbsWarnTemplate brandkbsWarnTemplate4Channel(BrandkbsChannelConfig config, List<BaseMap> datas, long start, long end, AbstractProject project) {
+    private BrandkbsWarnTemplate brandkbsWarnTemplate4Channel(BrandkbsChannelConfig config, List<BaseMap> datas, long start, long end, Project project) {
         if (datas.isEmpty()) {
             return null;
         }
         int firstCount = datas.size();
         // key1
-        String key1 = "【品见】渠道参与-" + project.getProjectName();
+        String key1 = "【品见】渠道参与-" + project.getExtraProjectName();
         // key2
         String key2 = "自定义渠道";
         if (Boolean.TRUE.equals(config.getFriendlyChannel())) {
@@ -333,12 +333,12 @@ public class ProjectWarnServiceImpl implements ProjectWarnService {
         return new BrandkbsWarnTemplate(firstCount, key1, key2, key3, key4, new BrandkbsYuQingWarn(collect));
     }
 
-    private BrandkbsWarnTemplate brandkbsWarnTemplate4HotEvent(BrandkbsHotEventConfig config, Map<String, List<com.zhiwei.middleware.event.pojo.entity.Event>> eventMap, long start, long end, AbstractProject project) {
+    private BrandkbsWarnTemplate brandkbsWarnTemplate4HotEvent(BrandkbsHotEventConfig config, Map<String, List<com.zhiwei.middleware.event.pojo.entity.Event>> eventMap, long start, long end, Project project) {
         int firstCount = eventMap.values().stream().mapToInt(List::size).sum();
         if (firstCount == 0) {
             return null;
         }
-        String key1 = "【品见】热点事件-" + project.getProjectName();
+        String key1 = "【品见】热点事件-" + project.getExtraProjectName();
         // key2
         String key2 = null;
         // key3
@@ -377,11 +377,11 @@ public class ProjectWarnServiceImpl implements ProjectWarnService {
     }
 
     private BrandkbsWarnTemplate brandkbsWarnTemplate4HotTop(BrandkbsHotTopConfig config, List<BrandkbsHotTopWarn.HotTop> datas, long start, long end,
-                                                             AbstractProject project) {
+                                                             Project project) {
         if (CollectionUtils.isEmpty(datas)) {
             return null;
         }
-        String key1 = "【品见】上榜热搜-" + project.getProjectName();
+        String key1 = "【品见】上榜热搜-" + project.getExtraProjectName();
         // key2
         String key2 = "";
         List<String> key2Element = new ArrayList<>();
@@ -437,7 +437,7 @@ public class ProjectWarnServiceImpl implements ProjectWarnService {
             return null;
         }
         int firstCount = datas.size();
-        String key1 = "【品见】案例上新-" + project.getProjectName();
+        String key1 = "【品见】案例上新-" + project.getExtraProjectName();
         String key2 = null;
         String key3 = Constant.SPEC_MINUTE_FORMAT.format(time);
         // key4
@@ -677,11 +677,10 @@ public class ProjectWarnServiceImpl implements ProjectWarnService {
 
     @Override
     public ResponseResult getChannelWaring(String projectId, BrandkbsChannelConfig config) {
-        Project project = null;
         long end = System.currentTimeMillis();
         long start = end - config.getPushInterval();
+        Project project = projectService.getProjectById(projectId);
         try {
-            project = projectService.getProjectById(projectId);
             log.info("获取渠道参与预警开始,project:{}", project.getProjectName());
             EsClientDao.SearchHelper helper = EsClientDao.createSearchHelper();
             BoolQueryBuilder postFilter = EsQueryTools.assembleCacheMapsQuery(project.getId(), "0");
@@ -760,7 +759,7 @@ public class ProjectWarnServiceImpl implements ProjectWarnService {
         long end = System.currentTimeMillis();
         long start = end - Constant.ONE_DAY * 7;
         try {
-            log.info("获取热点事件预警开始,project:{}", project.getProjectName());
+            log.info("获取热点事件预警开始,project:{}", project.getExtraProjectName());
             Map<String, List<com.zhiwei.middleware.event.pojo.entity.Event>> eventMap = new LinkedHashMap<>();
             if (CollectionUtils.isNotEmpty(config.getOwnEvent())) {
                 // 调用事件中间件时，使用项目id作为主品牌id
@@ -801,10 +800,10 @@ public class ProjectWarnServiceImpl implements ProjectWarnService {
                 }
                 eventMap.put("行业动态", externalEvents);
             }
-            log.info("获取热点事件预警结束,project:{}", project.getProjectName());
+            log.info("获取热点事件预警结束,project:{}", project.getExtraProjectName());
             return ResponseResult.success(brandkbsWarnTemplate4HotEvent(config, eventMap, start, end, project));
         } catch (Exception e) {
-            log.info("获取热点事件预警失败,project:{}", project.getProjectName(), e);
+            log.info("获取热点事件预警失败,project:{}", project.getExtraProjectName(), e);
         }
         return ResponseResult.failure("获取热点事件预警失败");
     }

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

@@ -435,7 +435,7 @@ public class ReportServiceImpl implements ReportService {
         String startTimeStr = Constant.HOUR_FORMAT.format(report.getStartTime());
         String lastStartTimeStr = Constant.HOUR_FORMAT.format(lastStartTime);
         JSONObject result = new JSONObject();
-        result.put("brand", projectService.getProjectById(report.getProjectId()).getProjectName());
+        result.put("brand", projectService.getProjectById(report.getProjectId()).getExtraProjectName());
         result.put("startTime", report.getStartTime());
         result.put("endTime", report.getEndTime());
         result.put("curMonth", Integer.parseInt(startTimeStr.substring(5, 7)));

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

@@ -215,7 +215,7 @@ public class ToolsetServiceImpl implements ToolsetService {
         // 更新已用次数
         redisUtil.setExpire(redisKey, String.valueOf(ARTICLE_SUMMARY_LIMIT - remainingCount), Tools.getMillSecondNextDay(), TimeUnit.MILLISECONDS);
         // excel输出到指定路径
-        String filePath = EasyExcelUtil.generateExcelFilePath(brandkbsFilePath, project.getProjectName(), UserThreadLocal.getNickname(), "摘要提取结果");
+        String filePath = EasyExcelUtil.generateExcelFilePath(brandkbsFilePath, project.getExtraProjectName(), UserThreadLocal.getNickname(), "摘要提取结果");
         EasyExcelUtil.write(filePath, "sheet1", ExportArticleSummaryDTO.class, datas);
         res.put("filePath", filePath);
         res.put("remainingCount", remainingCount);
@@ -255,7 +255,7 @@ public class ToolsetServiceImpl implements ToolsetService {
         List<ExportInteractionUpdateDTO> exportList =
                 urls.stream().map(url -> new ExportInteractionUpdateDTO(String.valueOf(id.incrementAndGet()), urlMap, url)).collect(Collectors.toList());
         // excel输出到指定路径
-        String projectName = projectService.getProjectById(UserThreadLocal.getProjectId()).getProjectName();
+        String projectName = projectService.getProjectById(UserThreadLocal.getProjectId()).getExtraProjectName();
         String filePath = EasyExcelUtil.generateExcelFilePath(brandkbsFilePath, projectName, UserThreadLocal.getNickname(), "链接互动量更新结果");
         EasyExcelUtil.write(filePath, "sheet1", ExportInteractionUpdateDTO.class, exportList);
         JSONObject res = new JSONObject();
@@ -482,7 +482,7 @@ public class ToolsetServiceImpl implements ToolsetService {
             return dto;
         }).collect(Collectors.toList());
         // excel写入至指定路径
-        String projectName = projectService.getProjectById(UserThreadLocal.getProjectId()).getProjectName();
+        String projectName = projectService.getProjectById(UserThreadLocal.getProjectId()).getExtraProjectName();
         String filePath = EasyExcelUtil.generateExcelFilePath(brandkbsFilePath, projectName, UserThreadLocal.getNickname(), "事件计算结果");
         EasyExcelUtil.write(filePath, "sheet1", ExportBytedanceEventComputeResultDTO.class, list);
         return filePath;
@@ -493,7 +493,7 @@ public class ToolsetServiceImpl implements ToolsetService {
     public String downloadPrimaryErrorData(String taskId) {
         BytedanceCustomEventUpdateTask task = bytedanceCustomEventUpdateTaskDao.findOneById(taskId);
         // excel写入至指定路径
-        String projectName = projectService.getProjectById(UserThreadLocal.getProjectId()).getProjectName();
+        String projectName = projectService.getProjectById(UserThreadLocal.getProjectId()).getExtraProjectName();
         String filePath = EasyExcelUtil.generateExcelFilePath(brandkbsFilePath, projectName, UserThreadLocal.getNickname(), "报错数据");
 //        List<UploadBytedanceEventDTO> collect = task.getErrorData().stream().map(errorData -> Tools.convertMap(errorData, UploadBytedanceEventDTO.class)).collect(Collectors.toList());
         EasyExcelUtil.write(filePath, "sheet1", UploadBytedanceEventDTO.class, Collections.emptyList());

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

@@ -444,6 +444,7 @@ public class UserServiceImpl implements UserService {
                 JSONObject jsonObject = new JSONObject();
                 jsonObject.put("projectId", projectId);
                 jsonObject.put("projectName", project.getProjectName());
+                jsonObject.put("extraProjectName", project.getExtraProjectName());
                 jsonObject.put("id", user.getId());
                 jsonObject.put("nickname", user.getNickname());
                 jsonObject.put("username", user.getUsername());
@@ -526,6 +527,7 @@ public class UserServiceImpl implements UserService {
                 return null;
             }
             json.put("projectName", project.getProjectName());
+            json.put("extraProjectName", project.getExtraProjectName());
             json.put("key", role.getKey());
             json.put("projectId", projectId);
             json.put("roleId", role.getRoleId());