11

src/main/java/cn/cslg/pas/common/dto/ImportTaskDTO.java

@@ -0,0 +1,88 @@
+package cn.cslg.pas.common.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 导入任务DTO类
+ *
+ * @author 李仁杰
+ */
+
+@Accessors(chain = true)
+@Data
+public class ImportTaskDTO {
+    /**
+     * 项目id
+     */
+    private Integer projectId;
+
+    /**
+     * 项目类型
+     * 0专题库 1报告
+     */
+
+    /**
+     * 产品id
+     */
+    private Integer productId;
+
+    /**
+     * 周期
+     */
+    @TableField(value = "crons")
+    private String crons;
+
+    /**
+     * 上次更新时间
+     */
+
+    /**
+     * 若是检索导入/专利号导入则必填
+     * 五位数字
+     * 第1著录项目2附图
+     * 3权利要求，4说明书文本，5pdf文档
+     */
+    @TableField(value = "import_content")
+    private Integer importContent;
+
+    /**
+     * 是否更新
+     */
+    @TableField(value = "if_update")
+    private Integer ifUpdate;
+
+    /**
+     * 条件
+     */
+    @TableField(value = "'condition'")
+    private String condition;
+
+    /**
+     * 1excel导入
+     * 2专利号导入
+     * 3专利号文件导入
+     * 4检索导入
+     * 5pdf文档导入
+     */
+    @TableField(value = "type")
+    private Integer type;
+
+    /**
+     * 文件guid
+     */
+    @TableField(value = "file_guid")
+    private String fileGuid;
+
+    /**
+     * 若是excel导入任务，则使用到配置文件source_id
+     */
+    @TableField(value = "source_id")
+    private Integer sourceId;
+
+
+}

src/main/java/cn/cslg/pas/common/vo/ImportTaskAMVO.java

@@ -72,5 +72,6 @@ public class ImportTaskAMVO {
     private Integer endNum;
     private String orderBy;
     private  String orderByType;
-    private String DBType;
+    private String dBType;
+    private Integer doneNum;
 }

src/main/java/cn/cslg/pas/controller/ImportTaskController.java

@@ -4,11 +4,14 @@ package cn.cslg.pas.controller;
 import cn.cslg.pas.common.core.base.Constants;
 import cn.cslg.pas.common.dto.AddSelfFieldDTO;
 import cn.cslg.pas.common.model.cronModel.Records;
+import cn.cslg.pas.common.model.request.StringRequest;
 import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.common.utils.StringUtils;
 import cn.cslg.pas.common.vo.EntityVO;
 import cn.cslg.pas.common.vo.PersonSelfFieldVO;
 import cn.cslg.pas.domain.business.SystemDict;
+import cn.cslg.pas.factorys.businessFactory.Business;
+import cn.cslg.pas.factorys.businessFactory.BusinessFactory;
 import cn.cslg.pas.service.business.AssoScenarioMatterService;
 import cn.cslg.pas.service.business.CommonService;
 import cn.cslg.pas.service.business.ScenarioService;
