1

PAS/src/main/java/cn/cslg/pas/controller/outApi/PatentStarController.java

@@ -29,9 +29,6 @@ public class PatentStarController {
     @Operation(summary = "一般检索接口")
     public String getAreaList(@RequestBody @Validated PatentStarListDto patentStarListDto) throws IOException {
         Map<String, Object> map = patentStarApiService.patentStarSearchLocal(patentStarListDto);
-        if (map == null) {
-            return Response.error("检索失败,请检查检索式");
-        }
         return Response.success(map);
     }
 

PAS/src/main/java/cn/cslg/pas/service/TaskService.java

@@ -325,7 +325,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> implements ITaskS
                     String conditions = task.getConditions();
                     conditions = conditions.substring(conditions.indexOf("(") + 1, conditions.lastIndexOf(")"));
                     String createTime = new SimpleDateFormat("yyyyMMdd").format(task.getCreateTime());
-                    String taskName = createTime + "-" + conditions + "-" + task.getCreateName();
+                    String taskName = createTime + " - 检索式:" + conditions + " - " + task.getCreateName();
                     task.setTaskName(taskName);
                 }
             }
@@ -370,18 +370,15 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> implements ITaskS
             return;
         }
 
-        //检查任务状态是否为已完成，若是则提示用户"取消任务失败，已完成的任务无法取消"
-        if (task.getStatus().equals(2)) {
+        //检查任务状态是否为已完成（非定时任务），若是则提示用户"取消任务失败，已完成的任务无法取消"
+        if (task.getStatus().equals(2) && !task.getTaskType().equals(1)) {
             ThrowException.throwXiaoShiException("取消任务失败，已完成的任务无法取消");
         }
 
-        //若该任务是定时任务中最新的一条任务（即本次请求目的是取消该定时任务），则要删除job中的该定时任务条件
-        if (task.getType().equals(3) || task.getType().equals(4)) {
-            TaskCondition taskCondition = taskConditionService.getById(task.getTaskConditionId());
-            if (taskCondition.getTaskType().equals(1)) {
-                //删除job中的该定时任务条件
-                jobService.deleteJob(taskCondition.getId());
-            }
+        //若该任务是定时任务（即本次请求目的是取消该定时任务），则要删除job中的该定时任务条件
+        if (task.getType().equals(3) || task.getType().equals(4) && task.getTaskType().equals(1)) {
+            //删除job中的该定时任务条件
+            jobService.deleteJob(task.getId());
         }
 
         //若该任务处于进行中

PAS/src/main/java/cn/cslg/pas/service/outApi/PatentStarApiService.java

@@ -7,6 +7,7 @@ import cn.cslg.pas.common.model.vo.outApi.StarPatentVO;
 import cn.cslg.pas.common.utils.CacheUtils;
 import cn.cslg.pas.common.utils.FormatUtil;
 import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
+import cn.cslg.pas.common.utils.ThrowException;
 import cn.cslg.pas.domain.*;
 import cn.cslg.pas.service.upLoadPatent.RetrieveRecordService;
 import com.alibaba.fastjson.JSONArray;
@@ -47,8 +48,8 @@ public class PatentStarApiService {
     }
 
     public static String formQuery(String query) {
-       query= query.toUpperCase();
-       query ="("+query+")";
+        query = query.toUpperCase();
+        query = "(" + query + ")";
         query = query
                 .replace(" AND ", "*")
                 .replace(" OR ", "+")
@@ -127,8 +128,8 @@ public class PatentStarApiService {
     }
 
     //装载专利信息
-    public void loadStarPatentVOS(List<StarPatentVO> starPatentVOS,JSONObject Data) {
-        String aa =Data.toString();
+    public void loadStarPatentVOS(List<StarPatentVO> starPatentVOS, JSONObject Data) {
+        String aa = Data.toString();
         starPatentVOS.forEach(item -> {
             //如果有公开号，则将公开号作为专利号
             if (item.getPublicNo() != null && !item.getPublicNo().equals("")) {
@@ -137,8 +138,7 @@ public class PatentStarApiService {
             } else if (item.getAnnounceNo() != null && !item.getAnnounceNo().equals("")) {
                 item.setPublicNo(item.getAnnounceNo());
                 item.setPatentNo(item.getAnnounceNo());
-            }
-            else {
+            } else {
                 System.out.println("");
 
             }
@@ -232,6 +232,9 @@ public class PatentStarApiService {
             //patentStarListDto.setDBType(retrieveRecord.getDbType());
         }
         Map<String, Object> map = this.patentStarSearchApi(patentStarListDto);
+        if (map == null) {
+            ThrowException.throwXiaoShiException("检索失败,请检查检索式");
+        }
         //记录检索历史
         retrieveRecord.setRetrieveTime(new Date());
         retrieveRecord.setTotalNum(Integer.parseInt(map.get("total").toString()));
@@ -288,12 +291,12 @@ public class PatentStarApiService {
             // 判断请求是否成功
             if (response.isSuccessful()) {
                 JSONObject jsonObject = JSONObject.parseObject(Objects.requireNonNull(response.body()).string());
-                if (jsonObject.get("Ret").equals(500)) {
+                if (jsonObject.get("Ret").equals(500) || jsonObject.get("Data") == null) {
                     return null;
                 }
                 JSONObject Data = (JSONObject) jsonObject.get("Data");
                 List<StarPatentVO> starPatentVOS = JSONArray.parseArray(Data.get("List").toString(), StarPatentVO.class);
-                this.loadStarPatentVOS(starPatentVOS,Data);
+                this.loadStarPatentVOS(starPatentVOS, Data);
                 // 打印服务端返回结果
                 //  return Objects.requireNonNull(response.body()).string();
                 Map<String, Object> reMap = new HashMap<>();

PAS/src/main/resources/mapper/TaskMapper.xml

@@ -45,7 +45,7 @@
         tas.success_num tas_success_num,
         tas.true_success_num tas_true_success_num, tas.default_num tas_default_num, tas.pram_json tas_pram_json,
         tas.task_condition_id tas_task_condition_id, tas.create_time tas_create_time,
-        tas.task_name tas_task_name, tas.task_type tas_task_type,
+        tas.task_type tas_task_type,
         con.id, con.task_id, con.task_type, con.task_type2, con.conditions,
         con.crons, con.config_cells, con.config_id, con.task_name, con.total,
         con.orderby, con.orderby_type, con.db_type, con.start_number, con.end_number,
@@ -114,7 +114,7 @@
         <result column="tas_old_name" property="oldName"/>
         <result column="tas_create_time" property="createTime"/>
         <result column="tas_task_condition_id" property="taskConditionId"/>
-        <result column="tas_task_name" property="taskName"/>
+        <result column="tas_old_name" property="taskName"/>
         <result column="tas_task_type" property="taskType"/>
         <result column="tas_endtime" property="modifiedTime"/>
         <result column="conditions" property="conditions"/>