消息同步

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

@@ -4,30 +4,28 @@ import cn.cslg.pas.common.model.PersonnelVO;
 import cn.cslg.pas.common.model.outApi.PatentStarDto;
 import cn.cslg.pas.common.model.outApi.PatentStarListDto;
 import cn.cslg.pas.common.model.vo.outApi.StarPatentVO;
-import cn.cslg.pas.common.utils.*;
+import cn.cslg.pas.common.utils.CacheUtils;
+import cn.cslg.pas.common.utils.DateUtils2;
+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;
 import com.alibaba.fastjson.JSONObject;
-import io.swagger.v3.oas.models.security.SecurityScheme;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.FormBody;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-
 import org.joda.time.DateTime;
-import org.joda.time.Days;
-import org.joda.time.Months;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;

PAS/src/main/java/cn/cslg/pas/service/upLoadPatent/PantentQueueService.java

@@ -15,6 +15,7 @@ import cn.cslg.pas.service.PatentInstructionService;
 import cn.cslg.pas.service.TaskService;
 import cn.cslg.pas.service.UploadPatentBatchService;
 import cn.cslg.pas.service.asso.TaskConditionService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
@@ -570,18 +571,29 @@ public class PantentQueueService {
                 patentIdMap.remove(currentPatent);
                 //任务表更新 完成条数+1
                 task.setSuccessNum(task.getSuccessNum() + 1);
+                //根据专利号查询专利是否有导入失败记录
+                String patentNo = queueData.getUploadParamsVO().getPatent().getPatentNo();
+                LambdaQueryWrapper<QuestionRecord> wrapper = new LambdaQueryWrapper<>();
+                wrapper.eq(QuestionRecord::getTaskId, task.getId())
+                        .eq(QuestionRecord::getPatentNo, patentNo);
+                List<QuestionRecord> questionRecords = questionRecordService.list(wrapper);
+                if (questionRecords.size() > 0) {
+                    task.setDefaultNum(task.getDefaultNum() + 1);
+                }
                 Task updateTask = new Task();
                 updateTask.setId(task.getId());
-                updateTask.setDefaultNum(questionRecordMapper.selectDefaultNum(task.getId()));
-                updateTask.setTrueSuccessNum(task.getSuccessNum() - updateTask.getDefaultNum());
                 updateTask.setSuccessNum(task.getSuccessNum());
+                updateTask.setDefaultNum(task.getDefaultNum());
+                updateTask.setTrueSuccessNum(task.getSuccessNum() - updateTask.getDefaultNum());
                 taskService.updateById(updateTask);
                 long percentage = (long) Math.floor((task.getSuccessNum() + 0D) / total * 100D);
                 //当全部完成时
                 if (task.getSuccessNum().equals(total)) {
                     percentage = 100L;
                     //任务表更新最终数据
-                    task.setDefaultNum(questionRecordMapper.selectDefaultNum(task.getId()));
+                    if (questionRecords.size() > 0) {
+                        updateTask.setDefaultNum(task.getDefaultNum() + 1);
+                    }
                     task.setTrueSuccessNum(task.getSuccessNum() - task.getDefaultNum());
                     task.setStatus(2);
                     task.setEndTime(DateUtils.getDateTime());
@@ -595,7 +607,6 @@ public class PantentQueueService {
         }
     }
 
-
     /**
      * 数据丢入著录项目生产队列并唤醒装载著录项目线程
      *