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

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

@@ -1,227 +0,0 @@
-package cn.cslg.pas.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 产品类别
- * @TableName category
- */
-@TableName(value ="category")
-public class Category implements Serializable {
-    /**
-     * ID
-     */
-    @TableId(type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 产品类别名称
-     */
-    private String categoryname;
-
-    /**
-     * 许可费率
-     */
-    private Double licenserate;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 
-     */
-    private String picture;
-
-    /**
-     * 创建人Id
-     */
-    private Integer createpersonid;
-
-    /**
-     * 创建时间
-     */
-    private Date createtime;
-
-    /**
-     * 修改时间
-     */
-    private Date modifiedtime;
-
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    public Integer getId() {
-        return id;
-    }
-
-    /**
-     * ID
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    /**
-     * 产品类别名称
-     */
-    public String getCategoryname() {
-        return categoryname;
-    }
-
-    /**
-     * 产品类别名称
-     */
-    public void setCategoryname(String categoryname) {
-        this.categoryname = categoryname;
-    }
-
-    /**
-     * 许可费率
-     */
-    public Double getLicenserate() {
-        return licenserate;
-    }
-
-    /**
-     * 许可费率
-     */
-    public void setLicenserate(Double licenserate) {
-        this.licenserate = licenserate;
-    }
-
-    /**
-     * 备注
-     */
-    public String getRemark() {
-        return remark;
-    }
-
-    /**
-     * 备注
-     */
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    /**
-     * 
-     */
-    public String getPicture() {
-        return picture;
-    }
-
-    /**
-     * 
-     */
-    public void setPicture(String picture) {
-        this.picture = picture;
-    }
-
-    /**
-     * 创建人Id
-     */
-    public Integer getCreatepersonid() {
-        return createpersonid;
-    }
-
-    /**
-     * 创建人Id
-     */
-    public void setCreatepersonid(Integer createpersonid) {
-        this.createpersonid = createpersonid;
-    }
-
-    /**
-     * 创建时间
-     */
-    public Date getCreatetime() {
-        return createtime;
-    }
-
-    /**
-     * 创建时间
-     */
-    public void setCreatetime(Date createtime) {
-        this.createtime = createtime;
-    }
-
-    /**
-     * 修改时间
-     */
-    public Date getModifiedtime() {
-        return modifiedtime;
-    }
-
-    /**
-     * 修改时间
-     */
-    public void setModifiedtime(Date modifiedtime) {
-        this.modifiedtime = modifiedtime;
-    }
-
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        Category other = (Category) that;
-        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-            && (this.getCategoryname() == null ? other.getCategoryname() == null : this.getCategoryname().equals(other.getCategoryname()))
-            && (this.getLicenserate() == null ? other.getLicenserate() == null : this.getLicenserate().equals(other.getLicenserate()))
-            && (this.getRemark() == null ? other.getRemark() == null : this.getRemark().equals(other.getRemark()))
-            && (this.getPicture() == null ? other.getPicture() == null : this.getPicture().equals(other.getPicture()))
-            && (this.getCreatepersonid() == null ? other.getCreatepersonid() == null : this.getCreatepersonid().equals(other.getCreatepersonid()))
-            && (this.getCreatetime() == null ? other.getCreatetime() == null : this.getCreatetime().equals(other.getCreatetime()))
-            && (this.getModifiedtime() == null ? other.getModifiedtime() == null : this.getModifiedtime().equals(other.getModifiedtime()));
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
-        result = prime * result + ((getCategoryname() == null) ? 0 : getCategoryname().hashCode());
-        result = prime * result + ((getLicenserate() == null) ? 0 : getLicenserate().hashCode());
-        result = prime * result + ((getRemark() == null) ? 0 : getRemark().hashCode());
-        result = prime * result + ((getPicture() == null) ? 0 : getPicture().hashCode());
-        result = prime * result + ((getCreatepersonid() == null) ? 0 : getCreatepersonid().hashCode());
-        result = prime * result + ((getCreatetime() == null) ? 0 : getCreatetime().hashCode());
-        result = prime * result + ((getModifiedtime() == null) ? 0 : getModifiedtime().hashCode());
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", categoryname=").append(categoryname);
-        sb.append(", licenserate=").append(licenserate);
-        sb.append(", remark=").append(remark);
-        sb.append(", picture=").append(picture);
-        sb.append(", createpersonid=").append(createpersonid);
-        sb.append(", createtime=").append(createtime);
-        sb.append(", modifiedtime=").append(modifiedtime);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}

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

@@ -4,157 +4,42 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 
 /**
- * 元素表
- * @TableName element
+ * 元素表实体类
  */
-@TableName(value ="element")
+@Accessors(chain = true)
+@Data
+@TableName(value = "element")
 public class Element implements Serializable {
     /**
      * ID
      */
     @TableId(type = IdType.AUTO)
     private Integer id;
-
     /**
      * 架构id
      */
     private Integer structureId;
-
     /**
      * 父级id
      */
     private Integer parentId;
-
     /**
      * 元素名称
      */
     private Integer elementName;
-
     /**
-     * 路径
+     * 元素路径
      */
     private String path;
-
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    public Integer getId() {
-        return id;
-    }
-
-    /**
-     * ID
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    /**
-     * 架构id
-     */
-    public Integer getStructureId() {
-        return structureId;
-    }
-
-    /**
-     * 架构id
-     */
-    public void setStructureId(Integer structureId) {
-        this.structureId = structureId;
-    }
-
-    /**
-     * 父级id
-     */
-    public Integer getParentId() {
-        return parentId;
-    }
-
-    /**
-     * 父级id
-     */
-    public void setParentId(Integer parentId) {
-        this.parentId = parentId;
-    }
-
-    /**
-     * 元素名称
-     */
-    public Integer getElementName() {
-        return elementName;
-    }
-
-    /**
-     * 元素名称
-     */
-    public void setElementName(Integer elementName) {
-        this.elementName = elementName;
-    }
-
     /**
-     * 路径
+     * 元素说明
      */
-    public String getPath() {
-        return path;
-    }
-
-    /**
-     * 路径
-     */
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        Element other = (Element) that;
-        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-            && (this.getStructureId() == null ? other.getStructureId() == null : this.getStructureId().equals(other.getStructureId()))
-            && (this.getParentId() == null ? other.getParentId() == null : this.getParentId().equals(other.getParentId()))
-            && (this.getElementName() == null ? other.getElementName() == null : this.getElementName().equals(other.getElementName()))
-            && (this.getPath() == null ? other.getPath() == null : this.getPath().equals(other.getPath()));
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
-        result = prime * result + ((getStructureId() == null) ? 0 : getStructureId().hashCode());
-        result = prime * result + ((getParentId() == null) ? 0 : getParentId().hashCode());
-        result = prime * result + ((getElementName() == null) ? 0 : getElementName().hashCode());
-        result = prime * result + ((getPath() == null) ? 0 : getPath().hashCode());
-        return result;
-    }
+    private String remark;
 
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", structureId=").append(structureId);
-        sb.append(", parentId=").append(parentId);
-        sb.append(", elementName=").append(elementName);
-        sb.append(", path=").append(path);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}
+}

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

