Merge branch 'release' into 'master'

Release

See merge request !517

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

@@ -1914,6 +1914,10 @@ public class MarkDataServiceImpl implements MarkDataService {
         NonManualProjectPlan plan = new NonManualProjectPlan(dto);
         Project project = projectService.getProjectById(projectId);
         if (project.getExternalDataSource()) {
+            // 未填默认选全部
+            if (CollectionUtils.isEmpty(dto.getType())){
+                dto.setType(new ArrayList<>(Arrays.asList("原创", "转发", "OCR")));
+            }
             // 同时添加快搜订阅任务
             String iStarShineSubjectTaskId = addIStarShineSubjectTask(dto);
             if (Objects.isNull(iStarShineSubjectTaskId)) {
@@ -1966,6 +1970,10 @@ public class MarkDataServiceImpl implements MarkDataService {
         Project project = projectService.getProjectById(UserThreadLocal.getProjectId());
         // 商业数据源同时修改快搜订阅任务
         if (project.getExternalDataSource()){
+            // 未填默认选全部
+            if (CollectionUtils.isEmpty(dto.getType())){
+                dto.setType(new ArrayList<>(Arrays.asList("原创", "转发", "OCR")));
+            }
             ResponseResult responseResult = updateIStarShineSubjectTask(dto);
             if (!responseResult.isStatus()){
                 return responseResult;
@@ -1995,7 +2003,21 @@ public class MarkDataServiceImpl implements MarkDataService {
         if (!dto.getLasting() && Objects.nonNull(dto.getEndTime())) {
             param.put("stopTime", dto.getEndTime());
         }
+        // 只选ocr
+        if (dto.getType().size() == 1 && dto.getType().contains("OCR")){
+            param.put("ocrType", 2);
+        }
+        // 未选ocr
+        if (!dto.getType().contains("OCR")){
+            param.put("filterWtype", String.join(",", dto.getType()));
+            param.put("ocrType", 1);
+        }
+        // 选了ocr+其他
+        if (dto.getType().contains("OCR") && dto.getType().size() != 1){
+            dto.getType().remove("OCR");
             param.put("filterWtype", String.join(",", dto.getType()));
+            param.put("ocrType", 3);
+        }
         HttpHeaders httpHeaders = new HttpHeaders();
         httpHeaders.setContentType(MediaType.APPLICATION_JSON);
         HttpEntity<String> request = new HttpEntity<>(param.toJSONString(), httpHeaders);
@@ -2028,7 +2050,21 @@ public class MarkDataServiceImpl implements MarkDataService {
         if (!dto.getLasting() && Objects.nonNull(dto.getEndTime())) {
             param.put("stopTime", dto.getEndTime());
         }
+        // 只选ocr
+        if (dto.getType().size() == 1 && dto.getType().contains("OCR")){
+            param.put("ocrType", 2);
+        }
+        // 未选ocr
+        if (!dto.getType().contains("OCR")){
             param.put("filterWtype", String.join(",", dto.getType()));
+            param.put("ocrType", 1);
+        }
+        // 选了ocr+其他
+        if (dto.getType().contains("OCR") && dto.getType().size() != 1){
+            dto.getType().remove("OCR");
+            param.put("filterWtype", String.join(",", dto.getType()));
+            param.put("ocrType", 3);
+        }
         param.put("taskName", dto.getName() + "_" + System.currentTimeMillis());
         param.put("groupName", projectService.getProjectById(UserThreadLocal.getProjectId()).getProjectName());
         param.put("isKsSubject", true);

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

@@ -33,6 +33,7 @@ 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.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
@@ -90,12 +91,18 @@ public class ProjectServiceImpl implements ProjectService {
     @Value("${jwt.key}")
     private String jwtKey;
 
+    @Value("${istarshine.subject.updateTaskStatus.url}")
+    private String updateIStarShineSubjectTaskStatusUrl;
+
     @Value("${brandkbs.file.url}")
     private String brandkbsFileUrl;
 
     @Value("${brandkbs.image.url}")
     private String brandkbsImageUrl;
 
+    @Resource(name = "restTemplate")
+    private RestTemplate restTemplate;
+
     @Override
     public ResponseResult addProject(ProjectVO projectVO) {
         if (Objects.isNull(projectVO)) {
@@ -284,12 +291,30 @@ public class ProjectServiceImpl implements ProjectService {
         if (Objects.isNull(project)) {
             ExceptionCast.cast(CommonCodeEnum.INVALID_PARAM, "项目不存在");
         }
+        // 对开启了商业数据订阅的非人工项目
+        if (!project.isManual() && project.getExternalDataSource()){
+            List<NonManualProjectPlan> planList = nonManualProjectPlanDao.findList(new Query(Criteria.where("projectId").is(project.getId())));
+            // 启动->终止：暂停商业数据订阅任务 终止->启动：启动商业数据订阅任务
+            planList.forEach(plan -> updateStarShineSubjectTaskStatus(plan.getIStarShineSubjectTaskId()));
+        }
         Update update = new Update();
         update.set("uTime", System.currentTimeMillis());
         update.set("isStart", !project.isStart());
         projectDao.updateOneByIdWithField(pid, update);
     }
 
+    /**
+     * 修改快搜任务状态
+     * @param taskId
+     * @return
+     */
+    private void updateStarShineSubjectTaskStatus(String taskId){
+        JSONObject body = restTemplate.getForEntity(updateIStarShineSubjectTaskStatusUrl, JSONObject.class, taskId, UserThreadLocal.getNickname()).getBody();
+        if (Objects.isNull(body) || body.isEmpty() || !body.getBoolean("status")){
+            log.error("快搜任务id：" + taskId + "-修改快搜订阅任务状态失败,接口返回信息-" + body);
+        }
+    }
+
     @Override
     public ResponseResult getUserAllProjects() {
         User user = userDao.findOneById(UserThreadLocal.getUserId());
@@ -676,6 +701,9 @@ public class ProjectServiceImpl implements ProjectService {
             List<NonManualProjectPlan> successList = new ArrayList<>(planList.size());
             // 添加商业数据订阅任务
             for (NonManualProjectPlan plan : planList) {
+                if (CollectionUtils.isEmpty(plan.getType())){
+                    plan.setType(new ArrayList<>(Arrays.asList("原创", "转发", "OCR")));
+                }
                 String taskId = markDataService.addIStarShineSubjectTask(Tools.convertMap(plan, NonManualProjectPlanDTO.class));
                 if (Objects.isNull(taskId)){
                     for (NonManualProjectPlan successPlan : successList) {

src/main/resources/application-dev.properties

@@ -133,3 +133,4 @@ toolset.interactionResult.url=https://zhiwei-middleware.zhiweidata.com/interact/
 istarshine.subject.addTask.url=https://istarshine-service.zhiweidata.com/istarshine/subject/addIStarShineSubjectTask
 istarshine.subject.deleteTask.url=https://istarshine-service.zhiweidata.com/istarshine/subject/deleteIStarShineSubjectTask?taskId={1}&updateUserName={2}
 istarshine.subject.updateTask.url=https://istarshine-service.zhiweidata.com/istarshine/subject/updateIStarShineSubjectTask
+istarshine.subject.updateTaskStatus.url=https://istarshine-service.zhiweidata.com/istarshine/subject/updateIStarShineSubjectTaskStatus?taskId={1}&updateUserName={2}
\ No newline at end of file

src/main/resources/application-local.properties

@@ -112,7 +112,7 @@ ef.checkCaptcha.url=https://ef.zhiweidata.com/captchaApi/checkeCaptcha.do.do?id=
 #\u5168\u7F51\u641C\u5916\u90E8\u63A5\u53E3
 istarshine.addIStarShineKSData.url=https://istarshine-service.zhiweidata.com/istarshine/ks/addIStarShineKSData
 istarshine.getIStarShineKSInfoData.url=https://istarshine-service.zhiweidata.com/istarshine/ks/getIStarShineKSInfoData?taskId={1}&appId=6183571e0d710000f6003a12
-whole.search.url=https://yuqing.zhiweidata.com/qbjcbackPhoenix/interface/middleware/search/yuqing
+whole.search.url=https://yuqing.test.zhiweidata.com/qbjcbackPhoenix/interface/middleware/search/yuqing
 whole.searchCriteria.url=https://yuqing.zhiweidata.com/qbjcbackPhoenix/interface/middleware/search/pt
 whole.extraParam.url=https://yuqing.zhiweidata.com/qbjcbackPhoenix/interface/middleware/search/extra/param
 brief.report.url=http://192.168.0.79:11000/qbjcbackPhoenix/interface/middleware/brief-report-web
@@ -143,3 +143,4 @@ toolset.interactionResult.url=https://zhiwei-middleware.zhiweidata.com/interact/
 istarshine.subject.addTask.url=https://istarshine-service.zhiweidata.com/istarshine/subject/addIStarShineSubjectTask
 istarshine.subject.deleteTask.url=https://istarshine-service.zhiweidata.com/istarshine/subject/deleteIStarShineSubjectTask?taskId={1}&updateUserName={2}
 istarshine.subject.updateTask.url=https://istarshine-service.zhiweidata.com/istarshine/subject/updateIStarShineSubjectTask
+istarshine.subject.updateTaskStatus.url=https://istarshine-service.zhiweidata.com/istarshine/subject/updateIStarShineSubjectTaskStatus?taskId={1}&updateUserName={2}
\ No newline at end of file

src/main/resources/application-prod.properties

@@ -133,3 +133,4 @@ toolset.interactionResult.url=https://zhiwei-middleware.zhiweidata.com/interact/
 istarshine.subject.addTask.url=https://istarshine-service.zhiweidata.com/istarshine/subject/addIStarShineSubjectTask
 istarshine.subject.deleteTask.url=https://istarshine-service.zhiweidata.com/istarshine/subject/deleteIStarShineSubjectTask?taskId={1}&updateUserName={2}
 istarshine.subject.updateTask.url=https://istarshine-service.zhiweidata.com/istarshine/subject/updateIStarShineSubjectTask
+istarshine.subject.updateTaskStatus.url=https://istarshine-service.zhiweidata.com/istarshine/subject/updateIStarShineSubjectTaskStatus?taskId={1}&updateUserName={2}
\ No newline at end of file