@@ -39,77 +42,21 @@ public class ImportTaskController {
 
     @Autowired
     private PersonFieldService personFieldService;
-    @PostMapping("getParams")
-    @Operation(summary = "获得实体类栏位信息")
-    public Response getQueryConditions(@RequestBody List<String> tables) {
-        List<EntityVO> vos = commonService.getQueryConditions(tables);
-        return Response.success(vos);
-    }
-
-    @GetMapping("data")
-    @Operation(summary = "通用数据")
-    public Object getCommonData(String keys) {
-        List<String> typeList = StringUtils.changeStringToString(keys, ",");
-        List<SystemDict> systemDictList = systemDictService.getSystemDictListByType(typeList);
-        Map<String, Object> map = new HashMap<>();
-        for (String type : typeList) {
-            map.put(type, systemDictList.stream().filter(item -> item.getType().equals(type)).collect(Collectors.toList()));
-        }
-        return Response.success(map);
-    }
-
-
-    @GetMapping("getCustomField")
-    @Operation(summary = "查询个人栏位配置")
-    public Response getCustomField(String tableName) {
-        try {
-          List<PersonSelfFieldVO> personSelfFieldVOS= personFieldService.getCustomField(tableName);
-            Records records =new Records();
-            records.setData(personSelfFieldVOS);
-            return Response.success(records);
-        }
-        catch (Exception e){
-                return Response.error(e.getMessage());
-        }
-
-    }
-
-
-    @PostMapping("setCustomField")
-    @Operation(summary = "设置个人栏位配置")
-    public Response setCustomField(@RequestBody AddSelfFieldDTO addSelfFieldDTO) {
-        try {
-            List<PersonSelfFieldVO> personSelfFieldVOS= personFieldService.setCustomField(addSelfFieldDTO);
-            Records records =new Records();
-            records.setData(personSelfFieldVOS);
-            return Response.success(records);
-        }
-        catch (Exception e){
-            return Response.error(e.getMessage());
-        }
-
-    }
-    @GetMapping("/scenario")
-    @Operation(summary = "查询应用场景")
-    public Response queryAllScenario(){
-        Records records = new Records();
-        records.setData(scenarioService.queryAll());
-        return Response.success(records);
-    }
-
-    @PostMapping("/matter")
-    @Operation(summary = "查询处理事项")
-    public Response queryMatter(@RequestBody List<Integer> scenarioIds){
-        Records records = new Records();
-        records.setData(assoScenarioMatterService.queryMatterIds(scenarioIds));
+    @Autowired
+    private BusinessFactory businessFactory;
+    @Operation(summary = "查询导入任务")
+    @PostMapping("/queryImportTask")
+    public Response queryImportTask(@RequestBody StringRequest stringRequest) throws Exception {
+        Business business = businessFactory.getClass("importTaskService");
+        Records records = (Records) business.queryMessage(stringRequest);
         return Response.success(records);
     }
 
-    @GetMapping("/queryCrons")
-    @Operation(summary = "查找核心结论")
-    public Response queryCrons(Integer reportType){
-        Records records = new Records();
-        records.setData(systemDictService.getCrons(reportType));
+    @Operation(summary = "添加导入任务")
+    @PostMapping("/addImportTask")
+    public Response addImportTask(@RequestBody StringRequest stringRequest) throws Exception {
+        Business business = businessFactory.getClass("importTaskService");
+        Records records = (Records) business.addMessage(stringRequest);
         return Response.success(records);
     }
 }

src/main/java/cn/cslg/pas/controller/PatentProjectController.java

@@ -47,7 +47,7 @@ public class PatentProjectController {
 
     @Operation(summary = "添加专利数据库")
     @PostMapping("/addPatentProject")
-    public Response addPatentProject(@RequestBody  PatentProjectDTO patentProjectDTO) throws Exception {
+    public Response addPatentProject(@RequestBody PatentProjectDTO patentProjectDTO) throws Exception {
         if (patentProjectDTO != null) {
             Business business = businessFactory.getClass("patentProjectService");
             Integer id = null;

src/main/java/cn/cslg/pas/service/business/ImportTaskService.java

@@ -1,10 +1,17 @@
 package cn.cslg.pas.service.business;
 
+import cn.cslg.pas.common.model.request.GroupRequest;
+import cn.cslg.pas.common.model.request.QueryRequest;
 import cn.cslg.pas.domain.business.ImportTask;
+import cn.cslg.pas.factorys.businessFactory.Business;
 import cn.cslg.pas.mapper.ImportTaskMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.List;
 
 /**
  * 导入任务表业务层
@@ -14,8 +21,41 @@ import org.springframework.stereotype.Service;
  */
 @Service
 @RequiredArgsConstructor
-public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask> {
+public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask> implements Business {
+
+
+    @Override
+    public Object queryMessage(QueryRequest queryRequest) throws Exception {
+        return null;
+    }
+
+    @Override
+    public Object addMessage(Object object, List<MultipartFile> files) {
+        return null;
+    }
+
+    @Override
+    public Object deleteMessage(List<Integer> ids) throws IOException {
+        return null;
+    }
+
+    @Override
+    public Object updateMessage(Object object, List<MultipartFile> files) {
+        return null;
+    }
 
+    @Override
+    public Object getGroup(GroupRequest groupRequest, String tableName) throws Exception {
+        return null;
+    }
 
+    @Override
+    public Object addMessage(Object object) {
+        return null;
+    }
 
+    @Override
+    public Object updateMessage(Object object) {
+        return null;
+    }
 }

src/main/java/cn/cslg/pas/service/importPatent/ImportFromWebToEsService.java

@@ -14,6 +14,9 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+
 
 @Scope("prototype")
 @Service
@@ -159,35 +162,13 @@ public class ImportFromWebToEsService implements PatentImportImp {
             String orderByType = importTaskAMVO.getOrderByType();  //排序类型
             String dbType = importTaskAMVO.getDBType();  //检索数据库类型
             Integer importContent = importTaskAMVO.getImportContent();  //下载字段
+            Integer doneNum =importTaskAMVO.getDoneNum();
             //十进制转二进制
             String imContents = MathUtils.fun(2, importContent);
             //下载字段
             char[] importCells = imContents.toCharArray();
 
-            //startToEndNum：起止条数中需要下载的专利总数量
-            int startToEndNum = 0;
-//            if (endNumber > 0) {
-//                startToEndNum = endNumber - startNumber + 1;
-//                if (isDeletePatentNos != null && isDeletePatentNos.size() > 0) {
-//                    startToEndNum = startToEndNum - isDeletePatentNos.size();
-//                }
-//            }
-//
-//            //如果完成数量大于0，则当前下载任务为暂停后的继续下载，则开始位置更新
-//            if (successNum > 0) {
-//                if (startNumber == null) {  //多个专利号导入任务没有startNumber这些值
-//                    startNumber = 0;
-//                }
-//                startNumber += successNum;
-//            }
-//
-//            //若有起止条数，并且完成条数在起止条数内（即起止条数中专利还没有下载完）
-//            if (endNumber > 0 && startNumber <= endNumber && successNum < startToEndNum) {
-//                Calculate calculate = calculateFromStartAndEndNumber(startNumber, endNumber);
-//                Integer startPage = calculate.getStartPage();
-//                Integer startNum = calculate.getStartNum();
-//                Integer endPage = calculate.getEndPage();
-//                Integer endNum = calculate.getEndNum();
+
 //
 //                //根据计算出的起止页数，一页一页检索
 //                for (int i = startPage; i <= endPage; i++) {
@@ -258,15 +239,9 @@ public class ImportFromWebToEsService implements PatentImportImp {
 //                    }
 //
 //                }
-//            }
-//
-//            //下载 isAdd中的专利
-//            if (isAddPatentNos != null && isAddPatentNos.size() > 0) {
-//                String patentNoCondition = StringUtils.join(isAddPatentNos, " OR ");
-//                conditions = "AN=(" + patentNoCondition + ")";
-//                downLoadIsAddPatentNos(isAddPatentNos, task, orderBy, orderByType, dbType, cells, conditions);
-//            }
-//
+
+
+
         } catch (Exception e) {
             e.printStackTrace();
             //生产消费到一半时，发生错误异常，将任务状态置为完成

src/main/java/cn/cslg/pas/service/query/FormatQueryService.java

@@ -319,7 +319,6 @@ public class FormatQueryService {
                     }
                 }
             }
-
         }
         if (Right != null) {
             String rightValue = "";