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

PAS/src/main/java/cn/cslg/pas/domain/ImportTaskPatent.java

@@ -0,0 +1,38 @@
+package cn.cslg.pas.domain;
+
+import cn.cslg.pas.common.model.BaseEntity;
+import cn.cslg.pas.common.model.vo.KeyValueVO;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 专利信息事务信息表
+ * </p>
+ *
+ * @author 王岩
+ * @since 2022-02-24
+ */
+@Data
+@TableName("ASSO_IMPORTTASK_PATENT")
+public class ImportTaskPatent extends BaseEntity<ImportTaskPatent> {
+
+    /**
+     * 发生日期
+     */
+    @TableField("IMPORTTASK_ID")
+    private Integer importTaskId;
+
+    /**
+     * 简单法律状态
+     */
+    @TableField("PATENT_NO")
+    private String patentNo;
+
+
+
+
+}

PAS/src/main/java/cn/cslg/pas/mapper/ImportTaskMapper.java

@@ -0,0 +1,17 @@
+package cn.cslg.pas.mapper;
+
+import cn.cslg.pas.domain.ImportTaskPatent;
+import cn.cslg.pas.domain.PatentAffair;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 专利信息事务信息表 Mapper 接口
+ * </p>
+ *
+ * @author 王岩
+ * @since 2022-02-24
+ */
+public interface ImportTaskMapper extends BaseMapper<ImportTaskPatent> {
+
+}

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

@@ -0,0 +1,41 @@
+package cn.cslg.pas.service;
+
+import cn.cslg.pas.common.model.PersonnelVO;
+import cn.cslg.pas.common.model.vo.ClientVO;
+import cn.cslg.pas.common.model.vo.ProjectVO;
+import cn.cslg.pas.common.utils.*;
+import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
+import cn.cslg.pas.domain.Client;
+import cn.cslg.pas.domain.ImportTaskPatent;
+import cn.cslg.pas.mapper.ClientMapper;
+import cn.cslg.pas.mapper.ImportTaskMapper;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 委托方表 服务类
+ * </p>
+ *
+ * @author 王岩
+ * @since 2022-02-17
+ */
+@Service
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
+public class ImportTaskPatentService extends ServiceImpl<ImportTaskMapper, ImportTaskPatent> {
+
+}

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

@@ -88,7 +88,6 @@ public class UploadPatentBatchService {
                 }
                 //将装配对象中的数据保存到数据库
                 dataToDB(params, uploadParamsVO, projectImportPatentVO);
-
                 //通过WebSocket 在每一次循环结束后 向前端发送完成进度
                 WebSocketServer.sendInfo(Response.websocket(new TaskWebSocketDTO()
                         .setTaskId(params.getTaskId())
@@ -141,21 +140,18 @@ public class UploadPatentBatchService {
             String getSettingJson = fileUtils.analysisJsonFile();
             //查找需求数据源的对应配置
             List<UploadSettingVO.Column> jsonData = UploadPatentBatchUtil.parsingConfigurationFilesBro(getSettingJson);
-
             Map<String, PictureData> pictureDataMap = ExcelUtils.getDataFromExcel(params.getPath());
-
             //将数据进行装配并进行数据库操作
                 //获取每一行的数据
                 Map<Object, Object> row = params.getRowList().get(0);
                 //基础数据装配
                 UploadParamsVO uploadParamsVO = UploadPatentBatchUtil.processData(row, jsonData);
-
                 //查询数据是否存在 如果存在 返回该条数据 如果不存在 新增一条数据
                 getOneOrInsertOne(uploadParamsVO);
-
                 //专利信息需要特殊处理部分
                 //专利信息(摘要附图)数据装配
                 PictureData pictureData = pictureDataMap.get(String.valueOf(index+ 1));
+
                 if (uploadParamsVO.getPatent() != null) {
                     if (uploadParamsVO.getPatent().getId() != null && pictureData != null) {
                         uploadParamsVO.getPatent().setAbstractPath(patentImageService.updatePatentImage(uploadParamsVO.getPatent().getId(), pictureData));
@@ -171,6 +167,10 @@ public class UploadPatentBatchService {
                 //将装配对象中的数据保存到数据库
                 dataToDBBro(params, uploadParamsVO);
 
+            ImportTaskPatent importTaskPatent =new ImportTaskPatent();
+            importTaskPatent.setImportTaskId(params.getTaskId());
+            importTaskPatent.setPatentNo(uploadParamsVO.getPatent().getPatentNo());
+            importTaskPatent.insert();
                 //通过WebSocket 在每一次循环结束后 向前端发送完成进度
                 WebSocketServer.sendInfo(Response.websocket(new TaskWebSocketDTO()
                         .setTaskId(params.getTaskId())