@@ -4,246 +4,63 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.Date;
 
 /**
  * 许可记录表
- * @TableName permission_record
  */
-@TableName(value ="permission_record")
+@Accessors(chain = true)
+@Data
+@TableName(value = "permission_record")
 public class PermissionRecord implements Serializable {
     /**
      * ID
      */
     @TableId(type = IdType.AUTO)
     private Integer id;
-
     /**
      * 专利号
      */
     private String patentNo;
-
     /**
      * 许可人 (默认为专利权利人)
      */
     private String licensor;
-
     /**
      * 被许可人国家
      */
     private String licenseeCountry;
-
     /**
      * 许可时间
      */
     private Date licenseTime;
-
     /**
      * 许可费用
      */
     private Double licenseFee;
-
-    /**
-     * 创建人id
-     */
-    private Integer createPersonId;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 修改时间
-     */
-    private Integer modifiedTime;
-
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    public Integer getId() {
-        return id;
-    }
-
-    /**
-     * ID
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    /**
-     * 专利号
-     */
-    public String getPatentNo() {
-        return patentNo;
-    }
-
-    /**
-     * 专利号
-     */
-    public void setPatentNo(String patentNo) {
-        this.patentNo = patentNo;
-    }
-
-    /**
-     * 许可人 (默认为专利权利人)
-     */
-    public String getLicensor() {
-        return licensor;
-    }
-
     /**
-     * 许可人 (默认为专利权利人)
-     */
-    public void setLicensor(String licensor) {
-        this.licensor = licensor;
-    }
-
-    /**
-     * 被许可人国家
-     */
-    public String getLicenseeCountry() {
-        return licenseeCountry;
-    }
-
-    /**
-     * 被许可人国家
-     */
-    public void setLicenseeCountry(String licenseeCountry) {
-        this.licenseeCountry = licenseeCountry;
-    }
-
-    /**
-     * 许可时间
-     */
-    public Date getLicenseTime() {
-        return licenseTime;
-    }
-
-    /**
-     * 许可时间
+     * 许可类型
      */
-    public void setLicenseTime(Date licenseTime) {
-        this.licenseTime = licenseTime;
-    }
-
-    /**
-     * 许可费用
-     */
-    public Double getLicenseFee() {
-        return licenseFee;
-    }
-
-    /**
-     * 许可费用
-     */
-    public void setLicenseFee(Double licenseFee) {
-        this.licenseFee = licenseFee;
-    }
-
+    private String licenseType;
     /**
      * 创建人id
      */
-    public Integer getCreatePersonId() {
-        return createPersonId;
-    }
-
+    private Integer createPersonId;
     /**
-     * 创建人id
+     * 创建人名称
      */
-    public void setCreatePersonId(Integer createPersonId) {
-        this.createPersonId = createPersonId;
-    }
-
+    private String createPersonName;
     /**
      * 创建时间
      */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * 创建时间
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    /**
-     * 修改时间
-     */
-    public Integer getModifiedTime() {
-        return modifiedTime;
-    }
-
+    private Date createTime;
     /**
      * 修改时间
      */
-    public void setModifiedTime(Integer modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        PermissionRecord other = (PermissionRecord) that;
-        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-            && (this.getPatentNo() == null ? other.getPatentNo() == null : this.getPatentNo().equals(other.getPatentNo()))
-            && (this.getLicensor() == null ? other.getLicensor() == null : this.getLicensor().equals(other.getLicensor()))
-            && (this.getLicenseeCountry() == null ? other.getLicenseeCountry() == null : this.getLicenseeCountry().equals(other.getLicenseeCountry()))
-            && (this.getLicenseTime() == null ? other.getLicenseTime() == null : this.getLicenseTime().equals(other.getLicenseTime()))
-            && (this.getLicenseFee() == null ? other.getLicenseFee() == null : this.getLicenseFee().equals(other.getLicenseFee()))
-            && (this.getCreatePersonId() == null ? other.getCreatePersonId() == null : this.getCreatePersonId().equals(other.getCreatePersonId()))
-            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
-            && (this.getModifiedTime() == null ? other.getModifiedTime() == null : this.getModifiedTime().equals(other.getModifiedTime()));
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
-        result = prime * result + ((getPatentNo() == null) ? 0 : getPatentNo().hashCode());
-        result = prime * result + ((getLicensor() == null) ? 0 : getLicensor().hashCode());
-        result = prime * result + ((getLicenseeCountry() == null) ? 0 : getLicenseeCountry().hashCode());
-        result = prime * result + ((getLicenseTime() == null) ? 0 : getLicenseTime().hashCode());
-        result = prime * result + ((getLicenseFee() == null) ? 0 : getLicenseFee().hashCode());
-        result = prime * result + ((getCreatePersonId() == null) ? 0 : getCreatePersonId().hashCode());
-        result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
-        result = prime * result + ((getModifiedTime() == null) ? 0 : getModifiedTime().hashCode());
-        return result;
-    }
+    private Integer modifiedTime;
 
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", patentNo=").append(patentNo);
-        sb.append(", licensor=").append(licensor);
-        sb.append(", licenseeCountry=").append(licenseeCountry);
-        sb.append(", licenseTime=").append(licenseTime);
-        sb.append(", licenseFee=").append(licenseFee);
-        sb.append(", createPersonId=").append(createPersonId);
-        sb.append(", createTime=").append(createTime);
-        sb.append(", modifiedTime=").append(modifiedTime);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}
+}

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

@@ -4,312 +4,67 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 产品表
- * @TableName product
+ * 产品表实体类
  */
