bug修改

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

@@ -221,6 +221,9 @@ public class InformationController {
         if (StringUtils.isEmpty(dataSetId)) {
             return Result.FAIL("数据集id不能为空");
         }
+        if (StringUtils.isEmpty(searchCondition.getSubjectId())) {
+            return Result.FAIL("专题id不能为空");
+        }
         CompletableFuture.runAsync(() -> informationService.saveAsDataSet(searchCondition));
         return Result.OK("数据集保存中。。。");
     }

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

@@ -58,13 +58,6 @@ public class SubjectTypeController {
      */
     @PostMapping("/add")
     public Result<?> addSubjectType(@RequestBody SubjectType subjectType) {
-        String pid = subjectType.getPid();
-        if (!"0".equals(pid)) {
-            int count = subjectTypeMapService.count(new LambdaQueryWrapper<SubjectTypeMap>().eq(SubjectTypeMap::getTypeId, pid));
-            if (count > 0) {
-                return Result.FAIL(501, "当前分类下存在专题");
-            }
-        }
         subjectTypeService.add(subjectType);
         return Result.OK();
     }

src/main/java/com/zzsn/event/mapper/xml/InfoSourceMapper.xml

@@ -228,17 +228,14 @@
         <if test="searchWord!=null and searchWord != ''">
             and (
             iso.web_site_name like CONCAT('%',#{searchWord},'%')
-            or iso.site_uri like CONCAT('%',#{searchWord},'%')
             )
         </if>
         group by iso.web_site_name
-        order by iso.create_time
     </select>
 
     <select id="directSourceColumnList" resultType="com.zzsn.event.entity.InfoSource">
         select iso.id, iso.site_name, iso.site_uri
         from info_source iso
         where iso.web_site_name = #{webSiteName}
-        order by iso.create_time
     </select>
 </mapper>

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

@@ -75,7 +75,7 @@ public class ScoreModelServiceImpl extends ServiceImpl<ScoreModelMapper, ScoreMo
         if(CollectionUtils.isNotEmpty(list)){
             //不为空，则查询数据库存在的信息
             Object data = list.get(0).getData();
-            jsonObject.put("data", data);
+            jsonObject.put("data", JSON.parseArray(data.toString()));
             return jsonObject;
         }else{
             //为空，返回默认值

src/main/java/com/zzsn/event/util/HanlpUtil.java

@@ -30,6 +30,9 @@ public class HanlpUtil {
         }
         //每100字最多提取30个词
         int keySize = text.length() * 30 / 100;
+        if (keySize == 0) {
+            keySize = 1;
+        }
         List<String> phraseList = HanLP.extractKeyword(text, keySize);
         //获取短语前100个
         if (phraseList != null) {
@@ -44,7 +47,7 @@ public class HanlpUtil {
                 //如果是人名、地名、组织名 则去除
                 //获取人名、地名、组织名
                 List<String> resul = CompanyUtil.entityAll(strs);
-                if (resul.size() > 0) {
+                if (!resul.isEmpty()) {
                     iterator.remove();
                     continue;
                 }

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

@@ -104,7 +104,7 @@ public class InfoDataSearchCondition {
     //选择前num条数据
     private Integer num;
 
-    //资讯id集合，导出/专题分析时使用-研究中心
+    //资讯id集合-研究中心
     private List<String> ids;
 
     /*------资讯导出类参数-研究中心---start-------------------*/