新建分支，准备用来进行项目重构开发

PAS/src/main/java/cn/cslg/pas/common/core/base/Constants.java

@@ -43,7 +43,7 @@ public class Constants {
     public static final String PROJECT_FIELD_TEXT_FILE_NAME = "project-field-text.json";
     public static final String PROJECT_FIELD_PATENT_LINK_FILE_NAME = "project-field-patent-link.json";
 
-    public static final String API_VERSION_V2 = "/api/v2";
+    public static final String API_XiaoSHI = "/api/xiaoshi";
 
     public static final Integer PATENT_CLASS_NUMBER_IPC = 1;
     public static final Integer PATENT_CLASS_NUMBER_CPC = 2;

PAS/src/main/java/cn/cslg/pas/common/model/BaseEntity.java

@@ -1,25 +0,0 @@
-package cn.cslg.pas.common.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-
-
-/**
- * Entity基类
- */
-@Data
-@SuppressWarnings("rawtypes")
-public class BaseEntity<T extends Model> extends Model {
-    /**
-     *
-     */
-    private static final long serialVersionUID = -4851055162892178225L;
-    /**
-     * 唯一ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/DataSource.java

@@ -1,46 +0,0 @@
-package cn.cslg.pas.common.model;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @author 沈永艺
- * @date 2022-8-12
- * @description 数据权限类 数据库对应实体
- */
-
-@Data
-@Accessors(chain = true)
-
-public class DataSource  {
-    /**
-     * 数据字典名字
-     */
-    private String dataSourceName;
-
-    /**
-     * 数据字典描述
-     */
-    private String dataSourceDescription;
-
-    /**
-     * 数据字典数据库
-     */
-    private String dataSourceDataBase;
-
-    /**
-     * 数据字典表格
-     */
-    private String dataSourceTable;
-
-    /**
-     * 数据字典字段
-     */
-    private String dataSourceField;
-
-    private  Integer id;
-    private Integer isDelete;
-
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/FileSource.java

@@ -1,41 +0,0 @@
-package cn.cslg.pas.common.model;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * @author 沈永艺
- * @date 2022-8-12
- * @description 数据权限类 数据库对应实体
- */
-
-@Data
-@Accessors(chain = true)
-
-public class FileSource {
-    /**
-     * 数据字典名字
-     */
-    private String patentNo;
-
-    /**
-     * 数据字典描述
-     */
-    private String pic;
-
-    /**
-     * 数据字典数据库
-     */
-    private Integer type;
-
-    /**
-     * 数据字典表格
-     */
-    private String url;
-    private String appNo;
-    private String publicdate;
-    private String publictono;
-    private String publictodate;
-
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/PatentCell.java

@@ -1,179 +0,0 @@
-package cn.cslg.pas.common.model;
-
-
-import cn.cslg.pas.common.model.dto.UploadFileDTO;
-import cn.cslg.pas.domain.Priority;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * <p>
- * 管理员表
- * </p>
- *
- * @author 王岩
- * @since 2022-03-25
- */
-@Data
-
-/*数据库中的表对应的类
- */
-public class PatentCell {
-
-    /**
-     * 管理员用户名
-     */
-    private String patentNo;
-    private String title;
-    private String applications;
-    private String legal;
-    private String url;
-    private String abstrc;
-    /**
-     * 附图路径
-     */
-    private String picUrl;
-    /**
-     * 附图文件名称
-     */
-    private String fileName;
-    /*
-    申请号
-     */
-    private String applicationNo;
-    /*
-    专题库id
-     */
-    private Integer projectId;
-    /*
-报告id
- */
-    private Integer reportId;
-    private String country;
-    private String applicationDate;
-    private String pubilcDate;
-    /*
-    公开授权号
-     */
-    private String publicAccreditNo;
-    /*
-公开授权日
-     */
-    private String publicAccreditDate;
-    /*
-      主分类号
-       */
-    private String mainIpc;
-    /*
-      分类号
-       */
-    private List<String> ipc;
-    /*
-    申请人
-     */
-    private List<String> applicationPersons;
-    /*
-申请人地址
- */
-    private List<String> applicationAddress;
-    /*
-  发明人
-   */
-    private List<String> inventors;
-
-    /*
-    当前权利人
-     */
-    private List<String> applicationCurrents;
-    private List<String> applicationCurrentAddress;
-    /*
-    范畴分类
-     */
-    private String classical;
-    /*
-    状态
-     */
-    private String statue;
-
-    /*
-    摘要
-     */
-    private String abstrText;
-
-    /*
-    主权要
-     */
-    private String mainRignt;
-
-    /*
-    权要
-     */
-    private List<String> rights;
-
-    /*
-        PDF文档路径
-         */
-    private String PDFUrl;
-
-    /*
-   PDF文档大小
-    */
-    private Long PDFSize;
-    private String PDFName;
-    private UploadFileDTO pdf;
-    /*
-    说明书
-     */
-    private String patentInstructionText;
-    /*
-     公开号
-     */
-    private String publicNo;
-
-    /*
-   代理机构
-    */
-    private String agency;
-    /*
-    代理人
-     */
-    private List<String> agencyPersons;
-
-    /*专利法律状态
-
-     */
-    List<PatentAffair> patentAffairs;
-    /**
-     * 同族号
-     */
-    private String familyId;
-    /**
-     * 优先权信息(优先权号、优先权国家、优先权日)
-     */
-    private List<Priority> priorities;
-    /**
-     * 其他附图路径
-     */
-    private List<String> otherUrls;
-
-    @Data
-    public static class PatentAffair {
-        /**
-         * 法律状态
-         */
-        private String status;
-
-        /**
-         * 发生日期
-         */
-        private String dateTime;
-        /**
-         * 简单法律状态
-         */
-
-        private String simpleStatus;
-
-
-    }
-}

PAS/src/main/java/cn/cslg/pas/common/model/PersonnelVO.java

@@ -1,169 +0,0 @@
-package cn.cslg.pas.common.model;
-
-import cn.cslg.pas.common.model.vo.BaseVO;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-
-/**
- * @author 沈永艺
- * @date 2022-8-4
- * @description 人员类 前台对应实体
- */
-
-@Data
-@Accessors(chain = true)
-public class PersonnelVO {
-    /**
-     * ID
-     */
-    private Integer id;
-
-    /**
-     * Front:姓名
-     * Back:人员名称
-     */
-    private String name;
-
-    /**
-     * Front:性别
-     * Back:人员性别
-     */
-    private Integer gender;
-
-    /**
-     * Front:邮箱
-     * Back:人员邮箱
-     */
-    private String email;
-
-    /**
-     * Front:联系方式
-     * Back:人员联系电话
-     */
-    private String mobile;
-
-    /**
-     * Front:所属租户
-     * Back:租户ID
-     */
-    private Integer tenant;
-
-    /**
-     * Front:状态
-     * Back:人员账号状态(1启用0停用)
-     */
-    private Integer state;
-
-    /**
-     * Front:账号
-     * Back:人员账号
-     */
-    private String username;
-
-    /**
-     * Front:密码
-     * Back:人员密码
-     */
-    private String password;
-
-    /**
-     * Front:备注
-     * Back:人员描述
-     */
-    private String remark;
-
-    /**
-     * Front:QQ号
-     * Back:人员QQ号
-     */
-    private String qqNumber;
-
-    /**
-     * Front:微信号
-     * Back:人员微信号
-     */
-    private String wechat;
-
-    /**
-     * Front:钉钉号
-     * Back:人员钉钉号
-     */
-    private String nail;
-
-    /**
-     * Front:
-     * Back:租户名称
-     */
-    private String tenantName;
-
-    /**
-     * Front:
-     * Back:租户ID
-     */
-    private Integer tenantId;
-
-    /**
-     * 登陆成功后生成的Token
-     */
-    private String token;
-
-    /**
-     * 角色List
-     */
-    private List<PerRole> rList;
-
-    /**
-     * 部门职位List
-     */
-    private List<DP> dpList;
-    /**
-     * 角色类型(是否为管理角色)
-     */
-    private Integer roleType;
-    /**
-     * 租户类型
-     */
-    private String tenantType;
-
-    /**
-     * 部门职位绑定关系
-     */
-    @Data
-    public static class DP {
-        /**
-         * 部门名称
-         */
-        private String departmentName;
-        /**
-         * 部门ID
-         */
-        private Integer departmentId;
-        /**
-         * 职位名称
-         */
-        private String positionName;
-        /**
-         * 职位ID
-         */
-        private Integer positionId;
-    }
-
-    /**
-     * 角色信息
-     */
-    @Data
-    public static class PerRole {
-        /**
-         * 角色名称
-         */
-        private String roleName;
-        /**
-         * 角色ID
-         */
-        private Integer roleId;
-    }
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/QueryPREntity.java

@@ -1,23 +0,0 @@
-package cn.cslg.pas.common.model;
-
-import lombok.Data;
-
-/**
- * @Author xiexiang
- * @Date 2023/3/10
- */
-@Data
-public class QueryPREntity {
-    /**
-     * 专利号
-     */
-    private String patentNo;
-    /**
-     * 当前页
-     */
-    private Integer current;
-    /**
-     * 每页条数
-     */
-    private Integer size;
-}

PAS/src/main/java/cn/cslg/pas/common/model/QueryPatentVO.java

@@ -1,68 +0,0 @@
-package cn.cslg.pas.common.model;
-
-import cn.cslg.pas.common.model.vo.BaseVO;
-import cn.cslg.pas.common.model.vo.SourceVO;
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author 李仁杰
- * RMS查询专利的VO类
- */
-@Data
-public class QueryPatentVO extends BaseVO {
-    /**
-     * 查询商品化专利还是相关专利（1.商品化专利  2相关专利）
-     */
-    private Integer queryType;
-    //报告id
-    private Integer reportId;
-    //架构id
-    private Integer structureId;
-    //产品id
-    private Integer productId;
-    //专题库ID
-    private Integer projectId;
-    //RMS导入ID
-    private List<Integer> importTaskId;
-    //专利号
-    private List<String> patentNos;
-    // 去除的专利号
-    private List<String> notInPatentNos;
-    //申请人名字
-    private String applicationName;
-    //权利人名字
-    private String obligeeName;
-
-    private Integer startNumber;
-
-    private Integer endNumber;
-
-    private String orderType;
-
-    private String orderItem;
-
-    private List<String> conPatentNos;
-    @Schema(description = "专题库自定义选项列表")
-    private List<SourceVO> pasOptions;
-    @Schema(description = "专利号")
-    private String patentNo;
-
-    @Schema(description = "申请号")
-    private String applicationNo;
-
-    @Schema(description = "IPC分类号")
-    private String numberIpc;
-    @Schema(description = "CPC分类号")
-    private String numberCpc;
-    @Schema(description = "UPC分类号")
-    private String numberUpc;
-    @Schema(description = "摘要")
-    private String abstractStr;
-    @Schema(description = "标题")
-    private String patentName;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/SuperEntity.java

@@ -1,61 +0,0 @@
-package cn.cslg.pas.common.model;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-
-/**
- * Entity基类
- *
- */
-@Data
-@SuppressWarnings("rawtypes")
-public class SuperEntity<T extends Model> extends Model {
-
-    /**
-     *
-     */
-    private static final long serialVersionUID = -4851055162892178225L;
-
-    /**
-     * 唯一ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 状态 0：失效  1：生效
-     */
-    private Integer status;
-
-    /**
-     * @TableField 配置需要填充的字段
-     * 创建时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Date updateTime;
-
-    public SuperEntity() {
-        this.status = 1;
-        this.createTime = new Date();
-        this.updateTime = new Date();
-    }
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/AreaAddressDTO.java

@@ -1,13 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-
-@Data
-public class AreaAddressDTO {
-    private Integer provinceId;
-    private Integer cityId;
-    private Integer areaId;
-    private String provinceName;
-    private String cityName;
-    private String areaName;
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/AsInvalidReasonHistoryDTO.java

@@ -1,57 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import cn.cslg.pas.common.model.BaseEntity;
-import cn.cslg.pas.common.model.vo.SystemFile;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 无效应对报告历史
- * </p>
- *
- * @author 王岩
- * @since 2022-08-14
- */
-
-/*数据库中的表对应的类
- */
- @Data
-public class AsInvalidReasonHistoryDTO {
-  private Integer id;
-   private String patentNo;
-    /**
-     * 无效案号
-     */
-    private String invalidCaseNum;
-
-    /**
-     * 无效专利
-     */
-
-    private String invalidedPatent;
-
-    /**
-     *无效时间
-     */
-
-    private Date invalidTime;
-
-    /**
-     * 无效理由
-     */
-
-    private String invalidReason;
-
-    /**
-     * 是否审核员通过
-     */
-    private Integer ifApproved;
-
- private List<SystemFile> files;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/AssoProductPatentAddNewDTO.java

@@ -1,23 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 新增多个专利和多个产品关联的DTO类
- */
-@Accessors(chain = true)
-@Data
-public class AssoProductPatentAddNewDTO implements Serializable {
-    /**
-     * 专利号s
-     */
-    private List<String> patentNos;
-    /**
-     * 产品ids
-     */
-    private List<Integer> productIds;
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/AssoStructurePatentAddNewBatchDTO.java

@@ -1,31 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 专题库批量新增标引(一个专题库给多个专利选择同样的多个产品架构)的DTO类
- *
- * @Author chenyu
- * @Date 2023/4/7
- */
-@Accessors(chain = true)
-@Data
-public class AssoStructurePatentAddNewBatchDTO implements Serializable {
-    /**
-     * 专题库id
-     */
-    private Integer projectId;
-    /**
-     * 多个专利号
-     */
-    private List<String> patentNos;
-    /**
-     * 多个产品架构id和产品id
-     */
-    private List<StructureAndProductIds> structureAndProductIds;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/AssoStructurePatentQueryDTO.java

@@ -1,23 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * 专题库产品架构专利号标引的查询DTO类
- */
-@Accessors(chain = true)
-@Data
-public class AssoStructurePatentQueryDTO implements Serializable {
-    /**
-     * 专利号
-     */
-    private String patentNo;
-    /**
-     * 专题库id
-     */
-    private Integer projectId;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/AssoStructurePatentUpdateDTO.java

@@ -1,40 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-import org.apache.xpath.operations.Bool;
-
-import java.io.Serializable;
-
-/**
- * 专题库产品架构专利号标引的修改DTO类
- */
-@Accessors(chain = true)
-@Data
-public class AssoStructurePatentUpdateDTO implements Serializable {
-    /**
-     * ID
-     */
-    private Integer id;
-    /**
-     * 架构id
-     */
-    private Integer structureId;
-    /**
-     * 专利号
-     */
-    private String patentNo;
-    /**
-     * 产品id
-     */
-    private Integer productId;
-    /**
-     * 专题库id
-     */
-    private Integer projectId;
-    /**
-     * 更新类型(true新增 false删除)
-     */
-    private Boolean updateType;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/ClassNumberDTO.java

@@ -1,31 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-
-@Data
-public class ClassNumberDTO {
-    /**
-     * 部
-     */
-    private String a;
-    /**
-     * 大类
-     */
-    private String b;
-    /**
-     * 小类
-     */
-    private String c;
-    /**
-     * 大组
-     */
-    private String d;
-    /**
-     * 小组
-     */
-    private String e;
-    /**
-     * 分类号
-     */
-    private String classNumber;
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/ClientDTO.java

@@ -1,48 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-
-
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-/**
- * <p>
- * 委托方表
- * </p>
- *
- * @author 王岩
- * @since 2022-02-17
- */
-@Data
-
-public class ClientDTO  {
-
-    private Integer id;
-
-    /**
-     * 委托方名称
-     */
-
-    private String name;
-
-
-    /**
-     * 客户负责人
-     */
-    private Integer personnelId;
-
-
-
-    private Integer tenantId;
-    /**
-     * 备注
-     */
-    private String remark;
-
-
-    @TableField(exist = false)
-    private String personnelName;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/CommonData.java

@@ -1,8 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-
-@Data
-public class CommonData {
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/ConfigDTO.java

@@ -1,17 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-
-@Data
-public class ConfigDTO {
-
-    private String loginAccount;
-
-    private String loginPassword;
-
-    private Integer tenantId;
-
-    private Integer webId;
-
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/CustomFieldDTO.java

@@ -1,12 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class CustomFieldDTO {
-    private String name;
-    private Integer type;
-    private List<String> selected;
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/CustomFieldLabelDTO.java

@@ -1,13 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class CustomFieldLabelDTO {
-    private Integer id;
-    private Integer type;
-    private String name;
-    private List<LabelDTO> selected;
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/EventAddNewDTO.java

@@ -1,45 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 新增事件的DTO类
- *
- * @Author chenyu
- * @Date 2023/4/2
- */
-@Accessors(chain = true)
-@Data
-public class EventAddNewDTO implements Serializable {
-    /**
-     * 事件id(主键)
-     */
-    private Integer id;
-    /**
-     * 事件名称
-     */
-    private String questionName;
-    /**
-     * 描述
-     */
-    private String description;
-    /**
-     * 应用场景
-     */
-    private List<Integer> applicationScenarios;
-    /**
-     * 时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date eventDate;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/EventQueryPageDTO.java

@@ -1,34 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 事件的分页查询DTO类
- *
- * @Author chenyu
- * @Date 2023/4/2
- */
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@Data
-public class EventQueryPageDTO extends PageDTO2 {
-    /**
-     * 专题库id
-     */
-    private Integer projectId;
-    /**
-     * 事件名称
-     */
-    private String questionName;
-    /**
-     * 租户id
-     */
-    private Integer tenantId;
-    /**
-     * 应用场景value
-     */
-    private Integer applicationScenario;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/EventUpdateDTO.java

@@ -1,48 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 修改事件的DTO类
- *
- * @Author chenyu
- * @Date 2023/4/2
- */
-@Accessors(chain = true)
-@Data
-public class EventUpdateDTO implements Serializable {
-    /**
-     * 主键
-     */
-    private Integer id;
-    /**
-     * 事件名称
-     */
-    private String questionName;
-    /**
-     * 描述
-     */
-    private String description;
-    /**
-     * 应用场景
-     */
-    private List<Integer> applicationScenarios;
-    /**
-     * 时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date eventDate;
-    /**
-     * 专题库id
-     */
-    private Integer projectId;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/FMSDeleteFileDTO.java

@@ -1,24 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 调用FMS系统删除文件接口
- *
- * @Author xiexiang
- * @Date 2023/8/14
- */
-@Data
-public class FMSDeleteFileDTO {
-    /**
-     * 文件ids
-     */
-    private List<Integer> ids;
-
-    /**
-     * 删除类型（2物理删除 1逻辑删除）
-     */
-    private Integer type;
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/GetAreaListDTO.java

@@ -1,33 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 查询架构的地区集合
- *
- * @Author xiexiang
- * @Date 2023/3/16
- */
-@Data
-public class GetAreaListDTO {
-    /**
-     * 产品id
-     */
-    private Integer productId;
-
-    /**
-     * 架构id
-     */
-    private Integer categoryId;
-
-    /**
-     * 专利号集合
-     */
-    private List<String> patentNoList;
-    /**
-     * 租户id
-     */
-    private Integer tenantId;
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/GetClaimsInfoParamsDTO.java

@@ -1,30 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * 远程调用爬取欧专局，获取获取权要信息的接口的DTO类
- *
- * @Author chenyu
- * @Date 2023/4/12
- */
-@Accessors(chain = true)
-@Data
-public class GetClaimsInfoParamsDTO implements Serializable {
-    /**
-     * 国家前2位首字母
-     */
-    private String cc;
-    /**
-     * 专利号数字
-     */
-    private String number;
-    /**
-     * 专利种类
-     */
-    private String kind;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/GetDescriptionInfoParamsDTO.java

@@ -1,30 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * 远程调用爬取欧专局，获取说明书信息的接口的DTO类
- *
- * @Author chenyu
- * @Date 2023/4/12
- */
-@Accessors(chain = true)
-@Data
-public class GetDescriptionInfoParamsDTO implements Serializable {
-    /**
-     * 国家前2位首字母
-     */
-    private String cc;
-    /**
-     * 专利号数字
-     */
-    private String number;
-    /**
-     * 专利种类
-     */
-    private String kind;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/GetFuTuParamsDTO.java

@@ -1,30 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * 远程调用爬取欧专局，获取附件的接口的DTO类
- *
- * @Author chenyu
- * @Date 2023/4/12
- */
-@Accessors(chain = true)
-@Data
-public class GetFuTuParamsDTO implements Serializable {
-    /**
-     * 附件链接
-     */
-    private String link;
-    /**
-     * 附件页数
-     */
-    private Integer page;
-    /**
-     * 附件类型
-     */
-    private String type;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/GetPatentStarPartDTO.java

@@ -1,34 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * 获取专利之星专利指定项DTO类
- *
- * @Author chenyu
- * @Date 2023/6/30
- */
-@Accessors(chain = true)
-@Data
-public class GetPatentStarPartDTO extends PageDTO2 implements Serializable {
-    /**
-     * 要检索的专利项（1.权要 2.说明书文本 3.说明书pdf 4.摘要附图 5.同族专利）
-     */
-    private Integer patentCell;
-    /**
-     * 公开号
-     */
-    private String patentNo;
-    /**
-     * 申请号
-     */
-    private String appNo;
-    /**
-     * 原始申请号
-     */
-    private String rowAppNo;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/GetSearchBiblioParamsDTO.java

@@ -1,30 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * 远程调用爬取欧专局，获取一批专利著录接口的DTO类
- *
- * @Author chenyu
- * @Date 2023/4/11
- */
-@Accessors(chain = true)
-@Data
-public class GetSearchBiblioParamsDTO implements Serializable {
-    /**
-     * 检索信息条件
-     */
-    private String query;
-    /**
-     * 起始专利数(1代表从第1个专利开始，注意不是页数)
-     */
-    private Integer start;
-    /**
-     * 最后专利数(10代表到第10个专利为止，注意不是页数)
-     */
-    private Integer end;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/LabelDTO.java

@@ -1,9 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-
-@Data
-public class LabelDTO {
-    private String label;
-    private Integer value;
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/PageDTO.java

@@ -1,13 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class PageDTO<T> {
-    private Integer total;
-    private Long size;
-    private Long current;
-    private List<T> records;
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/PageDTO2.java

@@ -1,34 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * 分页查询前端传输DTO类
- *
- * @Author chenyu
- * @Date 2023/2/16
- */
-@Accessors(chain = true)
-@Data
-public class PageDTO2 implements Serializable {
-    /**
-     * 当前页数
-     */
-    private Integer current;
-    /**
-     * 每页条数
-     */
-    private Integer size;
-    /**
-     * 排序名称
-     */
-    private String orderBy;
-    /**
-     * 排序类型
-     */
-    private String orderType;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/PasUserDTO.java

@@ -1,35 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class PasUserDTO {
-    /**
-     * 每页条数
-     */
-    private Long size;
-
-    /**
-     * 当前页数
-     */
-    private Long current;
-
-    /**
-     * 数据总数
-     */
-    private Long total;
-    /**
-     * Front:姓名
-     * Back:人员名称
-     */
-    private String name;
-    /**
-     * Front:账号
-     * Back:人员账号
-     */
-    private String username;
-
-     private List<Integer> userIds;
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/PatentDTO.java

@@ -1,360 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import cn.cslg.pas.domain.*;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class PatentDTO {
-    private Integer id;
-    private List<PatentLabel> label;
-    private List<PatentApplicant> applicant;
-    private List<PatentInventor> inventor;
-    private PatentAgency agency;
-    private List<PatentAgent> agent;
-    private List<PatentAffair> affair;
-    private List<Field> field;
-    private Integer read;
-    private List<String> ipcList;
-    private List<String> cpcList;
-    private List<String> upcList;
-    private List<String> locList;
-    private List<PatentImage> image;
-    private List<PatentInstruction> pdf;
-    private Integer simpleFamily;
-    private Integer inpadocFamily;
-    private Integer patSnapFamily;
-    private PatentFamily family;
-    private List<PatentRight> rights;
-    private PatentInstructionText instruction;
-    private List<String> priorityCountry;
-    /**
-     * 结果集（专利之星检索接口返回同族专利的接口使用）
-     */
-    private Object familyPatentResult;
-
-    @Data
-    public static class PatentFamily {
-        private List<String> simple;
-        private List<String> inpadoc;
-        private List<String> patSnap;
-    }
-
-    @Data
-    public static class Field {
-        private Integer id;
-        private Integer type;
-        private String name;
-        private List<String> selected;
-    }
-
-    /**
-     * 专利名称(标题)
-     */
-    private String name;
-
-    /**
-     * 专利名称(标题)（译）
-     */
-    private String nameOut;
-
-    /**
-     * 专利号
-     */
-    private String patentNo;
-
-    /**
-     * 摘要
-     */
-    private String abstractStr;
-
-    /**
-     * 摘要(译)
-     */
-    private String abstractOut;
-
-    /**
-     * 申请号
-     */
-    private String applicationNo;
-
-    /**
-     * 申请日
-     */
-    private String applicationDate;
-
-    /**
-     * 公开号
-     */
-    private String publicNo;
-
-    /**
-     * 公开日
-     */
-    private String publicDate;
-
-    /**
-     * 首次公开日
-     */
-    private String firstPublicDate;
-
-    /**
-     * 公开授权号
-     */
-    private String publicAccreditNo;
-
-    /**
-     * 公开授权日
-     */
-    private String publicAccreditDate;
-
-    /**
-     * 受理局
-     */
-    private String bureau;
-
-    /**
-     * IPC国际分类号(主)
-     */
-    private String ipc;
-
-    /**
-     * CPC国际分类号(主)
-     */
-    private String cpc;
-
-    /**
-     * UPC国际分类号(主)
-     */
-    private String upc;
-
-    /**
-     * LOC国际分类号(主)
-     */
-    private String loc;
-
-    /**
-     * 专利状态【有权、审中、无权、PCT状态】
-     */
-    private String simpleStatus;
-    /**
-     * 专利状态【有权、审中、无权、PCT状态】
-     */
-    private Integer simpleStatusInt;
-    /**
-     * 专利类型【发明、新型、外观】
-     */
-    private String type;
-
-    /**
-     * 授权文档名称
-     */
-    private String authDocName;
-
-    /**
-     * 授权文档文件地址
-     */
-    private String authDocUrl;
-
-    /**
-     * 公开文档名称
-     */
-    private String publicDocName;
-
-    /**
-     * 公开文档文件地址
-     */
-    private String publicDocUrl;
-
-    /**
-     * 文献代码
-     */
-    private String code;
-
-    /**
-     * 说明书
-     */
-    private String manual;
-
-    /**
-     * 说明书(译)
-     */
-    private String manualOut;
-
-    /**
-     * 文献页数
-     */
-    private Integer docPage;
-
-    /**
-     * 发明人数量
-     */
-    private Integer inventorNum;
-
-    /**
-     * 主权项数量
-     */
-    private Integer mainRightNum;
-
-    /**
-     * 权利要求数量
-     */
-    private Integer rightNum;
-
-    /**
-     * 权利要求
-     */
-    private String rightContent;
-
-    /**
-     * 独立权力要求
-     */
-    private String selfRightContent;
-
-    /**
-     * 权利要求(译)
-     */
-    private String rightContentOut;
-
-    /**
-     * 优先权号
-     */
-    private String priorityNo;
-
-    /**
-     * 优先权日
-     */
-    private String priorityDate;
-
-    /**
-     * 简单同族数量
-     */
-    private Integer simpleFamilyNum;
-
-    /**
-     * INPADOC同族数量
-     */
-    private Integer inpadocFamilyNum;
-
-    private Integer patSnapFamilyNum;
-
-    /**
-     * 引用专利数量
-     */
-    private Integer quoteNum;
-
-    /**
-     * 被引用次数
-     */
-    private Integer quotedNum;
-
-    /**
-     * 3年内被引用次数
-     */
-    private Integer quotedNum3;
-
-    /**
-     * 5年内被引用次数
-     */
-    private Integer quotedNum5;
-
-    /**
-     * 非专利引用文献数量
-     */
-    private Integer notPatentQuoteNum;
-
-    /**
-     * WO国家阶段
-     */
-    private String wo;
-
-    /**
-     * 代理机构ID
-     */
-    private String agencyId;
-
-    /**
-     * 代理人ID
-     */
-    private String agentId;
-
-    /**
-     * 审查员
-     */
-    private String examiner;
-
-    /**
-     * 助理审查员
-     */
-    private String aidExaminer;
-
-    /**
-     * 引用专利
-     */
-    private String quote;
-
-    /**
-     * 被引用专利
-     */
-    private String quoted;
-
-    /**
-     * 非专利引用文献
-     */
-    private String notPatentQuote;
-
-    /**
-     * 摘要附图
-     */
-    private String abstractPath;
-
-    /**
-     * 当前第一申请人
-     */
-    private String firstApplicant;
-
-    /**
-     * 当前第一申请人地址
-     */
-    private String firstApplicantAddress;
-
-    /**
-     * 申请人数量
-     */
-    private Integer applicantNum;
-
-    /**
-     * 第一发明人
-     */
-    private String firstInventor;
-
-    /**
-     * 第一发明人地址
-     */
-    private String firstInventorAddress;
-
-    private Integer selfRightContentNum;
-
-    /**
-     * 简单同族
-     */
-    private String simpleFamilyStr;
-
-    /**
-     * INPADOC同族
-     */
-    private String inpadocFamilyStr;
-
-    /**
-     * EP指定国状态
-     */
-    private String epStatus;
-
-    /**
-     * pdf首页文件base64位字节流
-     */
-    private String pdfFirstPage;
-
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/PatentMarketDataDTO.java

@@ -1,31 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-
-/**
- * 单篇专利价值曲线传入数据对象DTO
- *
- * @Author xiexiang
- * @Date 2023/3/15
- */
-@Accessors(chain = true)
-@Data
-public class PatentMarketDataDTO {
-    /**
-     * 专利号
-     */
-    private List<String> patentNoList;
-
-    /**
-     * 产品地区
-     */
-    private String saleArea;
-
-    /**
-     * 时间单位（0月份，1季度，2年份，不传为月份）
-     */
-    private Integer timeUnit;
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/PatentQueryFieldSourceDTO.java

@@ -1,11 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-
-@Data
-public class PatentQueryFieldSourceDTO {
-    private String value;
-    private String label;
-    private Integer count;
-    private String ids;
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/PermissionRecordDTO.java

@@ -1,63 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-
-/**
- * 新增许可记录的前端传输DTO类
- *
- * @Author xiexiang
- * @Date 2023/3/9
- */
-@Accessors(chain = true)
-@Data
-public class PermissionRecordDTO {
-    /**
-     * 专利号
-     */
-    private String patentNo;
-
-    /**
-     * 许可人（默认为专利权利人）
-     */
-    private String licensor;
-
-    /**
-     * 被许可人
-     */
-    private String licensee;
-
-    /**
-     * 被许可人国家
-     */
-    private String licenseeCountry;
-
-    /**
-     * 许可时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    private Date licenseTime;
-
-    /**
-     * 许可费用（单位万元）
-     */
-    private Double licenseFee;
-
-    /**
-     * 截止时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    private Date licenseDeadLine;
-
-    /**
-     * 许可类型
-     */
-    private Integer licenseType;
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/PermissionRecordUpdateDTO.java

@@ -1,67 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import cn.hutool.core.date.DateTime;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * @Author xiexiang
- * @Date 2023/3/10
- */
-@Accessors(chain = true)
-@Data
-public class PermissionRecordUpdateDTO {
-    /**
-     * ID
-     */
-    private Integer id;
-    /**
-     * 专利号
-     */
-    private String patentNo;
-
-    /**
-     * 许可人（默认为专利权利人）
-     */
-    private String licensor;
-
-    /**
-     * 被许可人
-     */
-    private String licensee;
-
-    /**
-     * 被许可人国家
-     */
-    private String licenseeCountry;
-
-    /**
-     * 许可时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date licenseTime;
-
-    /**
-     * 许可费用（单位万元）
-     */
-    private Double licenseFee;
-
-    /**
-     * 截止时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date licenseDeadLine;
-
-    /**
-     * 许可类型
-     */
-    private Integer licenseType;
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/ProductAddNewDTO.java

@@ -1,48 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 产品的新增产品DTO类
- */
-@Data
-@Accessors(chain = true)
-public class ProductAddNewDTO implements Serializable {
-    /**
-     * 产品名称
-     */
-    private String productName;
-    /**
-     * 上市时间
-     */
-    private Date marketTime;
-    /**
-     * 所属公司或租户名称
-     */
-    private String companyName;
-    /**
-     * 租户id
-     */
-    private Integer tenantId;
-    /**
-     * 产品说明
-     */
-    private String productExplain;
-    /**
-     * 所属产品类别id
-     */
-    private Integer productCategoryId;
-    /**
-     * 许可费率
-     */
-    private Double licenseRate;
-    /**
-     * 专利号
-     */
-    private String patentNo;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/ProductCategoryAddNewDTO.java

@@ -1,27 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * 新增产品类别的DTO类
- */
-@Accessors(chain = true)
-@Data
-public class ProductCategoryAddNewDTO implements Serializable {
-    /**
-     * 产品类别名称
-     */
-    private String productCategoryName;
-    /**
-     * 备注
-     */
-    private String remark;
-    /**
-     * 许可费率
-     */
-    private Double licenseRate;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/ProductCategoryDTO.java

@@ -1,34 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * 新增产品类别的DTO类
- */
-@Accessors(chain = true)
-@Data
-public class ProductCategoryDTO implements Serializable {
-    /**
-     * 产品类别Id（必填）
-     */
-    private Integer categoryId;
-
-    /**
-     * 产品地区
-     */
-    private String categoryArea;
-
-    /**
-     * 时间单位（0月份，1季度，2年份，不传为月份）
-     */
-    private Integer timeUnit;
-
-    /**
-     * 公司名称
-     */
-    private String companyName;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/ProductCategoryPictureUpateDTO.java

@@ -1,35 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * 产品类别的修改图片DTO类
- */
-@Accessors(chain = true)
-@Data
-public class ProductCategoryPictureUpateDTO implements Serializable {
-    /**
-     * ID
-     */
-    private Integer id;
-    /**
-     * 产品类别ID
-     */
-    private Integer productCategoryId;
-    /**
-     * 图片名称
-     */
-    private String name;
-    /**
-     * 后缀类型
-     */
-    private String suffix;
-    /**
-     * 路径
-     */
-    private String url;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/ProductCategoryQueryPageDTO.java

@@ -1,36 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 产品类别和图片的标准查询DTO类
- *
- * @Author chenyu
- * @Date 2023/3/7
- */
-@Accessors(chain = true)
-@Data
-public class ProductCategoryQueryPageDTO extends PageDTO2 {
-    /**
-     * 模糊查询-产品类别名称
-     */
-    private String productCategoryName;
-    /**
-     * 模糊查询-产品名称
-     */
-    private String productName;
-    /**
-     * 模糊查询-创建人名称
-     */
-    private String createPersonName;
-    /**
-     * 专利号
-     */
-    private String patentNo;
-    /**
-     * 租户id
-     */
-    private Integer tenantId;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/ProductCategoryUpdateDTO.java

@@ -1,36 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 产品类别的修改产品类别DTO类
- */
-@Accessors(chain = true)
-@Data
-public class ProductCategoryUpdateDTO implements Serializable {
-    /**
-     * ID
-     */
-    private Integer id;
-    /**
-     * 产品类别名称
-     */
-    private String productCategoryName;
-    /**
-     * 备注
-     */
-    private String remark;
-    /**
-     * 许可费率
-     */
-    private Double licenseRate;
-    /**
-     * 图片
-     */
-    List<ProductCategoryPictureUpateDTO> pictures;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/ProductMarketDataAddNewDTO.java

@@ -1,40 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 新增产品营销数据的DTO类
- */
-@Accessors(chain = true)
-@Data
-public class ProductMarketDataAddNewDTO implements Serializable {
-    /**
-     * 所属产品id
-     */
-    private Integer productId;
-    /**
-     * 营销时间
-     */
-    private String saleTime;
-    /**
-     * 营销地区（国家）
-     */
-    private String saleArea;
-    /**
-     * 销售量
-     */
-    private Integer saleCount;
-    /**
-     * 销售额
-     */
-    private Double saleMoney;
-    /**
-     * 自定义许可费率(默认为产品表的许可费率)
-     */
-    private Double customLicenseRate;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/ProductMarketDataDTO.java

@@ -1,28 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 产品营销数据趋势图传入数据对象DTO
- *
- * @Author xiexiang
- * @Date 2023/3/13
- */
-@Accessors(chain = true)
-@Data
-public class ProductMarketDataDTO {
-    /**
-     * 产品Id
-     */
-    private Integer productId;
-    /**
-     * 产品地区
-     */
-    private String saleArea;
-    /**
-     * 时间单位（0月份，1季度，2年份，不传为月份）
-     */
-    private Integer timeUnit;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/ProductMarketDataQueryPageDTO.java

@@ -1,18 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * @Author chenyu
- * @Date 2023/3/9
- */
-@Accessors(chain = true)
-@Data
-public class ProductMarketDataQueryPageDTO extends PageDTO2 {
-    /**
-     * 所属产品id
-     */
-    private Integer productId;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/ProductMarketDataUpdateDTO.java

@@ -1,43 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * 修改产品营销数据的DTO类
- */
-@Accessors(chain = true)
-@Data
-public class ProductMarketDataUpdateDTO implements Serializable {
-    /**
-     * id
-     */
-    private Integer id;
-    /**
-     * 所属产品id
-     */
-    private Integer productId;
-    /**
-     * 营销时间
-     */
-    private String saleTime;
-    /**
-     * 营销地区（国家）
-     */
-    private String saleArea;
-    /**
-     * 销售量
-     */
-    private Integer saleCount;
-    /**
-     * 销售额
-     */
-    private Double saleMoney;
-    /**
-     * 自定义许可费率(默认为产品表的许可费率)
-     */
-    private Double customLicenseRate;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/ProductPatentDTO.java

@@ -1,47 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import cn.cslg.pas.common.model.vo.BaseVO;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class ProductPatentDTO extends BaseVO {
-
-    private Integer productId;
-    //专利号
-    private List<String> patentNos;
-    // 去除的专利号
-    private List<String> notInPatentNos;
-    //申请人名字
-    private String applicationName;
-    //权利人名字
-    private String obligeeName;
-
-    private Integer startNumber;
-
-    private Integer endNumber;
-
-    private String orderType;
-
-    private String orderItem;
-
-    @Schema(description = "专利号")
-    private String patentNo;
-
-    @Schema(description = "申请号")
-    private String applicationNo;
-
-    @Schema(description = "IPC分类号")
-    private String numberIpc;
-    @Schema(description = "CPC分类号")
-    private String numberCpc;
-    @Schema(description = "UPC分类号")
-    private String numberUpc;
-    @Schema(description = "摘要")
-    private String abstractStr;
-    @Schema(description = "标题")
-    private String patentName;
-    private Integer isIn;
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/ProductPictureUpdateDTO.java

@@ -1,35 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * 产品的修改图片DTO类
- */
-@Accessors(chain = true)
-@Data
-public class ProductPictureUpdateDTO implements Serializable {
-    /**
-     * ID
-     */
-    private Integer id;
-    /**
-     * 产品ID
-     */
-    private Integer productId;
-    /**
-     * 图片名称
-     */
-    private String name;
-    /**
-     * 后缀类型
-     */
-    private String suffix;
-    /**
-     * 路径
-     */
-    private String url;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/ProductQueryPageDTO.java

@@ -1,46 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 分页查询产品的DTO类
- *
- * @Author chenyu
- * @Date 2023/3/8
- */
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@Data
-public class ProductQueryPageDTO extends PageDTO2 {
-    /**
-     * 模糊查询-产品名称
-     */
-    private String productName;
-    /**
-     * 模糊查询-产品类别名称
-     */
-    private String productCategoryName;
-    /**
-     * 模糊查询-专利号
-     */
-    private String patentNo;
-    /**
-     * 模糊查询-公司或租户名称
-     */
-    private String companyName;
-    /**
-     * 所属产品类别id
-     */
-    private Integer productCategoryId;
-    /**
-     * 分组条件
-     */
-    private String groupBy;
-    /**
-     * 产品创建人所属租户id
-     */
-    private Integer createPersonTenantId;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/ProductUpdateDTO.java

@@ -1,53 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 产品的修改产品DTO类
- */
-@Data
-@Accessors(chain = true)
-public class ProductUpdateDTO implements Serializable {
-    /**
-     * 产品id
-     */
-    private Integer id;
-    /**
-     * 产品名称
-     */
-    private String productName;
-    /**
-     * 上市时间
-     */
-    private Date marketTime;
-    /**
-     * 所属公司或租户名称
-     */
-    private String companyName;
-    /**
-     * 租户id
-     */
-    private Integer tenantId;
-    /**
-     * 产品说明
-     */
-    private String productExplain;
-    /**
-     * 所属产品类别id
-     */
-    private Integer productCategoryId;
-    /**
-     * 许可费率
-     */
-    private Double licenseRate;
-    /**
-     * 图片
-     */
-    private List<ProductPictureUpdateDTO> pictures;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/ProjectCopyDTO.java

@@ -1,13 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-
-@Data
-public class ProjectCopyDTO {
-    private Integer id;
-    private Integer tenantId;
-    private Integer areaId;
-    private String provinceName;
-    private String cityName;
-    private String areaName;
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/ProjectEventAddNewDTO.java

@@ -1,27 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 新增事件的DTO类
- *
- * @Author chenyu
- * @Date 2023/4/2
- */
-@Accessors(chain = true)
-@Data
-public class ProjectEventAddNewDTO implements Serializable {
-    /**
-     * 事件
-     */
-    List<EventAddNewDTO> eventAddNewDTOs;
-    /**
-     * 专题库id
-     */
-    private Integer projectId;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/ProjectFieldOrderDTO.java

@@ -1,9 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-
-@Data
-public class ProjectFieldOrderDTO {
-    private Integer id;
-    private Integer order;
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/QueryGroupScratchsDTO.java

@@ -1,28 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import cn.cslg.pas.domain.SearchItem;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 查询标注清单DTO类
- *
- * @Author chenyu
- * @Date 2023/8/11
- */
-@Accessors(chain = true)
-@Data
-public class QueryGroupScratchsDTO extends PageDTO2 implements Serializable {
-    /**
-     * 分组字段
-     */
-    private String grouping;
-    /**
-     * 检索信息
-     */
-    private List<SearchItem> search;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/QueryInvestigationTypeProjectNumberDTO.java

@@ -1,26 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * 根据应用场景和事件id查询调查类型对应的专题库数量(该事件对应的专题库中该应用场景的专题库数量)
- *
- * @Author chenyu
- * @Date 2023/4/17
- */
-@Accessors(chain = true)
-@Data
-public class QueryInvestigationTypeProjectNumberDTO implements Serializable {
-    /**
-     * 应用场景value
-     */
-    private Integer applicationScenario;
-    /**
-     * 事件id
-     */
-    private Integer eventId;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/QueryPathStructureNameDTO.java

@@ -1,26 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * 查询所有架构的路径和路径拼接成的架构名称
- *
- * @Author chenyu
- * @Date 2023/3/16
- */
-@Accessors(chain = true)
-@Data
-public class QueryPathStructureNameDTO implements Serializable {
-    /**
-     * 产品id
-     */
-    private Integer productId;
-    /**
-     * 架构id
-     */
-    private Integer structureId;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/QueryQrtzTaskLogsDTO.java

@@ -1,22 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * 查询定时任务更新日志DTO类
- *
- * @Author chenyu
- * @Date 2023/7/10
- */
-@Accessors(chain = true)
-@Data
-public class QueryQrtzTaskLogsDTO extends PageDTO2 implements Serializable {
-    /**
-     * 某定时任务条件最新一条任务的id
-     */
-    private Integer taskId;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/QueryScratchsDTO.java

@@ -1,24 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import cn.cslg.pas.domain.SearchItem;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 查询标注清单DTO类
- *
- * @Author chenyu
- * @Date 2023/8/11
- */
-@Accessors(chain = true)
-@Data
-public class QueryScratchsDTO extends PageDTO2 implements Serializable {
-    /**
-     * 检索信息
-     */
-    private List<SearchItem> search;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/QueryTaskDTO.java

@@ -1,55 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 查询任务DTO类
- *
- * @Author chenyu
- * @Date 2023/7/7
- */
-@Accessors(chain = true)
-@Data
-public class QueryTaskDTO extends PageDTO2 implements Serializable {
-    /**
-     * 专题库id
-     */
-    private Integer projectId;
-    /**
-     * 报告id
-     */
-    private Integer reportId;
-    /**
-     * 产品id
-     */
-    private Integer productId;
-    /**
-     * 创建人名称
-     */
-    private String createName;
-    /**
-     * 当前登陆人id
-     */
-    private Integer createId;
-    /**
-     * 创建人ids
-     */
-    private List<Integer> personIds;
-    /**
-     * 任务类型1（0普通任务 1定时任务）
-     */
-    private Integer taskType;
-    /**
-     * 任务类型2（1Excel导入 3欧专局导入 4专利之星导入）
-     */
-    private Integer taskType2;
-    /**
-     * 任务状态（0等待中 1进行中 2已完成 4已暂停）
-     */
-    private List<Integer> taskStatus;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/RMS/ComPatentDTO.java

@@ -1,13 +0,0 @@
-package cn.cslg.pas.common.model.dto.RMS;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class ComPatentDTO {
-    private Integer total;
-    private Long size;
-    private Long current;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/RetrieveRecordDTO.java

@@ -1,32 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class RetrieveRecordDTO {
-
-    private Integer id;
-    /**
-     * 检索式
-     */
-    private String conditions;
-    /**
-     * 数据库类型
-     */
-    private String dbType;
-
-    /**
-     * 检索时间
-     */
-    private Date retrieveTime;
-
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-
-    private Integer totalNum;
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/SWQueryDTO.java

@@ -1,27 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * @Author xiexiang
- * @Date 2023/6/16
- */
-@Data
-@Accessors(chain = true)
-public class SWQueryDTO {
-    /**
-     * 专利号
-     */
-    private String patentNo;
-
-    /**
-     * id（专题库id/报告id）
-     */
-    private Integer id;
-
-    /**
-     * 创建来源（默认0/专题库1/报告2）
-     */
-    private Integer createFrom;
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/ScratchWordsDTO.java

@@ -1,83 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import cn.cslg.pas.common.model.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 管理员表
- * </p>
- */
-@Data
-@Accessors(chain = true)
-public class ScratchWordsDTO extends BaseEntity<ScratchWordsDTO> {
-
-    /**
-     * 创建人
-     */
-    private Integer createId;
-
-    /**
-     * 租户id
-     */
-    private Integer tenantId;
-
-    /**
-     * 专利号
-     */
-    private String patentNo;
-
-    /**
-     * 位置
-     */
-    private Integer position;
-
-    /**
-     * 内容
-     */
-    private String text;
-
-    /**
-     * 划词栏位
-     */
-    private String scratchField;
-
-    /**
-     * 划词类型（0下划线，1高亮，2波浪线）
-     */
-    private Integer scratchType;
-
-    /**
-     * 划词颜色
-     */
-    private String color;
-
-    /**
-     * 标引备注
-     */
-    private String remark;
-
-    /**
-     * 创建来源
-     */
-    private Integer createFrom;
-
-    /**
-     * 存放id（专题库id/报告id）
-     */
-    private Integer rangeId;
-
-    /**
-     * 公开类型（0私有1公有）
-     */
-    private Integer permissionType;
-
-    /**
-     * 公开范围（true只在来源处可见/false所有地方可见）
-     */
-    private String rangeType;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/ScratchWordsUpdateDTO.java

@@ -1,81 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import cn.cslg.pas.common.model.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 管理员表
- * </p>
- */
-@Data
-@Accessors(chain = true)
-public class ScratchWordsUpdateDTO extends BaseEntity<ScratchWordsUpdateDTO> {
-
-    /**
-     * 创建人
-     */
-    private Integer createId;
-
-    /**
-     * 租户id
-     */
-    private Integer tenantId;
-
-    /**
-     * 专利号
-     */
-    private String patentNo;
-
-    /**
-     * 位置
-     */
-    private Integer position;
-
-    /**
-     * 内容
-     */
-    private String text;
-
-    /**
-     * 划词栏位
-     */
-    private String scratchField;
-
-    /**
-     * 划词类型（0下划线，1高亮,2波浪线）
-     */
-    private Integer scratchType;
-
-    /**
-     * 划词颜色
-     */
-    private String color;
-
-    /**
-     * 标引备注
-     */
-    private String remark;
-
-    /**
-     * 创建来源
-     */
-    private Integer createFrom;
-
-    /**
-     * 存放id（专题库id/报告id）
-     */
-    private Integer rangeId;
-
-    /**
-     * 公开类型（0私有1公有）
-     */
-    private Integer permissionType;
-
-    /**
-     * 公开范围（true只在来源处可见/false所有地方可见）
-     */
-    private String rangeType;
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/SearchHistoryDTO.java

@@ -1,32 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-
-/**
- * <p>
- * 无效应对报告历史
- * </p>
- *
- * @author 王岩
- * @since 2022-08-14
- */
-
-/*数据库中的表对应的类
- */
- @Data
-public class SearchHistoryDTO  {
- private String patentNo;
- /**
-  * 每页条数
-  */
- private Long size;
-
- /**
-  * 当前页数
-  */
- private Long current;
-
-
-
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/StructureAddNewDTO.java

@@ -1,35 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * 新增架构的DTO类
- */
-@Accessors(chain = true)
-@Data
-public class StructureAddNewDTO implements Serializable {
-    /**
-     * 父级id
-     */
-    private Integer parentId;
-    /**
-     * 名称
-     */
-    private String structureName;
-    /**
-     * 父级路径
-     */
-    private String parentPath;
-    /**
-     * 说明
-     */
-    private String remark;
-    /**
-     * 产品id
-     */
-    private Integer productId;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/StructureAndProductIds.java

@@ -1,26 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * 新增产品架构id和产品id的DTO类
- *
- * @Author chenyu
- * @Date 2023/4/7
- */
-@Accessors(chain = true)
-@Data
-public class StructureAndProductIds implements Serializable {
-    /**
-     * 架构id
-     */
-    private Integer structureId;
-    /**
-     * 产品id
-     */
-    private Integer productId;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/StructurePictureUpdateDTO.java

@@ -1,38 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * 架构的修改图片DTO类
- *
- * @Author chenyu
- * @Date 2023/3/13
- */
-@Accessors(chain = true)
-@Data
-public class StructurePictureUpdateDTO implements Serializable {
-    /**
-     * ID
-     */
-    private Integer id;
-    /**
-     * 架构id
-     */
-    private Integer structureId;
-    /**
-     * 图片名称
-     */
-    private String name;
-    /**
-     * 后缀类型
-     */
-    private String suffix;
-    /**
-     * 路径
-     */
-    private String url;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/StructureQueryPageDTO.java

@@ -1,28 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 架构分页查询DTO类
- *
- * @Author chenyu
- * @Date 2023/3/10
- */
-@Accessors(chain = true)
-@Data
-public class StructureQueryPageDTO {
-    /**
-     * 产品id
-     */
-    private Integer productId;
-    /**
-     * 架构id
-     */
-    private Integer structureId;
-    /**
-     * 架构名称
-     */
-    private String structureName;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/StructureUpdateDTO.java

@@ -1,44 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 架构的修改架构DTO类
- */
-@Accessors(chain = true)
-@Data
-public class StructureUpdateDTO implements Serializable {
-    /**
-     * ID
-     */
-    private Integer id;
-    /**
-     * 父级id
-     */
-    private Integer parentId;
-    /**
-     * 名称
-     */
-    private String structureName;
-    /**
-     * 父级路径
-     */
-    private String parentPath;
-    /**
-     * 说明
-     */
-    private String remark;
-    /**
-     * 产品id
-     */
-    private Integer productId;
-    /**
-     * 图片
-     */
-    private List<StructurePictureUpdateDTO> pictures;
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/TaskAddNewDTO.java

@@ -1,149 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import cn.cslg.pas.common.model.vo.ProjectImportPatentVO;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-
-/**
- * 新增任务条件DTO
- *
- * @Author chenyu
- * @Date 2023/3/27
- */
-@Accessors(chain = true)
-@Data
-public class TaskAddNewDTO {
-    /**
-     * 检索信息
-     */
-    private String conditions;
-    /**
-     * 排序字段：“AD”，“PD”，“GD”，“ID”
-     */
-    private String orderBy;
-    /**
-     * 排序方式：“ASC”，“DESC”
-     */
-    private String orderByType;
-    /**
-     * 需要检索的数据库类型（"CN"/"WD"）
-     */
-    @JsonProperty(value = "DBType")
-    private String dBType;
-    /**
-     * 下载起始条数位置（如2表示从第二个专利开始下载）
-     */
-    private Integer startNumber;
-    /**
-     * 下载终止条数位置（如13表示从第十三个专利开始下载）
-     */
-    private Integer endNumber;
-    /**
-     * 需要额外下载的专利
-     */
-    private List<String> isAddPatentNos;
-    /**
-     * isAddPatentNos中的多个专利或申请号的下载任务类型（1.检索页面手动勾选的专利下载任务 2.多个专利号导入的下载任务）
-     */
-    private Integer isAddType;
-    /**
-     * 起止条数中不需要下载的专利
-     */
-    private List<String> isDeletePatentNos;
-    /**
-     * 专题库id
-     */
-    private Integer projectId;
-    /**
-     * 报告id
-     */
-    private Integer reportId;
-    /**
-     * 产品id
-     */
-    private Integer productId;
-    /**
-     * 任务类型（1.Excel导入 2.导出 3.欧专局导入 4.专利之星导入 5.专利号导入 6.合并导出pdf首页）
-     */
-    private Integer taskType2;
-    /**
-     * 任务类型 (0普通任务 1定时任务)
-     */
-    private Integer taskType;
-    /**
-     * cron表达式
-     */
-    private String crons;
-    /**
-     * 下载字段（1.著录项 2.权要 3.说明书文本 4.说明书pdf 6.摘要附图）
-     */
-    private List<String> configCells;
-    /**
-     * 网站配置id
-     */
-    private Integer configId;
-    /**
-     * 任务名称
-     */
-    private String taskName;
-
-
-    //以下为自定义字段和文件夹信息 ↓
-    /**
-     * 自定义字段ids
-     */
-    private List<ProjectImportPatentVO.Field> fieldList;
-    /**
-     * 文件夹ids
-     */
-    private List<Integer> folderIds;
-
-    private Integer asCompare;
-    /**
-     * 自定义字段信息
-     */
-    @Data
-    public static class Field {
-        /**
-         * 自定义字段id
-         */
-        private Integer fieldId;
-        /**
-         * 自定义字段类型（6为树）
-         */
-        private Integer type;
-        /**
-         * 选项id
-         */
-        private Integer optionId;
-        private String text;
-    }
-
-    /**
-     * 文件夹信息
-     */
-    @Data
-    public static class Folder {
-        /**
-         * 文件夹id
-         */
-        private Integer id;
-        /**
-         * 上级文件夹id
-         */
-        private Integer parentId;
-        /**
-         * 文件夹名称
-         */
-        private String name;
-        private Boolean selected;
-        /**
-         * 子级文件夹们
-         */
-        private List<ProjectImportPatentVO.Folder> children;
-    }
-
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/TaskWebSocketDTO.java

@@ -1,31 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-@Data
-@Accessors(chain = true)
-public class TaskWebSocketDTO {
-    /**
-     * 专题库id
-     */
-    private Integer projectId;
-    /**
-     * 报告id
-     */
-    private Integer reportId;
-    /**
-     * 产品id
-     */
-    private Integer productId;
-    private Integer total;
-    private Integer index;
-    private Integer taskId;
-    private Integer taskStatus;
-    private Boolean complete;
-    private String url;
-    private String fileName;
-    private Integer taskType;
-    private Long percentage;
-    private String oldName;
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/UploadFileDTO.java

@@ -1,12 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-
-@Data
-public class UploadFileDTO {
-    private String name;
-    private String fileName;
-    private String path;
-    private String extName;
-    private Long fileSize;
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/WebQueryDTO.java

@@ -1,35 +0,0 @@
-package cn.cslg.pas.common.model.dto;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-
-@Accessors(chain = true)
-@Data
-public class WebQueryDTO {
-    /**
-     * 专题库id
-     */
-    private Integer projectId;
-    /**
-     * 检索信息
-     */
-    private String conditions;
-    /**
-     * 网站id
-     */
-    private Integer webConfigId;
-    /**
-     * 任务id
-     */
-    private Integer taskId;
-    /**
-     * 报告id
-     */
-    private Integer reportId;
-    /**
-     * 下载字段
-     */
-    private List<String> conCells;
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/analysis/AnalysisItemResultDTO.java

@@ -1,11 +0,0 @@
-package cn.cslg.pas.common.model.dto.analysis;
-
-import lombok.Data;
-
-@Data
-public class AnalysisItemResultDTO {
-    private String ids;
-    private String name;
-    private String id;
-    private Integer count;
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/analysis/CustomSettingColorConfigDTO.java

@@ -1,14 +0,0 @@
-package cn.cslg.pas.common.model.dto.analysis;
-
-import lombok.Data;
-
-@Data
-public class CustomSettingColorConfigDTO {
-    private String name;
-    private String color;
-
-    public CustomSettingColorConfigDTO() {
-        this.name = "";
-        this.color = "";
-    }
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/analysis/CustomSettingConfigDTO.java

@@ -1,27 +0,0 @@
-package cn.cslg.pas.common.model.dto.analysis;
-
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Data
-public class CustomSettingConfigDTO {
-    private List<CustomSettingTableConfigDTO> table;
-    private CustomSettingLineConfigDTO line;
-    private List<CustomSettingColorConfigDTO> color;
-
-    public CustomSettingConfigDTO() {
-        this.line = new CustomSettingLineConfigDTO();
-        List<CustomSettingTableConfigDTO> configs = new ArrayList<>();
-        for (int i = 0; i < 10; i++) {
-            CustomSettingTableConfigDTO configDTO = new CustomSettingTableConfigDTO();
-            configDTO.setMax(0);
-            configDTO.setMin(0);
-            configDTO.setColor("");
-            configs.add(configDTO);
-        }
-        this.table = configs;
-        this.color = new ArrayList<>();
-    }
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/analysis/CustomSettingLineConfigDTO.java

@@ -1,17 +0,0 @@
-package cn.cslg.pas.common.model.dto.analysis;
-
-import lombok.Data;
-
-@Data
-public class CustomSettingLineConfigDTO {
-
-    private String name;
-    private Integer operator;
-    private Boolean enable;
-
-    public CustomSettingLineConfigDTO() {
-        this.name = "";
-        this.operator = 0;
-        this.enable = false;
-    }
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/analysis/CustomSettingTableConfigDTO.java

@@ -1,10 +0,0 @@
-package cn.cslg.pas.common.model.dto.analysis;
-
-import lombok.Data;
-
-@Data
-public class CustomSettingTableConfigDTO {
-    private Integer min;
-    private Integer max;
-    private String color;
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/analysis/DateTimeDTO.java

@@ -1,16 +0,0 @@
-package cn.cslg.pas.common.model.dto.analysis;
-
-import lombok.Data;
-
-@Data
-public class DateTimeDTO {
-    private Long startTime;
-    private Long endTime;
-    private String key;
-
-    public DateTimeDTO(Long startTime, Long endTime, String key) {
-        this.startTime = startTime / 1000;
-        this.endTime = endTime / 1000;
-        this.key = key;
-    }
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/analysis/SchemaDataDTO.java

@@ -1,27 +0,0 @@
-package cn.cslg.pas.common.model.dto.analysis;
-
-import lombok.Data;
-
-@Data
-public class SchemaDataDTO {
-    private Integer field;
-    private Integer expand;
-    private Integer ptype;
-    private Integer type;
-    private Integer num;
-    private Integer merge;
-
-    public SchemaDataDTO() {
-        this.field = 0;
-        this.expand = 0;
-        this.type = 0;
-        this.ptype = 0;
-        this.num = 0;
-        this.merge = 0;
-    }
-
-    public SchemaDataDTO(Integer field, Integer expand) {
-        this.field = field;
-        this.expand = expand;
-    }
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/analysis/SchemaDimensionDTO.java

@@ -1,24 +0,0 @@
-package cn.cslg.pas.common.model.dto.analysis;
-
-import cn.cslg.pas.common.model.dto.analysis.SchemaDataDTO;
-
-public class SchemaDimensionDTO {
-    private SchemaDataDTO x;
-    private SchemaDataDTO y;
-
-    public SchemaDataDTO getX() {
-        return x;
-    }
-
-    public void setX(SchemaDataDTO x) {
-        this.x = x;
-    }
-
-    public SchemaDataDTO getY() {
-        return y;
-    }
-
-    public void setY(SchemaDataDTO y) {
-        this.y = y;
-    }
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/analysis/SourceDataDTO.java

@@ -1,33 +0,0 @@
-package cn.cslg.pas.common.model.dto.analysis;
-
-
-import cn.cslg.pas.domain.CustomAnalysisItemSource;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class SourceDataDTO {
-    private List<CustomAnalysisItemSource> x;
-    private List<CustomAnalysisItemSource> y;
-
-    public SourceDataDTO() {
-        this.x = new ArrayList<>();
-        this.y = new ArrayList<>();
-    }
-
-    public List<CustomAnalysisItemSource> getX() {
-        return x;
-    }
-
-    public void setX(List<CustomAnalysisItemSource> x) {
-        this.x = x;
-    }
-
-    public List<CustomAnalysisItemSource> getY() {
-        return y;
-    }
-
-    public void setY(List<CustomAnalysisItemSource> y) {
-        this.y = y;
-    }
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/analysis/SourceMinAndMaxDataDTO.java

@@ -1,14 +0,0 @@
-package cn.cslg.pas.common.model.dto.analysis;
-
-import lombok.Data;
-
-@Data
-public class SourceMinAndMaxDataDTO {
-    private Integer value;
-    private Integer operator;
-
-    public SourceMinAndMaxDataDTO() {
-        this.operator = 0;
-        this.value = 0;
-    }
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/report/ClassifyMO.java

@@ -1,39 +0,0 @@
-package cn.cslg.pas.common.model.dto.report;
-
-import java.util.List;
-
-/**
- * @author Coding.lu
- * @version V1.0
- * @Package com.shouyue.patentapi.model
- * @date 2021/12/15 上午11:42
- */
-public class ClassifyMO {
-    private String key;  //模板代表的key
-    private String classify_name;
-    private List<PatentMO> arrys;
-
-    public String getClassify_name() {
-        return classify_name;
-    }
-
-    public void setClassify_name(String classify_name) {
-        this.classify_name = classify_name;
-    }
-
-    public List<PatentMO> getArrys() {
-        return arrys;
-    }
-
-    public void setArrys(List<PatentMO> arrys) {
-        this.arrys = arrys;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/report/InventorMO.java

@@ -1,38 +0,0 @@
-package cn.cslg.pas.common.model.dto.report;
-
-/**
- * @author Coding.lu
- * @version V1.0
- * @Package com.shouyue.api.model.report
- * @date 2021/12/27 上午1:08
- */
-public class InventorMO {
-    private String biaoname;
-    private String name;
-    private String type;
-
-    public String getBiaoname() {
-        return biaoname;
-    }
-
-    public void setBiaoname(String biaoname) {
-        this.biaoname = biaoname;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-}
-

PAS/src/main/java/cn/cslg/pas/common/model/dto/report/KeyWordModel.java

@@ -1,37 +0,0 @@
-package cn.cslg.pas.common.model.dto.report;
-
-import cn.cslg.pas.common.model.vo.TemplateVO;
-
-import java.util.List;
-
-/**
- * @author Coding.lu
- * @version V1.0
- * @Package com.shouyue.api.model.report
- * @date 2022/1/16 下午9:41
- */
-public class KeyWordModel {
-    private List<TemplateVO> list;
-    private String fileUrl;
-
-    public KeyWordModel(List<TemplateVO> list, String fileUrl) {
-        this.list = list;
-        this.fileUrl = fileUrl;
-    }
-
-    public List<TemplateVO> getList() {
-        return list;
-    }
-
-    public void setList(List<TemplateVO> list) {
-        this.list = list;
-    }
-
-    public String getFileUrl() {
-        return fileUrl;
-    }
-
-    public void setFileUrl(String fileUrl) {
-        this.fileUrl = fileUrl;
-    }
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/report/LicensedMO.java

@@ -1,28 +0,0 @@
-package cn.cslg.pas.common.model.dto.report;
-
-/**
- * @author Coding.lu
- * @version V1.0
- * @Package com.shouyue.api.model.report
- * @date 2021/12/24 上午12:02
- */
-public class LicensedMO {
-    private String licensed_name;//许可人
-    private String licensed_permittype;//被许可类型
-
-    public String getLicensed_name() {
-        return licensed_name;
-    }
-
-    public void setLicensed_name(String licensed_name) {
-        this.licensed_name = licensed_name;
-    }
-
-    public String getLicensed_permittype() {
-        return licensed_permittype;
-    }
-
-    public void setLicensed_permittype(String licensed_permittype) {
-        this.licensed_permittype = licensed_permittype;
-    }
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/report/MergeApplyMO.java

@@ -1,97 +0,0 @@
-package cn.cslg.pas.common.model.dto.report;
-
-/**
- *合并检查
- */
-public class MergeApplyMO {
-    private String mname ;//合并名称
-    private String mabbreviation ;//检查
-    private String mcountry ;//国家
-    private String mmark ;//备注
-    private String muser ;//更新人
-    private String mupdate_time ;//更新时间
-    private String mprovince ;//省份
-    private String mcity ;//城市
-    private String marea ;//区域
-    private String maddress ;//详细地址
-
-    public String getMname() {
-        return mname;
-    }
-
-    public void setMname(String mname) {
-        this.mname = mname;
-    }
-
-    public String getMabbreviation() {
-        return mabbreviation;
-    }
-
-    public void setMabbreviation(String mabbreviation) {
-        this.mabbreviation = mabbreviation;
-    }
-
-    public String getMcountry() {
-        return mcountry;
-    }
-
-    public void setMcountry(String mcountry) {
-        this.mcountry = mcountry;
-    }
-
-    public String getMmark() {
-        return mmark;
-    }
-
-    public void setMmark(String mmark) {
-        this.mmark = mmark;
-    }
-
-    public String getMuser() {
-        return muser;
-    }
-
-    public void setMuser(String muser) {
-        this.muser = muser;
-    }
-
-    public String getMupdate_time() {
-        return mupdate_time;
-    }
-
-    public void setMupdate_time(String mupdate_time) {
-        this.mupdate_time = mupdate_time;
-    }
-
-    public String getMprovince() {
-        return mprovince;
-    }
-
-    public void setMprovince(String mprovince) {
-        this.mprovince = mprovince;
-    }
-
-    public String getMcity() {
-        return mcity;
-    }
-
-    public void setMcity(String mcity) {
-        this.mcity = mcity;
-    }
-
-    public String getMarea() {
-        return marea;
-    }
-
-    public void setMarea(String marea) {
-        this.marea = marea;
-    }
-
-    public String getMaddress() {
-        return maddress;
-    }
-
-    public void setMaddress(String maddress) {
-        this.maddress = maddress;
-    }
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/report/ParameModel.java

@@ -1,64 +0,0 @@
-package cn.cslg.pas.common.model.dto.report;
-
-import cn.cslg.pas.domain.*;
-
-import java.util.List;
-
-/**
- * @author Coding.lu
- * @version V1.0
- * @Package com.shouyue.api.model.report
- * @date 2021/12/27 上午1:38
- */
-public class ParameModel {
-
-    List<PatentApplicantLink> allApplicant;
-    List<PatentAffair> allAffair;
-    List<PatentInventor> allInventor;
-    List<PatentInventorLink> allInventorRelation;
-    List<PatentLicensor> allLicensorRelation;
-
-
-
-    public List<PatentApplicantLink> getAllApplicant() {
-        return allApplicant;
-    }
-
-    public void setAllApplicant(List<PatentApplicantLink> allApplicant) {
-        this.allApplicant = allApplicant;
-    }
-
-
-
-    public List<PatentAffair> getAllAffair() {
-        return allAffair;
-    }
-
-    public void setAllAffair(List<PatentAffair> allAffair) {
-        this.allAffair = allAffair;
-    }
-
-    public List<PatentInventor> getAllInventor() {
-        return allInventor;
-    }
-
-    public void setAllInventor(List<PatentInventor> allInventor) {
-        this.allInventor = allInventor;
-    }
-
-    public List<PatentInventorLink> getAllInventorRelation() {
-        return allInventorRelation;
-    }
-
-    public void setAllInventorRelation(List<PatentInventorLink> allInventorRelation) {
-        this.allInventorRelation = allInventorRelation;
-    }
-
-    public List<PatentLicensor> getAllLicensorRelation() {
-        return allLicensorRelation;
-    }
-
-    public void setAllLicensorRelation(List<PatentLicensor> allLicensorRelation) {
-        this.allLicensorRelation = allLicensorRelation;
-    }
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/report/PatentApplyMO.java

@@ -1,112 +0,0 @@
-package cn.cslg.pas.common.model.dto.report;
-
-/**
- * @author Coding.lu
- * @version V1.0
- * @Package com.shouyue.api.model.report
- * @date 2021/12/23 下午11:49
- */
-public class PatentApplyMO {
-    private String name;//申请人/权利人
-    private String bname;//标准名称
-    private String remark;//备注
-    private String last_user;//更新人
-    private String last_time;//更新时间
-    private String type;//类型
-    private String country;//国家
-    private String province;//省份
-    private String city;//城市
-    private String area;//区域
-    private String address;//详细地址
-
-
-
-    public String getBname() {
-        return bname;
-    }
-
-    public void setBname(String bname) {
-        this.bname = bname;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getLast_user() {
-        return last_user;
-    }
-
-    public void setLast_user(String last_user) {
-        this.last_user = last_user;
-    }
-
-    public String getLast_time() {
-        return last_time;
-    }
-
-    public void setLast_time(String last_time) {
-        this.last_time = last_time;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getCountry() {
-        return country;
-    }
-
-    public void setCountry(String country) {
-        this.country = country;
-    }
-
-    public String getProvince() {
-        return province;
-    }
-
-    public void setProvince(String province) {
-        this.province = province;
-    }
-
-    public String getCity() {
-        return city;
-    }
-
-    public void setCity(String city) {
-        this.city = city;
-    }
-
-    public String getArea() {
-        return area;
-    }
-
-    public void setArea(String area) {
-        this.area = area;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-}
-

PAS/src/main/java/cn/cslg/pas/common/model/dto/report/PatentContentMO.java

@@ -1,42 +0,0 @@
-package cn.cslg.pas.common.model.dto.report;
-
-
-//专利权利要求 详细
-public class PatentContentMO {
-    private String name;
-    private String dname;
-    private String bproduct;
-    private String result;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDname() {
-        return dname;
-    }
-
-    public void setDname(String dname) {
-        this.dname = dname;
-    }
-
-    public String getBproduct() {
-        return bproduct;
-    }
-
-    public void setBproduct(String bproduct) {
-        this.bproduct = bproduct;
-    }
-
-    public String getResult() {
-        return result;
-    }
-
-    public void setResult(String result) {
-        this.result = result;
-    }
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/report/PatentDuquanMO.java

@@ -1,37 +0,0 @@
-package cn.cslg.pas.common.model.dto.report;
-
-/**
- * @author Coding.lu
- * @version V1.0
- * @Package com.shouyue.patentapi.model
- * @date 2021/12/16 上午12:24
- */
-public class PatentDuquanMO {
-    private String keyName;
-    private String name;
-    private String detail;
-
-    public String getKeyName() {
-        return keyName;
-    }
-
-    public void setKeyName(String keyName) {
-        this.keyName = keyName;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDetail() {
-        return detail;
-    }
-
-    public void setDetail(String detail) {
-        this.detail = detail;
-    }
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/report/PatentLawMO.java

@@ -1,52 +0,0 @@
-package cn.cslg.pas.common.model.dto.report;
-
-/**
- * 专利法律状态
- */
-public class PatentLawMO {
-    private String law_datetime;//发生日期
-    private String law_status;//法律状态
-    private String law_simplestatus;//简单法律状态
-    private String law_content;//事物内容
-    private String law_remark;//备注
-
-    public String getLaw_datetime() {
-        return law_datetime;
-    }
-
-    public void setLaw_datetime(String law_datetime) {
-        this.law_datetime = law_datetime;
-    }
-
-    public String getLaw_status() {
-        return law_status;
-    }
-
-    public void setLaw_status(String law_status) {
-        this.law_status = law_status;
-    }
-
-    public String getLaw_simplestatus() {
-        return law_simplestatus;
-    }
-
-    public void setLaw_simplestatus(String law_simplestatus) {
-        this.law_simplestatus = law_simplestatus;
-    }
-
-    public String getLaw_content() {
-        return law_content;
-    }
-
-    public void setLaw_content(String law_content) {
-        this.law_content = law_content;
-    }
-
-    public String getLaw_remark() {
-        return law_remark;
-    }
-
-    public void setLaw_remark(String law_remark) {
-        this.law_remark = law_remark;
-    }
-}

PAS/src/main/java/cn/cslg/pas/common/model/dto/report/PatentMO.java

@@ -1,761 +0,0 @@
-package cn.cslg.pas.common.model.dto.report;
-
-import com.deepoove.poi.data.PictureRenderData;
-
-import java.util.List;
-
-/**
- * @author Coding.lu
- * @version V1.0
- * @Package com.shouyue.patentreport.model
- * @date 2021/12/14 下午8:55
- */
-public class PatentMO {
-    private String applicant_names_current;//当前申请人名字拼接
-    private List<PatentApplyMO> applicant_list_current;//当前申请人列表
-    private String applicant_names_standard;//标准申请人名字拼接
-    private List<PatentApplyMO> applicant_list_standard;//标准申请人列表
-    private String applicant_names_merge;//合并申请人名字拼接
-    private List<PatentApplyMO> applicant_list_merge;//合并申请人列表
-
-
-    private String obligee_names_current;//当前申请人名字拼接
-    private List<PatentApplyMO> obligee_list_current;//当前申请人列表
-    private String obligee_names_standard;//标准申请人名字拼接
-    private List<PatentApplyMO> obligee_list_standard;//标准申请人列表
-    private String obligee_names_merge;//合并申请人名字拼接
-    private List<PatentApplyMO> obligee_list_merge;//合并申请人列表
-
-    //许可人
-    private List<PermitMO> permit_list;
-    //被许可人
-    private List<PermitMO> licensed_list;
-
-    //法律事务
-    private List<PatentLawMO> lawArrys;
-    private String inventor_names;//发明人名字拼接
-    private List<InventorMO> inventor_list;//发明人里列表
-
-
-    public List<PermitMO> getPermit_list() {
-        return permit_list;
-    }
-
-    public void setPermit_list(List<PermitMO> permit_list) {
-        this.permit_list = permit_list;
-    }
-
-    public List<PermitMO> getLicensed_list() {
-        return licensed_list;
-    }
-
-    public void setLicensed_list(List<PermitMO> licensed_list) {
-        this.licensed_list = licensed_list;
-    }
-
-    public String getInventor_names() {
-        return inventor_names;
-    }
-
-    public void setInventor_names(String inventor_names) {
-        this.inventor_names = inventor_names;
-    }
-
-    public List<InventorMO> getInventor_list() {
-        return inventor_list;
-    }
-
-    public void setInventor_list(List<InventorMO> inventor_list) {
-        this.inventor_list = inventor_list;
-    }
-
-    public String getObligee_names_current() {
-        return obligee_names_current;
-    }
-
-    public void setObligee_names_current(String obligee_names_current) {
-        this.obligee_names_current = obligee_names_current;
-    }
-
-    public List<PatentApplyMO> getObligee_list_current() {
-        return obligee_list_current;
-    }
-
-    public void setObligee_list_current(List<PatentApplyMO> obligee_list_current) {
-        this.obligee_list_current = obligee_list_current;
-    }
-
-    public String getObligee_names_standard() {
-        return obligee_names_standard;
-    }
-
-    public void setObligee_names_standard(String obligee_names_standard) {
-        this.obligee_names_standard = obligee_names_standard;
-    }
-
-    public List<PatentApplyMO> getObligee_list_standard() {
-        return obligee_list_standard;
-    }
-
-    public void setObligee_list_standard(List<PatentApplyMO> obligee_list_standard) {
-        this.obligee_list_standard = obligee_list_standard;
-    }
-
-    public String getObligee_names_merge() {
-        return obligee_names_merge;
-    }
-
-    public void setObligee_names_merge(String obligee_names_merge) {
-        this.obligee_names_merge = obligee_names_merge;
-    }
-
-    public List<PatentApplyMO> getObligee_list_merge() {
-        return obligee_list_merge;
-    }
-
-    public void setObligee_list_merge(List<PatentApplyMO> obligee_list_merge) {
-        this.obligee_list_merge = obligee_list_merge;
-    }
-
-    public String getApplicant_names_merge() {
-        return applicant_names_merge;
-    }
-
-    public void setApplicant_names_merge(String applicant_names_merge) {
-        this.applicant_names_merge = applicant_names_merge;
-    }
-
-    public List<PatentApplyMO> getApplicant_list_merge() {
-        return applicant_list_merge;
-    }
-
-    public void setApplicant_list_merge(List<PatentApplyMO> applicant_list_merge) {
-        this.applicant_list_merge = applicant_list_merge;
-    }
-
-
-    public String getApplicant_names_standard() {
-        return applicant_names_standard;
-    }
-
-    public void setApplicant_names_standard(String applicant_names_standard) {
-        this.applicant_names_standard = applicant_names_standard;
-    }
-
-    public List<PatentApplyMO> getApplicant_list_standard() {
-        return applicant_list_standard;
-    }
-
-    public void setApplicant_list_standard(List<PatentApplyMO> applicant_list_standard) {
-        this.applicant_list_standard = applicant_list_standard;
-    }
-
-    public String getApplicant_names_current() {
-        return applicant_names_current;
-    }
-
-    public void setApplicant_names_current(String applicant_names_current) {
-        this.applicant_names_current = applicant_names_current;
-    }
-
-    public List<PatentApplyMO> getApplicant_list_current() {
-        return applicant_list_current;
-    }
-
-    public void setApplicant_list_current(List<PatentApplyMO> applicant_list_current) {
-        this.applicant_list_current = applicant_list_current;
-    }
-
-
-    public List<PatentLawMO> getLawArrys() {
-        return lawArrys;
-    }
-
-    public void setLawArrys(List<PatentLawMO> lawArrys) {
-        this.lawArrys = lawArrys;
-    }
-
-
-    private String pname;//专利名称
-    private String translate_name;//专利标题(译)
-    private String patentno;//专利号
-    private String abstracts; //摘要
-    private String abstractout;//摘要 译
-    private String applicationno;//申请号
-    private String appdate;//申请日
-    private String publicno;//公开号
-    private String publicdate;
-    private String fpublicdate;
-    private String publictono;
-    private String publictodate;
-    private String bureau;
-    private String intclassno;
-    private String intclasscpcno;
-    private String intclassupcno;
-    private String intclasslocno;
-    private String pstatus;
-    private String ptype;
-    private String code;
-    private String manual;
-    private String manualout;
-    private String page;
-    private String inventornum;
-    private String num2;//权利要求数量
-    private String num3;//独立权利要求数量
-    private List<PatentContentMO> content;
-    private List<PatentContentMO> contentout;
-    private List<ContentMO2> selfcontent;
-    private String priorityno;
-    private String prioritycountry;
-    private String prioritydate;
-    private String simplefamilynum;
-    private String inpadocfamilynum;
-    private String quoteno;
-    private String quotedno;
-    private String quotedno3;
-    private String quotedno5;
-    private String agency;
-    private String agent;
-    private String wonational;
-    private String examiner;
-    private String assexaminer;
-    private String quote;
-    private String quoted;
-    private String nonpatentquote;
-    private PictureRenderData abstract_path;//摘要附图
-
-    private String firstapplicant;
-    private String firstapplicantaddr;
-    private String firstapplicantnum;
-    private String firstnventor;
-    private String firstnventoraddr;
-    private String epcountry;
-    private String authorizationpdf;
-    private String Publicpdf;
-
-    private String sfamily;
-    private String ifamily;
-
-    public String getSfamily() {
-        return sfamily;
-    }
-
-    public void setSfamily(String sfamily) {
-        this.sfamily = sfamily;
-    }
-
-    public String getIfamily() {
-        return ifamily;
-    }
-
-    public void setIfamily(String ifamily) {
-        this.ifamily = ifamily;
-    }
-
-    public String getPname() {
-        return pname;
-    }
-
-    public void setPname(String pname) {
-        this.pname = pname;
-    }
-
-    public String getTranslate_name() {
-        return translate_name;
-    }
-
-    public void setTranslate_name(String translate_name) {
-        this.translate_name = translate_name;
-    }
-
-    public String getPatentno() {
-        return patentno;
-    }
-
-    public void setPatentno(String patentno) {
-        this.patentno = patentno;
-    }
-
-    public String getAbstracts() {
-        return abstracts;
-    }
-
-    public void setAbstracts(String abstracts) {
-        this.abstracts = abstracts;
-    }
-
-    public String getAbstractout() {
-        return abstractout;
-    }
-
-    public void setAbstractout(String abstractout) {
-        this.abstractout = abstractout;
-    }
-
-    public String getApplicationno() {
-        return applicationno;
-    }
-
-    public void setApplicationno(String applicationno) {
-        this.applicationno = applicationno;
-    }
-
-    public String getAppdate() {
-        return appdate;
-    }
-
-    public void setAppdate(String appdate) {
-        this.appdate = appdate;
-    }
-
-    public String getPublicno() {
-        return publicno;
-    }
-
-    public void setPublicno(String publicno) {
-        this.publicno = publicno;
-    }
-
-    public String getPublicdate() {
-        return publicdate;
-    }
-
-    public void setPublicdate(String publicdate) {
-        this.publicdate = publicdate;
-    }
-
-    public String getFpublicdate() {
-        return fpublicdate;
-    }
-
-    public void setFpublicdate(String fpublicdate) {
-        this.fpublicdate = fpublicdate;
-    }
-
-    public String getPublictono() {
-        return publictono;
-    }
-
-    public void setPublictono(String publictono) {
-        this.publictono = publictono;
-    }
-
-    public String getPublictodate() {
-        return publictodate;
-    }
-
-    public void setPublictodate(String publictodate) {
-        this.publictodate = publictodate;
-    }
-
-    public String getBureau() {
-        return bureau;
-    }
-
-    public void setBureau(String bureau) {
-        this.bureau = bureau;
-    }
-
-    public String getIntclassno() {
-        return intclassno;
-    }
-
-    public void setIntclassno(String intclassno) {
-        this.intclassno = intclassno;
-    }
-
-    public String getIntclasscpcno() {
-        return intclasscpcno;
-    }
-
-    public void setIntclasscpcno(String intclasscpcno) {
-        this.intclasscpcno = intclasscpcno;
-    }
-
-    public String getIntclassupcno() {
-        return intclassupcno;
-    }
-
-    public void setIntclassupcno(String intclassupcno) {
-        this.intclassupcno = intclassupcno;
-    }
-
-    public String getIntclasslocno() {
-        return intclasslocno;
-    }
-
-    public void setIntclasslocno(String intclasslocno) {
-        this.intclasslocno = intclasslocno;
-    }
-
-    public String getPstatus() {
-        return pstatus;
-    }
-
-    public void setPstatus(String pstatus) {
-        this.pstatus = pstatus;
-    }
-
-    public String getPtype() {
-        return ptype;
-    }
-
-    public void setPtype(String ptype) {
-        this.ptype = ptype;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getManual() {
-        return manual;
-    }
-
-    public void setManual(String manual) {
-        this.manual = manual;
-    }
-
-    public String getManualout() {
-        return manualout;
-    }
-
-    public void setManualout(String manualout) {
-        this.manualout = manualout;
-    }
-
-    public String getPage() {
-        return page;
-    }
-
-    public void setPage(String page) {
-        this.page = page;
-    }
-
-    public String getInventornum() {
-        return inventornum;
-    }
-
-    public void setInventornum(String inventornum) {
-        this.inventornum = inventornum;
-    }
-
-    public String getNum2() {
-        return num2;
-    }
-
-    public void setNum2(String num2) {
-        this.num2 = num2;
-    }
-
-    public String getNum3() {
-        return num3;
-    }
-
-    public void setNum3(String num3) {
-        this.num3 = num3;
-    }
-
-    public List<PatentContentMO> getContent() {
-        return content;
-    }
-
-    public void setContent(List<PatentContentMO> content) {
-        this.content = content;
-    }
-
-    public List<PatentContentMO> getContentout() {
-        return contentout;
-    }
-
-    public void setContentout(List<PatentContentMO> contentout) {
-        this.contentout = contentout;
-    }
-
-    public List<ContentMO2> getSelfcontent() {
-        return selfcontent;
-    }
-
-    public void setSelfcontent(List<ContentMO2> selfcontent) {
-        this.selfcontent = selfcontent;
-    }
-
-    public String getPriorityno() {
-        return priorityno;
-    }
-
-    public void setPriorityno(String priorityno) {
-        this.priorityno = priorityno;
-    }
-
-    public String getPrioritycountry() {
-        return prioritycountry;
-    }
-
-    public void setPrioritycountry(String prioritycountry) {
-        this.prioritycountry = prioritycountry;
-    }
-
-    public String getPrioritydate() {
-        return prioritydate;
-    }
-
-    public void setPrioritydate(String prioritydate) {
-        this.prioritydate = prioritydate;
-    }
-
-    public String getSimplefamilynum() {
-        return simplefamilynum;
-    }
-
-    public void setSimplefamilynum(String simplefamilynum) {
-        this.simplefamilynum = simplefamilynum;
-    }
-
-    public String getInpadocfamilynum() {
-        return inpadocfamilynum;
-    }
-
-    public void setInpadocfamilynum(String inpadocfamilynum) {
-        this.inpadocfamilynum = inpadocfamilynum;
-    }
-
-    public String getQuoteno() {
-        return quoteno;
-    }
-
-    public void setQuoteno(String quoteno) {
-        this.quoteno = quoteno;
-    }
-
-    public String getQuotedno() {
-        return quotedno;
-    }
-
-    public void setQuotedno(String quotedno) {
-        this.quotedno = quotedno;
-    }
-
-    public String getQuotedno3() {
-        return quotedno3;
-    }
-
-    public void setQuotedno3(String quotedno3) {
-        this.quotedno3 = quotedno3;
-    }
-
-    public String getQuotedno5() {
-        return quotedno5;
-    }
-
-    public void setQuotedno5(String quotedno5) {
-        this.quotedno5 = quotedno5;
-    }
-
-    public String getAgency() {
-        return agency;
-    }
-
-    public void setAgency(String agency) {
-        this.agency = agency;
-    }
-
-    public String getAgent() {
-        return agent;
-    }
-
-    public void setAgent(String agent) {
-        this.agent = agent;
-    }
-
-    public String getWonational() {
-        return wonational;
-    }
-
-    public void setWonational(String wonational) {
-        this.wonational = wonational;
-    }
-
-    public String getExaminer() {
-        return examiner;
-    }
-
-    public void setExaminer(String examiner) {
-        this.examiner = examiner;
-    }
-
-    public String getAssexaminer() {
-        return assexaminer;
-    }
-
-    public void setAssexaminer(String assexaminer) {
-        this.assexaminer = assexaminer;
-    }
-
-    public String getQuote() {
-        return quote;
-    }
-
-    public void setQuote(String quote) {
-        this.quote = quote;
-    }
-
-    public String getQuoted() {
-        return quoted;
-    }
-
-    public void setQuoted(String quoted) {
-        this.quoted = quoted;
-    }
-
-    public String getNonpatentquote() {
-        return nonpatentquote;
-    }
-
-    public void setNonpatentquote(String nonpatentquote) {
-        this.nonpatentquote = nonpatentquote;
-    }
-
-
-    public String getFirstapplicant() {
-        return firstapplicant;
-    }
-
-    public void setFirstapplicant(String firstapplicant) {
-        this.firstapplicant = firstapplicant;
-    }
-
-    public String getFirstapplicantaddr() {
-        return firstapplicantaddr;
-    }
-
-    public void setFirstapplicantaddr(String firstapplicantaddr) {
-        this.firstapplicantaddr = firstapplicantaddr;
-    }
-
-    public String getFirstapplicantnum() {
-        return firstapplicantnum;
-    }
-
-    public void setFirstapplicantnum(String firstapplicantnum) {
-        this.firstapplicantnum = firstapplicantnum;
-    }
-
-    public String getFirstnventor() {
-        return firstnventor;
-    }
-
-    public void setFirstnventor(String firstnventor) {
-        this.firstnventor = firstnventor;
-    }
-
-    public String getFirstnventoraddr() {
-        return firstnventoraddr;
-    }
-
-    public void setFirstnventoraddr(String firstnventoraddr) {
-        this.firstnventoraddr = firstnventoraddr;
-    }
-
-    public String getEpcountry() {
-        return epcountry;
-    }
-
-    public void setEpcountry(String epcountry) {
-        this.epcountry = epcountry;
-    }
-
-    public String getAuthorizationpdf() {
-        return authorizationpdf;
-    }
-
-    public void setAuthorizationpdf(String authorizationpdf) {
-        this.authorizationpdf = authorizationpdf;
-    }
-
-    public String getPublicpdf() {
-        return Publicpdf;
-    }
-
-    public void setPublicpdf(String publicpdf) {
-        Publicpdf = publicpdf;
-    }
-
-    public PictureRenderData getAbstract_path() {
-        return abstract_path;
-    }
-
-    public void setAbstract_path(PictureRenderData abstract_path) {
-        this.abstract_path = abstract_path;
-    }
-
-    public static class ContentMO {
-        private String title;
-        List<String> item;
-        List<String> out;
-
-        public String getTitle() {
-            return title;
-        }
-
-        public void setTitle(String title) {
-            this.title = title;
-        }
-
-        public List<String> getItem() {
-            return item;
-        }
-
-        public void setItem(List<String> item) {
-            this.item = item;
-        }
-
-        public List<String> getOut() {
-            return out;
-        }
-
-        public void setOut(List<String> out) {
-            this.out = out;
-        }
-    }
-
-    public static class ContentMO2 {
-        private String title;
-        private String item;
-        private String out;
-
-        public ContentMO2(String title, String item,String out) {
-            this.title = title;
-            this.item = item;
-            this.out = out;
-        }
-
-        public String getTitle() {
-            return title;
-        }
-
-        public void setTitle(String title) {
-            this.title = title;
-        }
-
-        public String getItem() {
-            return item;
-        }
-
-        public void setItem(String item) {
-            this.item = item;
-        }
-
-        public String getOut() {
-            return out;
-        }
-
-        public void setOut(String out) {
-            this.out = out;
-        }
-    }
-}