-@TableName(value ="product")
+@Data
+@Accessors(chain = true)
+@TableName(value = "product")
 public class Product implements Serializable {
     /**
      * ID
      */
     @TableId(type = IdType.AUTO)
     private Integer id;
-
-    /**
-     * 架构id
-     */
-    private Integer structureId;
-
     /**
      * 产品名称
      */
-    private String productname;
-
+    private String productName;
     /**
      * 上市时间
      */
     private Date marketTime;
-
     /**
      * 所属公司名称 (或租户)
      */
     private String companyName;
-
     /**
      * 租户id
      */
     private Integer tenantId;
-
     /**
      * 产品说明
      */
     private String productExplain;
-
-    /**
-     * 许可费率
-     */
-    private Double licenseRate;
-
     /**
-     * 所属产品类别
+     * 所属产品类别id
      */
     private Integer categoryId;
-
-    /**
-     * 创建人id
-     */
-    private Integer createPersonId;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 修改时间
-     */
-    private Date modifiedTime;
-
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    public Integer getId() {
-        return id;
-    }
-
-    /**
-     * ID
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    /**
-     * 架构id
-     */
-    public Integer getStructureId() {
-        return structureId;
-    }
-
     /**
      * 架构id
      */
-    public void setStructureId(Integer structureId) {
-        this.structureId = structureId;
-    }
-
-    /**
-     * 产品名称
-     */
-    public String getProductname() {
-        return productname;
-    }
-
-    /**
-     * 产品名称
-     */
-    public void setProductname(String productname) {
-        this.productname = productname;
-    }
-
-    /**
-     * 上市时间
-     */
-    public Date getMarketTime() {
-        return marketTime;
-    }
-
-    /**
-     * 上市时间
-     */
-    public void setMarketTime(Date marketTime) {
-        this.marketTime = marketTime;
-    }
-
-    /**
-     * 所属公司名称 (或租户)
-     */
-    public String getCompanyName() {
-        return companyName;
-    }
-
-    /**
-     * 所属公司名称 (或租户)
-     */
-    public void setCompanyName(String companyName) {
-        this.companyName = companyName;
-    }
-
-    /**
-     * 租户id
-     */
-    public Integer getTenantId() {
-        return tenantId;
-    }
-
-    /**
-     * 租户id
-     */
-    public void setTenantId(Integer tenantId) {
-        this.tenantId = tenantId;
-    }
-
-    /**
-     * 产品说明
-     */
-    public String getProductExplain() {
-        return productExplain;
-    }
-
-    /**
-     * 产品说明
-     */
-    public void setProductExplain(String productExplain) {
-        this.productExplain = productExplain;
-    }
-
-    /**
-     * 许可费率
-     */
-    public Double getLicenseRate() {
-        return licenseRate;
-    }
-
+    private Integer structureId;
     /**
      * 许可费率
      */
-    public void setLicenseRate(Double licenseRate) {
-        this.licenseRate = licenseRate;
-    }
-
-    /**
-     * 所属产品类别
-     */
-    public Integer getCategoryId() {
-        return categoryId;
-    }
-
-    /**
-     * 所属产品类别
-     */
-    public void setCategoryId(Integer categoryId) {
-        this.categoryId = categoryId;
-    }
-
-    /**
-     * 创建人id
-     */
-    public Integer getCreatePersonId() {
-        return createPersonId;
-    }
-
+    private Double licenseRate;
     /**
      * 创建人id
      */
-    public void setCreatePersonId(Integer createPersonId) {
-        this.createPersonId = createPersonId;
-    }
-
-    /**
-     * 创建时间
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
+    private Integer createPersonId;
     /**
      * 创建时间
      */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    /**
-     * 修改时间
-     */
-    public Date getModifiedTime() {
-        return modifiedTime;
-    }
-
+    private Date createTime;
     /**
-     * 修改时间
+     * 最后修改时间
      */
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        Product other = (Product) that;
-        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-            && (this.getStructureId() == null ? other.getStructureId() == null : this.getStructureId().equals(other.getStructureId()))
-            && (this.getProductname() == null ? other.getProductname() == null : this.getProductname().equals(other.getProductname()))
-            && (this.getMarketTime() == null ? other.getMarketTime() == null : this.getMarketTime().equals(other.getMarketTime()))
-            && (this.getCompanyName() == null ? other.getCompanyName() == null : this.getCompanyName().equals(other.getCompanyName()))
-            && (this.getTenantId() == null ? other.getTenantId() == null : this.getTenantId().equals(other.getTenantId()))
-            && (this.getProductExplain() == null ? other.getProductExplain() == null : this.getProductExplain().equals(other.getProductExplain()))
-            && (this.getLicenseRate() == null ? other.getLicenseRate() == null : this.getLicenseRate().equals(other.getLicenseRate()))
-            && (this.getCategoryId() == null ? other.getCategoryId() == null : this.getCategoryId().equals(other.getCategoryId()))
-            && (this.getCreatePersonId() == null ? other.getCreatePersonId() == null : this.getCreatePersonId().equals(other.getCreatePersonId()))
-            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
-            && (this.getModifiedTime() == null ? other.getModifiedTime() == null : this.getModifiedTime().equals(other.getModifiedTime()));
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
-        result = prime * result + ((getStructureId() == null) ? 0 : getStructureId().hashCode());
-        result = prime * result + ((getProductname() == null) ? 0 : getProductname().hashCode());
-        result = prime * result + ((getMarketTime() == null) ? 0 : getMarketTime().hashCode());
-        result = prime * result + ((getCompanyName() == null) ? 0 : getCompanyName().hashCode());
-        result = prime * result + ((getTenantId() == null) ? 0 : getTenantId().hashCode());
-        result = prime * result + ((getProductExplain() == null) ? 0 : getProductExplain().hashCode());
-        result = prime * result + ((getLicenseRate() == null) ? 0 : getLicenseRate().hashCode());
-        result = prime * result + ((getCategoryId() == null) ? 0 : getCategoryId().hashCode());
-        result = prime * result + ((getCreatePersonId() == null) ? 0 : getCreatePersonId().hashCode());
-        result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
-        result = prime * result + ((getModifiedTime() == null) ? 0 : getModifiedTime().hashCode());
-        return result;
-    }
+    private Date modifiedTime;
 
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", structureId=").append(structureId);
-        sb.append(", productname=").append(productname);
-        sb.append(", marketTime=").append(marketTime);
-        sb.append(", companyName=").append(companyName);
-        sb.append(", tenantId=").append(tenantId);
-        sb.append(", productExplain=").append(productExplain);
-        sb.append(", licenseRate=").append(licenseRate);
-        sb.append(", categoryId=").append(categoryId);
-        sb.append(", createPersonId=").append(createPersonId);
-        sb.append(", createTime=").append(createTime);
-        sb.append(", modifiedTime=").append(modifiedTime);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}
+}

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

@@ -0,0 +1,54 @@
+package cn.cslg.pas.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 产品类别表实体类
+ */
+@Accessors(chain = true)
+@Data
+@TableName(value = "product_category")
+public class ProductCategory implements Serializable {
+    /**
+     * ID
+     */
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 产品类别名称
+     */
+    private String productCategoryName;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 许可费率
+     */
+    private Double licenseRate;
+    /**
+     * 创建人Id
+     */
+    private Integer createPersonId;
+    /**
+     * 创建人名称
+     */
+    private Integer createPersonName;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 最后修改时间
+     */
+    private Date modifiedTime;
+
+}

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

@@ -1,270 +1,62 @@
 package cn.cslg.pas.domain;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 营销数据表
- * @TableName product_market_data
+ * 产品营销数据表实体类
  */
