Merge remote-tracking branch 'origin/event_fusion' into event_fusion

src/main/java/com/zzsn/event/controller/SubjectManageController.java

@@ -860,6 +860,18 @@ public class SubjectManageController {
         List<InfoSourceLabelVO> bindList = clbLabelService.bindInfoSourceLabelInfo(subjectId);
         return Result.OK(bindList);
     }
+    /**
+     * 更新subject的数据范围
+     * @param subjectId 专题id
+     */
+    @GetMapping("/subjectUpdateScope")
+    public Result<?> subjectUpdateScope(@RequestParam(name = "subjectId") String subjectId,
+                                          @RequestParam(name = "type") String type,
+                                          @RequestParam(name = "scop" , defaultValue = "") String scop
+                                          ) {
+        Subject subject = subjectService.subjectUpdateScope(subjectId,type,scop);
+        return Result.OK(subject);
+    }
 
     /**
      * 绑定信息源标签数据

src/main/java/com/zzsn/event/controller/common/RelationBindController.java

@@ -7,9 +7,11 @@ import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zzsn.event.constant.Result;
 import com.zzsn.event.entity.InfoSource;
 import com.zzsn.event.entity.InfoSourceGroup;
+import com.zzsn.event.entity.Subject;
 import com.zzsn.event.service.*;
 import com.zzsn.event.util.tree.Node;
 import com.zzsn.event.vo.*;
@@ -116,7 +118,30 @@ public class RelationBindController {
             }
             subjectIdList.add(subjectId);
         }
-        IPage<InfoSourceVo> pageList = infoSourceService.bindInfoSourcePageList(infoSourceCondition, subjectIdList, pageNo, pageSize);
+        //查询
+        IPage<InfoSourceVo> pageList = null;
+
+        if (CollectionUtil.isNotEmpty(subjectIdList) && subjectIdList.size() == 1 && subjectId.equals(subjectIdList.get(0))) {
+            Subject byId = subjectService.getById(subjectId);
+            if (ObjectUtil.isNotNull(byId) && StringUtils.isNotEmpty(byId.getDataScope()) && byId.getDataScope().contains("1")) {
+                Page<InfoSource> page = new Page<>(pageNo, pageSize);
+                return Result.OK(infoSourceService.page(page,
+                        Wrappers.<InfoSource>lambdaQuery()
+                                .eq(ObjectUtil.isNotNull(infoSourceCondition.getCrawlType()),InfoSource::getCrawlType, infoSourceCondition.getCrawlType())
+                                .eq(StrUtil.isNotBlank(infoSourceCondition.getStatus()),InfoSource::getStatus, infoSourceCondition.getStatus())
+                                .like(StrUtil.isNotBlank(infoSourceCondition.getWebSiteName()),InfoSource::getWebSiteName, infoSourceCondition.getWebSiteName())
+                                .like(StrUtil.isNotBlank(infoSourceCondition.getSiteName()),InfoSource::getSiteName, infoSourceCondition.getSiteName())
+                                .like(StrUtil.isNotBlank(infoSourceCondition.getSiteUri()),InfoSource::getSiteUri, infoSourceCondition.getSiteUri())
+                                .orderByDesc(InfoSource::getCreateTime)
+                ));
+            }else {
+                pageList = infoSourceService.bindInfoSourcePageList(infoSourceCondition, subjectIdList, pageNo, pageSize);
+            }
+
+        }else {
+            pageList = infoSourceService.bindInfoSourcePageList(infoSourceCondition, subjectIdList, pageNo, pageSize);
+        }
+
         return Result.OK(pageList);
     }
 

src/main/java/com/zzsn/event/entity/InfoSource.java

@@ -69,4 +69,8 @@ public class InfoSource implements Serializable {
 
     /**原创来源（中文逗号隔开）*/
     private String originalSource;
+    /**爬虫类别*/
+    private String crawlType;
+    /**爬虫类别*/
+    private String status;
 }

src/main/java/com/zzsn/event/entity/Subject.java

@@ -114,5 +114,8 @@ public class Subject implements Serializable {
     /**专题分类id*/
     @TableField(exist = false)
     private String typeId;
+    /**数据范围（是否是全库） - 采集库全库-1，企业库全库-2，政策库全库-3*/
+    @TableField(updateStrategy = FieldStrategy.IGNORED) // 忽略更新策略
+    private String dataScope;
 
 }

src/main/java/com/zzsn/event/service/SubjectService.java

@@ -202,4 +202,7 @@ public interface SubjectService extends IService<Subject> {
     void deleteBindNew(SubjectPage subjectPage);
 
     String getMinCreateTime(List<String> subjectIdList);
+
+    Subject subjectUpdateScope(String subjectId, String type, String scop);
+
 }

src/main/java/com/zzsn/event/service/impl/SubjectServiceImpl.java

@@ -905,6 +905,47 @@ public class SubjectServiceImpl extends ServiceImpl<SubjectMapper, Subject> impl
        return baseMapper.getMinCreateTime(subjectIdList);
     }
 
+    @Override
+    public Subject subjectUpdateScope(String subjectId, String type, String scop) {
+
+        Subject byId = super.getById(subjectId);
+        if (ObjectUtil.isNotNull(byId)){
+            String dataScope = byId.getDataScope();
+            if (StrUtil.isNotBlank(dataScope)){
+                List<String> scopeList = CollectionUtil.newArrayList(dataScope.split(","));
+                if (StrUtil.equals(type,"1") && "1".equals(scop)){
+                    scopeList.add("1");
+                }else if (StrUtil.equals(type,"1") && "0".equals(scop)){
+                    scopeList.remove("1");
+                }
+                if (StrUtil.equals(type,"2") && "1".equals(scop)){
+                    scopeList.add("2");
+                }else if (StrUtil.equals(type,"2") && "0".equals(scop)){
+                    scopeList.remove("2");
+                }
+                if (StrUtil.equals(type,"3") && "1".equals(scop)){
+                    scopeList.add("3");
+                }else if (StrUtil.equals(type,"3") && "0".equals(scop)){
+                    scopeList.remove("3");
+                }
+                if (CollectionUtil.isNotEmpty(scopeList)) {
+                    scopeList = scopeList.stream().distinct().collect(Collectors.toList());
+                    String join = StrUtil.join(",", scopeList);
+                    byId.setDataScope(join);
+                }else {
+                    byId.setDataScope(null);
+                }
+                this.updateById(byId);
+            }else {
+                if ("1".equals(scop)) {
+                    byId.setDataScope(scop);
+                }
+                this.updateById(byId);
+            }
+        }
+        return byId;
+    }
+
     private void unBindInfoSourceGroup(SubjectPage subjectPage) {
 
         String sourceBindType = subjectPage.getSourceBindType();

src/main/java/com/zzsn/event/vo/InfoSourceCondition.java

@@ -30,7 +30,7 @@ public class InfoSourceCondition {
     /**
      * 爬虫类别
      */
-    private int crawlType;
+    private Integer crawlType;
 
     /**
      * 专题id/事件id-获取专题绑定信息源信息时使用