-@TableName(value ="product_market_data")
+@Accessors(chain = true)
+@Data
+@TableName(value = "product_market_data")
 public class ProductMarketData implements Serializable {
     /**
      * ID
      */
     private Integer id;
-
     /**
      * 产品id
      */
     private Integer productId;
-
     /**
      * 营销时间
      */
-    private Date saletime;
-
+    private Date saleTime;
     /**
      * 营销地区（国家）
      */
-    private String salearea;
-
+    private String saleArea;
     /**
      * 销售量
      */
-    private Double salecount;
-
+    private Double saleCount;
     /**
      * 销售额
      */
-    private Double salemoney;
-
+    private Double saleMoney;
     /**
      * 自定义许可费率(默认为产品表的许可费率)
      */
-    private Double customlicenserate;
-
+    private Double customLicenseRate;
     /**
      * 创建人id
      */
     private Integer createPersonId;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 修改时间
-     */
-    private Date modifiedTime;
-
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    public Integer getId() {
-        return id;
-    }
-
     /**
-     * ID
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    /**
-     * 产品id
-     */
-    public Integer getProductId() {
-        return productId;
-    }
-
-    /**
-     * 产品id
-     */
-    public void setProductId(Integer productId) {
-        this.productId = productId;
-    }
-
-    /**
-     * 营销时间
-     */
-    public Date getSaletime() {
-        return saletime;
-    }
-
-    /**
-     * 营销时间
-     */
-    public void setSaletime(Date saletime) {
-        this.saletime = saletime;
-    }
-
-    /**
-     * 营销地区（国家）
+     * 创建人名称
      */
-    public String getSalearea() {
-        return salearea;
-    }
-
-    /**
-     * 营销地区（国家）
-     */
-    public void setSalearea(String salearea) {
-        this.salearea = salearea;
-    }
-
-    /**
-     * 销售量
-     */
-    public Double getSalecount() {
-        return salecount;
-    }
-
-    /**
-     * 销售量
-     */
-    public void setSalecount(Double salecount) {
-        this.salecount = salecount;
-    }
-
-    /**
-     * 销售额
-     */
-    public Double getSalemoney() {
-        return salemoney;
-    }
-
-    /**
-     * 销售额
-     */
-    public void setSalemoney(Double salemoney) {
-        this.salemoney = salemoney;
-    }
-
-    /**
-     * 自定义许可费率(默认为产品表的许可费率)
-     */
-    public Double getCustomlicenserate() {
-        return customlicenserate;
-    }
-
-    /**
-     * 自定义许可费率(默认为产品表的许可费率)
-     */
-    public void setCustomlicenserate(Double customlicenserate) {
-        this.customlicenserate = customlicenserate;
-    }
-
-    /**
-     * 创建人id
-     */
-    public Integer getCreatePersonId() {
-        return createPersonId;
-    }
-
-    /**
-     * 创建人id
-     */
-    public void setCreatePersonId(Integer createPersonId) {
-        this.createPersonId = createPersonId;
-    }
-
+    private String createPersonName;
     /**
      * 创建时间
      */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * 创建时间
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    /**
-     * 修改时间
-     */
-    public Date getModifiedTime() {
-        return modifiedTime;
-    }
-
+    private Date createTime;
     /**
      * 修改时间
      */
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        ProductMarketData other = (ProductMarketData) that;
-        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-            && (this.getProductId() == null ? other.getProductId() == null : this.getProductId().equals(other.getProductId()))
-            && (this.getSaletime() == null ? other.getSaletime() == null : this.getSaletime().equals(other.getSaletime()))
-            && (this.getSalearea() == null ? other.getSalearea() == null : this.getSalearea().equals(other.getSalearea()))
-            && (this.getSalecount() == null ? other.getSalecount() == null : this.getSalecount().equals(other.getSalecount()))
-            && (this.getSalemoney() == null ? other.getSalemoney() == null : this.getSalemoney().equals(other.getSalemoney()))
-            && (this.getCustomlicenserate() == null ? other.getCustomlicenserate() == null : this.getCustomlicenserate().equals(other.getCustomlicenserate()))
-            && (this.getCreatePersonId() == null ? other.getCreatePersonId() == null : this.getCreatePersonId().equals(other.getCreatePersonId()))
-            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
-            && (this.getModifiedTime() == null ? other.getModifiedTime() == null : this.getModifiedTime().equals(other.getModifiedTime()));
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
-        result = prime * result + ((getProductId() == null) ? 0 : getProductId().hashCode());
-        result = prime * result + ((getSaletime() == null) ? 0 : getSaletime().hashCode());
-        result = prime * result + ((getSalearea() == null) ? 0 : getSalearea().hashCode());
-        result = prime * result + ((getSalecount() == null) ? 0 : getSalecount().hashCode());
-        result = prime * result + ((getSalemoney() == null) ? 0 : getSalemoney().hashCode());
-        result = prime * result + ((getCustomlicenserate() == null) ? 0 : getCustomlicenserate().hashCode());
-        result = prime * result + ((getCreatePersonId() == null) ? 0 : getCreatePersonId().hashCode());
-        result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
-        result = prime * result + ((getModifiedTime() == null) ? 0 : getModifiedTime().hashCode());
-        return result;
-    }
+    private Date modifiedTime;
 
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", productId=").append(productId);
-        sb.append(", saletime=").append(saletime);
-        sb.append(", salearea=").append(salearea);
-        sb.append(", salecount=").append(salecount);
-        sb.append(", salemoney=").append(salemoney);
-        sb.append(", customlicenserate=").append(customlicenserate);
-        sb.append(", createPersonId=").append(createPersonId);
-        sb.append(", createTime=").append(createTime);
-        sb.append(", modifiedTime=").append(modifiedTime);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}
+}

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

@@ -4,35 +4,39 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 架构表
- * @TableName structure
+ * 架构表实体类
  */
-@TableName(value ="structure")
+@Accessors(chain = true)
+@Data
+@TableName(value = "structure")
 public class Structure implements Serializable {
     /**
      * ID
      */
     @TableId(type = IdType.AUTO)
     private Integer id;
-
     /**
      * 创建人ID
      */
     private Integer createPersonId;
-
+    /**
+     * 创建人名称
+     */
+    private String createPersonName;
     /**
      * 创建时间
      */
     private Date createTime;
-
     /**
      * 最后修改时间
      */
     private Date modifiedTime;
 
-
-}
+}

PAS/src/main/java/cn/cslg/pas/domain/asso/AssoElementPatent.java

@@ -1,115 +1,29 @@
 package cn.cslg.pas.domain.asso;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 
 /**
- * 架构元素-专利关联表
- * @TableName asso_element_patent
+ * 架构元素专利关联表实体类
  */
-@TableName(value ="asso_element_patent")
+@Accessors(chain = true)
+@Data
+@TableName(value = "asso_element_patent")
 public class AssoElementPatent implements Serializable {
     /**
      * ID
      */
     private Integer id;
-
     /**
      * 元素id
      */
     private Integer elementId;
-
     /**
      * 专利号
      */
     private String patentNo;
 
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    public Integer getId() {
-        return id;
-    }
-
-    /**
-     * ID
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    /**
-     * 元素id
-     */
-    public Integer getElementId() {
-        return elementId;
-    }
-
-    /**
-     * 元素id
-     */
-    public void setElementId(Integer elementId) {
-        this.elementId = elementId;
-    }
-
-    /**
-     * 专利号
-     */
-    public String getPatentNo() {
-        return patentNo;
-    }
-
-    /**
-     * 专利号
-     */
-    public void setPatentNo(String patentNo) {
-        this.patentNo = patentNo;
-    }
-
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        AssoElementPatent other = (AssoElementPatent) that;
-        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-            && (this.getElementId() == null ? other.getElementId() == null : this.getElementId().equals(other.getElementId()))
-            && (this.getPatentNo() == null ? other.getPatentNo() == null : this.getPatentNo().equals(other.getPatentNo()));
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
-        result = prime * result + ((getElementId() == null) ? 0 : getElementId().hashCode());
-        result = prime * result + ((getPatentNo() == null) ? 0 : getPatentNo().hashCode());
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", elementId=").append(elementId);
-        sb.append(", patentNo=").append(patentNo);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}
+}

PAS/src/main/java/cn/cslg/pas/domain/asso/AssoElementPicture.java

@@ -1,115 +1,29 @@
 package cn.cslg.pas.domain.asso;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 
 /**
- * 元素图片关联表
- * @TableName asso_element_picture
+ * 元素图片关联表实体类
  */
-@TableName(value ="asso_element_picture")
+@Accessors(chain = true)
+@Data
+@TableName(value = "asso_element_picture")
 public class AssoElementPicture implements Serializable {
     /**
      * ID
      */
     private Integer id;
-
     /**
      * 元素id
      */
     private Integer elementId;
-
-    /**
-     * 图片路径
-     */
-    private String pictureUrl;
-
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    public Integer getId() {
-        return id;
-    }
-
-    /**
-     * ID
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    /**
-     * 元素id
-     */
-    public Integer getElementId() {
-        return elementId;
-    }
-
-    /**
-     * 元素id
-     */
-    public void setElementId(Integer elementId) {
-        this.elementId = elementId;
-    }
-
     /**
      * 图片路径
      */
-    public String getPictureUrl() {
-        return pictureUrl;
-    }
-
-    /**
-     * 图片路径
-     */
-    public void setPictureUrl(String pictureUrl) {
-        this.pictureUrl = pictureUrl;
-    }
-
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        AssoElementPicture other = (AssoElementPicture) that;
-        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-            && (this.getElementId() == null ? other.getElementId() == null : this.getElementId().equals(other.getElementId()))
-            && (this.getPictureUrl() == null ? other.getPictureUrl() == null : this.getPictureUrl().equals(other.getPictureUrl()));
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
-        result = prime * result + ((getElementId() == null) ? 0 : getElementId().hashCode());
-        result = prime * result + ((getPictureUrl() == null) ? 0 : getPictureUrl().hashCode());
-        return result;
-    }
+    private String picture;
 
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", elementId=").append(elementId);
-        sb.append(", pictureUrl=").append(pictureUrl);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}
+}

PAS/src/main/java/cn/cslg/pas/domain/asso/AssoElementProduct.java

@@ -0,0 +1,29 @@
+package cn.cslg.pas.domain.asso;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 元素产品关联表实体类
+ */
+@Accessors(chain = true)
+@Data
+@TableName(value = "asso_element_product")
+public class AssoElementProduct implements Serializable {
+    /**
+     * 主键ID
+     */
+    private Integer id;
+    /**
+     * 产品id
+     */
+    private Integer productId;
+    /**
+     * 元素id
+     */
+    private Integer elementId;
+
+}

PAS/src/main/java/cn/cslg/pas/domain/asso/AssoProductCategoryPicture.java

@@ -0,0 +1,29 @@
+package cn.cslg.pas.domain.asso;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 产品类别图片关联表
+ */
+@Accessors(chain = true)
+@Data
+@TableName(value = "asso_product_category_picture")
+public class AssoProductCategoryPicture implements Serializable {
+    /**
+     * ID
+     */
+    private Integer id;
+    /**
+     * 产品类别ID
+     */
+    private Integer productCategoryId;
+    /**
+     * 图片路径
+     */
+    private String picture;
+
+}

PAS/src/main/java/cn/cslg/pas/domain/asso/AssoProductPatent.java

@@ -4,113 +4,29 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 
 /**
  * 产品专利关联表
- * @TableName asso_product_patent
  */
-@TableName(value ="asso_product_patent")
+@Accessors(chain = true)
+@Data
+@TableName(value = "asso_product_patent")
 public class AssoProductPatent implements Serializable {
     /**
      * ID
      */
     @TableId(type = IdType.AUTO)
     private Integer id;
-
     /**
      * 专利号
      */
     private String patentNo;
-
     /**
      * 产品id
      */
     private Integer productId;
-
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    public Integer getId() {
-        return id;
-    }
-
-    /**
-     * ID
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    /**
-     * 专利号
-     */
-    public String getPatentNo() {
-        return patentNo;
-    }
-
-    /**
-     * 专利号
-     */
-    public void setPatentNo(String patentNo) {
-        this.patentNo = patentNo;
-    }
-
-    /**
-     * 产品id
-     */
-    public Integer getProductId() {
-        return productId;
-    }
-
-    /**
-     * 产品id
-     */
-    public void setProductId(Integer productId) {
-        this.productId = productId;
-    }
-
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        AssoProductPatent other = (AssoProductPatent) that;
-        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-            && (this.getPatentNo() == null ? other.getPatentNo() == null : this.getPatentNo().equals(other.getPatentNo()))
-            && (this.getProductId() == null ? other.getProductId() == null : this.getProductId().equals(other.getProductId()));
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
-        result = prime * result + ((getPatentNo() == null) ? 0 : getPatentNo().hashCode());
-        result = prime * result + ((getProductId() == null) ? 0 : getProductId().hashCode());
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", patentNo=").append(patentNo);
-        sb.append(", productId=").append(productId);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}
+}

PAS/src/main/java/cn/cslg/pas/domain/asso/AssoProductPicture.java

@@ -1,115 +1,29 @@
 package cn.cslg.pas.domain.asso;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 
 /**
  * 产品图片关联表
- * @TableName asso_product_picture
  */
-@TableName(value ="asso_product_picture")
+@Accessors(chain = true)
+@Data
+@TableName(value = "asso_product_picture")
 public class AssoProductPicture implements Serializable {
     /**
      * ID
      */
     private Integer id;
-
     /**
      * 产品ID
      */
     private Integer productId;
-
     /**
      * 图片路径
      */
     private String picture;
 
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    public Integer getId() {
-        return id;
-    }
-
-    /**
-     * ID
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    /**
-     * 产品ID
-     */
-    public Integer getProductId() {
-        return productId;
-    }
-
-    /**
-     * 产品ID
-     */
-    public void setProductId(Integer productId) {
-        this.productId = productId;
-    }
-
-    /**
-     * 图片路径
-     */
-    public String getPicture() {
-        return picture;
-    }
-
-    /**
-     * 图片路径
-     */
-    public void setPicture(String picture) {
-        this.picture = picture;
-    }
-
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        AssoProductPicture other = (AssoProductPicture) that;
-        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-            && (this.getProductId() == null ? other.getProductId() == null : this.getProductId().equals(other.getProductId()))
-            && (this.getPicture() == null ? other.getPicture() == null : this.getPicture().equals(other.getPicture()));
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
-        result = prime * result + ((getProductId() == null) ? 0 : getProductId().hashCode());
-        result = prime * result + ((getPicture() == null) ? 0 : getPicture().hashCode());
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", productId=").append(productId);
-        sb.append(", picture=").append(picture);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}
+}

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

@@ -1,18 +0,0 @@
-package cn.cslg.pas.mapper;
-
-import cn.cslg.pas.domain.Category;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
-* @author admin
-* @description 针对表【category(产品类别)】的数据库操作Mapper
-* @createDate 2023-03-06 15:54:34
-* @Entity cn.cslg.pas.domain.Category
-*/
-public interface CategoryMapper extends BaseMapper<Category> {
-
-}
-
-
-
-

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

@@ -1,18 +0,0 @@
-package cn.cslg.pas.mapper;
-
-import cn.cslg.pas.domain.Element;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
-* @author admin
-* @description 针对表【element(元素表)】的数据库操作Mapper
-* @createDate 2023-03-06 15:31:11
-* @Entity cn.cslg.pas.domain.Element
-*/
-public interface ElementMapper extends BaseMapper<Element> {
-
-}
-
-
-
-

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

@@ -1,18 +0,0 @@
-package cn.cslg.pas.mapper;
-
-import cn.cslg.pas.domain.PermissionRecord;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
-* @author admin
-* @description 针对表【permission_record(许可记录表)】的数据库操作Mapper
-* @createDate 2023-03-06 15:56:43
-* @Entity cn.cslg.pas.domain.PermissionRecord
-*/
-public interface PermissionRecordMapper extends BaseMapper<PermissionRecord> {
-
-}
-
-
-
-

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

@@ -1,18 +0,0 @@
-package cn.cslg.pas.mapper;
-
-import cn.cslg.pas.domain.Product;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
-* @author admin
-* @description 针对表【product(产品表)】的数据库操作Mapper
-* @createDate 2023-03-06 15:59:00
-* @Entity cn.cslg.pas.domain.Product
-*/
-public interface ProductMapper extends BaseMapper<Product> {
-
-}
-
-
-
-

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

@@ -1,18 +0,0 @@
-package cn.cslg.pas.mapper;
-
-import cn.cslg.pas.domain.ProductMarketData;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
-* @author admin
-* @description 针对表【product_market_data(营销数据表)】的数据库操作Mapper
-* @createDate 2023-03-06 16:04:04
-* @Entity cn.cslg.pas.domain.ProductMarketData
-*/
-public interface ProductMarketDataMapper extends BaseMapper<ProductMarketData> {
-
-}
-
-
-
-

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

@@ -1,16 +0,0 @@
-package cn.cslg.pas.mapper;
-
-import cn.cslg.pas.domain.Report;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 报告表 Mapper 接口
- * </p>
- *
- * @author 王岩
- * @since 2021-12-27
- */
-public interface ReportMapper extends BaseMapper<Report> {
-
-}

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

@@ -1,18 +0,0 @@
-package cn.cslg.pas.mapper;
-
-import cn.cslg.pas.domain.Structure;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
-* @author admin
-* @description 针对表【structure(架构表)】的数据库操作Mapper
-* @createDate 2023-03-06 15:26:57
-* @Entity cn.cslg.pas.domain.Structure
-*/
-public interface StructureMapper extends BaseMapper<Structure> {
-
-}
-
-
-
-

PAS/src/main/java/cn/cslg/pas/mapper/asso/AssoElementPatentMapper.java

@@ -1,18 +0,0 @@
-package cn.cslg.pas.mapper.asso;
-
-import cn.cslg.pas.domain.asso.AssoElementPatent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
-* @author admin
-* @description 针对表【asso_element_patent(架构元素-专利关联表)】的数据库操作Mapper
-* @createDate 2023-03-06 15:41:04
-* @Entity cn.cslg.pas.domain/asso.AssoElementPatent
-*/
-public interface AssoElementPatentMapper extends BaseMapper<AssoElementPatent> {
-
-}
-
-
-
-

PAS/src/main/java/cn/cslg/pas/mapper/asso/AssoElementPictureMapper.java

@@ -1,18 +0,0 @@
-package cn.cslg.pas.mapper.asso;
-
-import cn.cslg.pas.domain.asso.AssoElementPicture;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
-* @author admin
-* @description 针对表【asso_element_picture(元素图片关联表)】的数据库操作Mapper
-* @createDate 2023-03-06 15:44:16
-* @Entity cn.cslg.pas.domain.asso.AssoElementPicture
-*/
-public interface AssoElementPictureMapper extends BaseMapper<AssoElementPicture> {
-
-}
-
-
-
-

PAS/src/main/java/cn/cslg/pas/mapper/asso/AssoProductPatentMapper.java

@@ -1,18 +0,0 @@
-package cn.cslg.pas.mapper.asso;
-
-import cn.cslg.pas.domain.asso.AssoProductPatent;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
-* @author admin
-* @description 针对表【asso_product_patent(产品专利关联表)】的数据库操作Mapper
-* @createDate 2023-03-06 15:47:28
-* @Entity cn.cslg.pas.domain.asso.AssoProductPatent
-*/
-public interface AssoProductPatentMapper extends BaseMapper<AssoProductPatent> {
-
-}
-
-
-
-

PAS/src/main/java/cn/cslg/pas/mapper/asso/AssoProductPictureMapper.java

@@ -1,18 +0,0 @@
-package cn.cslg.pas.mapper.asso;
-
-import cn.cslg.pas.domain.asso.AssoProductPicture;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
-* @author admin
-* @description 针对表【asso_product_picture(产品图片关联表)】的数据库操作Mapper
-* @createDate 2023-03-06 15:52:08
-* @Entity cn.cslg.pas.domain.asso.AssoProductPicture
-*/
-public interface AssoProductPictureMapper extends BaseMapper<AssoProductPicture> {
-
-}
-
-
-
-

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

@@ -1,20 +0,0 @@
-package cn.cslg.pas.service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import cn.cslg.pas.domain.Category;
-import cn.cslg.pas.mapper.CategoryMapper;
-import org.springframework.stereotype.Service;
-
-/**
-* @author admin
-* @description 针对表【category(产品类别)】的数据库操作Service实现
-* @createDate 2023-03-06 15:54:34
-*/
-@Service
-public class CategoryService extends ServiceImpl<CategoryMapper, Category> {
-
-}
-
-
-
-

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

@@ -1,22 +0,0 @@
-package cn.cslg.pas.service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import cn.cslg.pas.domain.Element;
-import cn.cslg.pas.service.ElementService;
-import cn.cslg.pas.mapper.ElementMapper;
-import org.springframework.stereotype.Service;
-
-/**
-* @author admin
-* @description 针对表【element(元素表)】的数据库操作Service实现
-* @createDate 2023-03-06 15:31:11
-*/
-@Service
-public class ElementService extends ServiceImpl<ElementMapper, Element>
-    {
-
-}
-
-
-
-

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

@@ -1,21 +0,0 @@
-package cn.cslg.pas.service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import cn.cslg.pas.domain.PermissionRecord;
-import cn.cslg.pas.service.PermissionRecordService;
-import cn.cslg.pas.mapper.PermissionRecordMapper;
-import org.springframework.stereotype.Service;
-
-/**
-* @author admin
-* @description 针对表【permission_record(许可记录表)】的数据库操作Service实现
-* @createDate 2023-03-06 15:56:43
-*/
-@Service
-public class PermissionRecordService extends ServiceImpl<PermissionRecordMapper, PermissionRecord> {
-
-}
-
-
-
-

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

@@ -1,22 +0,0 @@
-package cn.cslg.pas.service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import cn.cslg.pas.domain.ProductMarketData;
-import cn.cslg.pas.service.ProductMarketDataService;
-import cn.cslg.pas.mapper.ProductMarketDataMapper;
-import org.springframework.stereotype.Service;
-
-/**
-* @author admin
-* @description 针对表【product_market_data(营销数据表)】的数据库操作Service实现
-* @createDate 2023-03-06 16:04:04
-*/
-@Service
-public class ProductMarketDataService extends ServiceImpl<ProductMarketDataMapper, ProductMarketData>
-{
-
-}
-
-
-
-

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

@@ -1,22 +0,0 @@
-package cn.cslg.pas.service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import cn.cslg.pas.domain.Product;
-import cn.cslg.pas.service.ProductService;
-import cn.cslg.pas.mapper.ProductMapper;
-import org.springframework.stereotype.Service;
-
-/**
-* @author admin
-* @description 针对表【product(产品表)】的数据库操作Service实现
-* @createDate 2023-03-06 15:59:00
-*/
-@Service
-public class ProductService extends ServiceImpl<ProductMapper, Product>
-   {
-
-}
-
-
-
-

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

@@ -1,21 +0,0 @@
-package cn.cslg.pas.service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import cn.cslg.pas.domain.Structure;
-import cn.cslg.pas.mapper.StructureMapper;
-import org.springframework.stereotype.Service;
-
-/**
-* @author admin
-* @description 针对表【structure(架构表)】的数据库操作Service实现
-* @createDate 2023-03-06 15:26:57
-*/
-@Service
-public class StructureService extends ServiceImpl<StructureMapper, Structure>
-    {
-
-}
-
-
-
-

PAS/src/main/java/cn/cslg/pas/service/asso/AssoElementPatentService.java

@@ -1,22 +0,0 @@
-package cn.cslg.pas.service.asso;
-
-
-import cn.cslg.pas.domain.asso.AssoElementPatent;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import cn.cslg.pas.mapper.asso.AssoElementPatentMapper;
-import org.springframework.stereotype.Service;
-
-/**
-* @author admin
-* @description 针对表【asso_element_patent(架构元素-专利关联表)】的数据库操作Service实现
-* @createDate 2023-03-06 15:41:04
-*/
-@Service
-public class AssoElementPatentService extends ServiceImpl<AssoElementPatentMapper, AssoElementPatent>
-{
-
-}
-
-
-
-

PAS/src/main/java/cn/cslg/pas/service/asso/AssoElementPictureService.java

@@ -1,21 +0,0 @@
-package cn.cslg.pas.service.asso;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import cn.cslg.pas.domain.asso.AssoElementPicture;
-import cn.cslg.pas.mapper.asso.AssoElementPictureMapper;
-import org.springframework.stereotype.Service;
-
-/**
-* @author admin
-* @description 针对表【asso_element_picture(元素图片关联表)】的数据库操作Service实现
-* @createDate 2023-03-06 15:44:16
-*/
-@Service
-public class AssoElementPictureService extends ServiceImpl<AssoElementPictureMapper, AssoElementPicture>
-{
-
-}
-
-
-
-

PAS/src/main/java/cn/cslg/pas/service/asso/AssoProductPatentService.java

@@ -1,20 +0,0 @@
-package cn.cslg.pas.service.asso;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import cn.cslg.pas.domain.asso.AssoProductPatent;
-import cn.cslg.pas.mapper.asso.AssoProductPatentMapper;
-import org.springframework.stereotype.Service;
-
-/**
-* @author admin
-* @description 针对表【asso_product_patent(产品专利关联表)】的数据库操作Service实现
-* @createDate 2023-03-06 15:47:28
-*/
-@Service
-public class AssoProductPatentService extends ServiceImpl<AssoProductPatentMapper, AssoProductPatent> {
-
-}
-
-
-
-

PAS/src/main/java/cn/cslg/pas/service/asso/AssoProductPictureService.java

@@ -1,21 +0,0 @@
-package cn.cslg.pas.service.asso;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import cn.cslg.pas.domain.asso.AssoProductPicture;
-import cn.cslg.pas.mapper.asso.AssoProductPictureMapper;
-import org.springframework.stereotype.Service;
-
-/**
-* @author admin
-* @description 针对表【asso_product_picture(产品图片关联表)】的数据库操作Service实现
-* @createDate 2023-03-06 15:52:08
-*/
-@Service
-public class AssoProductPictureService extends ServiceImpl<AssoProductPictureMapper, AssoProductPicture>
-{
-
-}
-
-
-
-

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

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.cslg.pas.mapper.asso.AssoElementPatentMapper">
-
-    <resultMap id="BaseResultMap" type="cn.cslg.pas.domain.asso.AssoElementPatent">
-            <result property="id" column="id" jdbcType="INTEGER"/>
-            <result property="elementId" column="element_id" jdbcType="INTEGER"/>
-            <result property="patentNo" column="patent_no" jdbcType="VARCHAR"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id,element_id,patent_no
-    </sql>
-</mapper>

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

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.cslg.pas.mapper.asso.AssoElementPictureMapper">
-
-    <resultMap id="BaseResultMap" type="cn.cslg.pas.domain.asso.AssoElementPicture">
-            <result property="id" column="id" jdbcType="INTEGER"/>
-            <result property="elementId" column="element_id" jdbcType="INTEGER"/>
-            <result property="pictureUrl" column="picture_url" jdbcType="VARCHAR"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id,element_id,picture_url
-    </sql>
-</mapper>

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

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.cslg.pas.mapper.asso.AssoProductPatentMapper">
-
-    <resultMap id="BaseResultMap" type="cn.cslg.pas.domain.asso.AssoProductPatent">
-            <id property="id" column="id" jdbcType="INTEGER"/>
-            <result property="patentNo" column="patent_no" jdbcType="VARCHAR"/>
-            <result property="productId" column="product_id" jdbcType="INTEGER"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id,patent_no,product_id
-    </sql>
-</mapper>

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

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.cslg.pas.mapper.asso.AssoProductPictureMapper">
-
-    <resultMap id="BaseResultMap" type="cn.cslg.pas.domain.asso.AssoProductPicture">
-            <result property="id" column="id" jdbcType="INTEGER"/>
-            <result property="productId" column="product_id" jdbcType="INTEGER"/>
-            <result property="picture" column="picture" jdbcType="VARCHAR"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id,product_id,picture
-    </sql>
-</mapper>

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

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.cslg.pas.mapper.CategoryMapper">
-
-    <resultMap id="BaseResultMap" type="cn.cslg.pas.domain.Category">
-            <id property="id" column="id" jdbcType="INTEGER"/>
-            <result property="categoryname" column="categoryName" jdbcType="VARCHAR"/>
-            <result property="licenserate" column="licenseRate" jdbcType="DOUBLE"/>
-            <result property="remark" column="remark" jdbcType="VARCHAR"/>
-            <result property="picture" column="picture" jdbcType="VARCHAR"/>
-            <result property="createpersonid" column="createPersonId" jdbcType="INTEGER"/>
-            <result property="createtime" column="createTime" jdbcType="TIMESTAMP"/>
-            <result property="modifiedtime" column="modifiedTime" jdbcType="TIMESTAMP"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id,categoryName,licenseRate,
-        remark,picture,createPersonId,
-        createTime,modifiedTime
-    </sql>
-</mapper>

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

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.cslg.pas.mapper.ElementMapper">
-
-    <resultMap id="BaseResultMap" type="cn.cslg.pas.domain.Element">
-            <id property="id" column="id" jdbcType="INTEGER"/>
-            <result property="structureId" column="structure_id" jdbcType="INTEGER"/>
-            <result property="parentId" column="parent_id" jdbcType="INTEGER"/>
-            <result property="elementName" column="element_name" jdbcType="INTEGER"/>
-            <result property="path" column="path" jdbcType="VARCHAR"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id,structure_id,parent_id,
-        element_name,path
-    </sql>
-</mapper>

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

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.cslg.pas.mapper.PermissionRecordMapper">
-
-    <resultMap id="BaseResultMap" type="cn.cslg.pas.domain.PermissionRecord">
-            <id property="id" column="id" jdbcType="INTEGER"/>
-            <result property="patentNo" column="patent_no" jdbcType="VARCHAR"/>
-            <result property="licensor" column="licensor" jdbcType="VARCHAR"/>
-            <result property="licenseeCountry" column="licensee_country" jdbcType="VARCHAR"/>
-            <result property="licenseTime" column="license_time" jdbcType="TIMESTAMP"/>
-            <result property="licenseFee" column="license_fee" jdbcType="DOUBLE"/>
-            <result property="createPersonId" column="create_person_id" jdbcType="INTEGER"/>
-            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-            <result property="modifiedTime" column="modified_time" jdbcType="INTEGER"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id,patent_no,licensor,
-        licensee_country,license_time,license_fee,
-        create_person_id,create_time,modified_time
-    </sql>
-</mapper>

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

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.cslg.pas.mapper.ProductMapper">
-
-    <resultMap id="BaseResultMap" type="cn.cslg.pas.domain.Product">
-            <id property="id" column="id" jdbcType="INTEGER"/>
-            <result property="structureId" column="structure_Id" jdbcType="INTEGER"/>
-            <result property="productname" column="productName" jdbcType="VARCHAR"/>
-            <result property="marketTime" column="market_time" jdbcType="TIMESTAMP"/>
-            <result property="companyName" column="company_name" jdbcType="VARCHAR"/>
-            <result property="tenantId" column="tenant_id" jdbcType="INTEGER"/>
-            <result property="productExplain" column="product_explain" jdbcType="VARCHAR"/>
-            <result property="licenseRate" column="license_rate" jdbcType="DOUBLE"/>
-            <result property="categoryId" column="category_id" jdbcType="INTEGER"/>
-            <result property="createPersonId" column="create_person_Id" jdbcType="INTEGER"/>
-            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-            <result property="modifiedTime" column="modified_time" jdbcType="TIMESTAMP"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id,structure_Id,productName,
-        market_time,company_name,tenant_id,
-        product_explain,license_rate,category_id,
-        create_person_Id,create_time,modified_time
-    </sql>
-</mapper>

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

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.cslg.pas.mapper.ProductMarketDataMapper">
-
-    <resultMap id="BaseResultMap" type="cn.cslg.pas.domain.ProductMarketData">
-            <result property="id" column="id" jdbcType="INTEGER"/>
-            <result property="productId" column="product_Id" jdbcType="INTEGER"/>
-            <result property="saletime" column="saleTime" jdbcType="TIMESTAMP"/>
-            <result property="salearea" column="saleArea" jdbcType="VARCHAR"/>
-            <result property="salecount" column="saleCount" jdbcType="DOUBLE"/>
-            <result property="salemoney" column="saleMoney" jdbcType="DOUBLE"/>
-            <result property="customlicenserate" column="customLicenseRate" jdbcType="DOUBLE"/>
-            <result property="createPersonId" column="create_person_Id" jdbcType="INTEGER"/>
-            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-            <result property="modifiedTime" column="modified_time" jdbcType="TIMESTAMP"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id,product_Id,saleTime,
-        saleArea,saleCount,saleMoney,
-        customLicenseRate,create_person_Id,create_time,
-        modified_time
-    </sql>
-</mapper>

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

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.cslg.pas.mapper.StructureMapper">
-
-    <resultMap id="BaseResultMap" type="cn.cslg.pas.domain.Structure">
-            <id property="id" column="id" jdbcType="INTEGER"/>
-            <result property="createPersonId" column="create_person_id" jdbcType="INTEGER"/>
-            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-            <result property="modifiedTime" column="modified_time" jdbcType="TIMESTAMP"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id,create_person_id,create_time,
-        modified_time
-    </sql>
-</mapper>