Merge branch 'master' of http://172.16.90.250:3000/forest/forest-mall-cloud into dev

forest-admin/admin-common/admin-common.iml

@@ -19,10 +19,6 @@
     <orderEntry type="module" module-name="forest-common" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.10" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.13.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.2" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
@@ -57,6 +53,10 @@
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.3" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.10" level="project" />
     <orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.0.3" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.11" level="project" />

forest-admin/admin-mbg/admin-mbg.iml

@@ -19,10 +19,6 @@
     <orderEntry type="module" module-name="forest-common" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.10" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.13.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.2" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
@@ -56,6 +52,10 @@
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.3" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.10" level="project" />
     <orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.0.3" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.11" level="project" />

forest-admin/admin-mbg/src/main/java/com/hwrj/cloud/admin/mapper/UmsCompanyShopMapper.java

@@ -10,7 +10,7 @@ public interface UmsCompanyShopMapper {
 
     int deleteByExample(UmsCompanyShopExample example);
 
-    int deleteByPrimaryKey(Integer id);
+    int deleteByPrimaryKey(Long id);
 
     int insert(UmsCompanyShop record);
 
@@ -18,7 +18,7 @@ public interface UmsCompanyShopMapper {
 
     List<UmsCompanyShop> selectByExample(UmsCompanyShopExample example);
 
-    UmsCompanyShop selectByPrimaryKey(Integer id);
+    UmsCompanyShop selectByPrimaryKey(Long id);
 
     int updateByExampleSelective(@Param("record") UmsCompanyShop record, @Param("example") UmsCompanyShopExample example);
 

forest-admin/admin-mbg/src/main/java/com/hwrj/cloud/admin/mapper/UmsMemberOriginMapper.java

@@ -0,0 +1,36 @@
+package com.hwrj.cloud.admin.mapper;
+
+import com.hwrj.cloud.admin.model.UmsMemberOrigin;
+import com.hwrj.cloud.admin.model.UmsMemberOriginExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface UmsMemberOriginMapper {
+    long countByExample(UmsMemberOriginExample example);
+
+    int deleteByExample(UmsMemberOriginExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(UmsMemberOrigin record);
+
+    int insertSelective(UmsMemberOrigin record);
+
+    List<UmsMemberOrigin> selectByExampleWithBLOBs(UmsMemberOriginExample example);
+
+    List<UmsMemberOrigin> selectByExample(UmsMemberOriginExample example);
+
+    UmsMemberOrigin selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") UmsMemberOrigin record, @Param("example") UmsMemberOriginExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") UmsMemberOrigin record, @Param("example") UmsMemberOriginExample example);
+
+    int updateByExample(@Param("record") UmsMemberOrigin record, @Param("example") UmsMemberOriginExample example);
+
+    int updateByPrimaryKeySelective(UmsMemberOrigin record);
+
+    int updateByPrimaryKeyWithBLOBs(UmsMemberOrigin record);
+
+    int updateByPrimaryKey(UmsMemberOrigin record);
+}

forest-admin/admin-mbg/src/main/java/com/hwrj/cloud/admin/mapper/UmsMemberOriginProductMapper.java

@@ -0,0 +1,36 @@
+package com.hwrj.cloud.admin.mapper;
+
+import com.hwrj.cloud.admin.model.UmsMemberOriginProduct;
+import com.hwrj.cloud.admin.model.UmsMemberOriginProductExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface UmsMemberOriginProductMapper {
+    long countByExample(UmsMemberOriginProductExample example);
+
+    int deleteByExample(UmsMemberOriginProductExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(UmsMemberOriginProduct record);
+
+    int insertSelective(UmsMemberOriginProduct record);
+
+    List<UmsMemberOriginProduct> selectByExampleWithBLOBs(UmsMemberOriginProductExample example);
+
+    List<UmsMemberOriginProduct> selectByExample(UmsMemberOriginProductExample example);
+
+    UmsMemberOriginProduct selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") UmsMemberOriginProduct record, @Param("example") UmsMemberOriginProductExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") UmsMemberOriginProduct record, @Param("example") UmsMemberOriginProductExample example);
+
+    int updateByExample(@Param("record") UmsMemberOriginProduct record, @Param("example") UmsMemberOriginProductExample example);
+
+    int updateByPrimaryKeySelective(UmsMemberOriginProduct record);
+
+    int updateByPrimaryKeyWithBLOBs(UmsMemberOriginProduct record);
+
+    int updateByPrimaryKey(UmsMemberOriginProduct record);
+}

forest-admin/admin-mbg/src/main/java/com/hwrj/cloud/admin/model/UmsCompanyFile.java

@@ -24,13 +24,13 @@ public class UmsCompanyFile implements Serializable {
     private Date createTime;
 
     @ApiModelProperty(value = "创建人id")
-    private Integer createId;
+    private Long createId;
 
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;
 
     @ApiModelProperty(value = "修改人id")
-    private Integer updateId;
+    private Long updateId;
 
     private static final long serialVersionUID = 1L;
 
@@ -82,11 +82,11 @@ public class UmsCompanyFile implements Serializable {
         this.createTime = createTime;
     }
 
-    public Integer getCreateId() {
+    public Long getCreateId() {
         return createId;
     }
 
-    public void setCreateId(Integer createId) {
+    public void setCreateId(Long createId) {
         this.createId = createId;
     }
 
@@ -98,11 +98,11 @@ public class UmsCompanyFile implements Serializable {
         this.updateTime = updateTime;
     }
 
-    public Integer getUpdateId() {
+    public Long getUpdateId() {
         return updateId;
     }
 
-    public void setUpdateId(Integer updateId) {
+    public void setUpdateId(Long updateId) {
         this.updateId = updateId;
     }
 

forest-admin/admin-mbg/src/main/java/com/hwrj/cloud/admin/model/UmsCompanyFileExample.java

@@ -495,52 +495,52 @@ public class UmsCompanyFileExample {
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdEqualTo(Integer value) {
+        public Criteria andCreateIdEqualTo(Long value) {
             addCriterion("create_id =", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdNotEqualTo(Integer value) {
+        public Criteria andCreateIdNotEqualTo(Long value) {
             addCriterion("create_id <>", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdGreaterThan(Integer value) {
+        public Criteria andCreateIdGreaterThan(Long value) {
             addCriterion("create_id >", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdGreaterThanOrEqualTo(Integer value) {
+        public Criteria andCreateIdGreaterThanOrEqualTo(Long value) {
             addCriterion("create_id >=", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdLessThan(Integer value) {
+        public Criteria andCreateIdLessThan(Long value) {
             addCriterion("create_id <", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdLessThanOrEqualTo(Integer value) {
+        public Criteria andCreateIdLessThanOrEqualTo(Long value) {
             addCriterion("create_id <=", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdIn(List<Integer> values) {
+        public Criteria andCreateIdIn(List<Long> values) {
             addCriterion("create_id in", values, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdNotIn(List<Integer> values) {
+        public Criteria andCreateIdNotIn(List<Long> values) {
             addCriterion("create_id not in", values, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdBetween(Integer value1, Integer value2) {
+        public Criteria andCreateIdBetween(Long value1, Long value2) {
             addCriterion("create_id between", value1, value2, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdNotBetween(Integer value1, Integer value2) {
+        public Criteria andCreateIdNotBetween(Long value1, Long value2) {
             addCriterion("create_id not between", value1, value2, "createId");
             return (Criteria) this;
         }
@@ -615,52 +615,52 @@ public class UmsCompanyFileExample {
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdEqualTo(Integer value) {
+        public Criteria andUpdateIdEqualTo(Long value) {
             addCriterion("update_id =", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdNotEqualTo(Integer value) {
+        public Criteria andUpdateIdNotEqualTo(Long value) {
             addCriterion("update_id <>", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdGreaterThan(Integer value) {
+        public Criteria andUpdateIdGreaterThan(Long value) {
             addCriterion("update_id >", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdGreaterThanOrEqualTo(Integer value) {
+        public Criteria andUpdateIdGreaterThanOrEqualTo(Long value) {
             addCriterion("update_id >=", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdLessThan(Integer value) {
+        public Criteria andUpdateIdLessThan(Long value) {
             addCriterion("update_id <", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdLessThanOrEqualTo(Integer value) {
+        public Criteria andUpdateIdLessThanOrEqualTo(Long value) {
             addCriterion("update_id <=", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdIn(List<Integer> values) {
+        public Criteria andUpdateIdIn(List<Long> values) {
             addCriterion("update_id in", values, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdNotIn(List<Integer> values) {
+        public Criteria andUpdateIdNotIn(List<Long> values) {
             addCriterion("update_id not in", values, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdBetween(Integer value1, Integer value2) {
+        public Criteria andUpdateIdBetween(Long value1, Long value2) {
             addCriterion("update_id between", value1, value2, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdNotBetween(Integer value1, Integer value2) {
+        public Criteria andUpdateIdNotBetween(Long value1, Long value2) {
             addCriterion("update_id not between", value1, value2, "updateId");
             return (Criteria) this;
         }

forest-admin/admin-mbg/src/main/java/com/hwrj/cloud/admin/model/UmsCompanyInfo.java

@@ -11,49 +11,61 @@ public class UmsCompanyInfo implements Serializable {
     @ApiModelProperty(value = "供应商名称")
     private String compName;
 
+    @ApiModelProperty(value = "供应商类型")
+    private String companyType;
+
+    @ApiModelProperty(value = "供应商评级")
+    private Integer compLevel;
+
+    @ApiModelProperty(value = "供应商资质")
+    private String compQual;
+
     @ApiModelProperty(value = "供应商照片")
     private String compImgs;
 
     @ApiModelProperty(value = "供应商外部连接")
     private String compUrl;
 
-    @ApiModelProperty(value = "供应商生产许可证号")
+    @ApiModelProperty(value = "生产许可证号")
     private String compProdLicenseNum;
 
-    @ApiModelProperty(value = "供应商经营许可证")
+    @ApiModelProperty(value = "经营许可证号")
     private String compManageLicenseNum;
 
-    @ApiModelProperty(value = "供应商社会行用代码")
+    @ApiModelProperty(value = "社会信用代码")
     private String compSocialCode;
 
-    @ApiModelProperty(value = "供应商联系人")
+    @ApiModelProperty(value = "联系人")
     private String compConPerson;
 
+    @ApiModelProperty(value = "是否认证：0未认证，1认证")
+    private Integer isCert;
+
     @ApiModelProperty(value = "供应商联系方式")
     private String compConType;
 
     @ApiModelProperty(value = "供应商联系账号")
     private String compConNum;
 
-    @ApiModelProperty(value = "供应商对外qq")
+    @ApiModelProperty(value = "对外企业qq")
     private String compQq;
 
-    @ApiModelProperty(value = "供应商经营产平")
+    @ApiModelProperty(value = "经营产品")
     private String compManageProduct;
 
-    @ApiModelProperty(value = "所在省id")
+    @ApiModelProperty(value = "所在省")
     private String provinceId;
 
-    @ApiModelProperty(value = "所在市id")
+    @ApiModelProperty(value = "所在市")
     private String cityId;
 
-    @ApiModelProperty(value = "所在县id")
+    @ApiModelProperty(value = "所在县")
     private String countyId;
 
-    @ApiModelProperty(value = "所在镇id")
+    @ApiModelProperty(value = "所在镇")
     private String townId;
 
-    @ApiModelProperty(value = "所在乡id")
+    @ApiModelProperty(value = "所在乡")
     private String villageId;
 
     @ApiModelProperty(value = "详细位置")
@@ -72,16 +84,16 @@ public class UmsCompanyInfo implements Serializable {
     private Date createTime;
 
     @ApiModelProperty(value = "创建人")
-    private Integer createId;
+    private Long createId;
 
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;
 
     @ApiModelProperty(value = "修改人id")
-    private Integer updateId;
+    private Long updateId;
 
-    @ApiModelProperty(value = "供应商简介")
-    private String compIntroduction;
+    @ApiModelProperty(value = "简介")
+    private String compSum;
 
     private static final long serialVersionUID = 1L;
 
@@ -101,6 +113,30 @@ public class UmsCompanyInfo implements Serializable {
         this.compName = compName;
     }
 
+    public String getCompanyType() {
+        return companyType;
+    }
+
+    public void setCompanyType(String companyType) {
+        this.companyType = companyType;
+    }
+
+    public Integer getCompLevel() {
+        return compLevel;
+    }
+
+    public void setCompLevel(Integer compLevel) {
+        this.compLevel = compLevel;
+    }
+
+    public String getCompQual() {
+        return compQual;
+    }
+
+    public void setCompQual(String compQual) {
+        this.compQual = compQual;
+    }
+
     public String getCompImgs() {
         return compImgs;
     }
@@ -149,6 +185,14 @@ public class UmsCompanyInfo implements Serializable {
         this.compConPerson = compConPerson;
     }
 
+    public Integer getIsCert() {
+        return isCert;
+    }
+
+    public void setIsCert(Integer isCert) {
+        this.isCert = isCert;
+    }
+
     public String getCompConType() {
         return compConType;
     }
@@ -261,11 +305,11 @@ public class UmsCompanyInfo implements Serializable {
         this.createTime = createTime;
     }
 
-    public Integer getCreateId() {
+    public Long getCreateId() {
         return createId;
     }
 
-    public void setCreateId(Integer createId) {
+    public void setCreateId(Long createId) {
         this.createId = createId;
     }
 
@@ -277,20 +321,20 @@ public class UmsCompanyInfo implements Serializable {
         this.updateTime = updateTime;
     }
 
-    public Integer getUpdateId() {
+    public Long getUpdateId() {
         return updateId;
     }
 
-    public void setUpdateId(Integer updateId) {
+    public void setUpdateId(Long updateId) {
         this.updateId = updateId;
     }
 
-    public String getCompIntroduction() {
-        return compIntroduction;
+    public String getCompSum() {
+        return compSum;
     }
 
-    public void setCompIntroduction(String compIntroduction) {
-        this.compIntroduction = compIntroduction;
+    public void setCompSum(String compSum) {
+        this.compSum = compSum;
     }
 
     @Override
@@ -301,12 +345,16 @@ public class UmsCompanyInfo implements Serializable {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", compName=").append(compName);
+        sb.append(", companyType=").append(companyType);
+        sb.append(", compLevel=").append(compLevel);
+        sb.append(", compQual=").append(compQual);
         sb.append(", compImgs=").append(compImgs);
         sb.append(", compUrl=").append(compUrl);
         sb.append(", compProdLicenseNum=").append(compProdLicenseNum);
         sb.append(", compManageLicenseNum=").append(compManageLicenseNum);
         sb.append(", compSocialCode=").append(compSocialCode);
         sb.append(", compConPerson=").append(compConPerson);
+        sb.append(", isCert=").append(isCert);
         sb.append(", compConType=").append(compConType);
         sb.append(", compConNum=").append(compConNum);
         sb.append(", compQq=").append(compQq);
@@ -324,7 +372,7 @@ public class UmsCompanyInfo implements Serializable {
         sb.append(", createId=").append(createId);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", updateId=").append(updateId);
-        sb.append(", compIntroduction=").append(compIntroduction);
+        sb.append(", compSum=").append(compSum);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

forest-admin/admin-mbg/src/main/java/com/hwrj/cloud/admin/model/UmsCompanyInfoExample.java

@@ -235,6 +235,206 @@ public class UmsCompanyInfoExample {
             return (Criteria) this;
         }
 
+        public Criteria andCompanyTypeIsNull() {
+            addCriterion("company_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeIsNotNull() {
+            addCriterion("company_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeEqualTo(String value) {
+            addCriterion("company_type =", value, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeNotEqualTo(String value) {
+            addCriterion("company_type <>", value, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeGreaterThan(String value) {
+            addCriterion("company_type >", value, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("company_type >=", value, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeLessThan(String value) {
+            addCriterion("company_type <", value, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeLessThanOrEqualTo(String value) {
+            addCriterion("company_type <=", value, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeLike(String value) {
+            addCriterion("company_type like", value, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeNotLike(String value) {
+            addCriterion("company_type not like", value, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeIn(List<String> values) {
+            addCriterion("company_type in", values, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeNotIn(List<String> values) {
+            addCriterion("company_type not in", values, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeBetween(String value1, String value2) {
+            addCriterion("company_type between", value1, value2, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeNotBetween(String value1, String value2) {
+            addCriterion("company_type not between", value1, value2, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompLevelIsNull() {
+            addCriterion("comp_level is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompLevelIsNotNull() {
+            addCriterion("comp_level is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompLevelEqualTo(Integer value) {
+            addCriterion("comp_level =", value, "compLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompLevelNotEqualTo(Integer value) {
+            addCriterion("comp_level <>", value, "compLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompLevelGreaterThan(Integer value) {
+            addCriterion("comp_level >", value, "compLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompLevelGreaterThanOrEqualTo(Integer value) {
+            addCriterion("comp_level >=", value, "compLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompLevelLessThan(Integer value) {
+            addCriterion("comp_level <", value, "compLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompLevelLessThanOrEqualTo(Integer value) {
+            addCriterion("comp_level <=", value, "compLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompLevelIn(List<Integer> values) {
+            addCriterion("comp_level in", values, "compLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompLevelNotIn(List<Integer> values) {
+            addCriterion("comp_level not in", values, "compLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompLevelBetween(Integer value1, Integer value2) {
+            addCriterion("comp_level between", value1, value2, "compLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompLevelNotBetween(Integer value1, Integer value2) {
+            addCriterion("comp_level not between", value1, value2, "compLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompQualIsNull() {
+            addCriterion("comp_qual is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompQualIsNotNull() {
+            addCriterion("comp_qual is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompQualEqualTo(String value) {
+            addCriterion("comp_qual =", value, "compQual");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompQualNotEqualTo(String value) {
+            addCriterion("comp_qual <>", value, "compQual");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompQualGreaterThan(String value) {
+            addCriterion("comp_qual >", value, "compQual");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompQualGreaterThanOrEqualTo(String value) {
+            addCriterion("comp_qual >=", value, "compQual");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompQualLessThan(String value) {
+            addCriterion("comp_qual <", value, "compQual");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompQualLessThanOrEqualTo(String value) {
+            addCriterion("comp_qual <=", value, "compQual");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompQualLike(String value) {
+            addCriterion("comp_qual like", value, "compQual");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompQualNotLike(String value) {
+            addCriterion("comp_qual not like", value, "compQual");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompQualIn(List<String> values) {
+            addCriterion("comp_qual in", values, "compQual");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompQualNotIn(List<String> values) {
+            addCriterion("comp_qual not in", values, "compQual");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompQualBetween(String value1, String value2) {
+            addCriterion("comp_qual between", value1, value2, "compQual");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompQualNotBetween(String value1, String value2) {
+            addCriterion("comp_qual not between", value1, value2, "compQual");
+            return (Criteria) this;
+        }
+
         public Criteria andCompImgsIsNull() {
             addCriterion("comp_imgs is null");
             return (Criteria) this;
@@ -655,6 +855,66 @@ public class UmsCompanyInfoExample {
             return (Criteria) this;
         }
 
+        public Criteria andIsCertIsNull() {
+            addCriterion("is_cert is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCertIsNotNull() {
+            addCriterion("is_cert is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCertEqualTo(Integer value) {
+            addCriterion("is_cert =", value, "isCert");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCertNotEqualTo(Integer value) {
+            addCriterion("is_cert <>", value, "isCert");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCertGreaterThan(Integer value) {
+            addCriterion("is_cert >", value, "isCert");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCertGreaterThanOrEqualTo(Integer value) {
+            addCriterion("is_cert >=", value, "isCert");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCertLessThan(Integer value) {
+            addCriterion("is_cert <", value, "isCert");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCertLessThanOrEqualTo(Integer value) {
+            addCriterion("is_cert <=", value, "isCert");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCertIn(List<Integer> values) {
+            addCriterion("is_cert in", values, "isCert");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCertNotIn(List<Integer> values) {
+            addCriterion("is_cert not in", values, "isCert");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCertBetween(Integer value1, Integer value2) {
+            addCriterion("is_cert between", value1, value2, "isCert");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCertNotBetween(Integer value1, Integer value2) {
+            addCriterion("is_cert not between", value1, value2, "isCert");
+            return (Criteria) this;
+        }
+
         public Criteria andCompConTypeIsNull() {
             addCriterion("comp_con_type is null");
             return (Criteria) this;
@@ -1625,52 +1885,52 @@ public class UmsCompanyInfoExample {
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdEqualTo(Integer value) {
+        public Criteria andCreateIdEqualTo(Long value) {
             addCriterion("create_id =", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdNotEqualTo(Integer value) {
+        public Criteria andCreateIdNotEqualTo(Long value) {
             addCriterion("create_id <>", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdGreaterThan(Integer value) {
+        public Criteria andCreateIdGreaterThan(Long value) {
             addCriterion("create_id >", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdGreaterThanOrEqualTo(Integer value) {
+        public Criteria andCreateIdGreaterThanOrEqualTo(Long value) {
             addCriterion("create_id >=", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdLessThan(Integer value) {
+        public Criteria andCreateIdLessThan(Long value) {
             addCriterion("create_id <", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdLessThanOrEqualTo(Integer value) {
+        public Criteria andCreateIdLessThanOrEqualTo(Long value) {
             addCriterion("create_id <=", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdIn(List<Integer> values) {
+        public Criteria andCreateIdIn(List<Long> values) {
             addCriterion("create_id in", values, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdNotIn(List<Integer> values) {
+        public Criteria andCreateIdNotIn(List<Long> values) {
             addCriterion("create_id not in", values, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdBetween(Integer value1, Integer value2) {
+        public Criteria andCreateIdBetween(Long value1, Long value2) {
             addCriterion("create_id between", value1, value2, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdNotBetween(Integer value1, Integer value2) {
+        public Criteria andCreateIdNotBetween(Long value1, Long value2) {
             addCriterion("create_id not between", value1, value2, "createId");
             return (Criteria) this;
         }
@@ -1745,52 +2005,52 @@ public class UmsCompanyInfoExample {
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdEqualTo(Integer value) {
+        public Criteria andUpdateIdEqualTo(Long value) {
             addCriterion("update_id =", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdNotEqualTo(Integer value) {
+        public Criteria andUpdateIdNotEqualTo(Long value) {
             addCriterion("update_id <>", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdGreaterThan(Integer value) {
+        public Criteria andUpdateIdGreaterThan(Long value) {
             addCriterion("update_id >", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdGreaterThanOrEqualTo(Integer value) {
+        public Criteria andUpdateIdGreaterThanOrEqualTo(Long value) {
             addCriterion("update_id >=", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdLessThan(Integer value) {
+        public Criteria andUpdateIdLessThan(Long value) {
             addCriterion("update_id <", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdLessThanOrEqualTo(Integer value) {
+        public Criteria andUpdateIdLessThanOrEqualTo(Long value) {
             addCriterion("update_id <=", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdIn(List<Integer> values) {
+        public Criteria andUpdateIdIn(List<Long> values) {
             addCriterion("update_id in", values, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdNotIn(List<Integer> values) {
+        public Criteria andUpdateIdNotIn(List<Long> values) {
             addCriterion("update_id not in", values, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdBetween(Integer value1, Integer value2) {
+        public Criteria andUpdateIdBetween(Long value1, Long value2) {
             addCriterion("update_id between", value1, value2, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdNotBetween(Integer value1, Integer value2) {
+        public Criteria andUpdateIdNotBetween(Long value1, Long value2) {
             addCriterion("update_id not between", value1, value2, "updateId");
             return (Criteria) this;
         }

forest-admin/admin-mbg/src/main/java/com/hwrj/cloud/admin/model/UmsCompanyShop.java

@@ -6,12 +6,12 @@ import java.util.Date;
 
 public class UmsCompanyShop implements Serializable {
     @ApiModelProperty(value = "主键")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(value = "供应商id")
-    private Integer compId;
+    private Long compId;
 
-    @ApiModelProperty(value = "网店类型：taobao:淘宝店jd：京东店：ping：多多店")
+    @ApiModelProperty(value = "网店类型：taobao:淘宝店jd：京东店：ping：多多店,own自营")
     private String shopType;
 
     @ApiModelProperty(value = "网点访问地址")
@@ -27,7 +27,7 @@ public class UmsCompanyShop implements Serializable {
     private Date createTime;
 
     @ApiModelProperty(value = "创建人id")
-    private Integer createId;
+    private Long createId;
 
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;
@@ -37,19 +37,19 @@ public class UmsCompanyShop implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Integer getCompId() {
+    public Long getCompId() {
         return compId;
     }
 
-    public void setCompId(Integer compId) {
+    public void setCompId(Long compId) {
         this.compId = compId;
     }
 
@@ -93,11 +93,11 @@ public class UmsCompanyShop implements Serializable {
         this.createTime = createTime;
     }
 
-    public Integer getCreateId() {
+    public Long getCreateId() {
         return createId;
     }
 
-    public void setCreateId(Integer createId) {
+    public void setCreateId(Long createId) {
         this.createId = createId;
     }
 

forest-admin/admin-mbg/src/main/java/com/hwrj/cloud/admin/model/UmsCompanyShopExample.java

@@ -115,52 +115,52 @@ public class UmsCompanyShopExample {
             return (Criteria) this;
         }
 
-        public Criteria andIdEqualTo(Integer value) {
+        public Criteria andIdEqualTo(Long value) {
             addCriterion("id =", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdNotEqualTo(Integer value) {
+        public Criteria andIdNotEqualTo(Long value) {
             addCriterion("id <>", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdGreaterThan(Integer value) {
+        public Criteria andIdGreaterThan(Long value) {
             addCriterion("id >", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
             addCriterion("id >=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdLessThan(Integer value) {
+        public Criteria andIdLessThan(Long value) {
             addCriterion("id <", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdLessThanOrEqualTo(Integer value) {
+        public Criteria andIdLessThanOrEqualTo(Long value) {
             addCriterion("id <=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdIn(List<Integer> values) {
+        public Criteria andIdIn(List<Long> values) {
             addCriterion("id in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdNotIn(List<Integer> values) {
+        public Criteria andIdNotIn(List<Long> values) {
             addCriterion("id not in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdBetween(Integer value1, Integer value2) {
+        public Criteria andIdBetween(Long value1, Long value2) {
             addCriterion("id between", value1, value2, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+        public Criteria andIdNotBetween(Long value1, Long value2) {
             addCriterion("id not between", value1, value2, "id");
             return (Criteria) this;
         }
@@ -175,52 +175,52 @@ public class UmsCompanyShopExample {
             return (Criteria) this;
         }
 
-        public Criteria andCompIdEqualTo(Integer value) {
+        public Criteria andCompIdEqualTo(Long value) {
             addCriterion("comp_id =", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andCompIdNotEqualTo(Integer value) {
+        public Criteria andCompIdNotEqualTo(Long value) {
             addCriterion("comp_id <>", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andCompIdGreaterThan(Integer value) {
+        public Criteria andCompIdGreaterThan(Long value) {
             addCriterion("comp_id >", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andCompIdGreaterThanOrEqualTo(Integer value) {
+        public Criteria andCompIdGreaterThanOrEqualTo(Long value) {
             addCriterion("comp_id >=", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andCompIdLessThan(Integer value) {
+        public Criteria andCompIdLessThan(Long value) {
             addCriterion("comp_id <", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andCompIdLessThanOrEqualTo(Integer value) {
+        public Criteria andCompIdLessThanOrEqualTo(Long value) {
             addCriterion("comp_id <=", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andCompIdIn(List<Integer> values) {
+        public Criteria andCompIdIn(List<Long> values) {
             addCriterion("comp_id in", values, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andCompIdNotIn(List<Integer> values) {
+        public Criteria andCompIdNotIn(List<Long> values) {
             addCriterion("comp_id not in", values, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andCompIdBetween(Integer value1, Integer value2) {
+        public Criteria andCompIdBetween(Long value1, Long value2) {
             addCriterion("comp_id between", value1, value2, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andCompIdNotBetween(Integer value1, Integer value2) {
+        public Criteria andCompIdNotBetween(Long value1, Long value2) {
             addCriterion("comp_id not between", value1, value2, "compId");
             return (Criteria) this;
         }
@@ -575,52 +575,52 @@ public class UmsCompanyShopExample {
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdEqualTo(Integer value) {
+        public Criteria andCreateIdEqualTo(Long value) {
             addCriterion("create_id =", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdNotEqualTo(Integer value) {
+        public Criteria andCreateIdNotEqualTo(Long value) {
             addCriterion("create_id <>", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdGreaterThan(Integer value) {
+        public Criteria andCreateIdGreaterThan(Long value) {
             addCriterion("create_id >", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdGreaterThanOrEqualTo(Integer value) {
+        public Criteria andCreateIdGreaterThanOrEqualTo(Long value) {
             addCriterion("create_id >=", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdLessThan(Integer value) {
+        public Criteria andCreateIdLessThan(Long value) {
             addCriterion("create_id <", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdLessThanOrEqualTo(Integer value) {
+        public Criteria andCreateIdLessThanOrEqualTo(Long value) {
             addCriterion("create_id <=", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdIn(List<Integer> values) {
+        public Criteria andCreateIdIn(List<Long> values) {
             addCriterion("create_id in", values, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdNotIn(List<Integer> values) {
+        public Criteria andCreateIdNotIn(List<Long> values) {
             addCriterion("create_id not in", values, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdBetween(Integer value1, Integer value2) {
+        public Criteria andCreateIdBetween(Long value1, Long value2) {
             addCriterion("create_id between", value1, value2, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdNotBetween(Integer value1, Integer value2) {
+        public Criteria andCreateIdNotBetween(Long value1, Long value2) {
             addCriterion("create_id not between", value1, value2, "createId");
             return (Criteria) this;
         }

forest-admin/admin-mbg/src/main/java/com/hwrj/cloud/admin/model/UmsMemberOrigin.java

@@ -0,0 +1,343 @@
+package com.hwrj.cloud.admin.model;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+
+public class UmsMemberOrigin implements Serializable {
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @ApiModelProperty(value = "供应商id (供应商信息表 ums_company_info -> id)")
+    private Long fkCompanyInfoId;
+
+    @ApiModelProperty(value = "供应商名称")
+    private String compName;
+
+    @ApiModelProperty(value = "生产地名称")
+    private String originName;
+
+    @ApiModelProperty(value = "生产地面积（亩）")
+    private Double originArea;
+
+    @ApiModelProperty(value = "人数")
+    private Integer peopleNum;
+
+    @ApiModelProperty(value = "建立日期（年）")
+    private String foundDate;
+
+    @ApiModelProperty(value = "联系人")
+    private String linkUser;
+
+    @ApiModelProperty(value = "联系方式")
+    private String linkPhone;
+
+    @ApiModelProperty(value = "省")
+    private String provinceName;
+
+    @ApiModelProperty(value = "市")
+    private String cityName;
+
+    @ApiModelProperty(value = "县")
+    private String countyName;
+
+    @ApiModelProperty(value = "详细地址")
+    private String detailAddress;
+
+    private String altitude;
+
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
+    @ApiModelProperty(value = "状态 0:可用，1:禁用，2:删除")
+    private Integer state;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人")
+    private Integer createId;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "修改人id")
+    private Integer updateId;
+
+    @ApiModelProperty(value = "生产地图片")
+    private String imgUrl;
+
+    @ApiModelProperty(value = "生产地宣传视频地址")
+    private String videoUrl;
+
+    @ApiModelProperty(value = "vr地址")
+    private String vrUrl;
+
+    @ApiModelProperty(value = "实时监控视频地址")
+    private String cameraUrl;
+
+    @ApiModelProperty(value = "简介")
+    private String summary;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getFkCompanyInfoId() {
+        return fkCompanyInfoId;
+    }
+
+    public void setFkCompanyInfoId(Long fkCompanyInfoId) {
+        this.fkCompanyInfoId = fkCompanyInfoId;
+    }
+
+    public String getCompName() {
+        return compName;
+    }
+
+    public void setCompName(String compName) {
+        this.compName = compName;
+    }
+
+    public String getOriginName() {
+        return originName;
+    }
+
+    public void setOriginName(String originName) {
+        this.originName = originName;
+    }
+
+    public Double getOriginArea() {
+        return originArea;
+    }
+
+    public void setOriginArea(Double originArea) {
+        this.originArea = originArea;
+    }
+
+    public Integer getPeopleNum() {
+        return peopleNum;
+    }
+
+    public void setPeopleNum(Integer peopleNum) {
+        this.peopleNum = peopleNum;
+    }
+
+    public String getFoundDate() {
+        return foundDate;
+    }
+
+    public void setFoundDate(String foundDate) {
+        this.foundDate = foundDate;
+    }
+
+    public String getLinkUser() {
+        return linkUser;
+    }
+
+    public void setLinkUser(String linkUser) {
+        this.linkUser = linkUser;
+    }
+
+    public String getLinkPhone() {
+        return linkPhone;
+    }
+
+    public void setLinkPhone(String linkPhone) {
+        this.linkPhone = linkPhone;
+    }
+
+    public String getProvinceName() {
+        return provinceName;
+    }
+
+    public void setProvinceName(String provinceName) {
+        this.provinceName = provinceName;
+    }
+
+    public String getCityName() {
+        return cityName;
+    }
+
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
+
+    public String getCountyName() {
+        return countyName;
+    }
+
+    public void setCountyName(String countyName) {
+        this.countyName = countyName;
+    }
+
+    public String getDetailAddress() {
+        return detailAddress;
+    }
+
+    public void setDetailAddress(String detailAddress) {
+        this.detailAddress = detailAddress;
+    }
+
+    public String getAltitude() {
+        return altitude;
+    }
+
+    public void setAltitude(String altitude) {
+        this.altitude = altitude;
+    }
+
+    public String getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getCreateId() {
+        return createId;
+    }
+
+    public void setCreateId(Integer createId) {
+        this.createId = createId;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getUpdateId() {
+        return updateId;
+    }
+
+    public void setUpdateId(Integer updateId) {
+        this.updateId = updateId;
+    }
+
+    public String getImgUrl() {
+        return imgUrl;
+    }
+
+    public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl;
+    }
+
+    public String getVideoUrl() {
+        return videoUrl;
+    }
+
+    public void setVideoUrl(String videoUrl) {
+        this.videoUrl = videoUrl;
+    }
+
+    public String getVrUrl() {
+        return vrUrl;
+    }
+
+    public void setVrUrl(String vrUrl) {
+        this.vrUrl = vrUrl;
+    }
+
+    public String getCameraUrl() {
+        return cameraUrl;
+    }
+
+    public void setCameraUrl(String cameraUrl) {
+        this.cameraUrl = cameraUrl;
+    }
+
+    public String getSummary() {
+        return summary;
+    }
+
+    public void setSummary(String summary) {
+        this.summary = summary;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = 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(", fkCompanyInfoId=").append(fkCompanyInfoId);
+        sb.append(", compName=").append(compName);
+        sb.append(", originName=").append(originName);
+        sb.append(", originArea=").append(originArea);
+        sb.append(", peopleNum=").append(peopleNum);
+        sb.append(", foundDate=").append(foundDate);
+        sb.append(", linkUser=").append(linkUser);
+        sb.append(", linkPhone=").append(linkPhone);
+        sb.append(", provinceName=").append(provinceName);
+        sb.append(", cityName=").append(cityName);
+        sb.append(", countyName=").append(countyName);
+        sb.append(", detailAddress=").append(detailAddress);
+        sb.append(", altitude=").append(altitude);
+        sb.append(", longitude=").append(longitude);
+        sb.append(", latitude=").append(latitude);
+        sb.append(", state=").append(state);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", createId=").append(createId);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateId=").append(updateId);
+        sb.append(", imgUrl=").append(imgUrl);
+        sb.append(", videoUrl=").append(videoUrl);
+        sb.append(", vrUrl=").append(vrUrl);
+        sb.append(", cameraUrl=").append(cameraUrl);
+        sb.append(", summary=").append(summary);
+        sb.append(", remark=").append(remark);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

forest-admin/admin-mbg/src/main/java/com/hwrj/cloud/admin/model/UmsMemberOriginProduct.java

@@ -0,0 +1,164 @@
+package com.hwrj.cloud.admin.model;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+
+public class UmsMemberOriginProduct implements Serializable {
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @ApiModelProperty(value = "生产地id (生产地信息表 ums_member_origin -> id)")
+    private Long fkOriginId;
+
+    @ApiModelProperty(value = "产品名称")
+    private String productName;
+
+    @ApiModelProperty(value = "产出物种植面积（亩）")
+    private String plantArea;
+
+    @ApiModelProperty(value = "产出物总产量（吨）")
+    private String outputNum;
+
+    @ApiModelProperty(value = "产出物亩产值（万元）")
+    private String outputValue;
+
+    @ApiModelProperty(value = "状态 0:可用，1:禁用，2:删除")
+    private Integer state;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人")
+    private Integer createId;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "修改人id")
+    private Integer updateId;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getFkOriginId() {
+        return fkOriginId;
+    }
+
+    public void setFkOriginId(Long fkOriginId) {
+        this.fkOriginId = fkOriginId;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getPlantArea() {
+        return plantArea;
+    }
+
+    public void setPlantArea(String plantArea) {
+        this.plantArea = plantArea;
+    }
+
+    public String getOutputNum() {
+        return outputNum;
+    }
+
+    public void setOutputNum(String outputNum) {
+        this.outputNum = outputNum;
+    }
+
+    public String getOutputValue() {
+        return outputValue;
+    }
+
+    public void setOutputValue(String outputValue) {
+        this.outputValue = outputValue;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getCreateId() {
+        return createId;
+    }
+
+    public void setCreateId(Integer createId) {
+        this.createId = createId;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getUpdateId() {
+        return updateId;
+    }
+
+    public void setUpdateId(Integer updateId) {
+        this.updateId = updateId;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = 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(", fkOriginId=").append(fkOriginId);
+        sb.append(", productName=").append(productName);
+        sb.append(", plantArea=").append(plantArea);
+        sb.append(", outputNum=").append(outputNum);
+        sb.append(", outputValue=").append(outputValue);
+        sb.append(", state=").append(state);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", createId=").append(createId);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateId=").append(updateId);
+        sb.append(", remark=").append(remark);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

forest-admin/admin-mbg/src/main/java/com/hwrj/cloud/admin/model/UmsMemberOriginProductExample.java

@@ -0,0 +1,901 @@
+package com.hwrj.cloud.admin.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class UmsMemberOriginProductExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public UmsMemberOriginProductExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdIsNull() {
+            addCriterion("fk_origin_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdIsNotNull() {
+            addCriterion("fk_origin_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdEqualTo(Long value) {
+            addCriterion("fk_origin_id =", value, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdNotEqualTo(Long value) {
+            addCriterion("fk_origin_id <>", value, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdGreaterThan(Long value) {
+            addCriterion("fk_origin_id >", value, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("fk_origin_id >=", value, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdLessThan(Long value) {
+            addCriterion("fk_origin_id <", value, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdLessThanOrEqualTo(Long value) {
+            addCriterion("fk_origin_id <=", value, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdIn(List<Long> values) {
+            addCriterion("fk_origin_id in", values, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdNotIn(List<Long> values) {
+            addCriterion("fk_origin_id not in", values, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdBetween(Long value1, Long value2) {
+            addCriterion("fk_origin_id between", value1, value2, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdNotBetween(Long value1, Long value2) {
+            addCriterion("fk_origin_id not between", value1, value2, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameIsNull() {
+            addCriterion("product_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameIsNotNull() {
+            addCriterion("product_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameEqualTo(String value) {
+            addCriterion("product_name =", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameNotEqualTo(String value) {
+            addCriterion("product_name <>", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameGreaterThan(String value) {
+            addCriterion("product_name >", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameGreaterThanOrEqualTo(String value) {
+            addCriterion("product_name >=", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameLessThan(String value) {
+            addCriterion("product_name <", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameLessThanOrEqualTo(String value) {
+            addCriterion("product_name <=", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameLike(String value) {
+            addCriterion("product_name like", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameNotLike(String value) {
+            addCriterion("product_name not like", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameIn(List<String> values) {
+            addCriterion("product_name in", values, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameNotIn(List<String> values) {
+            addCriterion("product_name not in", values, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameBetween(String value1, String value2) {
+            addCriterion("product_name between", value1, value2, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameNotBetween(String value1, String value2) {
+            addCriterion("product_name not between", value1, value2, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaIsNull() {
+            addCriterion("plant_area is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaIsNotNull() {
+            addCriterion("plant_area is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaEqualTo(String value) {
+            addCriterion("plant_area =", value, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaNotEqualTo(String value) {
+            addCriterion("plant_area <>", value, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaGreaterThan(String value) {
+            addCriterion("plant_area >", value, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaGreaterThanOrEqualTo(String value) {
+            addCriterion("plant_area >=", value, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaLessThan(String value) {
+            addCriterion("plant_area <", value, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaLessThanOrEqualTo(String value) {
+            addCriterion("plant_area <=", value, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaLike(String value) {
+            addCriterion("plant_area like", value, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaNotLike(String value) {
+            addCriterion("plant_area not like", value, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaIn(List<String> values) {
+            addCriterion("plant_area in", values, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaNotIn(List<String> values) {
+            addCriterion("plant_area not in", values, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaBetween(String value1, String value2) {
+            addCriterion("plant_area between", value1, value2, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaNotBetween(String value1, String value2) {
+            addCriterion("plant_area not between", value1, value2, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumIsNull() {
+            addCriterion("output_num is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumIsNotNull() {
+            addCriterion("output_num is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumEqualTo(String value) {
+            addCriterion("output_num =", value, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumNotEqualTo(String value) {
+            addCriterion("output_num <>", value, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumGreaterThan(String value) {
+            addCriterion("output_num >", value, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumGreaterThanOrEqualTo(String value) {
+            addCriterion("output_num >=", value, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumLessThan(String value) {
+            addCriterion("output_num <", value, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumLessThanOrEqualTo(String value) {
+            addCriterion("output_num <=", value, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumLike(String value) {
+            addCriterion("output_num like", value, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumNotLike(String value) {
+            addCriterion("output_num not like", value, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumIn(List<String> values) {
+            addCriterion("output_num in", values, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumNotIn(List<String> values) {
+            addCriterion("output_num not in", values, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumBetween(String value1, String value2) {
+            addCriterion("output_num between", value1, value2, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumNotBetween(String value1, String value2) {
+            addCriterion("output_num not between", value1, value2, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueIsNull() {
+            addCriterion("output_value is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueIsNotNull() {
+            addCriterion("output_value is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueEqualTo(String value) {
+            addCriterion("output_value =", value, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueNotEqualTo(String value) {
+            addCriterion("output_value <>", value, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueGreaterThan(String value) {
+            addCriterion("output_value >", value, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueGreaterThanOrEqualTo(String value) {
+            addCriterion("output_value >=", value, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueLessThan(String value) {
+            addCriterion("output_value <", value, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueLessThanOrEqualTo(String value) {
+            addCriterion("output_value <=", value, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueLike(String value) {
+            addCriterion("output_value like", value, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueNotLike(String value) {
+            addCriterion("output_value not like", value, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueIn(List<String> values) {
+            addCriterion("output_value in", values, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueNotIn(List<String> values) {
+            addCriterion("output_value not in", values, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueBetween(String value1, String value2) {
+            addCriterion("output_value between", value1, value2, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueNotBetween(String value1, String value2) {
+            addCriterion("output_value not between", value1, value2, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNull() {
+            addCriterion("state is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNotNull() {
+            addCriterion("state is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateEqualTo(Integer value) {
+            addCriterion("state =", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotEqualTo(Integer value) {
+            addCriterion("state <>", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThan(Integer value) {
+            addCriterion("state >", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThanOrEqualTo(Integer value) {
+            addCriterion("state >=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThan(Integer value) {
+            addCriterion("state <", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThanOrEqualTo(Integer value) {
+            addCriterion("state <=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIn(List<Integer> values) {
+            addCriterion("state in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotIn(List<Integer> values) {
+            addCriterion("state not in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateBetween(Integer value1, Integer value2) {
+            addCriterion("state between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotBetween(Integer value1, Integer value2) {
+            addCriterion("state not between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdIsNull() {
+            addCriterion("create_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdIsNotNull() {
+            addCriterion("create_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdEqualTo(Integer value) {
+            addCriterion("create_id =", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdNotEqualTo(Integer value) {
+            addCriterion("create_id <>", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdGreaterThan(Integer value) {
+            addCriterion("create_id >", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("create_id >=", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdLessThan(Integer value) {
+            addCriterion("create_id <", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdLessThanOrEqualTo(Integer value) {
+            addCriterion("create_id <=", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdIn(List<Integer> values) {
+            addCriterion("create_id in", values, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdNotIn(List<Integer> values) {
+            addCriterion("create_id not in", values, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdBetween(Integer value1, Integer value2) {
+            addCriterion("create_id between", value1, value2, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("create_id not between", value1, value2, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdIsNull() {
+            addCriterion("update_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdIsNotNull() {
+            addCriterion("update_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdEqualTo(Integer value) {
+            addCriterion("update_id =", value, "updateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdNotEqualTo(Integer value) {
+            addCriterion("update_id <>", value, "updateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdGreaterThan(Integer value) {
+            addCriterion("update_id >", value, "updateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("update_id >=", value, "updateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdLessThan(Integer value) {
+            addCriterion("update_id <", value, "updateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdLessThanOrEqualTo(Integer value) {
+            addCriterion("update_id <=", value, "updateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdIn(List<Integer> values) {
+            addCriterion("update_id in", values, "updateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdNotIn(List<Integer> values) {
+            addCriterion("update_id not in", values, "updateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdBetween(Integer value1, Integer value2) {
+            addCriterion("update_id between", value1, value2, "updateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("update_id not between", value1, value2, "updateId");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

forest-admin/admin-mbg/src/main/resources/com/hwrj/cloud/admin/mapper/UmsCompanyFileMapper.xml

@@ -8,9 +8,9 @@
     <result column="file_type" jdbcType="VARCHAR" property="fileType" />
     <result column="file_status" jdbcType="INTEGER" property="fileStatus" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="create_id" jdbcType="INTEGER" property="createId" />
+    <result column="create_id" jdbcType="BIGINT" property="createId" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="update_id" jdbcType="INTEGER" property="updateId" />
+    <result column="update_id" jdbcType="BIGINT" property="updateId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -112,8 +112,8 @@
       file_status, create_time, create_id, 
       update_time, update_id)
     values (#{compId,jdbcType=BIGINT}, #{fileUrl,jdbcType=VARCHAR}, #{fileType,jdbcType=VARCHAR}, 
-      #{fileStatus,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{createId,jdbcType=INTEGER}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{updateId,jdbcType=INTEGER})
+      #{fileStatus,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{createId,jdbcType=BIGINT}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{updateId,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsCompanyFile">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
@@ -163,13 +163,13 @@
         #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="createId != null">
-        #{createId,jdbcType=INTEGER},
+        #{createId,jdbcType=BIGINT},
       </if>
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="updateId != null">
-        #{updateId,jdbcType=INTEGER},
+        #{updateId,jdbcType=BIGINT},
       </if>
     </trim>
   </insert>
@@ -201,13 +201,13 @@
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.createId != null">
-        create_id = #{record.createId,jdbcType=INTEGER},
+        create_id = #{record.createId,jdbcType=BIGINT},
       </if>
       <if test="record.updateTime != null">
         update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.updateId != null">
-        update_id = #{record.updateId,jdbcType=INTEGER},
+        update_id = #{record.updateId,jdbcType=BIGINT},
       </if>
     </set>
     <if test="_parameter != null">
@@ -222,9 +222,9 @@
       file_type = #{record.fileType,jdbcType=VARCHAR},
       file_status = #{record.fileStatus,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      create_id = #{record.createId,jdbcType=INTEGER},
+      create_id = #{record.createId,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      update_id = #{record.updateId,jdbcType=INTEGER}
+      update_id = #{record.updateId,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -248,13 +248,13 @@
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="createId != null">
-        create_id = #{createId,jdbcType=INTEGER},
+        create_id = #{createId,jdbcType=BIGINT},
       </if>
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="updateId != null">
-        update_id = #{updateId,jdbcType=INTEGER},
+        update_id = #{updateId,jdbcType=BIGINT},
       </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
@@ -266,9 +266,9 @@
       file_type = #{fileType,jdbcType=VARCHAR},
       file_status = #{fileStatus,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      create_id = #{createId,jdbcType=INTEGER},
+      create_id = #{createId,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      update_id = #{updateId,jdbcType=INTEGER}
+      update_id = #{updateId,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

forest-admin/admin-mbg/src/main/resources/com/hwrj/cloud/admin/mapper/UmsCompanyInfoMapper.xml

@@ -4,12 +4,16 @@
   <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsCompanyInfo">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="comp_name" jdbcType="VARCHAR" property="compName" />
+    <result column="company_type" jdbcType="VARCHAR" property="companyType" />
+    <result column="comp_level" jdbcType="INTEGER" property="compLevel" />
+    <result column="comp_qual" jdbcType="VARCHAR" property="compQual" />
     <result column="comp_imgs" jdbcType="VARCHAR" property="compImgs" />
     <result column="comp_url" jdbcType="VARCHAR" property="compUrl" />
     <result column="comp_prod_license_num" jdbcType="VARCHAR" property="compProdLicenseNum" />
     <result column="comp_manage_license_num" jdbcType="VARCHAR" property="compManageLicenseNum" />
     <result column="comp_social_code" jdbcType="VARCHAR" property="compSocialCode" />
     <result column="comp_con_person" jdbcType="VARCHAR" property="compConPerson" />
+    <result column="is_cert" jdbcType="INTEGER" property="isCert" />
     <result column="comp_con_type" jdbcType="VARCHAR" property="compConType" />
     <result column="comp_con_num" jdbcType="VARCHAR" property="compConNum" />
     <result column="comp_qq" jdbcType="VARCHAR" property="compQq" />
@@ -24,12 +28,12 @@
     <result column="latitude" jdbcType="VARCHAR" property="latitude" />
     <result column="comp_status" jdbcType="INTEGER" property="compStatus" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="create_id" jdbcType="INTEGER" property="createId" />
+    <result column="create_id" jdbcType="BIGINT" property="createId" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="update_id" jdbcType="INTEGER" property="updateId" />
+    <result column="update_id" jdbcType="BIGINT" property="updateId" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.hwrj.cloud.admin.model.UmsCompanyInfo">
-    <result column="comp_introduction" jdbcType="LONGVARCHAR" property="compIntroduction" />
+    <result column="comp_sum" jdbcType="LONGVARCHAR" property="compSum" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -90,13 +94,14 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, comp_name, comp_imgs, comp_url, comp_prod_license_num, comp_manage_license_num, 
-    comp_social_code, comp_con_person, comp_con_type, comp_con_num, comp_qq, comp_manage_product, 
-    province_id, city_id, county_id, town_id, village_id, detail_address, longitude, 
-    latitude, comp_status, create_time, create_id, update_time, update_id
+    id, comp_name, company_type, comp_level, comp_qual, comp_imgs, comp_url, comp_prod_license_num, 
+    comp_manage_license_num, comp_social_code, comp_con_person, is_cert, comp_con_type, 
+    comp_con_num, comp_qq, comp_manage_product, province_id, city_id, county_id, town_id, 
+    village_id, detail_address, longitude, latitude, comp_status, create_time, create_id, 
+    update_time, update_id
   </sql>
   <sql id="Blob_Column_List">
-    comp_introduction
+    comp_sum
   </sql>
   <select id="selectByExampleWithBLOBs" parameterType="com.hwrj.cloud.admin.model.UmsCompanyInfoExample" resultMap="ResultMapWithBLOBs">
     select
@@ -150,24 +155,28 @@
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into ums_company_info (comp_name, comp_imgs, comp_url, 
+    insert into ums_company_info (comp_name, company_type, comp_level, 
+      comp_qual, comp_imgs, comp_url, 
       comp_prod_license_num, comp_manage_license_num, 
-      comp_social_code, comp_con_person, comp_con_type, 
-      comp_con_num, comp_qq, comp_manage_product, 
-      province_id, city_id, county_id, 
-      town_id, village_id, detail_address, 
-      longitude, latitude, comp_status, 
-      create_time, create_id, update_time, 
-      update_id, comp_introduction)
-    values (#{compName,jdbcType=VARCHAR}, #{compImgs,jdbcType=VARCHAR}, #{compUrl,jdbcType=VARCHAR}, 
+      comp_social_code, comp_con_person, is_cert, 
+      comp_con_type, comp_con_num, comp_qq, 
+      comp_manage_product, province_id, city_id, 
+      county_id, town_id, village_id, 
+      detail_address, longitude, latitude, 
+      comp_status, create_time, create_id, 
+      update_time, update_id, comp_sum
+      )
+    values (#{compName,jdbcType=VARCHAR}, #{companyType,jdbcType=VARCHAR}, #{compLevel,jdbcType=INTEGER}, 
+      #{compQual,jdbcType=VARCHAR}, #{compImgs,jdbcType=VARCHAR}, #{compUrl,jdbcType=VARCHAR}, 
       #{compProdLicenseNum,jdbcType=VARCHAR}, #{compManageLicenseNum,jdbcType=VARCHAR}, 
-      #{compSocialCode,jdbcType=VARCHAR}, #{compConPerson,jdbcType=VARCHAR}, #{compConType,jdbcType=VARCHAR}, 
-      #{compConNum,jdbcType=VARCHAR}, #{compQq,jdbcType=VARCHAR}, #{compManageProduct,jdbcType=VARCHAR}, 
-      #{provinceId,jdbcType=VARCHAR}, #{cityId,jdbcType=VARCHAR}, #{countyId,jdbcType=VARCHAR}, 
-      #{townId,jdbcType=VARCHAR}, #{villageId,jdbcType=VARCHAR}, #{detailAddress,jdbcType=VARCHAR}, 
-      #{longitude,jdbcType=VARCHAR}, #{latitude,jdbcType=VARCHAR}, #{compStatus,jdbcType=INTEGER}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{createId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{updateId,jdbcType=INTEGER}, #{compIntroduction,jdbcType=LONGVARCHAR})
+      #{compSocialCode,jdbcType=VARCHAR}, #{compConPerson,jdbcType=VARCHAR}, #{isCert,jdbcType=INTEGER}, 
+      #{compConType,jdbcType=VARCHAR}, #{compConNum,jdbcType=VARCHAR}, #{compQq,jdbcType=VARCHAR}, 
+      #{compManageProduct,jdbcType=VARCHAR}, #{provinceId,jdbcType=VARCHAR}, #{cityId,jdbcType=VARCHAR}, 
+      #{countyId,jdbcType=VARCHAR}, #{townId,jdbcType=VARCHAR}, #{villageId,jdbcType=VARCHAR}, 
+      #{detailAddress,jdbcType=VARCHAR}, #{longitude,jdbcType=VARCHAR}, #{latitude,jdbcType=VARCHAR}, 
+      #{compStatus,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{createId,jdbcType=BIGINT}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{updateId,jdbcType=BIGINT}, #{compSum,jdbcType=LONGVARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsCompanyInfo">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
@@ -178,6 +187,15 @@
       <if test="compName != null">
         comp_name,
       </if>
+      <if test="companyType != null">
+        company_type,
+      </if>
+      <if test="compLevel != null">
+        comp_level,
+      </if>
+      <if test="compQual != null">
+        comp_qual,
+      </if>
       <if test="compImgs != null">
         comp_imgs,
       </if>
@@ -196,6 +214,9 @@
       <if test="compConPerson != null">
         comp_con_person,
       </if>
+      <if test="isCert != null">
+        is_cert,
+      </if>
       <if test="compConType != null">
         comp_con_type,
       </if>
@@ -247,14 +268,23 @@
       <if test="updateId != null">
         update_id,
       </if>
-      <if test="compIntroduction != null">
-        comp_introduction,
+      <if test="compSum != null">
+        comp_sum,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="compName != null">
         #{compName,jdbcType=VARCHAR},
       </if>
+      <if test="companyType != null">
+        #{companyType,jdbcType=VARCHAR},
+      </if>
+      <if test="compLevel != null">
+        #{compLevel,jdbcType=INTEGER},
+      </if>
+      <if test="compQual != null">
+        #{compQual,jdbcType=VARCHAR},
+      </if>
       <if test="compImgs != null">
         #{compImgs,jdbcType=VARCHAR},
       </if>
@@ -273,6 +303,9 @@
       <if test="compConPerson != null">
         #{compConPerson,jdbcType=VARCHAR},
       </if>
+      <if test="isCert != null">
+        #{isCert,jdbcType=INTEGER},
+      </if>
       <if test="compConType != null">
         #{compConType,jdbcType=VARCHAR},
       </if>
@@ -316,16 +349,16 @@
         #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="createId != null">
-        #{createId,jdbcType=INTEGER},
+        #{createId,jdbcType=BIGINT},
       </if>
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="updateId != null">
-        #{updateId,jdbcType=INTEGER},
+        #{updateId,jdbcType=BIGINT},
       </if>
-      <if test="compIntroduction != null">
-        #{compIntroduction,jdbcType=LONGVARCHAR},
+      <if test="compSum != null">
+        #{compSum,jdbcType=LONGVARCHAR},
       </if>
     </trim>
   </insert>
@@ -344,6 +377,15 @@
       <if test="record.compName != null">
         comp_name = #{record.compName,jdbcType=VARCHAR},
       </if>
+      <if test="record.companyType != null">
+        company_type = #{record.companyType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.compLevel != null">
+        comp_level = #{record.compLevel,jdbcType=INTEGER},
+      </if>
+      <if test="record.compQual != null">
+        comp_qual = #{record.compQual,jdbcType=VARCHAR},
+      </if>
       <if test="record.compImgs != null">
         comp_imgs = #{record.compImgs,jdbcType=VARCHAR},
       </if>
@@ -362,6 +404,9 @@
       <if test="record.compConPerson != null">
         comp_con_person = #{record.compConPerson,jdbcType=VARCHAR},
       </if>
+      <if test="record.isCert != null">
+        is_cert = #{record.isCert,jdbcType=INTEGER},
+      </if>
       <if test="record.compConType != null">
         comp_con_type = #{record.compConType,jdbcType=VARCHAR},
       </if>
@@ -405,16 +450,16 @@
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.createId != null">
-        create_id = #{record.createId,jdbcType=INTEGER},
+        create_id = #{record.createId,jdbcType=BIGINT},
       </if>
       <if test="record.updateTime != null">
         update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.updateId != null">
-        update_id = #{record.updateId,jdbcType=INTEGER},
+        update_id = #{record.updateId,jdbcType=BIGINT},
       </if>
-      <if test="record.compIntroduction != null">
-        comp_introduction = #{record.compIntroduction,jdbcType=LONGVARCHAR},
+      <if test="record.compSum != null">
+        comp_sum = #{record.compSum,jdbcType=LONGVARCHAR},
       </if>
     </set>
     <if test="_parameter != null">
@@ -425,12 +470,16 @@
     update ums_company_info
     set id = #{record.id,jdbcType=BIGINT},
       comp_name = #{record.compName,jdbcType=VARCHAR},
+      company_type = #{record.companyType,jdbcType=VARCHAR},
+      comp_level = #{record.compLevel,jdbcType=INTEGER},
+      comp_qual = #{record.compQual,jdbcType=VARCHAR},
       comp_imgs = #{record.compImgs,jdbcType=VARCHAR},
       comp_url = #{record.compUrl,jdbcType=VARCHAR},
       comp_prod_license_num = #{record.compProdLicenseNum,jdbcType=VARCHAR},
       comp_manage_license_num = #{record.compManageLicenseNum,jdbcType=VARCHAR},
       comp_social_code = #{record.compSocialCode,jdbcType=VARCHAR},
       comp_con_person = #{record.compConPerson,jdbcType=VARCHAR},
+      is_cert = #{record.isCert,jdbcType=INTEGER},
       comp_con_type = #{record.compConType,jdbcType=VARCHAR},
       comp_con_num = #{record.compConNum,jdbcType=VARCHAR},
       comp_qq = #{record.compQq,jdbcType=VARCHAR},
@@ -445,10 +494,10 @@
       latitude = #{record.latitude,jdbcType=VARCHAR},
       comp_status = #{record.compStatus,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      create_id = #{record.createId,jdbcType=INTEGER},
+      create_id = #{record.createId,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      update_id = #{record.updateId,jdbcType=INTEGER},
-      comp_introduction = #{record.compIntroduction,jdbcType=LONGVARCHAR}
+      update_id = #{record.updateId,jdbcType=BIGINT},
+      comp_sum = #{record.compSum,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -457,12 +506,16 @@
     update ums_company_info
     set id = #{record.id,jdbcType=BIGINT},
       comp_name = #{record.compName,jdbcType=VARCHAR},
+      company_type = #{record.companyType,jdbcType=VARCHAR},
+      comp_level = #{record.compLevel,jdbcType=INTEGER},
+      comp_qual = #{record.compQual,jdbcType=VARCHAR},
       comp_imgs = #{record.compImgs,jdbcType=VARCHAR},
       comp_url = #{record.compUrl,jdbcType=VARCHAR},
       comp_prod_license_num = #{record.compProdLicenseNum,jdbcType=VARCHAR},
       comp_manage_license_num = #{record.compManageLicenseNum,jdbcType=VARCHAR},
       comp_social_code = #{record.compSocialCode,jdbcType=VARCHAR},
       comp_con_person = #{record.compConPerson,jdbcType=VARCHAR},
+      is_cert = #{record.isCert,jdbcType=INTEGER},
       comp_con_type = #{record.compConType,jdbcType=VARCHAR},
       comp_con_num = #{record.compConNum,jdbcType=VARCHAR},
       comp_qq = #{record.compQq,jdbcType=VARCHAR},
@@ -477,9 +530,9 @@
       latitude = #{record.latitude,jdbcType=VARCHAR},
       comp_status = #{record.compStatus,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      create_id = #{record.createId,jdbcType=INTEGER},
+      create_id = #{record.createId,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      update_id = #{record.updateId,jdbcType=INTEGER}
+      update_id = #{record.updateId,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -490,6 +543,15 @@
       <if test="compName != null">
         comp_name = #{compName,jdbcType=VARCHAR},
       </if>
+      <if test="companyType != null">
+        company_type = #{companyType,jdbcType=VARCHAR},
+      </if>
+      <if test="compLevel != null">
+        comp_level = #{compLevel,jdbcType=INTEGER},
+      </if>
+      <if test="compQual != null">
+        comp_qual = #{compQual,jdbcType=VARCHAR},
+      </if>
       <if test="compImgs != null">
         comp_imgs = #{compImgs,jdbcType=VARCHAR},
       </if>
@@ -508,6 +570,9 @@
       <if test="compConPerson != null">
         comp_con_person = #{compConPerson,jdbcType=VARCHAR},
       </if>
+      <if test="isCert != null">
+        is_cert = #{isCert,jdbcType=INTEGER},
+      </if>
       <if test="compConType != null">
         comp_con_type = #{compConType,jdbcType=VARCHAR},
       </if>
@@ -551,16 +616,16 @@
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="createId != null">
-        create_id = #{createId,jdbcType=INTEGER},
+        create_id = #{createId,jdbcType=BIGINT},
       </if>
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="updateId != null">
-        update_id = #{updateId,jdbcType=INTEGER},
+        update_id = #{updateId,jdbcType=BIGINT},
       </if>
-      <if test="compIntroduction != null">
-        comp_introduction = #{compIntroduction,jdbcType=LONGVARCHAR},
+      <if test="compSum != null">
+        comp_sum = #{compSum,jdbcType=LONGVARCHAR},
       </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
@@ -568,12 +633,16 @@
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.hwrj.cloud.admin.model.UmsCompanyInfo">
     update ums_company_info
     set comp_name = #{compName,jdbcType=VARCHAR},
+      company_type = #{companyType,jdbcType=VARCHAR},
+      comp_level = #{compLevel,jdbcType=INTEGER},
+      comp_qual = #{compQual,jdbcType=VARCHAR},
       comp_imgs = #{compImgs,jdbcType=VARCHAR},
       comp_url = #{compUrl,jdbcType=VARCHAR},
       comp_prod_license_num = #{compProdLicenseNum,jdbcType=VARCHAR},
       comp_manage_license_num = #{compManageLicenseNum,jdbcType=VARCHAR},
       comp_social_code = #{compSocialCode,jdbcType=VARCHAR},
       comp_con_person = #{compConPerson,jdbcType=VARCHAR},
+      is_cert = #{isCert,jdbcType=INTEGER},
       comp_con_type = #{compConType,jdbcType=VARCHAR},
       comp_con_num = #{compConNum,jdbcType=VARCHAR},
       comp_qq = #{compQq,jdbcType=VARCHAR},
@@ -588,21 +657,25 @@
       latitude = #{latitude,jdbcType=VARCHAR},
       comp_status = #{compStatus,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      create_id = #{createId,jdbcType=INTEGER},
+      create_id = #{createId,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      update_id = #{updateId,jdbcType=INTEGER},
-      comp_introduction = #{compIntroduction,jdbcType=LONGVARCHAR}
+      update_id = #{updateId,jdbcType=BIGINT},
+      comp_sum = #{compSum,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsCompanyInfo">
     update ums_company_info
     set comp_name = #{compName,jdbcType=VARCHAR},
+      company_type = #{companyType,jdbcType=VARCHAR},
+      comp_level = #{compLevel,jdbcType=INTEGER},
+      comp_qual = #{compQual,jdbcType=VARCHAR},
       comp_imgs = #{compImgs,jdbcType=VARCHAR},
       comp_url = #{compUrl,jdbcType=VARCHAR},
       comp_prod_license_num = #{compProdLicenseNum,jdbcType=VARCHAR},
       comp_manage_license_num = #{compManageLicenseNum,jdbcType=VARCHAR},
       comp_social_code = #{compSocialCode,jdbcType=VARCHAR},
       comp_con_person = #{compConPerson,jdbcType=VARCHAR},
+      is_cert = #{isCert,jdbcType=INTEGER},
       comp_con_type = #{compConType,jdbcType=VARCHAR},
       comp_con_num = #{compConNum,jdbcType=VARCHAR},
       comp_qq = #{compQq,jdbcType=VARCHAR},
@@ -617,9 +690,9 @@
       latitude = #{latitude,jdbcType=VARCHAR},
       comp_status = #{compStatus,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      create_id = #{createId,jdbcType=INTEGER},
+      create_id = #{createId,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      update_id = #{updateId,jdbcType=INTEGER}
+      update_id = #{updateId,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

forest-admin/admin-mbg/src/main/resources/com/hwrj/cloud/admin/mapper/UmsCompanyShopMapper.xml

@@ -2,14 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hwrj.cloud.admin.mapper.UmsCompanyShopMapper">
   <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsCompanyShop">
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="comp_id" jdbcType="INTEGER" property="compId" />
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="comp_id" jdbcType="BIGINT" property="compId" />
     <result column="shop_type" jdbcType="VARCHAR" property="shopType" />
     <result column="shop_url" jdbcType="VARCHAR" property="shopUrl" />
     <result column="shop_address" jdbcType="VARCHAR" property="shopAddress" />
     <result column="shop_img" jdbcType="VARCHAR" property="shopImg" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="create_id" jdbcType="INTEGER" property="createId" />
+    <result column="create_id" jdbcType="BIGINT" property="createId" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="shop_status" jdbcType="INTEGER" property="shopStatus" />
   </resultMap>
@@ -89,15 +89,15 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
     from ums_company_shop
-    where id = #{id,jdbcType=INTEGER}
+    where id = #{id,jdbcType=BIGINT}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     delete from ums_company_shop
-    where id = #{id,jdbcType=INTEGER}
+    where id = #{id,jdbcType=BIGINT}
   </delete>
   <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsCompanyShopExample">
     delete from ums_company_shop
@@ -106,20 +106,20 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsCompanyShop">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into ums_company_shop (comp_id, shop_type, shop_url, 
       shop_address, shop_img, create_time, 
       create_id, update_time, shop_status
       )
-    values (#{compId,jdbcType=INTEGER}, #{shopType,jdbcType=VARCHAR}, #{shopUrl,jdbcType=VARCHAR}, 
+    values (#{compId,jdbcType=BIGINT}, #{shopType,jdbcType=VARCHAR}, #{shopUrl,jdbcType=VARCHAR}, 
       #{shopAddress,jdbcType=VARCHAR}, #{shopImg,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{createId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, #{shopStatus,jdbcType=INTEGER}
+      #{createId,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}, #{shopStatus,jdbcType=INTEGER}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsCompanyShop">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into ums_company_shop
@@ -154,7 +154,7 @@
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="compId != null">
-        #{compId,jdbcType=INTEGER},
+        #{compId,jdbcType=BIGINT},
       </if>
       <if test="shopType != null">
         #{shopType,jdbcType=VARCHAR},
@@ -172,7 +172,7 @@
         #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="createId != null">
-        #{createId,jdbcType=INTEGER},
+        #{createId,jdbcType=BIGINT},
       </if>
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
@@ -192,10 +192,10 @@
     update ums_company_shop
     <set>
       <if test="record.id != null">
-        id = #{record.id,jdbcType=INTEGER},
+        id = #{record.id,jdbcType=BIGINT},
       </if>
       <if test="record.compId != null">
-        comp_id = #{record.compId,jdbcType=INTEGER},
+        comp_id = #{record.compId,jdbcType=BIGINT},
       </if>
       <if test="record.shopType != null">
         shop_type = #{record.shopType,jdbcType=VARCHAR},
@@ -213,7 +213,7 @@
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.createId != null">
-        create_id = #{record.createId,jdbcType=INTEGER},
+        create_id = #{record.createId,jdbcType=BIGINT},
       </if>
       <if test="record.updateTime != null">
         update_time = #{record.updateTime,jdbcType=TIMESTAMP},
@@ -228,14 +228,14 @@
   </update>
   <update id="updateByExample" parameterType="map">
     update ums_company_shop
-    set id = #{record.id,jdbcType=INTEGER},
-      comp_id = #{record.compId,jdbcType=INTEGER},
+    set id = #{record.id,jdbcType=BIGINT},
+      comp_id = #{record.compId,jdbcType=BIGINT},
       shop_type = #{record.shopType,jdbcType=VARCHAR},
       shop_url = #{record.shopUrl,jdbcType=VARCHAR},
       shop_address = #{record.shopAddress,jdbcType=VARCHAR},
       shop_img = #{record.shopImg,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      create_id = #{record.createId,jdbcType=INTEGER},
+      create_id = #{record.createId,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       shop_status = #{record.shopStatus,jdbcType=INTEGER}
     <if test="_parameter != null">
@@ -246,7 +246,7 @@
     update ums_company_shop
     <set>
       <if test="compId != null">
-        comp_id = #{compId,jdbcType=INTEGER},
+        comp_id = #{compId,jdbcType=BIGINT},
       </if>
       <if test="shopType != null">
         shop_type = #{shopType,jdbcType=VARCHAR},
@@ -264,7 +264,7 @@
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="createId != null">
-        create_id = #{createId,jdbcType=INTEGER},
+        create_id = #{createId,jdbcType=BIGINT},
       </if>
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
@@ -273,19 +273,19 @@
         shop_status = #{shopStatus,jdbcType=INTEGER},
       </if>
     </set>
-    where id = #{id,jdbcType=INTEGER}
+    where id = #{id,jdbcType=BIGINT}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsCompanyShop">
     update ums_company_shop
-    set comp_id = #{compId,jdbcType=INTEGER},
+    set comp_id = #{compId,jdbcType=BIGINT},
       shop_type = #{shopType,jdbcType=VARCHAR},
       shop_url = #{shopUrl,jdbcType=VARCHAR},
       shop_address = #{shopAddress,jdbcType=VARCHAR},
       shop_img = #{shopImg,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      create_id = #{createId,jdbcType=INTEGER},
+      create_id = #{createId,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       shop_status = #{shopStatus,jdbcType=INTEGER}
-    where id = #{id,jdbcType=INTEGER}
+    where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

forest-admin/admin-mbg/src/main/resources/com/hwrj/cloud/admin/mapper/UmsMemberOriginMapper.xml

@@ -0,0 +1,627 @@
+<?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="com.hwrj.cloud.admin.mapper.UmsMemberOriginMapper">
+  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsMemberOrigin">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="fk_company_info_id" jdbcType="BIGINT" property="fkCompanyInfoId" />
+    <result column="comp_name" jdbcType="VARCHAR" property="compName" />
+    <result column="origin_name" jdbcType="VARCHAR" property="originName" />
+    <result column="origin_area" jdbcType="DOUBLE" property="originArea" />
+    <result column="people_num" jdbcType="INTEGER" property="peopleNum" />
+    <result column="found_date" jdbcType="VARCHAR" property="foundDate" />
+    <result column="link_user" jdbcType="VARCHAR" property="linkUser" />
+    <result column="link_phone" jdbcType="VARCHAR" property="linkPhone" />
+    <result column="province_name" jdbcType="VARCHAR" property="provinceName" />
+    <result column="city_name" jdbcType="VARCHAR" property="cityName" />
+    <result column="county_name" jdbcType="VARCHAR" property="countyName" />
+    <result column="detail_address" jdbcType="VARCHAR" property="detailAddress" />
+    <result column="altitude" jdbcType="VARCHAR" property="altitude" />
+    <result column="longitude" jdbcType="VARCHAR" property="longitude" />
+    <result column="latitude" jdbcType="VARCHAR" property="latitude" />
+    <result column="state" jdbcType="INTEGER" property="state" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="create_id" jdbcType="INTEGER" property="createId" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="update_id" jdbcType="INTEGER" property="updateId" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.hwrj.cloud.admin.model.UmsMemberOrigin">
+    <result column="img_url" jdbcType="LONGVARCHAR" property="imgUrl" />
+    <result column="video_url" jdbcType="LONGVARCHAR" property="videoUrl" />
+    <result column="vr_url" jdbcType="LONGVARCHAR" property="vrUrl" />
+    <result column="camera_url" jdbcType="LONGVARCHAR" property="cameraUrl" />
+    <result column="summary" jdbcType="LONGVARCHAR" property="summary" />
+    <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, fk_company_info_id, comp_name, origin_name, origin_area, people_num, found_date, 
+    link_user, link_phone, province_name, city_name, county_name, detail_address, altitude, 
+    longitude, latitude, state, create_time, create_id, update_time, update_id
+  </sql>
+  <sql id="Blob_Column_List">
+    img_url, video_url, vr_url, camera_url, summary, remark
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="com.hwrj.cloud.admin.model.UmsMemberOriginExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from ums_member_origin
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberOriginExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from ums_member_origin
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from ums_member_origin
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from ums_member_origin
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberOriginExample">
+    delete from ums_member_origin
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsMemberOrigin">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into ums_member_origin (fk_company_info_id, comp_name, origin_name, 
+      origin_area, people_num, found_date, 
+      link_user, link_phone, province_name, 
+      city_name, county_name, detail_address, 
+      altitude, longitude, latitude, 
+      state, create_time, create_id, 
+      update_time, update_id, img_url, 
+      video_url, vr_url, camera_url, 
+      summary, remark)
+    values (#{fkCompanyInfoId,jdbcType=BIGINT}, #{compName,jdbcType=VARCHAR}, #{originName,jdbcType=VARCHAR}, 
+      #{originArea,jdbcType=DOUBLE}, #{peopleNum,jdbcType=INTEGER}, #{foundDate,jdbcType=VARCHAR}, 
+      #{linkUser,jdbcType=VARCHAR}, #{linkPhone,jdbcType=VARCHAR}, #{provinceName,jdbcType=VARCHAR}, 
+      #{cityName,jdbcType=VARCHAR}, #{countyName,jdbcType=VARCHAR}, #{detailAddress,jdbcType=VARCHAR}, 
+      #{altitude,jdbcType=VARCHAR}, #{longitude,jdbcType=VARCHAR}, #{latitude,jdbcType=VARCHAR}, 
+      #{state,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{createId,jdbcType=INTEGER}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{updateId,jdbcType=INTEGER}, #{imgUrl,jdbcType=LONGVARCHAR}, 
+      #{videoUrl,jdbcType=LONGVARCHAR}, #{vrUrl,jdbcType=LONGVARCHAR}, #{cameraUrl,jdbcType=LONGVARCHAR}, 
+      #{summary,jdbcType=LONGVARCHAR}, #{remark,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsMemberOrigin">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into ums_member_origin
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="fkCompanyInfoId != null">
+        fk_company_info_id,
+      </if>
+      <if test="compName != null">
+        comp_name,
+      </if>
+      <if test="originName != null">
+        origin_name,
+      </if>
+      <if test="originArea != null">
+        origin_area,
+      </if>
+      <if test="peopleNum != null">
+        people_num,
+      </if>
+      <if test="foundDate != null">
+        found_date,
+      </if>
+      <if test="linkUser != null">
+        link_user,
+      </if>
+      <if test="linkPhone != null">
+        link_phone,
+      </if>
+      <if test="provinceName != null">
+        province_name,
+      </if>
+      <if test="cityName != null">
+        city_name,
+      </if>
+      <if test="countyName != null">
+        county_name,
+      </if>
+      <if test="detailAddress != null">
+        detail_address,
+      </if>
+      <if test="altitude != null">
+        altitude,
+      </if>
+      <if test="longitude != null">
+        longitude,
+      </if>
+      <if test="latitude != null">
+        latitude,
+      </if>
+      <if test="state != null">
+        state,
+      </if>
+        create_time,
+      <if test="createId != null">
+        create_id,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="updateId != null">
+        update_id,
+      </if>
+      <if test="imgUrl != null">
+        img_url,
+      </if>
+      <if test="videoUrl != null">
+        video_url,
+      </if>
+      <if test="vrUrl != null">
+        vr_url,
+      </if>
+      <if test="cameraUrl != null">
+        camera_url,
+      </if>
+      <if test="summary != null">
+        summary,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="fkCompanyInfoId != null">
+        #{fkCompanyInfoId,jdbcType=BIGINT},
+      </if>
+      <if test="compName != null">
+        #{compName,jdbcType=VARCHAR},
+      </if>
+      <if test="originName != null">
+        #{originName,jdbcType=VARCHAR},
+      </if>
+      <if test="originArea != null">
+        #{originArea,jdbcType=DOUBLE},
+      </if>
+      <if test="peopleNum != null">
+        #{peopleNum,jdbcType=INTEGER},
+      </if>
+      <if test="foundDate != null">
+        #{foundDate,jdbcType=VARCHAR},
+      </if>
+      <if test="linkUser != null">
+        #{linkUser,jdbcType=VARCHAR},
+      </if>
+      <if test="linkPhone != null">
+        #{linkPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="provinceName != null">
+        #{provinceName,jdbcType=VARCHAR},
+      </if>
+      <if test="cityName != null">
+        #{cityName,jdbcType=VARCHAR},
+      </if>
+      <if test="countyName != null">
+        #{countyName,jdbcType=VARCHAR},
+      </if>
+      <if test="detailAddress != null">
+        #{detailAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="altitude != null">
+        #{altitude,jdbcType=VARCHAR},
+      </if>
+      <if test="longitude != null">
+        #{longitude,jdbcType=VARCHAR},
+      </if>
+      <if test="latitude != null">
+        #{latitude,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null">
+        #{state,jdbcType=INTEGER},
+      </if>
+        NOW(),
+      <if test="createId != null">
+        #{createId,jdbcType=INTEGER},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateId != null">
+        #{updateId,jdbcType=INTEGER},
+      </if>
+      <if test="imgUrl != null">
+        #{imgUrl,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="videoUrl != null">
+        #{videoUrl,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="vrUrl != null">
+        #{vrUrl,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="cameraUrl != null">
+        #{cameraUrl,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="summary != null">
+        #{summary,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberOriginExample" resultType="java.lang.Long">
+    select count(*) from ums_member_origin
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update ums_member_origin
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.fkCompanyInfoId != null">
+        fk_company_info_id = #{record.fkCompanyInfoId,jdbcType=BIGINT},
+      </if>
+      <if test="record.compName != null">
+        comp_name = #{record.compName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.originName != null">
+        origin_name = #{record.originName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.originArea != null">
+        origin_area = #{record.originArea,jdbcType=DOUBLE},
+      </if>
+      <if test="record.peopleNum != null">
+        people_num = #{record.peopleNum,jdbcType=INTEGER},
+      </if>
+      <if test="record.foundDate != null">
+        found_date = #{record.foundDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.linkUser != null">
+        link_user = #{record.linkUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.linkPhone != null">
+        link_phone = #{record.linkPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="record.provinceName != null">
+        province_name = #{record.provinceName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cityName != null">
+        city_name = #{record.cityName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.countyName != null">
+        county_name = #{record.countyName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.detailAddress != null">
+        detail_address = #{record.detailAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="record.altitude != null">
+        altitude = #{record.altitude,jdbcType=VARCHAR},
+      </if>
+      <if test="record.longitude != null">
+        longitude = #{record.longitude,jdbcType=VARCHAR},
+      </if>
+      <if test="record.latitude != null">
+        latitude = #{record.latitude,jdbcType=VARCHAR},
+      </if>
+      <if test="record.state != null">
+        state = #{record.state,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.createId != null">
+        create_id = #{record.createId,jdbcType=INTEGER},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateId != null">
+        update_id = #{record.updateId,jdbcType=INTEGER},
+      </if>
+      <if test="record.imgUrl != null">
+        img_url = #{record.imgUrl,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="record.videoUrl != null">
+        video_url = #{record.videoUrl,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="record.vrUrl != null">
+        vr_url = #{record.vrUrl,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="record.cameraUrl != null">
+        camera_url = #{record.cameraUrl,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="record.summary != null">
+        summary = #{record.summary,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update ums_member_origin
+    set id = #{record.id,jdbcType=BIGINT},
+      fk_company_info_id = #{record.fkCompanyInfoId,jdbcType=BIGINT},
+      comp_name = #{record.compName,jdbcType=VARCHAR},
+      origin_name = #{record.originName,jdbcType=VARCHAR},
+      origin_area = #{record.originArea,jdbcType=DOUBLE},
+      people_num = #{record.peopleNum,jdbcType=INTEGER},
+      found_date = #{record.foundDate,jdbcType=VARCHAR},
+      link_user = #{record.linkUser,jdbcType=VARCHAR},
+      link_phone = #{record.linkPhone,jdbcType=VARCHAR},
+      province_name = #{record.provinceName,jdbcType=VARCHAR},
+      city_name = #{record.cityName,jdbcType=VARCHAR},
+      county_name = #{record.countyName,jdbcType=VARCHAR},
+      detail_address = #{record.detailAddress,jdbcType=VARCHAR},
+      altitude = #{record.altitude,jdbcType=VARCHAR},
+      longitude = #{record.longitude,jdbcType=VARCHAR},
+      latitude = #{record.latitude,jdbcType=VARCHAR},
+      state = #{record.state,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      create_id = #{record.createId,jdbcType=INTEGER},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      update_id = #{record.updateId,jdbcType=INTEGER},
+      img_url = #{record.imgUrl,jdbcType=LONGVARCHAR},
+      video_url = #{record.videoUrl,jdbcType=LONGVARCHAR},
+      vr_url = #{record.vrUrl,jdbcType=LONGVARCHAR},
+      camera_url = #{record.cameraUrl,jdbcType=LONGVARCHAR},
+      summary = #{record.summary,jdbcType=LONGVARCHAR},
+      remark = #{record.remark,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update ums_member_origin
+    set id = #{record.id,jdbcType=BIGINT},
+      fk_company_info_id = #{record.fkCompanyInfoId,jdbcType=BIGINT},
+      comp_name = #{record.compName,jdbcType=VARCHAR},
+      origin_name = #{record.originName,jdbcType=VARCHAR},
+      origin_area = #{record.originArea,jdbcType=DOUBLE},
+      people_num = #{record.peopleNum,jdbcType=INTEGER},
+      found_date = #{record.foundDate,jdbcType=VARCHAR},
+      link_user = #{record.linkUser,jdbcType=VARCHAR},
+      link_phone = #{record.linkPhone,jdbcType=VARCHAR},
+      province_name = #{record.provinceName,jdbcType=VARCHAR},
+      city_name = #{record.cityName,jdbcType=VARCHAR},
+      county_name = #{record.countyName,jdbcType=VARCHAR},
+      detail_address = #{record.detailAddress,jdbcType=VARCHAR},
+      altitude = #{record.altitude,jdbcType=VARCHAR},
+      longitude = #{record.longitude,jdbcType=VARCHAR},
+      latitude = #{record.latitude,jdbcType=VARCHAR},
+      state = #{record.state,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      create_id = #{record.createId,jdbcType=INTEGER},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      update_id = #{record.updateId,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsMemberOrigin">
+    update ums_member_origin
+    <set>
+      <if test="fkCompanyInfoId != null">
+        fk_company_info_id = #{fkCompanyInfoId,jdbcType=BIGINT},
+      </if>
+      <if test="compName != null">
+        comp_name = #{compName,jdbcType=VARCHAR},
+      </if>
+      <if test="originName != null">
+        origin_name = #{originName,jdbcType=VARCHAR},
+      </if>
+      <if test="originArea != null">
+        origin_area = #{originArea,jdbcType=DOUBLE},
+      </if>
+      <if test="peopleNum != null">
+        people_num = #{peopleNum,jdbcType=INTEGER},
+      </if>
+      <if test="foundDate != null">
+        found_date = #{foundDate,jdbcType=VARCHAR},
+      </if>
+      <if test="linkUser != null">
+        link_user = #{linkUser,jdbcType=VARCHAR},
+      </if>
+      <if test="linkPhone != null">
+        link_phone = #{linkPhone,jdbcType=VARCHAR},
+      </if>
+      <if test="provinceName != null">
+        province_name = #{provinceName,jdbcType=VARCHAR},
+      </if>
+      <if test="cityName != null">
+        city_name = #{cityName,jdbcType=VARCHAR},
+      </if>
+      <if test="countyName != null">
+        county_name = #{countyName,jdbcType=VARCHAR},
+      </if>
+      <if test="detailAddress != null">
+        detail_address = #{detailAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="altitude != null">
+        altitude = #{altitude,jdbcType=VARCHAR},
+      </if>
+      <if test="longitude != null">
+        longitude = #{longitude,jdbcType=VARCHAR},
+      </if>
+      <if test="latitude != null">
+        latitude = #{latitude,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null">
+        state = #{state,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createId != null">
+        create_id = #{createId,jdbcType=INTEGER},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateId != null">
+        update_id = #{updateId,jdbcType=INTEGER},
+      </if>
+      <if test="imgUrl != null">
+        img_url = #{imgUrl,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="videoUrl != null">
+        video_url = #{videoUrl,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="vrUrl != null">
+        vr_url = #{vrUrl,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="cameraUrl != null">
+        camera_url = #{cameraUrl,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="summary != null">
+        summary = #{summary,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.hwrj.cloud.admin.model.UmsMemberOrigin">
+    update ums_member_origin
+    set fk_company_info_id = #{fkCompanyInfoId,jdbcType=BIGINT},
+      comp_name = #{compName,jdbcType=VARCHAR},
+      origin_name = #{originName,jdbcType=VARCHAR},
+      origin_area = #{originArea,jdbcType=DOUBLE},
+      people_num = #{peopleNum,jdbcType=INTEGER},
+      found_date = #{foundDate,jdbcType=VARCHAR},
+      link_user = #{linkUser,jdbcType=VARCHAR},
+      link_phone = #{linkPhone,jdbcType=VARCHAR},
+      province_name = #{provinceName,jdbcType=VARCHAR},
+      city_name = #{cityName,jdbcType=VARCHAR},
+      county_name = #{countyName,jdbcType=VARCHAR},
+      detail_address = #{detailAddress,jdbcType=VARCHAR},
+      altitude = #{altitude,jdbcType=VARCHAR},
+      longitude = #{longitude,jdbcType=VARCHAR},
+      latitude = #{latitude,jdbcType=VARCHAR},
+      state = #{state,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      create_id = #{createId,jdbcType=INTEGER},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      update_id = #{updateId,jdbcType=INTEGER},
+      img_url = #{imgUrl,jdbcType=LONGVARCHAR},
+      video_url = #{videoUrl,jdbcType=LONGVARCHAR},
+      vr_url = #{vrUrl,jdbcType=LONGVARCHAR},
+      camera_url = #{cameraUrl,jdbcType=LONGVARCHAR},
+      summary = #{summary,jdbcType=LONGVARCHAR},
+      remark = #{remark,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsMemberOrigin">
+    update ums_member_origin
+    set fk_company_info_id = #{fkCompanyInfoId,jdbcType=BIGINT},
+      comp_name = #{compName,jdbcType=VARCHAR},
+      origin_name = #{originName,jdbcType=VARCHAR},
+      origin_area = #{originArea,jdbcType=DOUBLE},
+      people_num = #{peopleNum,jdbcType=INTEGER},
+      found_date = #{foundDate,jdbcType=VARCHAR},
+      link_user = #{linkUser,jdbcType=VARCHAR},
+      link_phone = #{linkPhone,jdbcType=VARCHAR},
+      province_name = #{provinceName,jdbcType=VARCHAR},
+      city_name = #{cityName,jdbcType=VARCHAR},
+      county_name = #{countyName,jdbcType=VARCHAR},
+      detail_address = #{detailAddress,jdbcType=VARCHAR},
+      altitude = #{altitude,jdbcType=VARCHAR},
+      longitude = #{longitude,jdbcType=VARCHAR},
+      latitude = #{latitude,jdbcType=VARCHAR},
+      state = #{state,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      create_id = #{createId,jdbcType=INTEGER},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      update_id = #{updateId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

forest-admin/admin-mbg/src/main/resources/com/hwrj/cloud/admin/mapper/UmsMemberOriginProductMapper.xml

@@ -0,0 +1,369 @@
+<?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="com.hwrj.cloud.admin.mapper.UmsMemberOriginProductMapper">
+  <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsMemberOriginProduct">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="fk_origin_id" jdbcType="BIGINT" property="fkOriginId" />
+    <result column="product_name" jdbcType="VARCHAR" property="productName" />
+    <result column="plant_area" jdbcType="VARCHAR" property="plantArea" />
+    <result column="output_num" jdbcType="VARCHAR" property="outputNum" />
+    <result column="output_value" jdbcType="VARCHAR" property="outputValue" />
+    <result column="state" jdbcType="INTEGER" property="state" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="create_id" jdbcType="INTEGER" property="createId" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="update_id" jdbcType="INTEGER" property="updateId" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.hwrj.cloud.admin.model.UmsMemberOriginProduct">
+    <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, fk_origin_id, product_name, plant_area, output_num, output_value, state, create_time, 
+    create_id, update_time, update_id
+  </sql>
+  <sql id="Blob_Column_List">
+    remark
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="com.hwrj.cloud.admin.model.UmsMemberOriginProductExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from ums_member_origin_product
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberOriginProductExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from ums_member_origin_product
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from ums_member_origin_product
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from ums_member_origin_product
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberOriginProductExample">
+    delete from ums_member_origin_product
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.hwrj.cloud.admin.model.UmsMemberOriginProduct">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into ums_member_origin_product (fk_origin_id, product_name, plant_area, 
+      output_num, output_value, state, 
+      create_time, create_id, update_time, 
+      update_id, remark)
+    values (#{fkOriginId,jdbcType=BIGINT}, #{productName,jdbcType=VARCHAR}, #{plantArea,jdbcType=VARCHAR}, 
+      #{outputNum,jdbcType=VARCHAR}, #{outputValue,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{createId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{updateId,jdbcType=INTEGER}, #{remark,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.UmsMemberOriginProduct">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into ums_member_origin_product
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="fkOriginId != null">
+        fk_origin_id,
+      </if>
+      <if test="productName != null">
+        product_name,
+      </if>
+      <if test="plantArea != null">
+        plant_area,
+      </if>
+      <if test="outputNum != null">
+        output_num,
+      </if>
+      <if test="outputValue != null">
+        output_value,
+      </if>
+      <if test="state != null">
+        state,
+      </if>
+        create_time,
+      <if test="createId != null">
+        create_id,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="updateId != null">
+        update_id,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="fkOriginId != null">
+        #{fkOriginId,jdbcType=BIGINT},
+      </if>
+      <if test="productName != null">
+        #{productName,jdbcType=VARCHAR},
+      </if>
+      <if test="plantArea != null">
+        #{plantArea,jdbcType=VARCHAR},
+      </if>
+      <if test="outputNum != null">
+        #{outputNum,jdbcType=VARCHAR},
+      </if>
+      <if test="outputValue != null">
+        #{outputValue,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null">
+        #{state,jdbcType=INTEGER},
+      </if>
+      NOW(),
+      <if test="createId != null">
+        #{createId,jdbcType=INTEGER},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateId != null">
+        #{updateId,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.UmsMemberOriginProductExample" resultType="java.lang.Long">
+    select count(*) from ums_member_origin_product
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update ums_member_origin_product
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.fkOriginId != null">
+        fk_origin_id = #{record.fkOriginId,jdbcType=BIGINT},
+      </if>
+      <if test="record.productName != null">
+        product_name = #{record.productName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.plantArea != null">
+        plant_area = #{record.plantArea,jdbcType=VARCHAR},
+      </if>
+      <if test="record.outputNum != null">
+        output_num = #{record.outputNum,jdbcType=VARCHAR},
+      </if>
+      <if test="record.outputValue != null">
+        output_value = #{record.outputValue,jdbcType=VARCHAR},
+      </if>
+      <if test="record.state != null">
+        state = #{record.state,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.createId != null">
+        create_id = #{record.createId,jdbcType=INTEGER},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateId != null">
+        update_id = #{record.updateId,jdbcType=INTEGER},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update ums_member_origin_product
+    set id = #{record.id,jdbcType=BIGINT},
+      fk_origin_id = #{record.fkOriginId,jdbcType=BIGINT},
+      product_name = #{record.productName,jdbcType=VARCHAR},
+      plant_area = #{record.plantArea,jdbcType=VARCHAR},
+      output_num = #{record.outputNum,jdbcType=VARCHAR},
+      output_value = #{record.outputValue,jdbcType=VARCHAR},
+      state = #{record.state,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      create_id = #{record.createId,jdbcType=INTEGER},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      update_id = #{record.updateId,jdbcType=INTEGER},
+      remark = #{record.remark,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update ums_member_origin_product
+    set id = #{record.id,jdbcType=BIGINT},
+      fk_origin_id = #{record.fkOriginId,jdbcType=BIGINT},
+      product_name = #{record.productName,jdbcType=VARCHAR},
+      plant_area = #{record.plantArea,jdbcType=VARCHAR},
+      output_num = #{record.outputNum,jdbcType=VARCHAR},
+      output_value = #{record.outputValue,jdbcType=VARCHAR},
+      state = #{record.state,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      create_id = #{record.createId,jdbcType=INTEGER},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      update_id = #{record.updateId,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsMemberOriginProduct">
+    update ums_member_origin_product
+    <set>
+      <if test="fkOriginId != null">
+        fk_origin_id = #{fkOriginId,jdbcType=BIGINT},
+      </if>
+      <if test="productName != null">
+        product_name = #{productName,jdbcType=VARCHAR},
+      </if>
+      <if test="plantArea != null">
+        plant_area = #{plantArea,jdbcType=VARCHAR},
+      </if>
+      <if test="outputNum != null">
+        output_num = #{outputNum,jdbcType=VARCHAR},
+      </if>
+      <if test="outputValue != null">
+        output_value = #{outputValue,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null">
+        state = #{state,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createId != null">
+        create_id = #{createId,jdbcType=INTEGER},
+      </if>
+        update_time = NOW(),
+      <if test="updateId != null">
+        update_id = #{updateId,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.hwrj.cloud.admin.model.UmsMemberOriginProduct">
+    update ums_member_origin_product
+    set fk_origin_id = #{fkOriginId,jdbcType=BIGINT},
+      product_name = #{productName,jdbcType=VARCHAR},
+      plant_area = #{plantArea,jdbcType=VARCHAR},
+      output_num = #{outputNum,jdbcType=VARCHAR},
+      output_value = #{outputValue,jdbcType=VARCHAR},
+      state = #{state,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      create_id = #{createId,jdbcType=INTEGER},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      update_id = #{updateId,jdbcType=INTEGER},
+      remark = #{remark,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsMemberOriginProduct">
+    update ums_member_origin_product
+    set fk_origin_id = #{fkOriginId,jdbcType=BIGINT},
+      product_name = #{productName,jdbcType=VARCHAR},
+      plant_area = #{plantArea,jdbcType=VARCHAR},
+      output_num = #{outputNum,jdbcType=VARCHAR},
+      output_value = #{outputValue,jdbcType=VARCHAR},
+      state = #{state,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      create_id = #{createId,jdbcType=INTEGER},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      update_id = #{updateId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

forest-admin/admin-mbg/src/main/resources/generatorConfig.xml

@@ -37,7 +37,7 @@
         <javaClientGenerator type="XMLMAPPER" targetPackage="com.hwrj.cloud.admin.mapper"
                              targetProject="forest-admin\admin-mbg\src\main\java"/>
         <!--生成全部表tableName设为%-->
-        <table tableName="%">
+        <table tableName="ums_company%">
             <generatedKey column="id" sqlStatement="MySql" identity="true"/>
         </table>
     </context>

forest-admin/admin-server/admin-server.iml

@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+        <sourceRoots>
+          <root url="file://$MODULE_DIR$/src/main/java" />
+          <root url="file://$MODULE_DIR$/src/main/resources" />
+        </sourceRoots>
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="forest-common" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.10" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.10" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.8" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.6.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.6.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:25.1-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.0.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.1.3" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.2.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
+    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.0" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.11" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.1.14" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.73" level="project" />
+    <orderEntry type="module" module-name="admin-common" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.60" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.60" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.5.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.5.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.1.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.1.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
+    <orderEntry type="module" module-name="forest-security" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.1.16.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.1.16.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.45.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.45.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.45.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.45.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.45.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.45.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.2.15.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.31" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.31" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.31" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.3.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.1.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-api:1.2.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.spring:spring-context-support:1.0.6" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.12.21" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter:5.5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-api:5.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apiguardian:apiguardian-api:1.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.opentest4j:opentest4j:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.platform:junit-platform-commons:1.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.junit.jupiter:junit-jupiter-params:5.3.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.3.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.junit.platform:junit-platform-engine:1.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-junit-jupiter:2.23.4" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config:2.1.2.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-zipkin:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-sleuth:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-sleuth-core:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.9.5" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.brave:brave:5.6.1" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.brave:brave-context-log4j2:5.6.1" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.brave:brave-instrumentation-spring-web:5.6.1" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.brave:brave-instrumentation-http:5.6.1" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.brave:brave-instrumentation-spring-rabbit:5.6.1" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.brave:brave-instrumentation-kafka-clients:5.6.1" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.brave:brave-instrumentation-httpclient:5.6.1" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.brave:brave-instrumentation-httpasyncclient:5.6.1" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.brave:brave-instrumentation-spring-webmvc:5.6.1" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.brave:brave-instrumentation-servlet:5.6.1" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.brave:brave-instrumentation-jms:5.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-sleuth-zipkin:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.zipkin2:zipkin:2.12.0" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.reporter2:zipkin-reporter:2.7.14" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.reporter2:zipkin-sender-kafka11:2.7.14" level="project" />
+    <orderEntry type="library" name="Maven: io.zipkin.reporter2:zipkin-sender-amqp-client:2.7.14" level="project" />
+    <orderEntry type="library" name="Maven: de.codecentric:spring-boot-admin-starter-client:2.1.6" level="project" />
+    <orderEntry type="library" name="Maven: de.codecentric:spring-boot-admin-client:2.1.6" level="project" />
+    <orderEntry type="library" name="Maven: org.jolokia:jolokia-core:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: net.logstash.logback:logstash-logback-encoder:5.2" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.10" level="project" />
+    <orderEntry type="module" module-name="admin-mbg" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.10" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.10" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.generator:mybatis-generator-core:1.3.7" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
+    <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.17" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
+    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:easyexcel:2.2.6" level="project" />
+    <orderEntry type="library" name="Maven: cglib:cglib:3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm:4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
+    <orderEntry type="library" name="Maven: org.ehcache:ehcache:3.6.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:5.1.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:1.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.1.10" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
+    <orderEntry type="library" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-core:2.23.4" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.16" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.16" level="project" />
+    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
+  </component>
+</module>

forest-admin/admin-server/pom.xml

@@ -80,6 +80,18 @@
             <version>2.2.6</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>5.1.7.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+
     </dependencies>
 
     <build>

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/AdminApplication.java

@@ -3,8 +3,9 @@ package com.hwrj.cloud.admin;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.scheduling.annotation.EnableAsync;
 
-
+@EnableAsync
 @SpringBootApplication
 @ComponentScan(basePackages = {"com.hwrj.cloud"})
 public class AdminApplication {

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/bo/AdminUserDetails.java

@@ -59,4 +59,8 @@ public class AdminUserDetails implements UserDetails {
     public boolean isEnabled() {
         return umsAdmin.getStatus().equals(1);
     }
+
+    public UmsAdmin getUmsAdmin(){
+        return umsAdmin;
+    }
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/config/GlobalCorsConfig.java

@@ -0,0 +1,35 @@
+package com.hwrj.cloud.admin.config;
+
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+
+/**
+ * 全局跨域相关配置
+ * Created by macro on 2019/7/27.
+ */
+//@Configuration
+public class GlobalCorsConfig {
+
+    /**
+     * 允许跨域调用的过滤器
+     */
+//    @Bean
+//    public CorsFilter corsFilter() {
+//        CorsConfiguration config = new CorsConfiguration();
+//        //允许所有域名进行跨域调用
+//        config.addAllowedOrigin("*");
+//        //允许跨越发送cookie
+//        config.setAllowCredentials(true);
+//        //放行全部原始头信息
+//        config.addAllowedHeader("*");
+//        //允许所有请求方法跨域调用
+//        config.addAllowedMethod("*");
+//        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+//        source.registerCorsConfiguration("/**", config);
+//        return new CorsFilter(source);
+//    }
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/config/WebMvcConfig.java

@@ -4,15 +4,15 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 
-@Configuration
+//@Configuration
 public class WebMvcConfig extends WebMvcConfigurationSupport {
 
-    @Override
-    public void addCorsMappings(CorsRegistry registry) {
-        registry.addMapping("/**")
-                .allowedOrigins("*")
-                .allowedMethods("POST", "GET", "PUT", "OPTIONS", "DELETE")
-                .maxAge(3600)
-                .allowCredentials(true);
-    }
+//    @Override
+//    public void addCorsMappings(CorsRegistry registry) {
+//        registry.addMapping("/**")
+//                .allowedOrigins("*")
+//                .allowedMethods("POST", "GET", "PUT", "OPTIONS", "DELETE")
+//                .maxAge(3600)
+//                .allowCredentials(true);
+//    }
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/BigCompanyController.java

@@ -0,0 +1,168 @@
+package com.hwrj.cloud.admin.controller;
+
+import com.hwrj.cloud.admin.dto.UmsCompanyDto;
+import com.hwrj.cloud.admin.dto.UmsMemberOriginParam;
+import com.hwrj.cloud.admin.dto.param.BigDataCompanyInfo;
+import com.hwrj.cloud.admin.service.BigCompanyService;
+import com.hwrj.cloud.admin.service.UmsCompanyService;
+import com.hwrj.cloud.admin.service.UmsMemberOriginService;
+import com.hwrj.cloud.common.api.CommonResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.*;
+
+@RestController
+@RequestMapping("/big/company")
+@Api(tags = "BigCompanyController",description ="涉林大屏数据")
+public class BigCompanyController {
+
+    @Autowired
+    private BigCompanyService bigCompanyService;
+
+    @Autowired
+    private UmsCompanyService umsCompanyService;
+
+    @Autowired
+    private UmsMemberOriginService umsMemberOriginService;
+
+    @GetMapping("/list")
+    @ApiOperation("涉林分布-供应商信息获取")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "catId",value = "分类id",required = false,paramType = "Long"),
+            @ApiImplicitParam(name = "key",value = "关键字",required = false,paramType = "String")
+    })
+    public CommonResult compList(@RequestParam(value = "catId",required = false)Long catId, @RequestParam(value = "key",required = false)String key){
+        List<Map<String, Object>> companyList = bigCompanyService.getCompanyList(catId, key);
+        List<Map<String,Object>> sh = new ArrayList<>();
+        for (Map<String,Object> map:companyList){
+            List<String> strings = new LinkedList<>();
+            if (map.containsKey("lng")){
+                strings.add(map.get("lng").toString());
+            }
+            if (map.containsKey("latitude")){
+                strings.add(map.get("latitude").toString());
+            }
+
+
+            map.put("laglat",strings);
+            map.put("legend","1");
+            List<Map<String,Object>> list = new LinkedList<>();
+            if (map.containsKey("compConPerson")){
+                Map<String,Object> map1 = new HashMap<>();
+                map1.put("value","联系人："+map.get("compConPerson"));
+                list.add(map1);
+            }
+            if (map.containsKey("address")){
+                Map<String,Object> map2 = new HashMap<>();
+                map2.put("value","联系地址："+map.get("address"));
+                list.add(map2);
+            }
+            map.put("info",list);
+            sh.add(map);
+        }
+        return CommonResult.success(companyList);
+    }
+
+    @GetMapping("/detail")
+    @ApiOperation("涉林分布-供应商详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "供应商id",value = "分类id",required = false,paramType = "Long"),
+    })
+    public CommonResult compDetail(@RequestParam(value = "id",required = true)Long id){
+        UmsCompanyDto detailCompany = umsCompanyService.getDetailCompany(id);
+        UmsMemberOriginParam param = new UmsMemberOriginParam();
+        param.setFkCompanyInfoId(detailCompany.getId());
+        List<UmsMemberOriginParam> list = umsMemberOriginService.list(param);
+        List<BigDataCompanyInfo> listBate = new ArrayList<>();
+        BigDataCompanyInfo big1 = new BigDataCompanyInfo();
+        big1.setId("1");
+        big1.setTitle("企业名称");
+        big1.setData(detailCompany.getCompName());
+        listBate.add(big1);
+        BigDataCompanyInfo big2 = new BigDataCompanyInfo();
+        big2.setId("2");
+        big2.setTitle("联系人");
+        big2.setData(detailCompany.getCompConPerson());
+        listBate.add(big2);
+        BigDataCompanyInfo big3 = new BigDataCompanyInfo();
+        big3.setId("3");
+        big3.setTitle("联系方式");
+        big3.setData(detailCompany.getCompConNum());
+        listBate.add(big3);
+
+        BigDataCompanyInfo big4 = new BigDataCompanyInfo();
+
+        big4.setId("4");
+        big4.setTitle("资质");
+        big4.setData(detailCompany.getCompQual());
+        listBate.add(big4);
+
+        BigDataCompanyInfo big5 = new BigDataCompanyInfo();
+        big5.setId("5");
+        big5.setTitle("类型");
+        big5.setData(detailCompany.getCompanyType());
+        listBate.add(big5);
+
+        BigDataCompanyInfo big6 = new BigDataCompanyInfo();
+        big6.setId("6");
+        big6.setTitle("是否有种植基地");
+        if (list != null && list.size()>0){
+            big6.setData("有");
+        }else {
+            big6.setData("没有");
+        }
+        big6.setData(detailCompany.getCompanyType());
+        listBate.add(big6);
+        BigDataCompanyInfo big7 = new BigDataCompanyInfo();
+        big7.setId("7");
+        big7.setTitle("地址");
+        big7.setData(detailCompany.getProvinceId()+detailCompany.getCityId()+detailCompany.getCountyId());
+        listBate.add(big7);
+        Map<String,Object> map = new HashMap<>();
+        map.put("desc",detailCompany.getCompSum());
+        map.put("list",listBate);
+
+        return CommonResult.success(map);
+    }
+
+    @GetMapping("/cat")
+    @ApiOperation("涉林分布-产品分类信息（刺梨，竹子，竹笋）")
+    public CommonResult cat(){
+        String[] title = {"id","type","num"};
+        List<String> dto = bigCompanyService.getCat();
+        List<Map<String, Object>> title1 = getTitle(dto, title);
+        return CommonResult.success(title1);
+    }
+
+    /**
+     *
+     * @param strings 数据
+     * @param params
+     * @return
+     */
+    public List<Map<String,Object>> getTitle(List<String> strings,String[] params){
+        if (strings == null|| strings.size()<1){
+            return null;
+        }
+        List<Map<String,Object>> list = new ArrayList<>();
+        for (String str:strings) {
+            Map<String,Object> map = new HashMap<>();
+            String[] split = str.split("---");
+            for (int i = 0;i<split.length;i++){
+                String param = params[i];
+                String s = split[i];
+                map.put(param,s);
+            }
+            list.add(map);
+        }
+        return list;
+    }
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/BigScreamController.java

@@ -0,0 +1,158 @@
+package com.hwrj.cloud.admin.controller;
+
+import com.hwrj.cloud.admin.service.BigScreamService;
+import com.hwrj.cloud.admin.service.UmsCompanyService;
+import com.hwrj.cloud.common.api.CommonResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.*;
+
+@RestController
+@Api(tags = "BigScreamController",description = "大屏数据展示")
+@RequestMapping("/big")
+@Slf4j
+public class BigScreamController  {
+    @Autowired
+    private BigScreamService bigScreamService;
+
+    @Autowired
+    private UmsCompanyService companyService;
+
+    @ApiOperation("林业态势-获取平台信息")
+    @GetMapping("/1/data1")
+    public CommonResult data11(@RequestParam(value = "id",required = false,defaultValue = "1")Long id){
+        Map<String, Object> map = bigScreamService.data1(id);
+        return CommonResult.success(map);
+    }
+
+    @ApiOperation("林业态势-获取供应商分布信息")
+    @GetMapping("/1/data2")
+    public CommonResult data12(@RequestParam(value = "compType",required = false)String compType){
+        List<Map<String, Object>> map = bigScreamService.date2(compType);
+        List<Map<String, Object>> maps = new ArrayList<>();
+        for (Map<String,Object> m:map) {
+            if (m.containsKey("lng")&&m.containsKey("lat")){
+                String lng = m.get("lng").toString();
+                String lat = m.get("lat").toString();
+                List<String> str = new LinkedList<>();
+                str.add(lng);
+                str.add(lat);
+                m.put("lnglat",str);
+            }
+            maps.add(m);
+        }
+        return CommonResult.success(maps);
+    }
+
+    @ApiOperation("产品现状-获取产品分布信息")
+    @GetMapping("/1/data3")
+    public CommonResult data13(){
+        List<Map<String, Object>> map = bigScreamService.data4();
+        return CommonResult.success(map);
+    }
+
+    @ApiOperation("林业态势-获取产品分布信息")
+    @GetMapping("/1/data6")
+    public CommonResult data16(){
+
+        String title = "供应信息";
+        String[] titles = {"供应商名称","供应产品","规格","参考价格"};
+        List<String> strings = bigScreamService.data6();
+        Map<String, Object> listData = getListData(title, titles, strings);
+
+        return CommonResult.success(listData);
+    }
+
+    @ApiOperation("林业态势-需求信息")
+    @GetMapping("/1/data7")
+    public CommonResult data17(){
+
+        String title = "需求信息";
+        String[] titles = {"需求主体","需求产品"};
+        List<String> strings = bigScreamService.data7();
+        Map<String, Object> listData = getListData(title, titles, strings);
+
+        return CommonResult.success(listData);
+    }
+
+    @ApiOperation("林业态势-左下角")
+    @GetMapping("/1/data8")
+    public CommonResult data18(){
+
+
+        String[] titles = {"id","name","num"};
+        List<String> strings = bigScreamService.data8();
+        List<Map<String, Object>> title = getTitle(strings, titles, "name", "企业分布");
+        return CommonResult.success(title);
+    }
+
+    /**
+     * 分装返回大屏数据
+     * @param title
+     * @param titles
+     * @param strings 必须用---分割成和titles一样长度的数组的字符串
+     * @return
+     */
+    public Map<String,Object> getListData(String title,String[] titles,List<String> strings){
+        Map<String,Object> has = new HashMap<>();
+        has.put("title",title);
+        List<Map<String,Object>> tabHeader = new LinkedList<>();
+        for (int i = 0 ;i<titles.length;i++) {
+            Map<String,Object> map = new HashMap<>();
+            map.put("name",titles[i]);
+            tabHeader.add(map);
+        }
+        has.put("tabHeader",tabHeader);
+        List<List<Map<String,Object>>> list = new ArrayList<>();
+        for (String str:strings) {
+            String[] split = str.split("---");
+            List<Map<String,Object>> maps = new LinkedList<>();
+            for (int i = 0;i<split.length;i++){
+                Map<String,Object> map = new HashMap<>();
+                map.put("value",split[i]);
+                maps.add(map);
+            }
+            list.add(maps);
+        }
+        has.put("list",list);
+        return has;
+    }
+
+    /**
+     *
+     * @param strings 数据
+     * @param params
+     * @return
+     */
+    public List<Map<String,Object>> getTitle(List<String> strings,String[] params,String title,String addStr){
+        if (strings == null|| strings.size()<1){
+            return null;
+        }
+        List<Map<String,Object>> list = new ArrayList<>();
+        for (String str:strings) {
+            Map<String,Object> map = new HashMap<>();
+            String[] split = str.split("---");
+            for (int i = 0;i<split.length;i++){
+                String param = params[i];
+                String s = split[i];
+                if ((!StringUtils.isEmpty(title))&&title.equals(param)){
+                    s=s+addStr;
+                }
+                map.put(param,s);
+            }
+            list.add(map);
+        }
+        return list;
+    }
+
+
+
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/UmsCompanyController.java

@@ -1,37 +1,136 @@
 package com.hwrj.cloud.admin.controller;
 
 
+import com.hwrj.cloud.admin.dto.UmsCompanyDto;
 import com.hwrj.cloud.admin.excelEntity.UmsCompanyInfoExcel;
+import com.hwrj.cloud.admin.model.UmsAdmin;
+import com.hwrj.cloud.admin.service.UmsAdminService;
+import com.hwrj.cloud.admin.service.UmsCompanyService;
 import com.hwrj.cloud.admin.util.EasyExcelUtil;
+import com.hwrj.cloud.common.api.CommonPage;
+import com.hwrj.cloud.common.api.CommonResult;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import io.swagger.models.Model;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.security.Principal;
+import java.util.ArrayList;
 import java.util.List;
 
 @Controller
 @Api(tags = "UmsCompanyController", description = "供应商信息")
 @RequestMapping("/umsCompany")
+@Slf4j
 public class UmsCompanyController {
-    //导入excel
+
+
+    @Autowired
+    private UmsCompanyService umsCompanyService;
+
+    @Autowired
+    private UmsAdminService adminService;
+
+    @ApiOperation(value = "添加供应商")
+    @PutMapping("/info/add")
+    @ResponseBody
+    public CommonResult infoAdd(@RequestBody UmsCompanyDto dto,Principal principal){
+        Long userId = getUserId(principal);
+
+        dto.setCreateId(userId);
+        umsCompanyService.add(dto);
+        return CommonResult.success();
+    }
+
+    @ApiOperation(value = "修改供应商")
+    @PutMapping("/info/update")
+    @ResponseBody
+    public CommonResult infoUpdate(@RequestBody UmsCompanyDto dto,Principal principal){
+        Long userId = getUserId(principal);
+
+        dto.setCreateId(userId);
+        umsCompanyService.update(dto);
+        return CommonResult.success();
+    }
+
+    @ApiOperation(value = "删除供应商")
+    @GetMapping("/info/delete")
+    @ResponseBody
+    public CommonResult infoDelete(@RequestParam(value = "compId")Long compId,Principal principal){
+        Long userId = getUserId(principal);
+
+        umsCompanyService.delete(compId);
+        return CommonResult.success();
+    }
+
+    @ApiOperation(value = "获取供应商列表")
+    @GetMapping("/dt/list")
+    @ResponseBody
+    public CommonResult list(@RequestParam(value = "pageSize")int pageSize,
+                             @RequestParam(value = "pageNo")int pageNo){
+
+        List<UmsCompanyDto> infoList = umsCompanyService.getCompanyInfoList(pageSize, pageNo);
+        return CommonResult.success(CommonPage.restPage(infoList));
+    }
+
+    @ApiOperation(value = "获取供应商详细信息")
+    @GetMapping("/dt/detail")
+    @ResponseBody
+    public CommonResult detail(@RequestParam(value = "compId")Long compId){
+
+        UmsCompanyDto dto = umsCompanyService.getDetailCompany(compId);
+        return CommonResult.success(dto);
+    }
+
+    /**
+     * 导入excel
+     * @param request
+     * @param model
+     * @param files
+     * @return
+     * @throws Exception
+     */
+    @ApiOperation(value = "供应商导入")
     @RequestMapping(value = "excelImport", method = {RequestMethod.GET, RequestMethod.POST })
-    public String excelImport(HttpServletRequest request, Model model, @RequestParam("uploadFile") MultipartFile[] files) throws Exception {
+    @ResponseBody
+    public CommonResult excelImport(HttpServletRequest request, Model model, @RequestParam("uploadFile") MultipartFile[] files, Principal principal) throws Exception {
+        Long userId = getUserId(principal);
+        List<UmsCompanyInfoExcel> listAll = new ArrayList<>();
         if(files != null && files.length > 0){
             MultipartFile file = files[0];
-            List<Object> list = EasyExcelUtil.readExcel(file, new UmsCompanyInfoExcel(),1,1);
+            List<Object> list = EasyExcelUtil.readExcel(file, new UmsCompanyInfoExcel(),1,2);
             if(list != null && list.size() > 0){
                 for(Object o : list){
                     UmsCompanyInfoExcel umsCompanyInfoExcel = (UmsCompanyInfoExcel) o;
-                    System.out.println(umsCompanyInfoExcel.getCompIntroduction()+"/"+umsCompanyInfoExcel.getCompConPerson()+"/"+umsCompanyInfoExcel.getCityId());
+                    umsCompanyInfoExcel.setCreateId(userId);
+                    listAll.add(umsCompanyInfoExcel);
                 }
             }
         }
-        return "index";
+        umsCompanyService.importExcel(listAll);
+
+        return CommonResult.success(listAll);
+    }
+
+    public Long getUserId(Principal principal){
+        Long userId = null;
+        try {
+            String username = principal.getName();
+
+            if (!StringUtils.isEmpty(username)){
+                UmsAdmin umsAdmin = adminService.getAdminByUsername(username);
+                userId = umsAdmin.getId();
+            }
+        }catch (Exception e){
+            log.info("获取用户id失败");
+        }
+        return userId;
     }
 
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/UmsMemberOriginController.java

@@ -0,0 +1,95 @@
+package com.hwrj.cloud.admin.controller;
+
+import com.hwrj.cloud.admin.dto.UmsMemberOriginParam;
+import com.hwrj.cloud.admin.excelEntity.UmsMemberOriginExcel;
+import com.hwrj.cloud.admin.listener.ImportExcelEventListener;
+import com.hwrj.cloud.admin.service.UmsMemberOriginService;
+import com.hwrj.cloud.admin.util.CurrUserUtil;
+import com.hwrj.cloud.admin.util.EasyExcelUtil;
+import com.hwrj.cloud.common.api.CommonPage;
+import com.hwrj.cloud.common.api.CommonResult;
+import com.hwrj.cloud.common.exception.GlobalException;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @className:
+ * @description: 生产地信息表
+ * @author: lym
+ * @date: 2020/9/5 10:38
+ */
+@RestController
+@Api(description = "生产地信息管理")
+@RequestMapping("/origin")
+public class UmsMemberOriginController {
+
+    @Autowired
+    private UmsMemberOriginService umsMemberOriginService;
+    @Autowired
+    private ImportExcelEventListener importExcelEventListener;
+
+    @ApiOperation(value = "导入生产地信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file",value = "导入文件",required = true,paramType = "MultipartFile" )
+    })
+    @GetMapping("/import")
+    public CommonResult importExcel(@RequestParam("file") MultipartFile file, Principal principal){
+        List<UmsMemberOriginExcel> listAll = new ArrayList<>();
+        if(file != null){
+            List<Object> list = null;
+            try {
+                list = EasyExcelUtil.readExcel(file, new UmsMemberOriginExcel(),2,2);
+            } catch (IOException e) {
+                //e.printStackTrace();
+                throw new GlobalException(1,"上传文件错误");
+            }
+            if(list != null && list.size() > 0){
+                for(Object obj : list){
+                    UmsMemberOriginExcel excel = (UmsMemberOriginExcel) obj;
+                    excel.setCreateId(CurrUserUtil.getUserId());
+                    excel.setState(0);
+                    listAll.add(excel);
+                }
+            }
+        }
+        int saveNum = 0;
+        if (listAll != null && listAll.size() > 0){
+            int batchNum = 500;
+            if (listAll.size() > batchNum){
+                List<UmsMemberOriginExcel> list = listAll.subList(0,batchNum);
+                saveNum = umsMemberOriginService.batchSave(list);
+                //if (saveNum > 0){ //存在前面数据已存在情况
+                    //异步导入
+                    importExcelEventListener.batchSaveOriginExcel(listAll.subList(batchNum,listAll.size()));
+                    return CommonResult.success(null,"正在导入数据，请稍后刷新!");
+                //}
+            }
+            saveNum = umsMemberOriginService.batchSave(listAll);
+            if (saveNum < 1){
+                return CommonResult.success(null,"导入数据已存在，请勿重复导入");
+            }
+        }
+
+        return CommonResult.success();
+    }
+
+    @ApiOperation(value = "查询列表",notes = "查询列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "origin",value = "",required = true,paramType = "UmsMemberOriginProductParam")
+    })
+    @PostMapping("/list")
+    public CommonResult list(@RequestBody UmsMemberOriginParam origin){
+        List<UmsMemberOriginParam> list = umsMemberOriginService.list(origin);
+        return CommonResult.success(CommonPage.restPage(list));
+    }
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/UmsMemberOriginProductController.java

@@ -0,0 +1,85 @@
+package com.hwrj.cloud.admin.controller;
+
+import com.hwrj.cloud.admin.dto.UmsMemberOriginProductParam;
+import com.hwrj.cloud.admin.model.UmsMemberOriginProduct;
+import com.hwrj.cloud.admin.service.UmsMemberOriginProductService;
+import com.hwrj.cloud.common.api.CommonPage;
+import com.hwrj.cloud.common.api.CommonResult;
+import com.hwrj.cloud.common.exception.GlobalException;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @className:
+ * @description:
+ * @author: lym
+ * @date: 2020/9/7 9:57
+ */
+@RestController
+@RequestMapping("/originProduct")
+@Api(description = "生产地产出物管理")
+public class UmsMemberOriginProductController {
+
+    @Autowired
+    private UmsMemberOriginProductService umsMemberOriginProductService;
+
+    @ApiOperation(value = "查询列表",notes = "查询列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "originProduct",value = "",required = true,paramType = "UmsMemberOriginProductParam")
+    })
+    @PostMapping("/list")
+    public CommonResult list(@RequestBody UmsMemberOriginProductParam originProduct){
+        List<UmsMemberOriginProduct> list = umsMemberOriginProductService.list(originProduct);
+        return CommonResult.success(CommonPage.restPage(list));
+    }
+
+    @ApiOperation(value = "添加产出物信息",notes = "添加产出物信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "originProduct",value = "产出物信息",required = true,paramType = "UmsMemberOriginProductParam")
+    })
+    @PostMapping("/save")
+    public CommonResult save(@RequestBody @Valid UmsMemberOriginProductParam originProduct){
+        int i = umsMemberOriginProductService.save(originProduct);
+        if (i > 0){
+            return CommonResult.success();
+        }
+        return CommonResult.failed();
+    }
+
+    @ApiOperation(value = "修改产出物信息",notes = "修改产出物信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "originProduct",value = "产出物信息",required = true,paramType = "UmsMemberOriginProductParam")
+    })
+    @PostMapping("/update")
+    public CommonResult update(@RequestBody @Valid UmsMemberOriginProductParam originProduct){
+        if (StringUtils.isEmpty(originProduct.getId())){
+            throw new GlobalException(500,"主键不为空!");
+        }
+        int i = umsMemberOriginProductService.update(originProduct);
+        if (i > 0){
+            return CommonResult.success();
+        }
+        return CommonResult.failed();
+    }
+
+    @ApiOperation(value = "删除产出物信息",notes = "删除产出物信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id",value = "主键",required = true,paramType = "String")
+    })
+    @GetMapping("/delete")
+    public CommonResult delete(@RequestParam("id") long id){
+        int i = umsMemberOriginProductService.delete(id);
+        if (i > 0){
+            return CommonResult.success();
+        }
+        return CommonResult.failed();
+    }
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dao/BigCompanyDao.java

@@ -0,0 +1,13 @@
+package com.hwrj.cloud.admin.dao;
+
+import io.lettuce.core.dynamic.annotation.Param;
+
+import java.util.List;
+import java.util.Map;
+
+public interface BigCompanyDao {
+
+    public List<Map<String,Object>> bigCompanyInfo(@Param("key")String key,@Param("catId")Long catId);
+
+    public List<String> getCat();
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dao/BigScreamDao.java

@@ -0,0 +1,32 @@
+package com.hwrj.cloud.admin.dao;
+
+import io.lettuce.core.dynamic.annotation.Param;
+
+import java.util.List;
+import java.util.Map;
+
+public interface BigScreamDao {
+    public Map<String,Object> data1(@Param("id")Long id);
+
+    public List<Map<String,Object>> data2(@Param("compType")String compType);
+
+    /**
+     * 获取产品分布信息
+     * lym
+     * @return
+     */
+    public List<Map<String,Object>> data4();
+
+    /**
+     * 获取产品种植面积分布信息
+     * lym
+     * @return
+     */
+    public List<Map<String,Object>> data5(@org.apache.ibatis.annotations.Param("productName") String productName);
+
+    public List<String> data6();
+
+    public List<String> data7();
+
+    public List<String> data8();
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dao/UmsCompanyShopDao.java

@@ -0,0 +1,24 @@
+package com.hwrj.cloud.admin.dao;
+
+import com.hwrj.cloud.admin.model.UmsCompanyFile;
+import com.hwrj.cloud.admin.model.UmsCompanyShop;
+
+import java.util.List;
+
+public interface UmsCompanyShopDao {
+    /**
+     * 批量添加shop
+     * @param list
+     * @return
+     */
+    int addUmsCompanyShopList(List<UmsCompanyShop> list);
+
+    /**
+     * 批量添加files
+     * @param list
+     * @return
+     */
+    int insertFile(List<UmsCompanyFile> list);
+
+
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dao/UmsMemberOriginDao.java

@@ -0,0 +1,25 @@
+package com.hwrj.cloud.admin.dao;
+
+import com.hwrj.cloud.admin.dto.UmsMemberOriginParam;
+import com.hwrj.cloud.admin.model.UmsMemberOrigin;
+
+import java.util.List;
+
+/**
+ * @className:
+ * @description:
+ * @author: lym
+ * @date: 2020/9/6 17:39
+ */
+public interface UmsMemberOriginDao {
+
+    /**
+     * 检验是否存在
+     * lym
+     * @param umsMemberOrigin
+     * @return
+     */
+    int isExist(UmsMemberOrigin umsMemberOrigin);
+
+    List<UmsMemberOriginParam> list(UmsMemberOriginParam origin);
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dao/UmsMemberOriginProductDao.java

@@ -0,0 +1,25 @@
+package com.hwrj.cloud.admin.dao;
+
+import com.hwrj.cloud.admin.model.UmsMemberOriginProduct;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @className:
+ * @description:
+ * @author: lym
+ * @date: 2020/9/6 11:27
+ */
+public interface UmsMemberOriginProductDao {
+
+    int batchSave(@Param("list") List<UmsMemberOriginProduct> list);
+
+    /**
+     * 查询生产地产出物
+     * lym
+     * @param originId
+     * @return
+     */
+    List<UmsMemberOriginProduct> selectByOriginId(@Param("originId") Long originId);
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dto/PmsProductCategoryDto.java

@@ -0,0 +1,12 @@
+package com.hwrj.cloud.admin.dto;
+
+import com.hwrj.cloud.admin.model.PmsProductCategory;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PmsProductCategoryDto extends PmsProductCategory {
+    private List<PmsProductCategoryDto> children;
+
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dto/UmsCompanyDto.java

@@ -0,0 +1,43 @@
+package com.hwrj.cloud.admin.dto;
+
+import com.hwrj.cloud.admin.model.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+@ApiModel(value = "供应商信息")
+public class UmsCompanyDto extends UmsCompanyInfo  {
+
+    @ApiModelProperty(value = "供应商图片信息")
+    private List<UmsCompanyFile> files;
+
+    @ApiModelProperty(value = "供应商店铺信息")
+    private List<UmsCompanyShop> shops;
+    @ApiModelProperty(value = "供应商基地信息")
+    private List<UmsMemberOriginParam> origins;
+
+    public List<UmsMemberOriginParam> getOrigins() {
+        return origins;
+    }
+
+    public void setOrigins(List<UmsMemberOriginParam> origins) {
+        this.origins = origins;
+    }
+
+    public List<UmsCompanyFile> getFiles() {
+        return files;
+    }
+
+    public void setFiles(List<UmsCompanyFile> files) {
+        this.files = files;
+    }
+
+    public List<UmsCompanyShop> getShops() {
+        return shops;
+    }
+
+    public void setShops(List<UmsCompanyShop> shops) {
+        this.shops = shops;
+    }
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dto/UmsMemberOriginParam.java

@@ -0,0 +1,107 @@
+package com.hwrj.cloud.admin.dto;
+
+import com.hwrj.cloud.admin.model.UmsMemberOriginProduct;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @className:
+ * @description:
+ * @author: lym
+ * @date: 2020/9/7 17:50
+ */
+@Data
+@ApiModel("生产基地信息")
+public class UmsMemberOriginParam {
+
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @ApiModelProperty(value = "供应商id (供应商信息表 ums_company_info -> id)")
+    private Long fkCompanyInfoId;
+
+    @ApiModelProperty(value = "供应商名称")
+    private String compName;
+
+    @ApiModelProperty(value = "生产地名称")
+    private String originName;
+
+    @ApiModelProperty(value = "生产地面积（亩）")
+    private Double originArea;
+
+    @ApiModelProperty(value = "人数")
+    private Integer peopleNum;
+
+    @ApiModelProperty(value = "建立日期（年）")
+    private String foundDate;
+
+    @ApiModelProperty(value = "联系人")
+    private String linkUser;
+
+    @ApiModelProperty(value = "联系方式")
+    private String linkPhone;
+
+    @ApiModelProperty(value = "省")
+    private String provinceName;
+
+    @ApiModelProperty(value = "市")
+    private String cityName;
+
+    @ApiModelProperty(value = "县")
+    private String countyName;
+
+    @ApiModelProperty(value = "详细地址")
+    private String detailAddress;
+
+    private String altitude;
+
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
+    @ApiModelProperty(value = "状态 0:可用，1:禁用，2:删除")
+    private Integer state;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人")
+    private Integer createId;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "修改人id")
+    private Integer updateId;
+
+    @ApiModelProperty(value = "生产地图片")
+    private String imgUrl;
+
+    @ApiModelProperty(value = "生产地宣传视频地址")
+    private String videoUrl;
+
+    @ApiModelProperty(value = "vr地址")
+    private String vrUrl;
+
+    @ApiModelProperty(value = "实时监控视频地址")
+    private String cameraUrl;
+
+    @ApiModelProperty(value = "简介")
+    private String summary;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    private Integer pageNum = 1;
+
+    private Integer pageSize = 10;
+
+    @ApiModelProperty(value = "生产地产出物")
+    private List<UmsMemberOriginProduct> productlist;
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dto/UmsMemberOriginProductParam.java

@@ -0,0 +1,64 @@
+package com.hwrj.cloud.admin.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * @className:
+ * @description:
+ * @author: lym
+ * @date: 2020/9/7 14:59
+ */
+@Data
+@ApiModel("生产地产物信息")
+public class UmsMemberOriginProductParam {
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @ApiModelProperty(value = "生产地id (生产地信息表 ums_member_origin -> id)")
+    @NotNull(message = "请选择生产地！")
+    private Long fkOriginId;
+
+    @ApiModelProperty(value = "产品名称")
+    @NotEmpty(message = "产品名称不能为空！")
+    private String productName;
+
+    @ApiModelProperty(value = "产出物种植面积（亩）")
+    @NotEmpty(message = "产出物种植面积不能为空！")
+    private String plantArea;
+
+    @ApiModelProperty(value = "产出物总产量（吨）")
+    @NotEmpty(message = "产出物总产量不能为空！")
+    private String outputNum;
+
+    @ApiModelProperty(value = "产出物亩产值（万元）")
+    @NotEmpty(message = "产出物亩产值不能为空！")
+    private String outputValue;
+
+    @ApiModelProperty(value = "状态 0:可用，1:禁用，2:删除")
+    private Integer state;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "创建人")
+    private Integer createId;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "修改人id")
+    private Integer updateId;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    private Integer pageNum = 1;
+
+    private Integer pageSize = 10;
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dto/param/BigDataCompanyInfo.java

@@ -0,0 +1,12 @@
+package com.hwrj.cloud.admin.dto.param;
+
+import lombok.Data;
+
+@Data
+public class BigDataCompanyInfo {
+    private String id;
+
+    private String title;
+
+    private String data;
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/excelEntity/UmsCompanyInfoExcel.java

@@ -1,9 +1,11 @@
 package com.hwrj.cloud.admin.excelEntity;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.NumberFormat;
 import com.alibaba.excel.metadata.BaseRowModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 public class UmsCompanyInfoExcel  extends BaseRowModel {
@@ -11,62 +13,123 @@ public class UmsCompanyInfoExcel  extends BaseRowModel {
     private Long id;
 
     @ApiModelProperty(value = "供应商名称")
-    @ExcelProperty(value = "供应商名称", index = 0)
+    @ExcelProperty(value = "供应商名称",index = 0)
     private String compName;
 
+    @ApiModelProperty(value = "供应商类型")
+    @ExcelProperty(value = "供应商类型",index = 1)
+    private String companyType;
+
+    @ApiModelProperty(value = "供应商评级")
+    @ExcelProperty(value = "供应商评级",index = 2)
+    @NumberFormat("#")
+    private Integer compLevel;
+
+    @ApiModelProperty(value = "供应商资质")
+    @ExcelProperty(value = "供应商资质",index = 3)
+    private String compQual;
+    @ApiModelProperty(value = "供应商图片")
+    @ExcelProperty(value = "供应商图片",index = 4)
+    private String imgs;
+    @ApiModelProperty(value = "供应商资质图片")
+    @ExcelProperty(value = "供应商资质图片",index = 5)
+    private String qualImgs;
+    @ApiModelProperty(value = "企业logo图片")
+    @ExcelProperty(value = "企业logo图片",index = 6)
+    private String logoImgs;
+    @ApiModelProperty(value = "公众号二维码图片")
+    @ExcelProperty(value = "公众号二维码图片",index = 7)
+    private String qrlImgs;
+    @ApiModelProperty(value = "淘宝店地址")
+    @ExcelProperty(value = "淘宝店地址",index = 8)
+    private String tbUrl;
+    @ApiModelProperty(value = "京东店地址")
+    @ExcelProperty(value = "京东店地址",index = 9)
+    private String jdUrl;
+    @ApiModelProperty(value = "自主商城地址")
+    @ExcelProperty(value = "自主商城地址",index = 10)
+    private String ownUrl;
+
+    @ApiModelProperty(value = "是否认证：0未认证，1认证")
+    @ExcelProperty(value = "是否认证",index = 11)
+    private Integer isCert;
+
+
     @ApiModelProperty(value = "供应商照片")
     private String compImgs;
 
     @ApiModelProperty(value = "供应商外部连接")
     private String compUrl;
 
-    @ApiModelProperty(value = "供应商生产许可证号")
+    @ApiModelProperty(value = "生产许可证号")
+    @ExcelProperty(value = "生产许可证号",index = 12)
     private String compProdLicenseNum;
 
-    @ApiModelProperty(value = "供应商经营许可证")
+    @ApiModelProperty(value = "经营许可证号")
+    @ExcelProperty(value = "经营许可证号",index = 13)
     private String compManageLicenseNum;
 
-    @ApiModelProperty(value = "供应商社会行用代码")
+    @ApiModelProperty(value = "社会信用代码")
+    @ExcelProperty(value = "社会信用代码",index = 14)
     private String compSocialCode;
 
-    @ApiModelProperty(value = "供应商联系人")
+
+
+
+
+    @ApiModelProperty(value = "联系人")
+    @ExcelProperty(value = "联系人",index = 15)
     private String compConPerson;
 
     @ApiModelProperty(value = "供应商联系方式")
+//    @ExcelProperty(value = "供应商联系方式",index = 0)
     private String compConType;
 
     @ApiModelProperty(value = "供应商联系账号")
+    @ExcelProperty(value = "供应商联系方式",index = 16)
     private String compConNum;
 
-    @ApiModelProperty(value = "供应商对外qq")
+    @ApiModelProperty(value = "对外企业qq")
+    @ExcelProperty(value = "对外企业qq",index = 17)
     private String compQq;
 
-    @ApiModelProperty(value = "供应商经营产平")
+    @ApiModelProperty(value = "经营产品")
+    @ExcelProperty(value = "经营产品",index = 18)
     private String compManageProduct;
 
-    @ApiModelProperty(value = "所在省id")
+    @ApiModelProperty(value = "简介")
+    @ExcelProperty(value = "简介",index = 19)
+    private String compSum;
+
+    @ApiModelProperty(value = "所在省")
+    @ExcelProperty(value = "所在省",index = 20)
     private String provinceId;
 
-    @ApiModelProperty(value = "所在市id")
+    @ApiModelProperty(value = "所在市")
+    @ExcelProperty(value = "所在市",index = 21)
     private String cityId;
 
-    @ApiModelProperty(value = "所在县id")
+    @ApiModelProperty(value = "所在县")
+    @ExcelProperty(value = "所在县",index = 22)
     private String countyId;
 
-    @ApiModelProperty(value = "所在镇id")
+    @ApiModelProperty(value = "所在镇")
     private String townId;
 
-    @ApiModelProperty(value = "所在乡id")
+    @ApiModelProperty(value = "所在乡")
     private String villageId;
 
     @ApiModelProperty(value = "详细位置")
+    @ExcelProperty(value = "详细位置",index = 23)
     private String detailAddress;
 
     @ApiModelProperty(value = "经度")
-    private String longitude;
+    @ExcelProperty(value = "经度",index = 24)
+    private BigDecimal longitude;
 
     @ApiModelProperty(value = "纬度")
-    private String latitude;
+    @ExcelProperty(value = "纬度",index = 25)
+    private BigDecimal latitude;
 
     @ApiModelProperty(value = "企业状态0可用，1，禁用，2删除")
     private Integer compStatus;
@@ -75,16 +138,15 @@ public class UmsCompanyInfoExcel  extends BaseRowModel {
     private Date createTime;
 
     @ApiModelProperty(value = "创建人")
-    private Integer createId;
+    private Long createId;
 
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;
 
     @ApiModelProperty(value = "修改人id")
-    private Integer updateId;
+    private Long updateId;
+
 
-    @ApiModelProperty(value = "供应商简介")
-    private String compIntroduction;
 
     private static final long serialVersionUID = 1L;
 
@@ -104,6 +166,30 @@ public class UmsCompanyInfoExcel  extends BaseRowModel {
         this.compName = compName;
     }
 
+    public String getCompanyType() {
+        return companyType;
+    }
+
+    public void setCompanyType(String companyType) {
+        this.companyType = companyType;
+    }
+
+    public Integer getCompLevel() {
+        return compLevel;
+    }
+
+    public void setCompLevel(Integer compLevel) {
+        this.compLevel = compLevel;
+    }
+
+    public String getCompQual() {
+        return compQual;
+    }
+
+    public void setCompQual(String compQual) {
+        this.compQual = compQual;
+    }
+
     public String getCompImgs() {
         return compImgs;
     }
@@ -152,6 +238,70 @@ public class UmsCompanyInfoExcel  extends BaseRowModel {
         this.compConPerson = compConPerson;
     }
 
+    public Integer getIsCert() {
+        return isCert;
+    }
+
+    public String getImgs() {
+        return imgs;
+    }
+
+    public void setImgs(String imgs) {
+        this.imgs = imgs;
+    }
+
+    public String getQualImgs() {
+        return qualImgs;
+    }
+
+    public void setQualImgs(String qualImgs) {
+        this.qualImgs = qualImgs;
+    }
+
+    public String getLogoImgs() {
+        return logoImgs;
+    }
+
+    public void setLogoImgs(String logoImgs) {
+        this.logoImgs = logoImgs;
+    }
+
+    public String getQrlImgs() {
+        return qrlImgs;
+    }
+
+    public void setQrlImgs(String qrlImgs) {
+        this.qrlImgs = qrlImgs;
+    }
+
+    public String getTbUrl() {
+        return tbUrl;
+    }
+
+    public void setTbUrl(String tbUrl) {
+        this.tbUrl = tbUrl;
+    }
+
+    public String getJdUrl() {
+        return jdUrl;
+    }
+
+    public void setJdUrl(String jdUrl) {
+        this.jdUrl = jdUrl;
+    }
+
+    public String getOwnUrl() {
+        return ownUrl;
+    }
+
+    public void setOwnUrl(String ownUrl) {
+        this.ownUrl = ownUrl;
+    }
+
+    public void setIsCert(Integer isCert) {
+        this.isCert = isCert;
+    }
+
     public String getCompConType() {
         return compConType;
     }
@@ -232,19 +382,19 @@ public class UmsCompanyInfoExcel  extends BaseRowModel {
         this.detailAddress = detailAddress;
     }
 
-    public String getLongitude() {
+    public BigDecimal getLongitude() {
         return longitude;
     }
 
-    public void setLongitude(String longitude) {
+    public void setLongitude(BigDecimal longitude) {
         this.longitude = longitude;
     }
 
-    public String getLatitude() {
+    public BigDecimal getLatitude() {
         return latitude;
     }
 
-    public void setLatitude(String latitude) {
+    public void setLatitude(BigDecimal latitude) {
         this.latitude = latitude;
     }
 
@@ -264,11 +414,11 @@ public class UmsCompanyInfoExcel  extends BaseRowModel {
         this.createTime = createTime;
     }
 
-    public Integer getCreateId() {
+    public Long getCreateId() {
         return createId;
     }
 
-    public void setCreateId(Integer createId) {
+    public void setCreateId(Long createId) {
         this.createId = createId;
     }
 
@@ -280,20 +430,20 @@ public class UmsCompanyInfoExcel  extends BaseRowModel {
         this.updateTime = updateTime;
     }
 
-    public Integer getUpdateId() {
+    public Long getUpdateId() {
         return updateId;
     }
 
-    public void setUpdateId(Integer updateId) {
+    public void setUpdateId(Long updateId) {
         this.updateId = updateId;
     }
 
-    public String getCompIntroduction() {
-        return compIntroduction;
+    public String getCompSum() {
+        return compSum;
     }
 
-    public void setCompIntroduction(String compIntroduction) {
-        this.compIntroduction = compIntroduction;
+    public void setCompSum(String compSum) {
+        this.compSum = compSum;
     }
 
     @Override
@@ -304,12 +454,16 @@ public class UmsCompanyInfoExcel  extends BaseRowModel {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", compName=").append(compName);
+        sb.append(", companyType=").append(companyType);
+        sb.append(", compLevel=").append(compLevel);
+        sb.append(", compQual=").append(compQual);
         sb.append(", compImgs=").append(compImgs);
         sb.append(", compUrl=").append(compUrl);
         sb.append(", compProdLicenseNum=").append(compProdLicenseNum);
         sb.append(", compManageLicenseNum=").append(compManageLicenseNum);
         sb.append(", compSocialCode=").append(compSocialCode);
         sb.append(", compConPerson=").append(compConPerson);
+        sb.append(", isCert=").append(isCert);
         sb.append(", compConType=").append(compConType);
         sb.append(", compConNum=").append(compConNum);
         sb.append(", compQq=").append(compQq);
@@ -327,7 +481,7 @@ public class UmsCompanyInfoExcel  extends BaseRowModel {
         sb.append(", createId=").append(createId);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", updateId=").append(updateId);
-        sb.append(", compIntroduction=").append(compIntroduction);
+        sb.append(", compSum=").append(compSum);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/excelEntity/UmsMemberOriginExcel.java

@@ -0,0 +1,121 @@
+package com.hwrj.cloud.admin.excelEntity;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.metadata.BaseRowModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @className:
+ * @description:
+ * @author: lym
+ * @date: 2020/9/5 17:54
+ */
+@Data
+public class UmsMemberOriginExcel extends BaseRowModel {
+
+    @ExcelProperty(value = "生产地名称")
+    @ApiModelProperty(value = "生产地名称")
+    private String originName;
+
+    @ExcelProperty("生产地面积（亩）")
+    @ApiModelProperty(value = "生产地面积（亩）")
+    private Double originArea;
+
+    @ExcelProperty("生产地图片")
+    @ApiModelProperty(value = "生产地图片")
+    private String imgUrl;
+
+    @ExcelProperty("生产地宣传视频")
+    @ApiModelProperty(value = "生产地宣传视频地址")
+    private String videoUrl;
+
+    @ExcelProperty("生产地vr")
+    @ApiModelProperty(value = "vr地址")
+    private String vrUrl;
+
+    @ExcelProperty("实时监控视频")
+    @ApiModelProperty(value = "实时监控视频地址")
+    private String cameraUrl;
+
+    @ExcelProperty("人员数")
+    @ApiModelProperty(value = "人数")
+    private Integer peopleNum;
+
+    @ExcelProperty("建立日期（年）")
+    @ApiModelProperty(value = "建立日期（年）")
+    private String foundDate;
+
+    @ExcelProperty("联系人")
+    @ApiModelProperty(value = "联系人")
+    private String linkUser;
+
+    @ExcelProperty("联系方式")
+    @ApiModelProperty(value = "联系方式")
+    private String linkPhone;
+
+    @ExcelProperty("简介")
+    @ApiModelProperty(value = "简介")
+    private String summary;
+
+    @ExcelProperty("产出物")
+    @ApiModelProperty(value = "产品名称")
+    private String productName;
+
+    @ExcelProperty("产出物种植面积（亩）")
+    @ApiModelProperty(value = "产出物种植面积（亩）")
+    private String plantArea;
+
+    @ExcelProperty("产出物总产量（吨）")
+    @ApiModelProperty(value = "产出物总产量（吨）")
+    private String outputNum;
+
+    @ExcelProperty("产出物亩产值（万元）")
+    @ApiModelProperty(value = "产出物亩产值（万元）")
+    private String outputValue;
+
+    @ExcelProperty("所在省")
+    @ApiModelProperty(value = "省")
+    private String provinceName;
+
+    @ExcelProperty("所在市")
+    @ApiModelProperty(value = "市")
+    private String cityName;
+
+    @ExcelProperty("所在县")
+    @ApiModelProperty(value = "县")
+    private String countyName;
+
+    @ExcelProperty(value = "详细地址")
+    @ApiModelProperty(value = "详细地址")
+    private String detailAddress;
+
+    @ExcelProperty(value = "海拔")
+    @ApiModelProperty(value = "海拔")
+    private String altitude;
+
+    @ExcelProperty(value = "经度（°）")
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ExcelProperty(value = "纬度（°）")
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
+    @ApiModelProperty(value = "状态 0:可用，1:禁用，2:删除")
+    private Integer state;
+
+    @ApiModelProperty(value = "创建人")
+    private Integer createId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "修改人id")
+    private Integer updateId;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/listener/ImportExcelEventListener.java

@@ -0,0 +1,47 @@
+package com.hwrj.cloud.admin.listener;
+
+import com.hwrj.cloud.admin.excelEntity.UmsMemberOriginExcel;
+import com.hwrj.cloud.admin.service.UmsMemberOriginService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @className:
+ * @description: 大批量导入异步事件
+ * @author: lym
+ * @date: 2020/9/6 15:24
+ */
+@Component
+public class ImportExcelEventListener {
+
+    @Autowired
+    private UmsMemberOriginService umsMemberOriginService;
+
+    /**
+     * 批量添加生产地信息
+     * lym
+     * @param list
+     */
+    @Async
+    public void batchSaveOriginExcel(List<UmsMemberOriginExcel> list){
+        if (list == null && list.size() < 1) return;
+        int total = list.size(),i = 0,saveNum = 500; //名次添加500
+        List<UmsMemberOriginExcel> saveList = new ArrayList<>();
+
+        while (total > saveNum) {
+            saveList = list.subList(i, i + saveNum);
+            i = i + saveNum;
+            total = total - saveNum;
+            umsMemberOriginService.batchSave(saveList);
+        }
+        if(total > 0) {
+            saveList = list.subList(i, i + total);
+            umsMemberOriginService.batchSave(saveList);
+        }
+    }
+
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/BigCompanyService.java

@@ -0,0 +1,18 @@
+package com.hwrj.cloud.admin.service;
+
+import com.hwrj.cloud.admin.dto.PmsProductCategoryDto;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 涉林大屏数据
+ */
+public interface BigCompanyService {
+    List<Map<String,Object>> getCompanyList(Long typeId,String key);
+
+    List<PmsProductCategoryDto> getCategoryDto();
+
+    List<String> getCat();
+
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/BigScreamService.java

@@ -0,0 +1,49 @@
+package com.hwrj.cloud.admin.service;
+
+import java.util.List;
+import java.util.Map;
+
+public interface BigScreamService {
+    /**
+     * 获取总体统计的数据
+     * @return
+     */
+    public Map<String,Object> data1(Long id);
+
+    /**
+     * 获取供应商分布信息
+     * @return
+     */
+    public List<Map<String,Object>> date2(String compType);
+
+    /**
+     *
+     * @return
+     */
+    public Map<String,Object> data3();
+
+    /**
+     * 获取产品分布信息
+     * lym
+     * @return
+     */
+    public List<Map<String,Object>> data4();
+
+    /**
+     * 获取供应信息
+     * @return
+     */
+    public List<String> data6();
+
+    /**
+     * 获取需求信息
+     * @return
+     */
+    public List<String> data7();
+
+    /**
+     * 获取需求信息
+     * @return
+     */
+    public List<String> data8();
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/UmsCompanyService.java

@@ -0,0 +1,117 @@
+package com.hwrj.cloud.admin.service;
+
+import com.hwrj.cloud.admin.dto.UmsCompanyDto;
+import com.hwrj.cloud.admin.excelEntity.UmsCompanyInfoExcel;
+import com.hwrj.cloud.admin.model.UmsCompanyFile;
+import com.hwrj.cloud.admin.model.UmsCompanyInfo;
+import com.hwrj.cloud.admin.model.UmsCompanyShop;
+
+import java.util.List;
+
+public interface UmsCompanyService {
+
+    /**
+     * excel导入供应商
+     * @param dto
+     */
+    public void add(UmsCompanyDto dto);
+
+    /**
+     * excel导入供应商
+     * @param dto
+     */
+    public void update(UmsCompanyDto dto);
+
+    /**
+     * excel导入供应商
+     * @param id
+     */
+    public void delete(Long id);
+
+
+
+    /**
+     * excel导入供应商
+     * @param infoExcels
+     */
+    public void importExcel(List<UmsCompanyInfoExcel> infoExcels);
+
+
+    /**
+     * excel导入供应商
+     *
+     */
+    public List<UmsCompanyDto> getCompanyInfoList(int pageSize, int pageNo);
+
+
+    /**
+     * 获取供应商详情
+     *
+     */
+    public UmsCompanyDto getDetailCompany(Long companyId);
+
+    /**
+     * 通过供应商id获取对应的供应商图片
+     * @param compId
+     * @return
+     */
+    public List<UmsCompanyFile> getCompanyFile(Long compId);
+
+    /**
+     * 通过供应商id获取对应的供应商商店
+     * @param compId
+     * @return
+     */
+    public List<UmsCompanyShop> getCompanyShop(Long compId);
+
+    /**
+     * 修改供应商文件
+     * @param umsCompanyFile
+     */
+    public void updateCompanyFile(UmsCompanyFile umsCompanyFile);
+
+
+    /**
+     * 删除供应商照片
+     * @param shopId
+     * @param userId
+     */
+    public void deleteCompanyFile(Long shopId,Long userId);
+
+
+    /**
+     * 修改供应商文件
+     * @param umsCompanyShop
+     */
+    public void updateCompanyShop(UmsCompanyShop umsCompanyShop);
+
+
+    /**
+     * 删除供应商照片
+     * @param shopId
+     * @param userId
+     */
+    public void deleteCompanyShop(Long shopId,Long userId);
+
+
+    /**
+     * 通过供应商id删除文件
+     * @param compId
+     * @param userId
+     */
+    public void deleteCompanyFileByCompId(Long compId,Long userId);
+
+
+    /**
+     * 通过供应商id来删除供应商商店
+     * @param compId
+     * @param userId
+     */
+    public void deleteCompanyShopByCompId(Long compId,Long userId);
+
+
+
+
+
+
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/UmsMemberOriginProductService.java

@@ -0,0 +1,23 @@
+package com.hwrj.cloud.admin.service;
+
+import com.hwrj.cloud.admin.dto.UmsMemberOriginProductParam;
+import com.hwrj.cloud.admin.model.UmsMemberOriginProduct;
+
+import java.util.List;
+
+/**
+ * @className:
+ * @description:
+ * @author: lym
+ * @date: 2020/9/7 10:13
+ */
+public interface UmsMemberOriginProductService {
+
+    List<UmsMemberOriginProduct> list(UmsMemberOriginProductParam originProduct);
+
+    int save(UmsMemberOriginProductParam originProduct);
+
+    int update(UmsMemberOriginProductParam originProduct);
+
+    int delete(long id);
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/UmsMemberOriginService.java

@@ -0,0 +1,18 @@
+package com.hwrj.cloud.admin.service;
+
+import com.hwrj.cloud.admin.dto.UmsMemberOriginParam;
+import com.hwrj.cloud.admin.excelEntity.UmsMemberOriginExcel;
+
+import java.util.List;
+
+/**
+ * @className:
+ * @description:
+ * @author: lym
+ * @date: 2020/9/5 11:18
+ */
+public interface UmsMemberOriginService {
+    public int batchSave(List<UmsMemberOriginExcel> list);
+
+    List<UmsMemberOriginParam> list(UmsMemberOriginParam origin);
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/BigCompanyServiceImpl.java

@@ -0,0 +1,56 @@
+package com.hwrj.cloud.admin.service.impl;
+
+import com.hwrj.cloud.admin.dao.BigCompanyDao;
+import com.hwrj.cloud.admin.dto.PmsProductCategoryDto;
+import com.hwrj.cloud.admin.mapper.PmsProductCategoryMapper;
+import com.hwrj.cloud.admin.model.PmsProductCategory;
+import com.hwrj.cloud.admin.model.PmsProductCategoryExample;
+import com.hwrj.cloud.admin.service.BigCompanyService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+public class BigCompanyServiceImpl implements BigCompanyService {
+    @Autowired
+    private PmsProductCategoryMapper pmsProductCategoryMapper;
+
+    @Autowired
+    private BigCompanyDao bigCompanyDao;
+    @Override
+    public List<Map<String, Object>> getCompanyList(Long typeId, String key) {
+        List<Map<String, Object>> maps = bigCompanyDao.bigCompanyInfo(key, typeId);
+        return maps;
+    }
+
+    @Override
+    public List<PmsProductCategoryDto> getCategoryDto() {
+        PmsProductCategoryExample example = new PmsProductCategoryExample();
+        List<PmsProductCategory> categoryList = pmsProductCategoryMapper.selectByExample(example);
+        List<PmsProductCategoryDto> result = categoryList.stream()
+                .filter(item -> item.getParentId().equals(0L))
+                .map(item -> covert(item, categoryList)).collect(Collectors.toList());
+        return result;
+    }
+
+    @Override
+    public List<String> getCat() {
+        List<String> cat = bigCompanyDao.getCat();
+        return cat;
+    }
+
+
+    private PmsProductCategoryDto covert(PmsProductCategory item, List<PmsProductCategory> allList) {
+        PmsProductCategoryDto node = new PmsProductCategoryDto();
+        BeanUtils.copyProperties(item, node);
+        List<PmsProductCategoryDto> children = allList.stream()
+                .filter(subItem -> subItem.getParentId().equals(item.getId()))
+                .map(subItem -> covert(subItem, allList)).collect(Collectors.toList());
+        node.setChildren(children);
+        return node;
+    }
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/BigScreamServiceImpl.java

@@ -0,0 +1,56 @@
+package com.hwrj.cloud.admin.service.impl;
+
+import com.hwrj.cloud.admin.dao.BigScreamDao;
+import com.hwrj.cloud.admin.service.BigScreamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class BigScreamServiceImpl implements BigScreamService {
+    @Autowired
+    private BigScreamDao bigScreamDao;
+
+
+    @Override
+    public Map<String, Object> data1(Long id) {
+        Map<String, Object> map = bigScreamDao.data1(id);
+        return map;
+    }
+
+    @Override
+    public List<Map<String, Object>> date2(String compType) {
+
+        return bigScreamDao.data2(compType);
+    }
+
+    @Override
+    public Map<String, Object> data3() {
+        return null;
+    }
+
+    @Override
+    public List<Map<String,Object>> data4() {
+        return bigScreamDao.data4();
+    }
+
+    @Override
+    public List<String> data6() {
+        List<String> strings = bigScreamDao.data6();
+        return strings;
+    }
+
+    @Override
+    public List<String> data7() {
+        List<String> strings = bigScreamDao.data7();
+
+        return strings;
+    }
+
+    @Override
+    public List<String> data8() {
+        return bigScreamDao.data8();
+    }
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/UmsCompanyInfoServiceImpl.java

@@ -0,0 +1,272 @@
+package com.hwrj.cloud.admin.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.excel.util.StringUtils;
+import com.github.pagehelper.PageHelper;
+import com.hwrj.cloud.admin.dao.UmsCompanyShopDao;
+import com.hwrj.cloud.admin.dto.UmsCompanyDto;
+import com.hwrj.cloud.admin.excelEntity.UmsCompanyInfoExcel;
+import com.hwrj.cloud.admin.mapper.UmsCompanyFileMapper;
+import com.hwrj.cloud.admin.mapper.UmsCompanyInfoMapper;
+import com.hwrj.cloud.admin.mapper.UmsCompanyShopMapper;
+import com.hwrj.cloud.admin.model.*;
+import com.hwrj.cloud.admin.service.UmsCompanyService;
+import com.hwrj.cloud.common.exception.GlobalException;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Service
+@Slf4j
+public class UmsCompanyInfoServiceImpl implements UmsCompanyService {
+
+    @Autowired
+    private UmsCompanyInfoMapper umsCompanyInfoMapper;
+
+    @Autowired
+    private UmsCompanyFileMapper umsCompanyFileMapper;
+
+    @Autowired
+    private UmsCompanyShopMapper umsCompanyShopMapper;
+
+    @Autowired
+    private UmsCompanyShopDao umsCompanyShopDao;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void add(UmsCompanyDto dto) {
+        UmsCompanyInfo ums = new UmsCompanyInfo();
+        BeanUtil.copyProperties(dto,ums);
+        int i = umsCompanyInfoMapper.insertSelective(ums);
+        List<UmsCompanyFile> files = dto.getFiles();
+        List<UmsCompanyShop> shops = dto.getShops();
+
+        List<UmsCompanyFile> filesAdd = dto.getFiles();
+        List<UmsCompanyShop> shopsAdd = dto.getShops();
+        if (shops != null && shops.size()>0){
+            for (UmsCompanyShop shop:shops) {
+                shop.setShopStatus(0);
+                shop.setCreateTime(new Date());
+                shop.setCreateId(dto.getCreateId());
+                shop.setCompId(ums.getId());
+                shopsAdd.add(shop);
+            }
+            umsCompanyShopDao.addUmsCompanyShopList(shopsAdd);
+        }
+        if (files != null && files.size()>0){
+            for (UmsCompanyFile file:files) {
+                file.setFileStatus(0);
+                file.setCreateTime(new Date());
+                file.setCreateId(dto.getCreateId());
+                file.setCompId(ums.getId());
+                files.add(file);
+            }
+            umsCompanyShopDao.insertFile(filesAdd);
+        }
+    }
+
+    @Override
+    public void update(UmsCompanyDto dto) {
+        UmsCompanyInfo umsCompanyInfo = new UmsCompanyInfo();
+        BeanUtil.copyProperties(dto, umsCompanyInfo);
+        umsCompanyInfoMapper.updateByPrimaryKeySelective(umsCompanyInfo);
+
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(Long id) {
+        UmsCompanyInfo info = new UmsCompanyInfo();
+        info.setCompStatus(2);
+        info.setId(id);
+
+        umsCompanyInfoMapper.updateByPrimaryKeySelective(info);
+
+
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void importExcel(List<UmsCompanyInfoExcel> infoExcels) {
+      if (infoExcels == null || infoExcels.size()<1){
+          return;
+      }
+      List<UmsCompanyShop> listShops = new ArrayList<>();
+      infoExcels.stream().forEach(item->{
+          UmsCompanyInfo umsCompanyInfo = new UmsCompanyInfo();
+          BeanUtil.copyProperties(item,umsCompanyInfo);
+          umsCompanyInfo.setCreateTime(new Date());
+          umsCompanyInfo.setCompStatus(0);
+          try {
+              int i = umsCompanyInfoMapper.insertSelective(umsCompanyInfo);
+              item.setId(umsCompanyInfo.getId());
+              List<UmsCompanyShop> shops = getShopsFromUmsCompanyInfoExcel(item);
+              listShops.addAll(shops);
+          }catch (Exception e){
+                log.info("添加数据失败");
+          }
+
+
+
+      });
+      if (listShops != null){
+          int i = umsCompanyShopDao.addUmsCompanyShopList(listShops);
+      }
+      return;
+    }
+
+    @Override
+    public List<UmsCompanyDto> getCompanyInfoList(int pageSize, int pageNo) {
+        PageHelper.startPage(pageNo,pageSize);
+        UmsCompanyInfoExample example = new UmsCompanyInfoExample();
+        UmsCompanyInfoExample.Criteria criteria = example.createCriteria();
+        criteria.andCompStatusEqualTo(0);
+        List<UmsCompanyInfo> companyInfos = umsCompanyInfoMapper.selectByExample(example);
+        List<UmsCompanyDto> dtos = new ArrayList<>();
+        companyInfos.stream().forEach(comp->{
+            UmsCompanyDto dto= new UmsCompanyDto();
+            BeanUtil.copyProperties(comp,dto);
+            dto.setFiles(getCompanyFile(comp.getId()));
+            dto.setShops(getCompanyShop(comp.getId()));
+            dtos.add(dto);
+            dtos.add(dto);
+
+        });
+        return dtos;
+    }
+
+    @Override
+    public UmsCompanyDto getDetailCompany(Long companyId) {
+        UmsCompanyInfo umsCompanyInfo = umsCompanyInfoMapper.selectByPrimaryKey(companyId);
+        UmsCompanyDto ums = new UmsCompanyDto();
+        BeanUtil.copyProperties(umsCompanyInfo,ums);
+        ums.setFiles(getCompanyFile(companyId));
+        ums.setShops(getCompanyShop(companyId));
+
+        return ums;
+    }
+
+    public List<UmsCompanyShop> getShopsFromUmsCompanyInfoExcel(UmsCompanyInfoExcel ums){
+        List<UmsCompanyShop> shops = new ArrayList<>();
+        UmsCompanyShop shop = new UmsCompanyShop();
+
+        shop.setCompId(ums.getId());
+        shop.setCreateId(ums.getCreateId());
+        shop.setCreateTime(ums.getCreateTime());
+        shop.setShopStatus(0);
+        if (!StringUtils.isEmpty(ums.getTbUrl())){
+            UmsCompanyShop tbShop = new UmsCompanyShop();
+            BeanUtil.copyProperties(shop,tbShop);
+            tbShop.setShopType("taobao");
+            tbShop.setShopUrl(ums.getTbUrl());
+            shops.add(tbShop);
+
+        }
+        if (!StringUtils.isEmpty(ums.getJdUrl())){
+            UmsCompanyShop jdShop = new UmsCompanyShop();
+            BeanUtil.copyProperties(shop,jdShop);
+            jdShop.setShopType("jd");
+            jdShop.setShopUrl(ums.getJdUrl());
+            shops.add(jdShop);
+        }
+
+        if (StringUtils.isEmpty(ums.getOwnUrl())){
+            UmsCompanyShop ownShop = new UmsCompanyShop();
+            BeanUtil.copyProperties(shop,ownShop);
+            ownShop.setShopType("own");
+            ownShop.setShopUrl(ums.getOwnUrl());
+            shops.add(ownShop);
+        }
+        return shops;
+    }
+    @Override
+    public List<UmsCompanyFile> getCompanyFile(Long compId){
+        UmsCompanyFileExample example = new UmsCompanyFileExample();
+        UmsCompanyFileExample.Criteria criteria = example.createCriteria();
+        criteria.andCompIdEqualTo(compId);
+        criteria.andFileStatusEqualTo(0);
+        List<UmsCompanyFile> files = umsCompanyFileMapper.selectByExample(example);
+        return files;
+    }
+    public List<UmsCompanyShop> getCompanyShop(Long compId){
+        UmsCompanyShopExample example = new UmsCompanyShopExample();
+        UmsCompanyShopExample.Criteria criteria = example.createCriteria();
+        criteria.andCompIdEqualTo(compId);
+        criteria.andShopStatusEqualTo(0);
+        List<UmsCompanyShop> shops = umsCompanyShopMapper.selectByExample(example);
+        return shops;
+    }
+
+    @Override
+    public void updateCompanyFile(UmsCompanyFile umsCompanyFile) {
+        if (StringUtils.isEmpty(umsCompanyFile.getId())){
+            throw new GlobalException("缺失修改主体");
+        }
+        umsCompanyFile.setUpdateTime(new Date());
+        umsCompanyFileMapper.updateByPrimaryKeySelective(umsCompanyFile);
+    }
+
+    @Override
+    public void deleteCompanyFile(Long shopId, Long userId) {
+        if (shopId == null){
+            throw  new GlobalException("缺失删除主体");
+        }
+        UmsCompanyFile umsCompanyFile = new UmsCompanyFile();
+        umsCompanyFile.setId(shopId);
+        umsCompanyFile.setFileStatus(2);
+        umsCompanyFile.setUpdateTime(new Date());
+        umsCompanyFile.setUpdateId(userId);
+
+    }
+
+    @Override
+    public void updateCompanyShop(UmsCompanyShop umsCompanyShop) {
+        if (StringUtils.isEmpty(umsCompanyShop.getId())){
+            throw new GlobalException("缺失修改主体");
+        }
+        umsCompanyShop.setUpdateTime(new Date());
+        umsCompanyShopMapper.updateByPrimaryKeySelective(umsCompanyShop);
+    }
+
+    @Override
+    public void deleteCompanyShop(Long shopId, Long userId) {
+        if (shopId == null){
+            throw  new GlobalException("缺失删除主体");
+        }
+
+        UmsCompanyShop umsCompanyShop = new UmsCompanyShop();
+        umsCompanyShop.setId(shopId);
+        umsCompanyShop.setShopStatus(2);
+        umsCompanyShop.setUpdateTime(new Date());
+        umsCompanyShopMapper.updateByPrimaryKeySelective(umsCompanyShop);
+    }
+
+    @Override
+    public void deleteCompanyFileByCompId(Long compId, Long userId) {
+        UmsCompanyFileExample fileExampleW = new UmsCompanyFileExample();
+        UmsCompanyFileExample.Criteria fileCriteriaW = fileExampleW.createCriteria();
+        fileCriteriaW.andCompIdEqualTo(compId);
+        UmsCompanyFile file = new UmsCompanyFile();
+        file.setFileStatus(2);
+        file.setUpdateId(userId);
+        file.setUpdateTime(new Date());
+        umsCompanyFileMapper.updateByExample(file,fileExampleW);
+    }
+
+    @Override
+    public void deleteCompanyShopByCompId(Long compId, Long userId) {
+        UmsCompanyShop shop = new UmsCompanyShop();
+        shop.setShopStatus(2);
+        shop.setUpdateTime(new Date());
+        UmsCompanyShopExample shopExample = new UmsCompanyShopExample();
+        UmsCompanyShopExample.Criteria criteria = shopExample.createCriteria();
+        criteria.andCompIdEqualTo(compId);
+        umsCompanyShopMapper.updateByExample(shop,shopExample);
+    }
+
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/UmsMemberOriginProductServiceImpl.java

@@ -0,0 +1,103 @@
+package com.hwrj.cloud.admin.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.hwrj.cloud.admin.dto.UmsMemberOriginProductParam;
+import com.hwrj.cloud.admin.mapper.UmsMemberOriginProductMapper;
+import com.hwrj.cloud.admin.model.UmsMemberOriginProduct;
+import com.hwrj.cloud.admin.model.UmsMemberOriginProductExample;
+import com.hwrj.cloud.admin.service.UmsMemberOriginProductService;
+import com.hwrj.cloud.admin.util.CurrUserUtil;
+import com.hwrj.cloud.common.exception.GlobalException;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @className:
+ * @description:
+ * @author: lym
+ * @date: 2020/9/7 10:24
+ */
+@Service
+public class UmsMemberOriginProductServiceImpl implements UmsMemberOriginProductService {
+
+    @Resource
+    private UmsMemberOriginProductMapper umsMemberOriginProductMapper;
+
+    @Override
+    public List<UmsMemberOriginProduct> list(UmsMemberOriginProductParam originProduct) {
+        PageHelper.startPage(originProduct.getPageNum(), originProduct.getPageSize());
+        UmsMemberOriginProductExample example = new UmsMemberOriginProductExample();
+        UmsMemberOriginProductExample.Criteria criteria = example.createCriteria();
+        if (!StringUtils.isEmpty(originProduct.getFkOriginId())) {
+            criteria.andFkOriginIdNotEqualTo(originProduct.getFkOriginId());
+        }
+        if (!StringUtils.isEmpty(originProduct.getProductName())) {
+            criteria.andProductNameLike(originProduct.getProductName());
+        }
+        if (!StringUtils.isEmpty(originProduct.getPlantArea())) {
+            criteria.andPlantAreaLike(originProduct.getPlantArea());
+        }
+        if (!StringUtils.isEmpty(originProduct.getOutputNum())) {
+            criteria.andOutputNumLike(originProduct.getOutputNum());
+        }
+        if (!StringUtils.isEmpty(originProduct.getOutputValue())) {
+            criteria.andOutputValueLike(originProduct.getOutputValue());
+        }
+        criteria.andStateEqualTo(0);
+        example.setOrderByClause("create_time desc");
+        return umsMemberOriginProductMapper.selectByExample(example);
+    }
+
+    @Override
+    public int save(UmsMemberOriginProductParam originProduct) {
+        isExist(originProduct); //检验唯一
+
+        UmsMemberOriginProduct product = new UmsMemberOriginProduct();
+        BeanUtils.copyProperties(originProduct,product);
+        product.setState(0);
+        product.setCreateId(CurrUserUtil.getUserId());
+        return umsMemberOriginProductMapper.insertSelective(product);
+    }
+
+    @Override
+    public int update(UmsMemberOriginProductParam originProduct) {
+        isExist(originProduct); //检验唯一
+
+        UmsMemberOriginProduct product = new UmsMemberOriginProduct();
+        BeanUtils.copyProperties(originProduct,product);
+        product.setUpdateId(CurrUserUtil.getUserId());
+        return umsMemberOriginProductMapper.updateByPrimaryKeySelective(product);
+    }
+
+    /**
+     * 检验唯一
+     * lym
+     * @param originProduct
+     */
+    private void isExist(UmsMemberOriginProductParam originProduct){
+        UmsMemberOriginProductExample example = new UmsMemberOriginProductExample();
+        UmsMemberOriginProductExample.Criteria criteria = example.createCriteria();
+        if (!StringUtils.isEmpty(originProduct.getId())){
+            criteria.andIdNotEqualTo(originProduct.getId());
+        }
+        criteria.andFkOriginIdEqualTo(originProduct.getFkOriginId());
+        criteria.andProductNameEqualTo(originProduct.getProductName());
+        criteria.andStateEqualTo(0);
+        long i = umsMemberOriginProductMapper.countByExample(example);
+        if (i > 0){
+            throw new GlobalException(500,"产出物已存在!");
+        }
+    }
+
+    @Override
+    public int delete(long id) {
+        UmsMemberOriginProduct product = new UmsMemberOriginProduct();
+        product.setId(id);
+        product.setState(2);
+        return umsMemberOriginProductMapper.updateByPrimaryKeySelective(product);
+    }
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/UmsMemberOriginServiceImpl.java

@@ -0,0 +1,123 @@
+package com.hwrj.cloud.admin.service.impl;
+
+import com.hwrj.cloud.admin.dao.UmsMemberOriginDao;
+import com.hwrj.cloud.admin.dao.UmsMemberOriginProductDao;
+import com.hwrj.cloud.admin.dto.UmsMemberOriginParam;
+import com.hwrj.cloud.admin.excelEntity.UmsMemberOriginExcel;
+import com.hwrj.cloud.admin.mapper.UmsMemberOriginMapper;
+import com.hwrj.cloud.admin.model.UmsMemberOrigin;
+import com.hwrj.cloud.admin.model.UmsMemberOriginProduct;
+import com.hwrj.cloud.admin.service.UmsMemberOriginService;
+import com.hwrj.cloud.admin.util.CurrUserUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @className:
+ * @description:
+ * @author: lym
+ * @date: 2020/9/5 11:23
+ */
+@Service
+public class UmsMemberOriginServiceImpl implements UmsMemberOriginService {
+    @Resource
+    private UmsMemberOriginMapper umsMemberOriginMapper;
+    @Resource
+    private UmsMemberOriginProductDao umsMemberOriginProductDao;
+    @Resource
+    private UmsMemberOriginDao umsMemberOriginDao;
+
+    @Override
+    //@Transactional
+    public int batchSave(List<UmsMemberOriginExcel> list) {
+        UmsMemberOrigin origin = null;
+        List<UmsMemberOriginProduct> originProductList = new ArrayList<>();
+        int saveNum = 0;
+        for (UmsMemberOriginExcel excel:list){
+            origin = new UmsMemberOrigin();
+            BeanUtils.copyProperties(excel,origin);
+            //检验是否唯一
+            int i = umsMemberOriginDao.isExist(origin);
+            if (i > 0) continue; //已存在
+            i = umsMemberOriginMapper.insertSelective(origin); //添加生产地信息
+            if (i > 0){
+                saveNum ++;
+                getOriginProductList(excel,origin.getId(),originProductList);
+            }
+        }
+        if (originProductList != null && originProductList.size() > 0)
+            umsMemberOriginProductDao.batchSave(originProductList);
+        return saveNum;
+    }
+
+    /**
+     * 产地产出物
+     * lym
+     * @param excel
+     * @param originProductList
+     */
+    private void getOriginProductList(UmsMemberOriginExcel excel,long originId,List<UmsMemberOriginProduct> originProductList){
+            if (!StringUtils.isEmpty(excel.getProductName())){ //产出物不为空
+                List<String> productNames = new ArrayList<>(),plantAreas = new ArrayList<>(),
+                        outputNums = new ArrayList<>(),outputValues = new ArrayList<>();
+                UmsMemberOriginProduct originProduct = null;
+                String productName = excel.getProductName();
+                String plantArea = excel.getPlantArea(); //产出物种植面积（亩）
+                String outputNum = excel.getOutputNum(); //产出物总产量（吨）
+                String outputValue = excel.getOutputValue(); //产出物亩产值（万元）
+                if (productName.contains("；")){ //多产出物
+                    productNames = Arrays.asList(productName.split("；"));
+                    //产出物不为空，种植面积这些才有价值
+                    if (plantArea.contains("；")){
+                        plantAreas = Arrays.asList(plantArea.split("；"));
+                    }
+
+                    if (outputNum.contains("；")){
+                        outputNums = Arrays.asList(outputNum.split("；"));
+                    }
+
+                    if (outputValue.contains("；")){
+                        outputValues = Arrays.asList(outputValue.split("；"));
+                    }
+
+                    for (int i = 0;i < productNames.size();i++){ //产出物
+                        originProduct = new UmsMemberOriginProduct();
+                        originProduct.setFkOriginId(originId);
+                        originProduct.setProductName(productNames.get(i));
+                        if (plantAreas != null && plantAreas.size() > i)
+                            originProduct.setPlantArea(plantAreas.get(i));
+                        if (outputNums != null && outputNums.size() > i)
+                            originProduct.setOutputNum(outputNums.get(i));
+                        if (outputValues != null && outputValues.size() > i)
+                            originProduct.setOutputValue(outputValues.get(i));
+                        originProduct.setState(0);
+                        originProduct.setCreateId(CurrUserUtil.getUserId());
+                        originProductList.add(originProduct);
+                    }
+                }else {
+                    originProduct = new UmsMemberOriginProduct();
+                    originProduct.setFkOriginId(originId);
+                    originProduct.setProductName(productName);
+                    originProduct.setPlantArea(plantArea);
+                    originProduct.setOutputNum(outputNum);
+                    originProduct.setOutputValue(outputValue);
+                    originProduct.setState(0);
+                    originProduct.setCreateId(CurrUserUtil.getUserId());
+                    originProductList.add(originProduct);
+                }
+            }
+    }
+
+    @Override
+    public List<UmsMemberOriginParam> list(UmsMemberOriginParam origin) {
+        List<UmsMemberOriginParam> list = umsMemberOriginDao.list(origin);
+        return list;
+    }
+
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/UmsMemberPlatformServiceImpl.java

@@ -4,6 +4,7 @@ import com.hwrj.cloud.admin.mapper.UmsMemberPlatformMapper;
 import com.hwrj.cloud.admin.model.UmsMemberPlatform;
 import com.hwrj.cloud.admin.model.UmsMemberPlatformExample;
 import com.hwrj.cloud.admin.service.UmsMemberPlatformService;
+import com.hwrj.cloud.security.util.JwtTokenUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 
@@ -12,6 +13,8 @@ import java.util.List;
 public class UmsMemberPlatformServiceImpl implements UmsMemberPlatformService {
     @Autowired
     private UmsMemberPlatformMapper umsMemberPlatformMapper;
+    @Autowired
+    private JwtTokenUtil jwtTokenUtil;
     @Override
     public int addUmsMemberPlatformService(UmsMemberPlatform umsMemberPlatform) {
         UmsMemberPlatformExample example= new UmsMemberPlatformExample();

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/util/CurrUserUtil.java

@@ -0,0 +1,59 @@
+package com.hwrj.cloud.admin.util;
+
+import com.hwrj.cloud.admin.bo.AdminUserDetails;
+import com.hwrj.cloud.admin.model.UmsAdmin;
+import com.hwrj.cloud.common.api.ResultCode;
+import com.hwrj.cloud.common.exception.GlobalException;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.util.StringUtils;
+
+/**
+ * @className:
+ * @description: 当前登录用户
+ * @author: lym
+ * @date: 2020/9/6 16:16
+ */
+public class CurrUserUtil {
+
+    /**
+     * 获取Authentication
+     */
+    public static Authentication getAuthentication() {
+        return SecurityContextHolder.getContext().getAuthentication();
+    }
+
+    public static UmsAdmin getUmsAdmin(){
+        Authentication authentication = getAuthentication();
+        if (authentication == null) {
+            return null;
+        }
+        AdminUserDetails adminUserDetails = getLoginUser(authentication);
+        UmsAdmin umsAdmin = adminUserDetails.getUmsAdmin();
+        if (StringUtils.isEmpty(umsAdmin)) {
+            throw new GlobalException((int)ResultCode.UNAUTHORIZED.getCode(),ResultCode.UNAUTHORIZED.getMessage());
+        }
+        return umsAdmin;
+    }
+
+    /**
+     * 获取用户
+     */
+    public static AdminUserDetails getLoginUser(Authentication authentication) {
+        Object principal = authentication.getPrincipal();
+        if (principal instanceof AdminUserDetails) {
+            return (AdminUserDetails) principal;
+        }
+        throw new GlobalException((int)ResultCode.UNAUTHORIZED.getCode(),ResultCode.UNAUTHORIZED.getMessage());
+    }
+
+    /**
+     * 获取用户id
+     */
+    public static int getUserId() {
+        UmsAdmin umsAdmin = getUmsAdmin();
+        long userId = umsAdmin.getId();
+        return (int) userId;
+    }
+}
+

forest-admin/admin-server/src/main/resources/dao/BigCompanyDao.xml

@@ -0,0 +1,53 @@
+<?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="com.hwrj.cloud.admin.dao.BigCompanyDao">
+    <select id="bigCompanyInfo" resultType="java.util.Map">
+        SELECT
+            a.id,
+            a.comp_name AS name,
+            a.comp_con_person as compConPerson,
+            a.comp_con_num as compConNum,
+            concat(a.province_id,a.city_id,a.county_id) as address,
+            a.longitude as lng,
+            a.latitude as latitude,
+            a.company_type as companyType
+        FROM
+            ums_company_info a
+        WHERE
+            a.comp_status =0
+            <if test="param1 != null and param1 != ''">
+                and a.comp_name like concat('%',#{param1},'%')
+            </if>
+            <if test="param2 != null">
+                and a.id in (
+                select p.ums_company_info_id from pms_product p LEFT JOIN pms_product_category pc on p.product_category_id =#{param2} pc.id where pc.parent_id =  GROUP BY p.ums_company_info_id
+
+                )
+            </if>
+
+    </select>
+    <select id="getCat" resultType="java.lang.String">
+        SELECT
+            CONCAT(a.id,'---',a.name,'---',IFNULL(SUM(d.numm),0)) as cat
+        FROM
+            pms_product_category a
+            LEFT JOIN (
+            SELECT
+                b.ums_company_info,
+                b.ums_company_info_id,
+                c.parent_id,
+            CASE IFNULL(b.ums_company_info_id,-1)
+            WHEN  -1 THEN
+                0
+            ELSE
+                1
+        END as numm
+
+            FROM
+                pms_product b
+                LEFT JOIN pms_product_category c ON b.product_category_id = c.id GROUP BY c.id,b.ums_company_info_id
+            ) d ON a.id = d.parent_id
+        GROUP BY
+            a.id
+    </select>
+</mapper>

forest-admin/admin-server/src/main/resources/dao/BigScreamDao.xml

@@ -0,0 +1,72 @@
+<?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="com.hwrj.cloud.admin.dao.BigScreamDao">
+    <select id="data1" resultType="java.util.Map">
+        SELECT
+            a.*,
+            ( SELECT count( 0 ) FROM ums_company_info WHERE comp_status = 0 ) AS companyNum,
+            (select count(0) from ums_member_origin where state = 0) as originNum,
+            (select count(0) from pms_product where delete_status = 0) as productNum
+
+        FROM
+            ums_platform a
+        WHERE
+            a.id = #{id}
+	</select>
+
+    <select id="data2" resultType="java.util.Map" parameterType="java.lang.String">
+        SELECT
+            a.comp_name AS compName,
+            a.company_type AS companyType,
+            a.longitude AS lng,
+            a.latitude AS lat,
+            a.comp_manage_product as compProduct
+        FROM
+        `ums_company_info` a
+        WHERE
+            1=1
+            <if test="compType != null and compType != ''">
+                and a.company_type=#{compType}
+            </if>
+
+    </select>
+
+    <resultMap id="productMap" type="java.util.Map">
+        <collection property="productList" javaType="java.util.List" select="com.hwrj.cloud.admin.dao.BigScreamDao.data5"
+            column="{productName=name}" ofType="java.util.Map">
+        </collection>
+    </resultMap>
+
+    <!-- 获取产品分布信息 lym -->
+    <select id="data4" resultMap="productMap">
+        SELECT id,parent_id AS parentId,`name`,product_unit AS productUnit FROM pms_product_category
+            WHERE parent_id = 0 AND show_status = 1
+            ORDER BY sort ASC
+    </select>
+
+    <!-- 获取产品种植面积分布信息 lym -->
+    <select id="data5" resultType="map">
+        SELECT a.latitude AS lat,a.longitude AS lng,b.plant_area AS value FROM ums_member_origin a
+        INNER JOIN ums_member_origin_product b ON a.id = b.fk_origin_id
+        WHERE a.state = 0 AND b.state = 0
+        AND b.product_name = #{productName}
+    </select>
+    <select id="data6" resultType="java.lang.String">
+        SELECT CONCAT(IFNULL(a.ums_company_info,'   '),'---',a.`name`,'---',IFNULL(a.spec,'   '),'---',a.price) as pri FROM `pms_product` a where delete_status=0
+    </select>
+
+    <select id="data7" resultType="java.lang.String">
+       SELECT CONCAT(CASE um.cert
+	WHEN 1 THEN
+		IFNULL(um.type,um.nickname)
+	WHEN	2 THEN
+		IFNULL(um.company_info,um.nickname)
+	ELSE
+		um.nickname
+END
+,'---',op.product_name) FROM `oms_pre_item` op LEFT JOIN ums_member um on op.member_id= um.id where op.delete_status=0 and um.`status`=1
+    </select>
+    <select id="data8" resultType="java.lang.String">
+        select CONCAT(company_type,'---',company_type,'---',COUNT(0)) comp from ums_company_info where comp_status=0 GROUP BY company_type
+    </select>
+</mapper>

forest-admin/admin-server/src/main/resources/dao/UmsCompanyShopDao.xml

@@ -0,0 +1,35 @@
+<?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="com.hwrj.cloud.admin.dao.UmsCompanyShopDao">
+
+    <insert id="addUmsCompanyShopList" parameterType="java.util.List">
+        insert into ums_company_shop (comp_id, shop_type, shop_url,
+        shop_address, shop_img, create_time,
+        create_id, update_time, shop_status
+        )
+        values
+        <foreach collection="list" item="item" separator=",">
+            (#{item.compId,jdbcType=INTEGER}, #{item.shopType,jdbcType=VARCHAR}, #{item.shopUrl,jdbcType=VARCHAR},
+            #{item.shopAddress,jdbcType=VARCHAR}, #{item.shopImg,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP},
+            #{item.createId,jdbcType=INTEGER}, #{item.updateTime,jdbcType=TIMESTAMP}, #{item.shopStatus,jdbcType=INTEGER}
+            )
+        </foreach>
+
+    </insert>
+
+    <insert id="insertFile" parameterType="java.util.List">
+        <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
+            SELECT LAST_INSERT_ID()
+        </selectKey>
+        insert into ums_company_file (comp_id, file_url, file_type,
+        file_status, create_time, create_id,
+        update_time, update_id)
+        values
+         <foreach collection="list" item="item" separator=",">
+             (#{item.compId,jdbcType=BIGINT}, #{item.fileUrl,jdbcType=VARCHAR}, #{item.fileType,jdbcType=VARCHAR},
+             #{item.fileStatus,jdbcType=INTEGER}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.createId,jdbcType=INTEGER},
+             #{item.updateTime,jdbcType=TIMESTAMP}, #{item.updateId,jdbcType=INTEGER})
+         </foreach>
+
+    </insert>
+</mapper>

forest-admin/admin-server/src/main/resources/dao/UmsMemberOriginDao.xml

@@ -0,0 +1,77 @@
+<?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="com.hwrj.cloud.admin.dao.UmsMemberOriginDao">
+    <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.dto.UmsMemberOriginParam">
+        <id column="id" jdbcType="BIGINT" property="id" />
+        <result column="fk_company_info_id" jdbcType="BIGINT" property="fkCompanyInfoId" />
+        <result column="comp_name" jdbcType="VARCHAR" property="compName" />
+        <result column="origin_name" jdbcType="VARCHAR" property="originName" />
+        <result column="origin_area" jdbcType="DOUBLE" property="originArea" />
+        <result column="people_num" jdbcType="INTEGER" property="peopleNum" />
+        <result column="found_date" jdbcType="VARCHAR" property="foundDate" />
+        <result column="link_user" jdbcType="VARCHAR" property="linkUser" />
+        <result column="link_phone" jdbcType="VARCHAR" property="linkPhone" />
+        <result column="province_name" jdbcType="VARCHAR" property="provinceName" />
+        <result column="city_name" jdbcType="VARCHAR" property="cityName" />
+        <result column="county_name" jdbcType="VARCHAR" property="countyName" />
+        <result column="detail_address" jdbcType="VARCHAR" property="detailAddress" />
+        <result column="altitude" jdbcType="VARCHAR" property="altitude" />
+        <result column="longitude" jdbcType="VARCHAR" property="longitude" />
+        <result column="latitude" jdbcType="VARCHAR" property="latitude" />
+        <result column="state" jdbcType="INTEGER" property="state" />
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="create_id" jdbcType="INTEGER" property="createId" />
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="update_id" jdbcType="INTEGER" property="updateId" />
+    </resultMap>
+    <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.hwrj.cloud.admin.dto.UmsMemberOriginParam">
+        <result column="img_url" jdbcType="LONGVARCHAR" property="imgUrl" />
+        <result column="video_url" jdbcType="LONGVARCHAR" property="videoUrl" />
+        <result column="vr_url" jdbcType="LONGVARCHAR" property="vrUrl" />
+        <result column="camera_url" jdbcType="LONGVARCHAR" property="cameraUrl" />
+        <result column="summary" jdbcType="LONGVARCHAR" property="summary" />
+        <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
+    </resultMap>
+    <resultMap extends="BaseResultMap" id="ResultOrigin" type="com.hwrj.cloud.admin.dto.UmsMemberOriginParam">
+        <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
+    </resultMap>
+
+    <resultMap extends="ResultMapWithBLOBs" id="ResultOriginProduct" type="com.hwrj.cloud.admin.dto.UmsMemberOriginParam">
+        <collection property="productlist" javaType="java.util.ArrayList" select="com.hwrj.cloud.admin.dao.UmsMemberOriginProductDao.selectByOriginId"
+                    column="{originId=id}" ofType="com.hwrj.cloud.admin.model.UmsMemberOriginProduct"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id, fk_company_info_id, comp_name, origin_name, origin_area, people_num, found_date,
+        link_user, link_phone, province_name, city_name, county_name, detail_address, altitude,
+        longitude, latitude, state, create_time, create_id, update_time, update_id
+    </sql>
+    <sql id="Blob_Column_List">
+        img_url, video_url, vr_url, camera_url, summary, remark
+    </sql>
+
+    <!-- 检验是否存在  lym -->
+    <select id="isExist" parameterType="com.hwrj.cloud.admin.model.UmsMemberOrigin" resultType="int">
+        SELECT COUNT(*) FROM ums_member_origin WHERE state = 0
+        <if test="id != null">
+            AND id != #{id}
+        </if>
+        AND origin_name = #{originName}
+    </select>
+
+    <select id="list" parameterType="com.hwrj.cloud.admin.dto.UmsMemberOriginParam" resultMap="ResultOriginProduct">
+        select <include refid="Base_Column_List" />,<include refid="Blob_Column_List" />
+        from ums_member_origin
+        WHERE state = 0
+        <if test="fkCompanyInfoId != null">
+            AND fk_company_info_id = #{fkCompanyInfoId,jdbcType=BIGINT}
+        </if>
+        <if test="originName != null and originName != ''">
+            AND origin_name = #{originName,jdbcType=VARCHAR}
+        </if>
+        <if test="foundDate != null and foundDate != ''">
+            AND found_date = #{foundDate,jdbcType=VARCHAR}
+        </if>
+        ORDER BY create_time desc
+    </select>
+</mapper>

forest-admin/admin-server/src/main/resources/dao/UmsMemberOriginProductDao.xml

@@ -0,0 +1,53 @@
+<?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="com.hwrj.cloud.admin.dao.UmsMemberOriginProductDao">
+    <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsMemberOriginProduct">
+        <id column="id" jdbcType="BIGINT" property="id" />
+        <result column="fk_origin_id" jdbcType="BIGINT" property="fkOriginId" />
+        <result column="product_name" jdbcType="VARCHAR" property="productName" />
+        <result column="plant_area" jdbcType="VARCHAR" property="plantArea" />
+        <result column="output_num" jdbcType="VARCHAR" property="outputNum" />
+        <result column="output_value" jdbcType="VARCHAR" property="outputValue" />
+        <result column="state" jdbcType="INTEGER" property="state" />
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="create_id" jdbcType="INTEGER" property="createId" />
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="update_id" jdbcType="INTEGER" property="updateId" />
+    </resultMap>
+    <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.hwrj.cloud.admin.model.UmsMemberOriginProduct">
+        <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id, fk_origin_id, product_name, plant_area, output_num, output_value, state, create_time,
+        create_id, update_time, update_id,remark
+    </sql>
+    <sql id="Blob_Column_List">
+        remark
+    </sql>
+
+    <insert id="batchSave" parameterType="com.hwrj.cloud.admin.model.UmsMemberOriginProduct">
+        insert into ums_member_origin_product (fk_origin_id, product_name, plant_area,
+        output_num, output_value, state,
+        create_time, create_id, update_time,
+        update_id, remark)
+        values
+        <foreach collection="list" item="item" separator=",">
+        (#{item.fkOriginId,jdbcType=BIGINT}, #{item.productName,jdbcType=VARCHAR}, #{item.plantArea,jdbcType=VARCHAR},
+        #{item.outputNum,jdbcType=VARCHAR}, #{item.outputValue,jdbcType=VARCHAR}, #{item.state,jdbcType=INTEGER},
+        NOW(), #{item.createId,jdbcType=INTEGER}, #{item.updateTime,jdbcType=TIMESTAMP},
+        #{item.updateId,jdbcType=INTEGER}, #{item.remark,jdbcType=LONGVARCHAR})
+        </foreach>
+    </insert>
+
+    <!-- 查询生产地产出物 lym -->
+    <select id="selectByOriginId" resultMap="BaseResultMap">
+        select <include refid="Base_Column_List" />,<include refid="Blob_Column_List" />
+        from ums_member_origin_product
+        WHERE state = 0
+        <if test="originId != null">
+            AND fk_origin_id = #{originId,jdbcType=BIGINT}
+        </if>
+        ORDER BY create_time desc
+    </select>
+</mapper>

forest-admin/admin-server/src/test/java/com/hwrj/cloud/admin/Applay.java

@@ -0,0 +1,18 @@
+package com.hwrj.cloud.admin;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.metadata.BaseRowModel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+@Data
+public class Applay extends BaseRowModel {
+    @ExcelProperty(value = "时间",index = 0)
+    private String time;
+
+    @ExcelProperty(value = "借贷标识",index = 1)
+    private String type;
+
+    @ExcelProperty(value = "交易金额",index = 2)
+    private BigDecimal money;
+}

forest-admin/admin-server/src/test/java/com/hwrj/cloud/admin/ResultApplay.java

@@ -0,0 +1,24 @@
+package com.hwrj.cloud.admin;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.metadata.BaseRowModel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class ResultApplay extends BaseRowModel {
+
+    @ExcelProperty("时间")
+    private String time;
+
+    @ExcelProperty("借")
+    private BigDecimal get;
+
+    @ExcelProperty("贷")
+    private BigDecimal put;
+
+    @ExcelProperty("总计")
+    private BigDecimal total;
+
+}

forest-admin/admin-server/src/test/java/com/hwrj/cloud/admin/UploadTest.java

@@ -0,0 +1,195 @@
+package com.hwrj.cloud.admin;
+
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.fastjson.JSONObject;
+import com.hwrj.cloud.admin.excelEntity.UmsCompanyInfoExcel;
+import com.hwrj.cloud.admin.util.EasyExcelUtil;
+import com.hwrj.cloud.common.util.FileUtil;
+import netscape.javascript.JSObject;
+import org.apache.http.entity.ContentType;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = AdminApplication.class)
+public class UploadTest {
+
+    @Test
+    public void readFile(){
+
+        String filepath = "D:\\developerUtil\\code\\hwrj\\forest\\data\\companyInfo";//D盘下的file文件夹的目录
+//        File file = new File(filepath);//File类型可以是文件也可以是文件夹
+//        File[] fileList = file.listFiles();//将该目录下的所有文件放置在一个File类型的数组中
+//        for (int j = 0; j < fileList.length; j++) {
+//            File[] files = fileList[j].listFiles();
+//            List<File> fs = new ArrayList<>(files)
+//
+//        }
+        List<File> file = getFile(filepath);
+        file.stream().forEach(item->{
+            String path = item.getPath();
+            if (path.endsWith(".xlsx")){
+                System.out.println(path);
+            }
+        });
+//        List<String> files = FileUtil.getFiles(filepath);
+//        for (String file:files
+//             ) {
+//            System.out.println(file);
+//        }
+
+
+    }
+
+    public void fileToMuti(File pdf){
+        System.out.println(pdf.getPath());
+        //        System.out.println("shojdsdfnldsjl");
+        ExecutorService fixedThreadPool = Executors.newFixedThreadPool(10);
+//        final int i = j;
+        fixedThreadPool.execute(new Runnable() {
+            @Override
+            public void run() {
+                try {
+//                    File pdf = fileList[i];
+                    System.out.println(pdf.getPath());
+                    FileInputStream fileInputStream = null;
+                    fileInputStream = new FileInputStream(pdf);
+                    MultipartFile multipartFile = new MockMultipartFile(pdf.getName(), pdf.getName(),
+                            ContentType.APPLICATION_OCTET_STREAM.toString(), fileInputStream);
+//                        String url = ossFileUtils.upload(multipartFile.getOriginalFilename(), multipartFile);
+                } catch (Exception e) {
+                    System.out.println(e.getMessage());
+
+                }
+            }
+        });
+
+    }
+
+    public List<File> getFile(String path){
+        List<File> files = new ArrayList<>();
+        File file = new File(path);//File类型可以是文件也可以是文件夹
+        File[] fileList = file.listFiles();//将该目录下的所有文件放置在一个File类型的数组中
+        for (int j = 0; j < fileList.length; j++) {
+            File f = fileList[j];
+            if (f.isFile()){
+                files.add(f);
+                if (f.getPath().endsWith(".xlsx")){
+                    fileToMuti(f);
+                }
+            }else {
+                getFile(f.getPath());
+            }
+        }
+        return files;
+
+    }
+
+@Test
+    public void ssh(){
+
+        try {
+            File pdf = new File("C:\\Users\\qb\\Desktop\\myDuizhang.xlsx");
+            System.out.println(pdf.getPath());
+            FileInputStream fileInputStream = null;
+            fileInputStream = new FileInputStream(pdf);
+            MultipartFile multipartFile = new MockMultipartFile(pdf.getName(), pdf.getName(),
+                    ContentType.APPLICATION_OCTET_STREAM.toString(), fileInputStream);
+//                        String url = ossFileUtils.upload(multipartFile.getOriginalFilename(), multipartFile);
+            List<Applay> excelData = getExcelData(multipartFile);
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+
+        }
+    }
+
+    public List<Applay> getExcelData(MultipartFile file) throws IOException {
+        List<Applay> listApplay = new ArrayList<>();
+        List<Object> list = EasyExcelUtil.readExcel(file, new Applay(),1,1);
+        if(list != null && list.size() > 0){
+            for(Object o : list){
+                Applay applay = (Applay) o;
+                System.out.println(JSONObject.toJSONString(applay));
+                listApplay.add(applay);
+            }
+        }
+        List<ResultApplay> reList = new ArrayList<>();
+        Map<String, List<Applay>> listMap = listApplay.stream().collect(Collectors.groupingBy(Applay::getTime));
+        List<String> keys = new ArrayList<>(listMap.keySet());
+        for (String key:keys){
+            ResultApplay re = new ResultApplay();
+            List<Applay> applays = listMap.get(key);
+            Map<String, List<Applay>> collect = applays.stream().collect(Collectors.groupingBy(Applay::getType));
+//            List<Applay> get = new ArrayList<>();
+            List<Applay> put = new ArrayList<>();
+            List<Applay> get = collect.get("借");
+            if (collect.containsKey("贷")){
+                put = collect.get("贷");
+            }
+            re.setTime(key);
+
+            BigDecimal reduce = get.stream()
+                    // 将user对象的age取出来map为Bigdecimal
+                    .map(Applay::getMoney)
+                    // 使用reduce()聚合函数,实现累加器
+                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+            re.setGet(reduce);
+            if (put != null && put.size()>0){
+                BigDecimal p = put.stream()
+                        // 将user对象的age取出来map为Bigdecimal
+                        .map(Applay::getMoney)
+                        // 使用reduce()聚合函数,实现累加器
+                        .reduce(BigDecimal.ZERO, BigDecimal::add);
+                re.setPut(p);
+            }else {
+                re.setPut(new BigDecimal(0));
+            }
+            BigDecimal subtract = reduce.subtract(re.getPut());
+            re.setTotal(subtract);
+            reList.add(re);
+            System.out.println(JSONObject.toJSONString(re));
+        }
+        addExcel(reList);
+        return listApplay;
+    }
+
+    public void addExcel(List<ResultApplay> data){
+        String fileName = "C:\\Users\\qb\\Desktop\\" + "simpleWrite" + System.currentTimeMillis() + ".xlsx";
+
+        // 这里 需要指定写用哪个class去写
+        ExcelWriter excelWriter = null;
+        try {
+            excelWriter = EasyExcel.write(fileName, ResultApplay.class).build();
+            WriteSheet writeSheet = EasyExcel.writerSheet("模板").build();
+            excelWriter.write(data, writeSheet);
+        } finally {
+            // 千万别忘记finish 会帮忙关闭流
+            if (excelWriter != null) {
+                excelWriter.finish();
+            }
+        }
+
+    }
+
+
+
+}

forest-common/forest-common.iml

@@ -29,10 +29,6 @@
     <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.13.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.2" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
@@ -71,6 +67,10 @@
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.3" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.10" level="project" />
     <orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.0.3" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.11" level="project" />

forest-common/pom.xml

@@ -44,6 +44,10 @@
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+        </dependency>
 
         <!--短信服务-->
         <dependency>

forest-common/src/main/java/com/hwrj/cloud/common/api/CommonResult.java

@@ -1,10 +1,14 @@
 package com.hwrj.cloud.common.api;
 
+import io.swagger.annotations.ApiModel;
+
 /**
  * 通用返回对象
  * Created by macro on 2019/4/19.
  */
+@ApiModel("公共返回类")
 public class CommonResult<T> {
+
     private long code;
     private String message;
     private T data;

forest-common/src/main/java/com/hwrj/cloud/common/entity/BaseForm.java

@@ -0,0 +1,14 @@
+package com.hwrj.cloud.common.entity;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@ApiModel(value = "基础请求类")
+@Data
+public class BaseForm {
+    private int pageSize=10;
+
+    private int pageNo=1;
+
+
+}

forest-common/src/main/java/com/hwrj/cloud/common/exception/GlobalExceptionHandler.java

@@ -2,18 +2,22 @@ package com.hwrj.cloud.common.exception;
 
 
 import com.hwrj.cloud.common.api.CommonResult;
-import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.validation.BindException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
 
 /**
  * 全局异常处理
  * Created by macro on 2020/2/27.
  */
-@ControllerAdvice
+@RestControllerAdvice
 public class GlobalExceptionHandler {
 
-    @ResponseBody
+    private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class);
+
     @ExceptionHandler(value = ApiException.class)
     public CommonResult handle(ApiException e) {
         if (e.getErrorCode() != null) {
@@ -21,4 +25,32 @@ public class GlobalExceptionHandler {
         }
         return CommonResult.failed(e.getMessage());
     }
+
+    /**
+     * 自定义验证异常
+     */
+    @ExceptionHandler(BindException.class)
+    public CommonResult validatedBindException(BindException e){
+        log.error(e.getMessage(), e);
+        String message = e.getAllErrors().get(0).getDefaultMessage();
+        return CommonResult.failed(message);
+    }
+
+    /**
+     * 自定义验证异常
+     */
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public Object validExceptionHandler(MethodArgumentNotValidException e){
+        log.error(e.getMessage(), e);
+        String message = e.getBindingResult().getFieldError().getDefaultMessage();
+        return CommonResult.failed(message);
+    }
+
+    /**
+     * 业务异常
+     */
+    @ExceptionHandler(GlobalException.class)
+    public CommonResult businessException(GlobalException e){
+         return CommonResult.failed(e.getMessage());
+    }
 }

forest-common/src/main/java/com/hwrj/cloud/common/util/FileUtil.java

@@ -0,0 +1,31 @@
+package com.hwrj.cloud.common.util;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+public class FileUtil {
+    /**
+     * @Author：
+     * @Description：获取某个目录下所有直接下级文件，不包括目录下的子目录的下的文件，所以不用递归获取
+     * @Date：
+     */
+    public static List<String> getFiles(String path) {
+        List<String> files = new ArrayList<String>();
+        File file = new File(path);
+        File[] tempList = file.listFiles();
+
+        for (int i = 0; i < tempList.length; i++) {
+            if (tempList[i].isFile()) {
+                files.add(tempList[i].toString());
+                //文件名，不包含路径
+                //String fileName = tempList[i].getName();
+            }
+            if (tempList[i].isDirectory()) {
+                //这里就不递归了，
+                FileUtil.getFiles(tempList[i].getPath());
+            }
+        }
+        return files;
+    }
+}

forest-common/src/main/java/com/hwrj/cloud/common/util/InvitationCodeUtil.java

@@ -0,0 +1,42 @@
+package com.hwrj.cloud.common.util;
+
+import java.util.Arrays;
+
+public class InvitationCodeUtil {
+
+    private static final char[] CHARS = new char[] {'F', 'L', 'G', 'W', '5', 'X', 'C', '3',
+            '9', 'Z', 'M', '6', '7', 'Y', 'R', 'T', '2', 'H', 'S', '8', 'D', 'V', 'E', 'J', '4', 'K',
+            'Q', 'P', 'U', 'A', 'N', 'B'};
+//    private static final String PRIME1 =
+
+//    /**
+//     * 生成邀请码
+//     *
+//     * @param id 唯一的id主键
+//     * @return code
+//     */
+//    String gen(Long id) {
+//        //补位，并扩大整体
+//        id = id * PRIME1 + SLAT;
+//        //将 id 转换成32进制的值
+//        long[] b = new long[CODE_LENGTH];
+//        //32进制数
+//        b[0] = id;
+//        for (int i = 0; i < CODE_LENGTH - 1; i++) {
+//            b[i + 1] = b[i] / CHARS_LENGTH;
+//            //扩大每一位的差异
+//            b[i] = (b[i] + i * b[0]) % CHARS_LENGTH;
+//        }
+//        b[5] = (b[0] + b[1] + b[2] + b[3] + b[4]) * PRIME1 % CHARS_LENGTH;
+//
+//        //进行混淆
+//        long[] codeIndexArray = new long[CODE_LENGTH];
+//        for (int i = 0; i < CODE_LENGTH; i++) {
+//            codeIndexArray[i] = b[i * PRIME2 % CODE_LENGTH];
+//        }
+//
+//        StringBuilder buffer = new StringBuilder();
+//        Arrays.stream(codeIndexArray).boxed().map(Long::intValue).map(t -> CHARS[t]).forEach(buffer::append);
+//        return buffer.toString();
+//    }
+}

forest-gateway/forest-gateway.iml

@@ -40,6 +40,9 @@
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.0.3" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.11" level="project" />

forest-gateway/src/main/java/com/hwrj/cloud/gateway/MallGatewayApplication.java

@@ -3,15 +3,12 @@ package com.hwrj.cloud.gateway;
 import com.hwrj.cloud.gateway.config.IgnoreUrlsConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 
-/**
- * @author mtcarpenter
- * @github https://github.com/mtcarpenter/spring-cloud-learning
- * @desc 微信公众号：山间木匠
- */
 
-@SpringBootApplication
+
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
 @EnableConfigurationProperties(IgnoreUrlsConfig.class)
 public class MallGatewayApplication {
     public static void main(String[] args) {

forest-gateway/src/main/java/com/hwrj/cloud/gateway/filter/AuthGlobalFilter.java

@@ -22,11 +22,6 @@ import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
 
 
-/**
- * @author mtcarpenter
- * @github https://github.com/mtcarpenter/mall-cloud-alibaba
- * @desc 微信公众号：山间木匠
- */
 @Component
 @Slf4j
 public class AuthGlobalFilter implements GlobalFilter, Ordered {

forest-portal/portal-common/portal-common.iml

@@ -19,10 +19,6 @@
     <orderEntry type="module" module-name="forest-common" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.10" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.13.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.2" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
@@ -57,6 +53,10 @@
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.3" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.10" level="project" />
     <orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.0.3" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.11" level="project" />

forest-portal/portal-mbg/portal-mbg.iml

@@ -19,10 +19,6 @@
     <orderEntry type="module" module-name="forest-common" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.10" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.13.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.2" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
@@ -56,6 +52,10 @@
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.3" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.10" level="project" />
     <orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.0.3" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.11" level="project" />

forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/mapper/OmsPreItemMapper.java

@@ -0,0 +1,30 @@
+package com.hwrj.cloud.portal.mapper;
+
+import com.hwrj.cloud.portal.model.OmsPreItem;
+import com.hwrj.cloud.portal.model.OmsPreItemExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface OmsPreItemMapper {
+    long countByExample(OmsPreItemExample example);
+
+    int deleteByExample(OmsPreItemExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(OmsPreItem record);
+
+    int insertSelective(OmsPreItem record);
+
+    List<OmsPreItem> selectByExample(OmsPreItemExample example);
+
+    OmsPreItem selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") OmsPreItem record, @Param("example") OmsPreItemExample example);
+
+    int updateByExample(@Param("record") OmsPreItem record, @Param("example") OmsPreItemExample example);
+
+    int updateByPrimaryKeySelective(OmsPreItem record);
+
+    int updateByPrimaryKey(OmsPreItem record);
+}

forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/mapper/UmsCompanyShopMapper.java

@@ -10,7 +10,7 @@ public interface UmsCompanyShopMapper {
 
     int deleteByExample(UmsCompanyShopExample example);
 
-    int deleteByPrimaryKey(Integer id);
+    int deleteByPrimaryKey(Long id);
 
     int insert(UmsCompanyShop record);
 
@@ -18,7 +18,7 @@ public interface UmsCompanyShopMapper {
 
     List<UmsCompanyShop> selectByExample(UmsCompanyShopExample example);
 
-    UmsCompanyShop selectByPrimaryKey(Integer id);
+    UmsCompanyShop selectByPrimaryKey(Long id);
 
     int updateByExampleSelective(@Param("record") UmsCompanyShop record, @Param("example") UmsCompanyShopExample example);
 

forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/mapper/UmsMemberOriginMapper.java

@@ -0,0 +1,36 @@
+package com.hwrj.cloud.portal.mapper;
+
+import com.hwrj.cloud.portal.model.UmsMemberOrigin;
+import com.hwrj.cloud.portal.model.UmsMemberOriginExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface UmsMemberOriginMapper {
+    long countByExample(UmsMemberOriginExample example);
+
+    int deleteByExample(UmsMemberOriginExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(UmsMemberOrigin record);
+
+    int insertSelective(UmsMemberOrigin record);
+
+    List<UmsMemberOrigin> selectByExampleWithBLOBs(UmsMemberOriginExample example);
+
+    List<UmsMemberOrigin> selectByExample(UmsMemberOriginExample example);
+
+    UmsMemberOrigin selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") UmsMemberOrigin record, @Param("example") UmsMemberOriginExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") UmsMemberOrigin record, @Param("example") UmsMemberOriginExample example);
+
+    int updateByExample(@Param("record") UmsMemberOrigin record, @Param("example") UmsMemberOriginExample example);
+
+    int updateByPrimaryKeySelective(UmsMemberOrigin record);
+
+    int updateByPrimaryKeyWithBLOBs(UmsMemberOrigin record);
+
+    int updateByPrimaryKey(UmsMemberOrigin record);
+}

forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/mapper/UmsMemberOriginProductMapper.java

@@ -0,0 +1,36 @@
+package com.hwrj.cloud.portal.mapper;
+
+import com.hwrj.cloud.portal.model.UmsMemberOriginProduct;
+import com.hwrj.cloud.portal.model.UmsMemberOriginProductExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface UmsMemberOriginProductMapper {
+    long countByExample(UmsMemberOriginProductExample example);
+
+    int deleteByExample(UmsMemberOriginProductExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(UmsMemberOriginProduct record);
+
+    int insertSelective(UmsMemberOriginProduct record);
+
+    List<UmsMemberOriginProduct> selectByExampleWithBLOBs(UmsMemberOriginProductExample example);
+
+    List<UmsMemberOriginProduct> selectByExample(UmsMemberOriginProductExample example);
+
+    UmsMemberOriginProduct selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") UmsMemberOriginProduct record, @Param("example") UmsMemberOriginProductExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") UmsMemberOriginProduct record, @Param("example") UmsMemberOriginProductExample example);
+
+    int updateByExample(@Param("record") UmsMemberOriginProduct record, @Param("example") UmsMemberOriginProductExample example);
+
+    int updateByPrimaryKeySelective(UmsMemberOriginProduct record);
+
+    int updateByPrimaryKeyWithBLOBs(UmsMemberOriginProduct record);
+
+    int updateByPrimaryKey(UmsMemberOriginProduct record);
+}

forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/model/OmsPreItem.java

@@ -0,0 +1,270 @@
+package com.hwrj.cloud.portal.model;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class OmsPreItem implements Serializable {
+    private Long id;
+
+    @ApiModelProperty(value = "产品id")
+    private Long productId;
+
+    @ApiModelProperty(value = "产品购买人id")
+    private Long memberId;
+
+    @ApiModelProperty(value = "产品供应商id")
+    private Long companyId;
+
+    @ApiModelProperty(value = "产品发布人id")
+    private Long pushId;
+
+    @ApiModelProperty(value = "生产地id")
+    private Long originId;
+
+    @ApiModelProperty(value = "生产地名称")
+    private String originName;
+
+    @ApiModelProperty(value = "产品供应商名称")
+    private String companyName;
+
+    @ApiModelProperty(value = "添加意向购买人的价格")
+    private BigDecimal price;
+
+    @ApiModelProperty(value = "商品主图")
+    private String productPic;
+
+    @ApiModelProperty(value = "商品名称")
+    private String productName;
+
+    @ApiModelProperty(value = "商品副标题（卖点）")
+    private String productSubTitle;
+
+    @ApiModelProperty(value = "商品sku条码")
+    private String productSkuCode;
+
+    @ApiModelProperty(value = "会员昵称")
+    private String memberNickname;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date modifyDate;
+
+    @ApiModelProperty(value = "是否删除")
+    private Integer deleteStatus;
+
+    @ApiModelProperty(value = "商品分类")
+    private Long productCategoryId;
+
+    private String productBrand;
+
+    private String productSn;
+
+    @ApiModelProperty(value = "商品销售属性:[{'key':'颜色','value':'颜色'},{'key':'容量','value':'4G'}]")
+    private String productAttr;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Long productId) {
+        this.productId = productId;
+    }
+
+    public Long getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(Long memberId) {
+        this.memberId = memberId;
+    }
+
+    public Long getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Long companyId) {
+        this.companyId = companyId;
+    }
+
+    public Long getPushId() {
+        return pushId;
+    }
+
+    public void setPushId(Long pushId) {
+        this.pushId = pushId;
+    }
+
+    public Long getOriginId() {
+        return originId;
+    }
+
+    public void setOriginId(Long originId) {
+        this.originId = originId;
+    }
+
+    public String getOriginName() {
+        return originName;
+    }
+
+    public void setOriginName(String originName) {
+        this.originName = originName;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    public void setPrice(BigDecimal price) {
+        this.price = price;
+    }
+
+    public String getProductPic() {
+        return productPic;
+    }
+
+    public void setProductPic(String productPic) {
+        this.productPic = productPic;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getProductSubTitle() {
+        return productSubTitle;
+    }
+
+    public void setProductSubTitle(String productSubTitle) {
+        this.productSubTitle = productSubTitle;
+    }
+
+    public String getProductSkuCode() {
+        return productSkuCode;
+    }
+
+    public void setProductSkuCode(String productSkuCode) {
+        this.productSkuCode = productSkuCode;
+    }
+
+    public String getMemberNickname() {
+        return memberNickname;
+    }
+
+    public void setMemberNickname(String memberNickname) {
+        this.memberNickname = memberNickname;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Date getModifyDate() {
+        return modifyDate;
+    }
+
+    public void setModifyDate(Date modifyDate) {
+        this.modifyDate = modifyDate;
+    }
+
+    public Integer getDeleteStatus() {
+        return deleteStatus;
+    }
+
+    public void setDeleteStatus(Integer deleteStatus) {
+        this.deleteStatus = deleteStatus;
+    }
+
+    public Long getProductCategoryId() {
+        return productCategoryId;
+    }
+
+    public void setProductCategoryId(Long productCategoryId) {
+        this.productCategoryId = productCategoryId;
+    }
+
+    public String getProductBrand() {
+        return productBrand;
+    }
+
+    public void setProductBrand(String productBrand) {
+        this.productBrand = productBrand;
+    }
+
+    public String getProductSn() {
+        return productSn;
+    }
+
+    public void setProductSn(String productSn) {
+        this.productSn = productSn;
+    }
+
+    public String getProductAttr() {
+        return productAttr;
+    }
+
+    public void setProductAttr(String productAttr) {
+        this.productAttr = productAttr;
+    }
+
+    @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(", memberId=").append(memberId);
+        sb.append(", companyId=").append(companyId);
+        sb.append(", pushId=").append(pushId);
+        sb.append(", originId=").append(originId);
+        sb.append(", originName=").append(originName);
+        sb.append(", companyName=").append(companyName);
+        sb.append(", price=").append(price);
+        sb.append(", productPic=").append(productPic);
+        sb.append(", productName=").append(productName);
+        sb.append(", productSubTitle=").append(productSubTitle);
+        sb.append(", productSkuCode=").append(productSkuCode);
+        sb.append(", memberNickname=").append(memberNickname);
+        sb.append(", createDate=").append(createDate);
+        sb.append(", modifyDate=").append(modifyDate);
+        sb.append(", deleteStatus=").append(deleteStatus);
+        sb.append(", productCategoryId=").append(productCategoryId);
+        sb.append(", productBrand=").append(productBrand);
+        sb.append(", productSn=").append(productSn);
+        sb.append(", productAttr=").append(productAttr);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/model/PmsProduct.java

@@ -8,12 +8,16 @@ import java.util.Date;
 public class PmsProduct implements Serializable {
     private Long id;
 
+    @ApiModelProperty(value = "品牌id")
     private Long brandId;
 
+    @ApiModelProperty(value = "产品类别标识")
     private Long productCategoryId;
 
+    @ApiModelProperty(value = "运费模版id")
     private Long feightTemplateId;
 
+    @ApiModelProperty(value = "产品属性类别标识")
     private Long productAttributeCategoryId;
 
     private String name;
@@ -109,6 +113,48 @@ public class PmsProduct implements Serializable {
     @ApiModelProperty(value = "商品分类名称")
     private String productCategoryName;
 
+    @ApiModelProperty(value = "供应商id")
+    private Long umsCompanyInfoId;
+
+    @ApiModelProperty(value = "供应商")
+    private String umsCompanyInfo;
+
+    @ApiModelProperty(value = "批发价")
+    private BigDecimal tradePrice;
+
+    @ApiModelProperty(value = "规格")
+    private String spec;
+
+    @ApiModelProperty(value = "生产日期")
+    private String dateOfManufacture;
+
+    @ApiModelProperty(value = "生产地id")
+    private Long placeOfProductionId;
+
+    @ApiModelProperty(value = "生产地")
+    private String placeOfProduction;
+
+    @ApiModelProperty(value = "使用说明")
+    private String instructions;
+
+    @ApiModelProperty(value = "保质期")
+    private String qualityGuaranteePeriod;
+
+    @ApiModelProperty(value = "注意事项")
+    private String pointsForAttention;
+
+    @ApiModelProperty(value = "创建人")
+    private Long createUser;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新人")
+    private Long updateUser;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
     @ApiModelProperty(value = "商品描述")
     private String description;
 
@@ -426,6 +472,118 @@ public class PmsProduct implements Serializable {
         this.productCategoryName = productCategoryName;
     }
 
+    public Long getUmsCompanyInfoId() {
+        return umsCompanyInfoId;
+    }
+
+    public void setUmsCompanyInfoId(Long umsCompanyInfoId) {
+        this.umsCompanyInfoId = umsCompanyInfoId;
+    }
+
+    public String getUmsCompanyInfo() {
+        return umsCompanyInfo;
+    }
+
+    public void setUmsCompanyInfo(String umsCompanyInfo) {
+        this.umsCompanyInfo = umsCompanyInfo;
+    }
+
+    public BigDecimal getTradePrice() {
+        return tradePrice;
+    }
+
+    public void setTradePrice(BigDecimal tradePrice) {
+        this.tradePrice = tradePrice;
+    }
+
+    public String getSpec() {
+        return spec;
+    }
+
+    public void setSpec(String spec) {
+        this.spec = spec;
+    }
+
+    public String getDateOfManufacture() {
+        return dateOfManufacture;
+    }
+
+    public void setDateOfManufacture(String dateOfManufacture) {
+        this.dateOfManufacture = dateOfManufacture;
+    }
+
+    public Long getPlaceOfProductionId() {
+        return placeOfProductionId;
+    }
+
+    public void setPlaceOfProductionId(Long placeOfProductionId) {
+        this.placeOfProductionId = placeOfProductionId;
+    }
+
+    public String getPlaceOfProduction() {
+        return placeOfProduction;
+    }
+
+    public void setPlaceOfProduction(String placeOfProduction) {
+        this.placeOfProduction = placeOfProduction;
+    }
+
+    public String getInstructions() {
+        return instructions;
+    }
+
+    public void setInstructions(String instructions) {
+        this.instructions = instructions;
+    }
+
+    public String getQualityGuaranteePeriod() {
+        return qualityGuaranteePeriod;
+    }
+
+    public void setQualityGuaranteePeriod(String qualityGuaranteePeriod) {
+        this.qualityGuaranteePeriod = qualityGuaranteePeriod;
+    }
+
+    public String getPointsForAttention() {
+        return pointsForAttention;
+    }
+
+    public void setPointsForAttention(String pointsForAttention) {
+        this.pointsForAttention = pointsForAttention;
+    }
+
+    public Long getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Long createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Long getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Long updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
     public String getDescription() {
         return description;
     }
@@ -502,6 +660,20 @@ public class PmsProduct implements Serializable {
         sb.append(", promotionType=").append(promotionType);
         sb.append(", brandName=").append(brandName);
         sb.append(", productCategoryName=").append(productCategoryName);
+        sb.append(", umsCompanyInfoId=").append(umsCompanyInfoId);
+        sb.append(", umsCompanyInfo=").append(umsCompanyInfo);
+        sb.append(", tradePrice=").append(tradePrice);
+        sb.append(", spec=").append(spec);
+        sb.append(", dateOfManufacture=").append(dateOfManufacture);
+        sb.append(", placeOfProductionId=").append(placeOfProductionId);
+        sb.append(", placeOfProduction=").append(placeOfProduction);
+        sb.append(", instructions=").append(instructions);
+        sb.append(", qualityGuaranteePeriod=").append(qualityGuaranteePeriod);
+        sb.append(", pointsForAttention=").append(pointsForAttention);
+        sb.append(", createUser=").append(createUser);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateUser=").append(updateUser);
+        sb.append(", updateTime=").append(updateTime);
         sb.append(", description=").append(description);
         sb.append(", detailDesc=").append(detailDesc);
         sb.append(", detailHtml=").append(detailHtml);

forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/model/PmsProductExample.java

@@ -2505,6 +2505,916 @@ public class PmsProductExample {
             addCriterion("product_category_name not between", value1, value2, "productCategoryName");
             return (Criteria) this;
         }
+
+        public Criteria andUmsCompanyInfoIdIsNull() {
+            addCriterion("ums_company_info_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUmsCompanyInfoIdIsNotNull() {
+            addCriterion("ums_company_info_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUmsCompanyInfoIdEqualTo(Long value) {
+            addCriterion("ums_company_info_id =", value, "umsCompanyInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUmsCompanyInfoIdNotEqualTo(Long value) {
+            addCriterion("ums_company_info_id <>", value, "umsCompanyInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUmsCompanyInfoIdGreaterThan(Long value) {
+            addCriterion("ums_company_info_id >", value, "umsCompanyInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUmsCompanyInfoIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("ums_company_info_id >=", value, "umsCompanyInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUmsCompanyInfoIdLessThan(Long value) {
+            addCriterion("ums_company_info_id <", value, "umsCompanyInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUmsCompanyInfoIdLessThanOrEqualTo(Long value) {
+            addCriterion("ums_company_info_id <=", value, "umsCompanyInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUmsCompanyInfoIdIn(List<Long> values) {
+            addCriterion("ums_company_info_id in", values, "umsCompanyInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUmsCompanyInfoIdNotIn(List<Long> values) {
+            addCriterion("ums_company_info_id not in", values, "umsCompanyInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUmsCompanyInfoIdBetween(Long value1, Long value2) {
+            addCriterion("ums_company_info_id between", value1, value2, "umsCompanyInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUmsCompanyInfoIdNotBetween(Long value1, Long value2) {
+            addCriterion("ums_company_info_id not between", value1, value2, "umsCompanyInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUmsCompanyInfoIsNull() {
+            addCriterion("ums_company_info is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUmsCompanyInfoIsNotNull() {
+            addCriterion("ums_company_info is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUmsCompanyInfoEqualTo(String value) {
+            addCriterion("ums_company_info =", value, "umsCompanyInfo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUmsCompanyInfoNotEqualTo(String value) {
+            addCriterion("ums_company_info <>", value, "umsCompanyInfo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUmsCompanyInfoGreaterThan(String value) {
+            addCriterion("ums_company_info >", value, "umsCompanyInfo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUmsCompanyInfoGreaterThanOrEqualTo(String value) {
+            addCriterion("ums_company_info >=", value, "umsCompanyInfo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUmsCompanyInfoLessThan(String value) {
+            addCriterion("ums_company_info <", value, "umsCompanyInfo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUmsCompanyInfoLessThanOrEqualTo(String value) {
+            addCriterion("ums_company_info <=", value, "umsCompanyInfo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUmsCompanyInfoLike(String value) {
+            addCriterion("ums_company_info like", value, "umsCompanyInfo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUmsCompanyInfoNotLike(String value) {
+            addCriterion("ums_company_info not like", value, "umsCompanyInfo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUmsCompanyInfoIn(List<String> values) {
+            addCriterion("ums_company_info in", values, "umsCompanyInfo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUmsCompanyInfoNotIn(List<String> values) {
+            addCriterion("ums_company_info not in", values, "umsCompanyInfo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUmsCompanyInfoBetween(String value1, String value2) {
+            addCriterion("ums_company_info between", value1, value2, "umsCompanyInfo");
+            return (Criteria) this;
+        }
+
+        public Criteria andUmsCompanyInfoNotBetween(String value1, String value2) {
+            addCriterion("ums_company_info not between", value1, value2, "umsCompanyInfo");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradePriceIsNull() {
+            addCriterion("trade_price is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradePriceIsNotNull() {
+            addCriterion("trade_price is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradePriceEqualTo(BigDecimal value) {
+            addCriterion("trade_price =", value, "tradePrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradePriceNotEqualTo(BigDecimal value) {
+            addCriterion("trade_price <>", value, "tradePrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradePriceGreaterThan(BigDecimal value) {
+            addCriterion("trade_price >", value, "tradePrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradePriceGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("trade_price >=", value, "tradePrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradePriceLessThan(BigDecimal value) {
+            addCriterion("trade_price <", value, "tradePrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradePriceLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("trade_price <=", value, "tradePrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradePriceIn(List<BigDecimal> values) {
+            addCriterion("trade_price in", values, "tradePrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradePriceNotIn(List<BigDecimal> values) {
+            addCriterion("trade_price not in", values, "tradePrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradePriceBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("trade_price between", value1, value2, "tradePrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradePriceNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("trade_price not between", value1, value2, "tradePrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecIsNull() {
+            addCriterion("spec is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecIsNotNull() {
+            addCriterion("spec is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecEqualTo(String value) {
+            addCriterion("spec =", value, "spec");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecNotEqualTo(String value) {
+            addCriterion("spec <>", value, "spec");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecGreaterThan(String value) {
+            addCriterion("spec >", value, "spec");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecGreaterThanOrEqualTo(String value) {
+            addCriterion("spec >=", value, "spec");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecLessThan(String value) {
+            addCriterion("spec <", value, "spec");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecLessThanOrEqualTo(String value) {
+            addCriterion("spec <=", value, "spec");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecLike(String value) {
+            addCriterion("spec like", value, "spec");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecNotLike(String value) {
+            addCriterion("spec not like", value, "spec");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecIn(List<String> values) {
+            addCriterion("spec in", values, "spec");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecNotIn(List<String> values) {
+            addCriterion("spec not in", values, "spec");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecBetween(String value1, String value2) {
+            addCriterion("spec between", value1, value2, "spec");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecNotBetween(String value1, String value2) {
+            addCriterion("spec not between", value1, value2, "spec");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateOfManufactureIsNull() {
+            addCriterion("date_of_manufacture is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateOfManufactureIsNotNull() {
+            addCriterion("date_of_manufacture is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateOfManufactureEqualTo(String value) {
+            addCriterion("date_of_manufacture =", value, "dateOfManufacture");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateOfManufactureNotEqualTo(String value) {
+            addCriterion("date_of_manufacture <>", value, "dateOfManufacture");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateOfManufactureGreaterThan(String value) {
+            addCriterion("date_of_manufacture >", value, "dateOfManufacture");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateOfManufactureGreaterThanOrEqualTo(String value) {
+            addCriterion("date_of_manufacture >=", value, "dateOfManufacture");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateOfManufactureLessThan(String value) {
+            addCriterion("date_of_manufacture <", value, "dateOfManufacture");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateOfManufactureLessThanOrEqualTo(String value) {
+            addCriterion("date_of_manufacture <=", value, "dateOfManufacture");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateOfManufactureLike(String value) {
+            addCriterion("date_of_manufacture like", value, "dateOfManufacture");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateOfManufactureNotLike(String value) {
+            addCriterion("date_of_manufacture not like", value, "dateOfManufacture");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateOfManufactureIn(List<String> values) {
+            addCriterion("date_of_manufacture in", values, "dateOfManufacture");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateOfManufactureNotIn(List<String> values) {
+            addCriterion("date_of_manufacture not in", values, "dateOfManufacture");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateOfManufactureBetween(String value1, String value2) {
+            addCriterion("date_of_manufacture between", value1, value2, "dateOfManufacture");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateOfManufactureNotBetween(String value1, String value2) {
+            addCriterion("date_of_manufacture not between", value1, value2, "dateOfManufacture");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlaceOfProductionIdIsNull() {
+            addCriterion("place_of_production_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlaceOfProductionIdIsNotNull() {
+            addCriterion("place_of_production_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlaceOfProductionIdEqualTo(Long value) {
+            addCriterion("place_of_production_id =", value, "placeOfProductionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlaceOfProductionIdNotEqualTo(Long value) {
+            addCriterion("place_of_production_id <>", value, "placeOfProductionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlaceOfProductionIdGreaterThan(Long value) {
+            addCriterion("place_of_production_id >", value, "placeOfProductionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlaceOfProductionIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("place_of_production_id >=", value, "placeOfProductionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlaceOfProductionIdLessThan(Long value) {
+            addCriterion("place_of_production_id <", value, "placeOfProductionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlaceOfProductionIdLessThanOrEqualTo(Long value) {
+            addCriterion("place_of_production_id <=", value, "placeOfProductionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlaceOfProductionIdIn(List<Long> values) {
+            addCriterion("place_of_production_id in", values, "placeOfProductionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlaceOfProductionIdNotIn(List<Long> values) {
+            addCriterion("place_of_production_id not in", values, "placeOfProductionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlaceOfProductionIdBetween(Long value1, Long value2) {
+            addCriterion("place_of_production_id between", value1, value2, "placeOfProductionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlaceOfProductionIdNotBetween(Long value1, Long value2) {
+            addCriterion("place_of_production_id not between", value1, value2, "placeOfProductionId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlaceOfProductionIsNull() {
+            addCriterion("place_of_production is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlaceOfProductionIsNotNull() {
+            addCriterion("place_of_production is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlaceOfProductionEqualTo(String value) {
+            addCriterion("place_of_production =", value, "placeOfProduction");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlaceOfProductionNotEqualTo(String value) {
+            addCriterion("place_of_production <>", value, "placeOfProduction");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlaceOfProductionGreaterThan(String value) {
+            addCriterion("place_of_production >", value, "placeOfProduction");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlaceOfProductionGreaterThanOrEqualTo(String value) {
+            addCriterion("place_of_production >=", value, "placeOfProduction");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlaceOfProductionLessThan(String value) {
+            addCriterion("place_of_production <", value, "placeOfProduction");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlaceOfProductionLessThanOrEqualTo(String value) {
+            addCriterion("place_of_production <=", value, "placeOfProduction");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlaceOfProductionLike(String value) {
+            addCriterion("place_of_production like", value, "placeOfProduction");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlaceOfProductionNotLike(String value) {
+            addCriterion("place_of_production not like", value, "placeOfProduction");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlaceOfProductionIn(List<String> values) {
+            addCriterion("place_of_production in", values, "placeOfProduction");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlaceOfProductionNotIn(List<String> values) {
+            addCriterion("place_of_production not in", values, "placeOfProduction");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlaceOfProductionBetween(String value1, String value2) {
+            addCriterion("place_of_production between", value1, value2, "placeOfProduction");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlaceOfProductionNotBetween(String value1, String value2) {
+            addCriterion("place_of_production not between", value1, value2, "placeOfProduction");
+            return (Criteria) this;
+        }
+
+        public Criteria andInstructionsIsNull() {
+            addCriterion("instructions is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInstructionsIsNotNull() {
+            addCriterion("instructions is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInstructionsEqualTo(String value) {
+            addCriterion("instructions =", value, "instructions");
+            return (Criteria) this;
+        }
+
+        public Criteria andInstructionsNotEqualTo(String value) {
+            addCriterion("instructions <>", value, "instructions");
+            return (Criteria) this;
+        }
+
+        public Criteria andInstructionsGreaterThan(String value) {
+            addCriterion("instructions >", value, "instructions");
+            return (Criteria) this;
+        }
+
+        public Criteria andInstructionsGreaterThanOrEqualTo(String value) {
+            addCriterion("instructions >=", value, "instructions");
+            return (Criteria) this;
+        }
+
+        public Criteria andInstructionsLessThan(String value) {
+            addCriterion("instructions <", value, "instructions");
+            return (Criteria) this;
+        }
+
+        public Criteria andInstructionsLessThanOrEqualTo(String value) {
+            addCriterion("instructions <=", value, "instructions");
+            return (Criteria) this;
+        }
+
+        public Criteria andInstructionsLike(String value) {
+            addCriterion("instructions like", value, "instructions");
+            return (Criteria) this;
+        }
+
+        public Criteria andInstructionsNotLike(String value) {
+            addCriterion("instructions not like", value, "instructions");
+            return (Criteria) this;
+        }
+
+        public Criteria andInstructionsIn(List<String> values) {
+            addCriterion("instructions in", values, "instructions");
+            return (Criteria) this;
+        }
+
+        public Criteria andInstructionsNotIn(List<String> values) {
+            addCriterion("instructions not in", values, "instructions");
+            return (Criteria) this;
+        }
+
+        public Criteria andInstructionsBetween(String value1, String value2) {
+            addCriterion("instructions between", value1, value2, "instructions");
+            return (Criteria) this;
+        }
+
+        public Criteria andInstructionsNotBetween(String value1, String value2) {
+            addCriterion("instructions not between", value1, value2, "instructions");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualityGuaranteePeriodIsNull() {
+            addCriterion("quality_guarantee_period is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualityGuaranteePeriodIsNotNull() {
+            addCriterion("quality_guarantee_period is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualityGuaranteePeriodEqualTo(String value) {
+            addCriterion("quality_guarantee_period =", value, "qualityGuaranteePeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualityGuaranteePeriodNotEqualTo(String value) {
+            addCriterion("quality_guarantee_period <>", value, "qualityGuaranteePeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualityGuaranteePeriodGreaterThan(String value) {
+            addCriterion("quality_guarantee_period >", value, "qualityGuaranteePeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualityGuaranteePeriodGreaterThanOrEqualTo(String value) {
+            addCriterion("quality_guarantee_period >=", value, "qualityGuaranteePeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualityGuaranteePeriodLessThan(String value) {
+            addCriterion("quality_guarantee_period <", value, "qualityGuaranteePeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualityGuaranteePeriodLessThanOrEqualTo(String value) {
+            addCriterion("quality_guarantee_period <=", value, "qualityGuaranteePeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualityGuaranteePeriodLike(String value) {
+            addCriterion("quality_guarantee_period like", value, "qualityGuaranteePeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualityGuaranteePeriodNotLike(String value) {
+            addCriterion("quality_guarantee_period not like", value, "qualityGuaranteePeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualityGuaranteePeriodIn(List<String> values) {
+            addCriterion("quality_guarantee_period in", values, "qualityGuaranteePeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualityGuaranteePeriodNotIn(List<String> values) {
+            addCriterion("quality_guarantee_period not in", values, "qualityGuaranteePeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualityGuaranteePeriodBetween(String value1, String value2) {
+            addCriterion("quality_guarantee_period between", value1, value2, "qualityGuaranteePeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualityGuaranteePeriodNotBetween(String value1, String value2) {
+            addCriterion("quality_guarantee_period not between", value1, value2, "qualityGuaranteePeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointsForAttentionIsNull() {
+            addCriterion("points_for_attention is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointsForAttentionIsNotNull() {
+            addCriterion("points_for_attention is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointsForAttentionEqualTo(String value) {
+            addCriterion("points_for_attention =", value, "pointsForAttention");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointsForAttentionNotEqualTo(String value) {
+            addCriterion("points_for_attention <>", value, "pointsForAttention");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointsForAttentionGreaterThan(String value) {
+            addCriterion("points_for_attention >", value, "pointsForAttention");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointsForAttentionGreaterThanOrEqualTo(String value) {
+            addCriterion("points_for_attention >=", value, "pointsForAttention");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointsForAttentionLessThan(String value) {
+            addCriterion("points_for_attention <", value, "pointsForAttention");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointsForAttentionLessThanOrEqualTo(String value) {
+            addCriterion("points_for_attention <=", value, "pointsForAttention");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointsForAttentionLike(String value) {
+            addCriterion("points_for_attention like", value, "pointsForAttention");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointsForAttentionNotLike(String value) {
+            addCriterion("points_for_attention not like", value, "pointsForAttention");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointsForAttentionIn(List<String> values) {
+            addCriterion("points_for_attention in", values, "pointsForAttention");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointsForAttentionNotIn(List<String> values) {
+            addCriterion("points_for_attention not in", values, "pointsForAttention");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointsForAttentionBetween(String value1, String value2) {
+            addCriterion("points_for_attention between", value1, value2, "pointsForAttention");
+            return (Criteria) this;
+        }
+
+        public Criteria andPointsForAttentionNotBetween(String value1, String value2) {
+            addCriterion("points_for_attention not between", value1, value2, "pointsForAttention");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNull() {
+            addCriterion("create_user is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNotNull() {
+            addCriterion("create_user is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserEqualTo(Long value) {
+            addCriterion("create_user =", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotEqualTo(Long value) {
+            addCriterion("create_user <>", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThan(Long value) {
+            addCriterion("create_user >", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThanOrEqualTo(Long value) {
+            addCriterion("create_user >=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThan(Long value) {
+            addCriterion("create_user <", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThanOrEqualTo(Long value) {
+            addCriterion("create_user <=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIn(List<Long> values) {
+            addCriterion("create_user in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotIn(List<Long> values) {
+            addCriterion("create_user not in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserBetween(Long value1, Long value2) {
+            addCriterion("create_user between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotBetween(Long value1, Long value2) {
+            addCriterion("create_user not between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNull() {
+            addCriterion("update_user is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNotNull() {
+            addCriterion("update_user is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserEqualTo(Long value) {
+            addCriterion("update_user =", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotEqualTo(Long value) {
+            addCriterion("update_user <>", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThan(Long value) {
+            addCriterion("update_user >", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThanOrEqualTo(Long value) {
+            addCriterion("update_user >=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThan(Long value) {
+            addCriterion("update_user <", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThanOrEqualTo(Long value) {
+            addCriterion("update_user <=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIn(List<Long> values) {
+            addCriterion("update_user in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotIn(List<Long> values) {
+            addCriterion("update_user not in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserBetween(Long value1, Long value2) {
+            addCriterion("update_user between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotBetween(Long value1, Long value2) {
+            addCriterion("update_user not between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/model/UmsCompanyFile.java

@@ -24,13 +24,13 @@ public class UmsCompanyFile implements Serializable {
     private Date createTime;
 
     @ApiModelProperty(value = "创建人id")
-    private Integer createId;
+    private Long createId;
 
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;
 
     @ApiModelProperty(value = "修改人id")
-    private Integer updateId;
+    private Long updateId;
 
     private static final long serialVersionUID = 1L;
 
@@ -82,11 +82,11 @@ public class UmsCompanyFile implements Serializable {
         this.createTime = createTime;
     }
 
-    public Integer getCreateId() {
+    public Long getCreateId() {
         return createId;
     }
 
-    public void setCreateId(Integer createId) {
+    public void setCreateId(Long createId) {
         this.createId = createId;
     }
 
@@ -98,11 +98,11 @@ public class UmsCompanyFile implements Serializable {
         this.updateTime = updateTime;
     }
 
-    public Integer getUpdateId() {
+    public Long getUpdateId() {
         return updateId;
     }
 
-    public void setUpdateId(Integer updateId) {
+    public void setUpdateId(Long updateId) {
         this.updateId = updateId;
     }
 

forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/model/UmsCompanyFileExample.java

@@ -495,52 +495,52 @@ public class UmsCompanyFileExample {
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdEqualTo(Integer value) {
+        public Criteria andCreateIdEqualTo(Long value) {
             addCriterion("create_id =", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdNotEqualTo(Integer value) {
+        public Criteria andCreateIdNotEqualTo(Long value) {
             addCriterion("create_id <>", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdGreaterThan(Integer value) {
+        public Criteria andCreateIdGreaterThan(Long value) {
             addCriterion("create_id >", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdGreaterThanOrEqualTo(Integer value) {
+        public Criteria andCreateIdGreaterThanOrEqualTo(Long value) {
             addCriterion("create_id >=", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdLessThan(Integer value) {
+        public Criteria andCreateIdLessThan(Long value) {
             addCriterion("create_id <", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdLessThanOrEqualTo(Integer value) {
+        public Criteria andCreateIdLessThanOrEqualTo(Long value) {
             addCriterion("create_id <=", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdIn(List<Integer> values) {
+        public Criteria andCreateIdIn(List<Long> values) {
             addCriterion("create_id in", values, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdNotIn(List<Integer> values) {
+        public Criteria andCreateIdNotIn(List<Long> values) {
             addCriterion("create_id not in", values, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdBetween(Integer value1, Integer value2) {
+        public Criteria andCreateIdBetween(Long value1, Long value2) {
             addCriterion("create_id between", value1, value2, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdNotBetween(Integer value1, Integer value2) {
+        public Criteria andCreateIdNotBetween(Long value1, Long value2) {
             addCriterion("create_id not between", value1, value2, "createId");
             return (Criteria) this;
         }
@@ -615,52 +615,52 @@ public class UmsCompanyFileExample {
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdEqualTo(Integer value) {
+        public Criteria andUpdateIdEqualTo(Long value) {
             addCriterion("update_id =", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdNotEqualTo(Integer value) {
+        public Criteria andUpdateIdNotEqualTo(Long value) {
             addCriterion("update_id <>", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdGreaterThan(Integer value) {
+        public Criteria andUpdateIdGreaterThan(Long value) {
             addCriterion("update_id >", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdGreaterThanOrEqualTo(Integer value) {
+        public Criteria andUpdateIdGreaterThanOrEqualTo(Long value) {
             addCriterion("update_id >=", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdLessThan(Integer value) {
+        public Criteria andUpdateIdLessThan(Long value) {
             addCriterion("update_id <", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdLessThanOrEqualTo(Integer value) {
+        public Criteria andUpdateIdLessThanOrEqualTo(Long value) {
             addCriterion("update_id <=", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdIn(List<Integer> values) {
+        public Criteria andUpdateIdIn(List<Long> values) {
             addCriterion("update_id in", values, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdNotIn(List<Integer> values) {
+        public Criteria andUpdateIdNotIn(List<Long> values) {
             addCriterion("update_id not in", values, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdBetween(Integer value1, Integer value2) {
+        public Criteria andUpdateIdBetween(Long value1, Long value2) {
             addCriterion("update_id between", value1, value2, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdNotBetween(Integer value1, Integer value2) {
+        public Criteria andUpdateIdNotBetween(Long value1, Long value2) {
             addCriterion("update_id not between", value1, value2, "updateId");
             return (Criteria) this;
         }

forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/model/UmsCompanyInfo.java

@@ -11,49 +11,61 @@ public class UmsCompanyInfo implements Serializable {
     @ApiModelProperty(value = "供应商名称")
     private String compName;
 
+    @ApiModelProperty(value = "供应商类型")
+    private String companyType;
+
+    @ApiModelProperty(value = "供应商评级")
+    private Integer compLevel;
+
+    @ApiModelProperty(value = "供应商资质")
+    private String compQual;
+
     @ApiModelProperty(value = "供应商照片")
     private String compImgs;
 
     @ApiModelProperty(value = "供应商外部连接")
     private String compUrl;
 
-    @ApiModelProperty(value = "供应商生产许可证号")
+    @ApiModelProperty(value = "生产许可证号")
     private String compProdLicenseNum;
 
-    @ApiModelProperty(value = "供应商经营许可证")
+    @ApiModelProperty(value = "经营许可证号")
     private String compManageLicenseNum;
 
-    @ApiModelProperty(value = "供应商社会行用代码")
+    @ApiModelProperty(value = "社会信用代码")
     private String compSocialCode;
 
-    @ApiModelProperty(value = "供应商联系人")
+    @ApiModelProperty(value = "联系人")
     private String compConPerson;
 
+    @ApiModelProperty(value = "是否认证：0未认证，1认证")
+    private Integer isCert;
+
     @ApiModelProperty(value = "供应商联系方式")
     private String compConType;
 
     @ApiModelProperty(value = "供应商联系账号")
     private String compConNum;
 
-    @ApiModelProperty(value = "供应商对外qq")
+    @ApiModelProperty(value = "对外企业qq")
     private String compQq;
 
-    @ApiModelProperty(value = "供应商经营产平")
+    @ApiModelProperty(value = "经营产品")
     private String compManageProduct;
 
-    @ApiModelProperty(value = "所在省id")
+    @ApiModelProperty(value = "所在省")
     private String provinceId;
 
-    @ApiModelProperty(value = "所在市id")
+    @ApiModelProperty(value = "所在市")
     private String cityId;
 
-    @ApiModelProperty(value = "所在县id")
+    @ApiModelProperty(value = "所在县")
     private String countyId;
 
-    @ApiModelProperty(value = "所在镇id")
+    @ApiModelProperty(value = "所在镇")
     private String townId;
 
-    @ApiModelProperty(value = "所在乡id")
+    @ApiModelProperty(value = "所在乡")
     private String villageId;
 
     @ApiModelProperty(value = "详细位置")
@@ -72,16 +84,16 @@ public class UmsCompanyInfo implements Serializable {
     private Date createTime;
 
     @ApiModelProperty(value = "创建人")
-    private Integer createId;
+    private Long createId;
 
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;
 
     @ApiModelProperty(value = "修改人id")
-    private Integer updateId;
+    private Long updateId;
 
-    @ApiModelProperty(value = "供应商简介")
-    private String compIntroduction;
+    @ApiModelProperty(value = "简介")
+    private String compSum;
 
     private static final long serialVersionUID = 1L;
 
@@ -101,6 +113,30 @@ public class UmsCompanyInfo implements Serializable {
         this.compName = compName;
     }
 
+    public String getCompanyType() {
+        return companyType;
+    }
+
+    public void setCompanyType(String companyType) {
+        this.companyType = companyType;
+    }
+
+    public Integer getCompLevel() {
+        return compLevel;
+    }
+
+    public void setCompLevel(Integer compLevel) {
+        this.compLevel = compLevel;
+    }
+
+    public String getCompQual() {
+        return compQual;
+    }
+
+    public void setCompQual(String compQual) {
+        this.compQual = compQual;
+    }
+
     public String getCompImgs() {
         return compImgs;
     }
@@ -149,6 +185,14 @@ public class UmsCompanyInfo implements Serializable {
         this.compConPerson = compConPerson;
     }
 
+    public Integer getIsCert() {
+        return isCert;
+    }
+
+    public void setIsCert(Integer isCert) {
+        this.isCert = isCert;
+    }
+
     public String getCompConType() {
         return compConType;
     }
@@ -261,11 +305,11 @@ public class UmsCompanyInfo implements Serializable {
         this.createTime = createTime;
     }
 
-    public Integer getCreateId() {
+    public Long getCreateId() {
         return createId;
     }
 
-    public void setCreateId(Integer createId) {
+    public void setCreateId(Long createId) {
         this.createId = createId;
     }
 
@@ -277,20 +321,20 @@ public class UmsCompanyInfo implements Serializable {
         this.updateTime = updateTime;
     }
 
-    public Integer getUpdateId() {
+    public Long getUpdateId() {
         return updateId;
     }
 
-    public void setUpdateId(Integer updateId) {
+    public void setUpdateId(Long updateId) {
         this.updateId = updateId;
     }
 
-    public String getCompIntroduction() {
-        return compIntroduction;
+    public String getCompSum() {
+        return compSum;
     }
 
-    public void setCompIntroduction(String compIntroduction) {
-        this.compIntroduction = compIntroduction;
+    public void setCompSum(String compSum) {
+        this.compSum = compSum;
     }
 
     @Override
@@ -301,12 +345,16 @@ public class UmsCompanyInfo implements Serializable {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", compName=").append(compName);
+        sb.append(", companyType=").append(companyType);
+        sb.append(", compLevel=").append(compLevel);
+        sb.append(", compQual=").append(compQual);
         sb.append(", compImgs=").append(compImgs);
         sb.append(", compUrl=").append(compUrl);
         sb.append(", compProdLicenseNum=").append(compProdLicenseNum);
         sb.append(", compManageLicenseNum=").append(compManageLicenseNum);
         sb.append(", compSocialCode=").append(compSocialCode);
         sb.append(", compConPerson=").append(compConPerson);
+        sb.append(", isCert=").append(isCert);
         sb.append(", compConType=").append(compConType);
         sb.append(", compConNum=").append(compConNum);
         sb.append(", compQq=").append(compQq);
@@ -324,7 +372,7 @@ public class UmsCompanyInfo implements Serializable {
         sb.append(", createId=").append(createId);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", updateId=").append(updateId);
-        sb.append(", compIntroduction=").append(compIntroduction);
+        sb.append(", compSum=").append(compSum);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/model/UmsCompanyInfoExample.java

@@ -235,6 +235,206 @@ public class UmsCompanyInfoExample {
             return (Criteria) this;
         }
 
+        public Criteria andCompanyTypeIsNull() {
+            addCriterion("company_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeIsNotNull() {
+            addCriterion("company_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeEqualTo(String value) {
+            addCriterion("company_type =", value, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeNotEqualTo(String value) {
+            addCriterion("company_type <>", value, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeGreaterThan(String value) {
+            addCriterion("company_type >", value, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("company_type >=", value, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeLessThan(String value) {
+            addCriterion("company_type <", value, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeLessThanOrEqualTo(String value) {
+            addCriterion("company_type <=", value, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeLike(String value) {
+            addCriterion("company_type like", value, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeNotLike(String value) {
+            addCriterion("company_type not like", value, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeIn(List<String> values) {
+            addCriterion("company_type in", values, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeNotIn(List<String> values) {
+            addCriterion("company_type not in", values, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeBetween(String value1, String value2) {
+            addCriterion("company_type between", value1, value2, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeNotBetween(String value1, String value2) {
+            addCriterion("company_type not between", value1, value2, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompLevelIsNull() {
+            addCriterion("comp_level is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompLevelIsNotNull() {
+            addCriterion("comp_level is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompLevelEqualTo(Integer value) {
+            addCriterion("comp_level =", value, "compLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompLevelNotEqualTo(Integer value) {
+            addCriterion("comp_level <>", value, "compLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompLevelGreaterThan(Integer value) {
+            addCriterion("comp_level >", value, "compLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompLevelGreaterThanOrEqualTo(Integer value) {
+            addCriterion("comp_level >=", value, "compLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompLevelLessThan(Integer value) {
+            addCriterion("comp_level <", value, "compLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompLevelLessThanOrEqualTo(Integer value) {
+            addCriterion("comp_level <=", value, "compLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompLevelIn(List<Integer> values) {
+            addCriterion("comp_level in", values, "compLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompLevelNotIn(List<Integer> values) {
+            addCriterion("comp_level not in", values, "compLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompLevelBetween(Integer value1, Integer value2) {
+            addCriterion("comp_level between", value1, value2, "compLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompLevelNotBetween(Integer value1, Integer value2) {
+            addCriterion("comp_level not between", value1, value2, "compLevel");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompQualIsNull() {
+            addCriterion("comp_qual is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompQualIsNotNull() {
+            addCriterion("comp_qual is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompQualEqualTo(String value) {
+            addCriterion("comp_qual =", value, "compQual");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompQualNotEqualTo(String value) {
+            addCriterion("comp_qual <>", value, "compQual");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompQualGreaterThan(String value) {
+            addCriterion("comp_qual >", value, "compQual");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompQualGreaterThanOrEqualTo(String value) {
+            addCriterion("comp_qual >=", value, "compQual");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompQualLessThan(String value) {
+            addCriterion("comp_qual <", value, "compQual");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompQualLessThanOrEqualTo(String value) {
+            addCriterion("comp_qual <=", value, "compQual");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompQualLike(String value) {
+            addCriterion("comp_qual like", value, "compQual");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompQualNotLike(String value) {
+            addCriterion("comp_qual not like", value, "compQual");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompQualIn(List<String> values) {
+            addCriterion("comp_qual in", values, "compQual");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompQualNotIn(List<String> values) {
+            addCriterion("comp_qual not in", values, "compQual");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompQualBetween(String value1, String value2) {
+            addCriterion("comp_qual between", value1, value2, "compQual");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompQualNotBetween(String value1, String value2) {
+            addCriterion("comp_qual not between", value1, value2, "compQual");
+            return (Criteria) this;
+        }
+
         public Criteria andCompImgsIsNull() {
             addCriterion("comp_imgs is null");
             return (Criteria) this;
@@ -655,6 +855,66 @@ public class UmsCompanyInfoExample {
             return (Criteria) this;
         }
 
+        public Criteria andIsCertIsNull() {
+            addCriterion("is_cert is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCertIsNotNull() {
+            addCriterion("is_cert is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCertEqualTo(Integer value) {
+            addCriterion("is_cert =", value, "isCert");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCertNotEqualTo(Integer value) {
+            addCriterion("is_cert <>", value, "isCert");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCertGreaterThan(Integer value) {
+            addCriterion("is_cert >", value, "isCert");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCertGreaterThanOrEqualTo(Integer value) {
+            addCriterion("is_cert >=", value, "isCert");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCertLessThan(Integer value) {
+            addCriterion("is_cert <", value, "isCert");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCertLessThanOrEqualTo(Integer value) {
+            addCriterion("is_cert <=", value, "isCert");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCertIn(List<Integer> values) {
+            addCriterion("is_cert in", values, "isCert");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCertNotIn(List<Integer> values) {
+            addCriterion("is_cert not in", values, "isCert");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCertBetween(Integer value1, Integer value2) {
+            addCriterion("is_cert between", value1, value2, "isCert");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsCertNotBetween(Integer value1, Integer value2) {
+            addCriterion("is_cert not between", value1, value2, "isCert");
+            return (Criteria) this;
+        }
+
         public Criteria andCompConTypeIsNull() {
             addCriterion("comp_con_type is null");
             return (Criteria) this;
@@ -1625,52 +1885,52 @@ public class UmsCompanyInfoExample {
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdEqualTo(Integer value) {
+        public Criteria andCreateIdEqualTo(Long value) {
             addCriterion("create_id =", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdNotEqualTo(Integer value) {
+        public Criteria andCreateIdNotEqualTo(Long value) {
             addCriterion("create_id <>", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdGreaterThan(Integer value) {
+        public Criteria andCreateIdGreaterThan(Long value) {
             addCriterion("create_id >", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdGreaterThanOrEqualTo(Integer value) {
+        public Criteria andCreateIdGreaterThanOrEqualTo(Long value) {
             addCriterion("create_id >=", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdLessThan(Integer value) {
+        public Criteria andCreateIdLessThan(Long value) {
             addCriterion("create_id <", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdLessThanOrEqualTo(Integer value) {
+        public Criteria andCreateIdLessThanOrEqualTo(Long value) {
             addCriterion("create_id <=", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdIn(List<Integer> values) {
+        public Criteria andCreateIdIn(List<Long> values) {
             addCriterion("create_id in", values, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdNotIn(List<Integer> values) {
+        public Criteria andCreateIdNotIn(List<Long> values) {
             addCriterion("create_id not in", values, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdBetween(Integer value1, Integer value2) {
+        public Criteria andCreateIdBetween(Long value1, Long value2) {
             addCriterion("create_id between", value1, value2, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdNotBetween(Integer value1, Integer value2) {
+        public Criteria andCreateIdNotBetween(Long value1, Long value2) {
             addCriterion("create_id not between", value1, value2, "createId");
             return (Criteria) this;
         }
@@ -1745,52 +2005,52 @@ public class UmsCompanyInfoExample {
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdEqualTo(Integer value) {
+        public Criteria andUpdateIdEqualTo(Long value) {
             addCriterion("update_id =", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdNotEqualTo(Integer value) {
+        public Criteria andUpdateIdNotEqualTo(Long value) {
             addCriterion("update_id <>", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdGreaterThan(Integer value) {
+        public Criteria andUpdateIdGreaterThan(Long value) {
             addCriterion("update_id >", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdGreaterThanOrEqualTo(Integer value) {
+        public Criteria andUpdateIdGreaterThanOrEqualTo(Long value) {
             addCriterion("update_id >=", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdLessThan(Integer value) {
+        public Criteria andUpdateIdLessThan(Long value) {
             addCriterion("update_id <", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdLessThanOrEqualTo(Integer value) {
+        public Criteria andUpdateIdLessThanOrEqualTo(Long value) {
             addCriterion("update_id <=", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdIn(List<Integer> values) {
+        public Criteria andUpdateIdIn(List<Long> values) {
             addCriterion("update_id in", values, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdNotIn(List<Integer> values) {
+        public Criteria andUpdateIdNotIn(List<Long> values) {
             addCriterion("update_id not in", values, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdBetween(Integer value1, Integer value2) {
+        public Criteria andUpdateIdBetween(Long value1, Long value2) {
             addCriterion("update_id between", value1, value2, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateIdNotBetween(Integer value1, Integer value2) {
+        public Criteria andUpdateIdNotBetween(Long value1, Long value2) {
             addCriterion("update_id not between", value1, value2, "updateId");
             return (Criteria) this;
         }

forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/model/UmsCompanyShop.java

@@ -6,12 +6,12 @@ import java.util.Date;
 
 public class UmsCompanyShop implements Serializable {
     @ApiModelProperty(value = "主键")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(value = "供应商id")
-    private Integer compId;
+    private Long compId;
 
-    @ApiModelProperty(value = "网店类型：taobao:淘宝店jd：京东店：ping：多多店")
+    @ApiModelProperty(value = "网店类型：taobao:淘宝店jd：京东店：ping：多多店,own自营")
     private String shopType;
 
     @ApiModelProperty(value = "网点访问地址")
@@ -27,7 +27,7 @@ public class UmsCompanyShop implements Serializable {
     private Date createTime;
 
     @ApiModelProperty(value = "创建人id")
-    private Integer createId;
+    private Long createId;
 
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;
@@ -37,19 +37,19 @@ public class UmsCompanyShop implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Integer getCompId() {
+    public Long getCompId() {
         return compId;
     }
 
-    public void setCompId(Integer compId) {
+    public void setCompId(Long compId) {
         this.compId = compId;
     }
 
@@ -93,11 +93,11 @@ public class UmsCompanyShop implements Serializable {
         this.createTime = createTime;
     }
 
-    public Integer getCreateId() {
+    public Long getCreateId() {
         return createId;
     }
 
-    public void setCreateId(Integer createId) {
+    public void setCreateId(Long createId) {
         this.createId = createId;
     }
 

forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/model/UmsCompanyShopExample.java

@@ -115,52 +115,52 @@ public class UmsCompanyShopExample {
             return (Criteria) this;
         }
 
-        public Criteria andIdEqualTo(Integer value) {
+        public Criteria andIdEqualTo(Long value) {
             addCriterion("id =", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdNotEqualTo(Integer value) {
+        public Criteria andIdNotEqualTo(Long value) {
             addCriterion("id <>", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdGreaterThan(Integer value) {
+        public Criteria andIdGreaterThan(Long value) {
             addCriterion("id >", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
             addCriterion("id >=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdLessThan(Integer value) {
+        public Criteria andIdLessThan(Long value) {
             addCriterion("id <", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdLessThanOrEqualTo(Integer value) {
+        public Criteria andIdLessThanOrEqualTo(Long value) {
             addCriterion("id <=", value, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdIn(List<Integer> values) {
+        public Criteria andIdIn(List<Long> values) {
             addCriterion("id in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdNotIn(List<Integer> values) {
+        public Criteria andIdNotIn(List<Long> values) {
             addCriterion("id not in", values, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdBetween(Integer value1, Integer value2) {
+        public Criteria andIdBetween(Long value1, Long value2) {
             addCriterion("id between", value1, value2, "id");
             return (Criteria) this;
         }
 
-        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+        public Criteria andIdNotBetween(Long value1, Long value2) {
             addCriterion("id not between", value1, value2, "id");
             return (Criteria) this;
         }
@@ -175,52 +175,52 @@ public class UmsCompanyShopExample {
             return (Criteria) this;
         }
 
-        public Criteria andCompIdEqualTo(Integer value) {
+        public Criteria andCompIdEqualTo(Long value) {
             addCriterion("comp_id =", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andCompIdNotEqualTo(Integer value) {
+        public Criteria andCompIdNotEqualTo(Long value) {
             addCriterion("comp_id <>", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andCompIdGreaterThan(Integer value) {
+        public Criteria andCompIdGreaterThan(Long value) {
             addCriterion("comp_id >", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andCompIdGreaterThanOrEqualTo(Integer value) {
+        public Criteria andCompIdGreaterThanOrEqualTo(Long value) {
             addCriterion("comp_id >=", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andCompIdLessThan(Integer value) {
+        public Criteria andCompIdLessThan(Long value) {
             addCriterion("comp_id <", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andCompIdLessThanOrEqualTo(Integer value) {
+        public Criteria andCompIdLessThanOrEqualTo(Long value) {
             addCriterion("comp_id <=", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andCompIdIn(List<Integer> values) {
+        public Criteria andCompIdIn(List<Long> values) {
             addCriterion("comp_id in", values, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andCompIdNotIn(List<Integer> values) {
+        public Criteria andCompIdNotIn(List<Long> values) {
             addCriterion("comp_id not in", values, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andCompIdBetween(Integer value1, Integer value2) {
+        public Criteria andCompIdBetween(Long value1, Long value2) {
             addCriterion("comp_id between", value1, value2, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andCompIdNotBetween(Integer value1, Integer value2) {
+        public Criteria andCompIdNotBetween(Long value1, Long value2) {
             addCriterion("comp_id not between", value1, value2, "compId");
             return (Criteria) this;
         }
@@ -575,52 +575,52 @@ public class UmsCompanyShopExample {
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdEqualTo(Integer value) {
+        public Criteria andCreateIdEqualTo(Long value) {
             addCriterion("create_id =", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdNotEqualTo(Integer value) {
+        public Criteria andCreateIdNotEqualTo(Long value) {
             addCriterion("create_id <>", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdGreaterThan(Integer value) {
+        public Criteria andCreateIdGreaterThan(Long value) {
             addCriterion("create_id >", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdGreaterThanOrEqualTo(Integer value) {
+        public Criteria andCreateIdGreaterThanOrEqualTo(Long value) {
             addCriterion("create_id >=", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdLessThan(Integer value) {
+        public Criteria andCreateIdLessThan(Long value) {
             addCriterion("create_id <", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdLessThanOrEqualTo(Integer value) {
+        public Criteria andCreateIdLessThanOrEqualTo(Long value) {
             addCriterion("create_id <=", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdIn(List<Integer> values) {
+        public Criteria andCreateIdIn(List<Long> values) {
             addCriterion("create_id in", values, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdNotIn(List<Integer> values) {
+        public Criteria andCreateIdNotIn(List<Long> values) {
             addCriterion("create_id not in", values, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdBetween(Integer value1, Integer value2) {
+        public Criteria andCreateIdBetween(Long value1, Long value2) {
             addCriterion("create_id between", value1, value2, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateIdNotBetween(Integer value1, Integer value2) {
+        public Criteria andCreateIdNotBetween(Long value1, Long value2) {
             addCriterion("create_id not between", value1, value2, "createId");
             return (Criteria) this;
         }

forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/model/UmsMemberOrigin.java

@@ -0,0 +1,344 @@
+package com.hwrj.cloud.portal.model;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+
+public class UmsMemberOrigin implements Serializable {
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @ApiModelProperty(value = "供应商id (供应商信息表 ums_company_info -> id)")
+    private Long fkCompanyInfoId;
+
+    @ApiModelProperty(value = "供应商名称")
+    private String compName;
+
+    @ApiModelProperty(value = "生产地名称")
+    private String originName;
+
+    @ApiModelProperty(value = "生产地面积（亩）")
+    private Double originArea;
+
+    @ApiModelProperty(value = "人数")
+    private Integer peopleNum;
+
+    @ApiModelProperty(value = "建立日期（年）")
+    private String foundDate;
+
+    @ApiModelProperty(value = "联系人")
+    private String linkUser;
+
+    @ApiModelProperty(value = "联系方式")
+    private String linkPhone;
+
+    @ApiModelProperty(value = "省")
+    private String provinceName;
+
+    @ApiModelProperty(value = "市")
+    private String cityName;
+
+    @ApiModelProperty(value = "县")
+    private String countyName;
+
+    @ApiModelProperty(value = "详细地址")
+    private String detailAddress;
+
+    @ApiModelProperty(value = "海拔")
+    private String altitude;
+
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
+    @ApiModelProperty(value = "状态 0:可用，1:禁用，2:删除")
+    private Integer state;
+
+    @ApiModelProperty(value = "创建人")
+    private Integer createId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "修改人id")
+    private Integer updateId;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "生产地图片")
+    private String imgUrl;
+
+    @ApiModelProperty(value = "生产地宣传视频地址")
+    private String videoUrl;
+
+    @ApiModelProperty(value = "vr地址")
+    private String vrUrl;
+
+    @ApiModelProperty(value = "实时监控视频地址")
+    private String cameraUrl;
+
+    @ApiModelProperty(value = "简介")
+    private String summary;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getFkCompanyInfoId() {
+        return fkCompanyInfoId;
+    }
+
+    public void setFkCompanyInfoId(Long fkCompanyInfoId) {
+        this.fkCompanyInfoId = fkCompanyInfoId;
+    }
+
+    public String getCompName() {
+        return compName;
+    }
+
+    public void setCompName(String compName) {
+        this.compName = compName;
+    }
+
+    public String getOriginName() {
+        return originName;
+    }
+
+    public void setOriginName(String originName) {
+        this.originName = originName;
+    }
+
+    public Double getOriginArea() {
+        return originArea;
+    }
+
+    public void setOriginArea(Double originArea) {
+        this.originArea = originArea;
+    }
+
+    public Integer getPeopleNum() {
+        return peopleNum;
+    }
+
+    public void setPeopleNum(Integer peopleNum) {
+        this.peopleNum = peopleNum;
+    }
+
+    public String getFoundDate() {
+        return foundDate;
+    }
+
+    public void setFoundDate(String foundDate) {
+        this.foundDate = foundDate;
+    }
+
+    public String getLinkUser() {
+        return linkUser;
+    }
+
+    public void setLinkUser(String linkUser) {
+        this.linkUser = linkUser;
+    }
+
+    public String getLinkPhone() {
+        return linkPhone;
+    }
+
+    public void setLinkPhone(String linkPhone) {
+        this.linkPhone = linkPhone;
+    }
+
+    public String getProvinceName() {
+        return provinceName;
+    }
+
+    public void setProvinceName(String provinceName) {
+        this.provinceName = provinceName;
+    }
+
+    public String getCityName() {
+        return cityName;
+    }
+
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
+
+    public String getCountyName() {
+        return countyName;
+    }
+
+    public void setCountyName(String countyName) {
+        this.countyName = countyName;
+    }
+
+    public String getDetailAddress() {
+        return detailAddress;
+    }
+
+    public void setDetailAddress(String detailAddress) {
+        this.detailAddress = detailAddress;
+    }
+
+    public String getAltitude() {
+        return altitude;
+    }
+
+    public void setAltitude(String altitude) {
+        this.altitude = altitude;
+    }
+
+    public String getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Integer getCreateId() {
+        return createId;
+    }
+
+    public void setCreateId(Integer createId) {
+        this.createId = createId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getUpdateId() {
+        return updateId;
+    }
+
+    public void setUpdateId(Integer updateId) {
+        this.updateId = updateId;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getImgUrl() {
+        return imgUrl;
+    }
+
+    public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl;
+    }
+
+    public String getVideoUrl() {
+        return videoUrl;
+    }
+
+    public void setVideoUrl(String videoUrl) {
+        this.videoUrl = videoUrl;
+    }
+
+    public String getVrUrl() {
+        return vrUrl;
+    }
+
+    public void setVrUrl(String vrUrl) {
+        this.vrUrl = vrUrl;
+    }
+
+    public String getCameraUrl() {
+        return cameraUrl;
+    }
+
+    public void setCameraUrl(String cameraUrl) {
+        this.cameraUrl = cameraUrl;
+    }
+
+    public String getSummary() {
+        return summary;
+    }
+
+    public void setSummary(String summary) {
+        this.summary = summary;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = 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(", fkCompanyInfoId=").append(fkCompanyInfoId);
+        sb.append(", compName=").append(compName);
+        sb.append(", originName=").append(originName);
+        sb.append(", originArea=").append(originArea);
+        sb.append(", peopleNum=").append(peopleNum);
+        sb.append(", foundDate=").append(foundDate);
+        sb.append(", linkUser=").append(linkUser);
+        sb.append(", linkPhone=").append(linkPhone);
+        sb.append(", provinceName=").append(provinceName);
+        sb.append(", cityName=").append(cityName);
+        sb.append(", countyName=").append(countyName);
+        sb.append(", detailAddress=").append(detailAddress);
+        sb.append(", altitude=").append(altitude);
+        sb.append(", longitude=").append(longitude);
+        sb.append(", latitude=").append(latitude);
+        sb.append(", state=").append(state);
+        sb.append(", createId=").append(createId);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateId=").append(updateId);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", imgUrl=").append(imgUrl);
+        sb.append(", videoUrl=").append(videoUrl);
+        sb.append(", vrUrl=").append(vrUrl);
+        sb.append(", cameraUrl=").append(cameraUrl);
+        sb.append(", summary=").append(summary);
+        sb.append(", remark=").append(remark);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/model/UmsMemberOriginProduct.java

@@ -0,0 +1,164 @@
+package com.hwrj.cloud.portal.model;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+
+public class UmsMemberOriginProduct implements Serializable {
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @ApiModelProperty(value = "生产地id (生产地信息表 ums_member_origin -> id)")
+    private Long fkOriginId;
+
+    @ApiModelProperty(value = "产品名称")
+    private String productName;
+
+    @ApiModelProperty(value = "产出物种植面积（亩）")
+    private String plantArea;
+
+    @ApiModelProperty(value = "产出物总产量（吨）")
+    private String outputNum;
+
+    @ApiModelProperty(value = "产出物亩产值（万元）")
+    private String outputValue;
+
+    @ApiModelProperty(value = "状态 0:可用，1:禁用，2:删除")
+    private Integer state;
+
+    @ApiModelProperty(value = "创建人")
+    private Integer createId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "修改人id")
+    private Integer updateId;
+
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getFkOriginId() {
+        return fkOriginId;
+    }
+
+    public void setFkOriginId(Long fkOriginId) {
+        this.fkOriginId = fkOriginId;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getPlantArea() {
+        return plantArea;
+    }
+
+    public void setPlantArea(String plantArea) {
+        this.plantArea = plantArea;
+    }
+
+    public String getOutputNum() {
+        return outputNum;
+    }
+
+    public void setOutputNum(String outputNum) {
+        this.outputNum = outputNum;
+    }
+
+    public String getOutputValue() {
+        return outputValue;
+    }
+
+    public void setOutputValue(String outputValue) {
+        this.outputValue = outputValue;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Integer getCreateId() {
+        return createId;
+    }
+
+    public void setCreateId(Integer createId) {
+        this.createId = createId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getUpdateId() {
+        return updateId;
+    }
+
+    public void setUpdateId(Integer updateId) {
+        this.updateId = updateId;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = 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(", fkOriginId=").append(fkOriginId);
+        sb.append(", productName=").append(productName);
+        sb.append(", plantArea=").append(plantArea);
+        sb.append(", outputNum=").append(outputNum);
+        sb.append(", outputValue=").append(outputValue);
+        sb.append(", state=").append(state);
+        sb.append(", createId=").append(createId);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateId=").append(updateId);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", remark=").append(remark);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

forest-portal/portal-mbg/src/main/java/com/hwrj/cloud/portal/model/UmsMemberOriginProductExample.java

@@ -0,0 +1,901 @@
+package com.hwrj.cloud.portal.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class UmsMemberOriginProductExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public UmsMemberOriginProductExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdIsNull() {
+            addCriterion("fk_origin_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdIsNotNull() {
+            addCriterion("fk_origin_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdEqualTo(Long value) {
+            addCriterion("fk_origin_id =", value, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdNotEqualTo(Long value) {
+            addCriterion("fk_origin_id <>", value, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdGreaterThan(Long value) {
+            addCriterion("fk_origin_id >", value, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("fk_origin_id >=", value, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdLessThan(Long value) {
+            addCriterion("fk_origin_id <", value, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdLessThanOrEqualTo(Long value) {
+            addCriterion("fk_origin_id <=", value, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdIn(List<Long> values) {
+            addCriterion("fk_origin_id in", values, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdNotIn(List<Long> values) {
+            addCriterion("fk_origin_id not in", values, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdBetween(Long value1, Long value2) {
+            addCriterion("fk_origin_id between", value1, value2, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFkOriginIdNotBetween(Long value1, Long value2) {
+            addCriterion("fk_origin_id not between", value1, value2, "fkOriginId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameIsNull() {
+            addCriterion("product_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameIsNotNull() {
+            addCriterion("product_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameEqualTo(String value) {
+            addCriterion("product_name =", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameNotEqualTo(String value) {
+            addCriterion("product_name <>", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameGreaterThan(String value) {
+            addCriterion("product_name >", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameGreaterThanOrEqualTo(String value) {
+            addCriterion("product_name >=", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameLessThan(String value) {
+            addCriterion("product_name <", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameLessThanOrEqualTo(String value) {
+            addCriterion("product_name <=", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameLike(String value) {
+            addCriterion("product_name like", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameNotLike(String value) {
+            addCriterion("product_name not like", value, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameIn(List<String> values) {
+            addCriterion("product_name in", values, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameNotIn(List<String> values) {
+            addCriterion("product_name not in", values, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameBetween(String value1, String value2) {
+            addCriterion("product_name between", value1, value2, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductNameNotBetween(String value1, String value2) {
+            addCriterion("product_name not between", value1, value2, "productName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaIsNull() {
+            addCriterion("plant_area is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaIsNotNull() {
+            addCriterion("plant_area is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaEqualTo(String value) {
+            addCriterion("plant_area =", value, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaNotEqualTo(String value) {
+            addCriterion("plant_area <>", value, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaGreaterThan(String value) {
+            addCriterion("plant_area >", value, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaGreaterThanOrEqualTo(String value) {
+            addCriterion("plant_area >=", value, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaLessThan(String value) {
+            addCriterion("plant_area <", value, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaLessThanOrEqualTo(String value) {
+            addCriterion("plant_area <=", value, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaLike(String value) {
+            addCriterion("plant_area like", value, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaNotLike(String value) {
+            addCriterion("plant_area not like", value, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaIn(List<String> values) {
+            addCriterion("plant_area in", values, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaNotIn(List<String> values) {
+            addCriterion("plant_area not in", values, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaBetween(String value1, String value2) {
+            addCriterion("plant_area between", value1, value2, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andPlantAreaNotBetween(String value1, String value2) {
+            addCriterion("plant_area not between", value1, value2, "plantArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumIsNull() {
+            addCriterion("output_num is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumIsNotNull() {
+            addCriterion("output_num is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumEqualTo(String value) {
+            addCriterion("output_num =", value, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumNotEqualTo(String value) {
+            addCriterion("output_num <>", value, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumGreaterThan(String value) {
+            addCriterion("output_num >", value, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumGreaterThanOrEqualTo(String value) {
+            addCriterion("output_num >=", value, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumLessThan(String value) {
+            addCriterion("output_num <", value, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumLessThanOrEqualTo(String value) {
+            addCriterion("output_num <=", value, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumLike(String value) {
+            addCriterion("output_num like", value, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumNotLike(String value) {
+            addCriterion("output_num not like", value, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumIn(List<String> values) {
+            addCriterion("output_num in", values, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumNotIn(List<String> values) {
+            addCriterion("output_num not in", values, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumBetween(String value1, String value2) {
+            addCriterion("output_num between", value1, value2, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputNumNotBetween(String value1, String value2) {
+            addCriterion("output_num not between", value1, value2, "outputNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueIsNull() {
+            addCriterion("output_value is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueIsNotNull() {
+            addCriterion("output_value is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueEqualTo(String value) {
+            addCriterion("output_value =", value, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueNotEqualTo(String value) {
+            addCriterion("output_value <>", value, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueGreaterThan(String value) {
+            addCriterion("output_value >", value, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueGreaterThanOrEqualTo(String value) {
+            addCriterion("output_value >=", value, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueLessThan(String value) {
+            addCriterion("output_value <", value, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueLessThanOrEqualTo(String value) {
+            addCriterion("output_value <=", value, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueLike(String value) {
+            addCriterion("output_value like", value, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueNotLike(String value) {
+            addCriterion("output_value not like", value, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueIn(List<String> values) {
+            addCriterion("output_value in", values, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueNotIn(List<String> values) {
+            addCriterion("output_value not in", values, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueBetween(String value1, String value2) {
+            addCriterion("output_value between", value1, value2, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutputValueNotBetween(String value1, String value2) {
+            addCriterion("output_value not between", value1, value2, "outputValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNull() {
+            addCriterion("state is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNotNull() {
+            addCriterion("state is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateEqualTo(Integer value) {
+            addCriterion("state =", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotEqualTo(Integer value) {
+            addCriterion("state <>", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThan(Integer value) {
+            addCriterion("state >", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThanOrEqualTo(Integer value) {
+            addCriterion("state >=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThan(Integer value) {
+            addCriterion("state <", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThanOrEqualTo(Integer value) {
+            addCriterion("state <=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIn(List<Integer> values) {
+            addCriterion("state in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotIn(List<Integer> values) {
+            addCriterion("state not in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateBetween(Integer value1, Integer value2) {
+            addCriterion("state between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotBetween(Integer value1, Integer value2) {
+            addCriterion("state not between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdIsNull() {
+            addCriterion("create_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdIsNotNull() {
+            addCriterion("create_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdEqualTo(Integer value) {
+            addCriterion("create_id =", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdNotEqualTo(Integer value) {
+            addCriterion("create_id <>", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdGreaterThan(Integer value) {
+            addCriterion("create_id >", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("create_id >=", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdLessThan(Integer value) {
+            addCriterion("create_id <", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdLessThanOrEqualTo(Integer value) {
+            addCriterion("create_id <=", value, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdIn(List<Integer> values) {
+            addCriterion("create_id in", values, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdNotIn(List<Integer> values) {
+            addCriterion("create_id not in", values, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdBetween(Integer value1, Integer value2) {
+            addCriterion("create_id between", value1, value2, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("create_id not between", value1, value2, "createId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdIsNull() {
+            addCriterion("update_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdIsNotNull() {
+            addCriterion("update_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdEqualTo(Integer value) {
+            addCriterion("update_id =", value, "updateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdNotEqualTo(Integer value) {
+            addCriterion("update_id <>", value, "updateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdGreaterThan(Integer value) {
+            addCriterion("update_id >", value, "updateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("update_id >=", value, "updateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdLessThan(Integer value) {
+            addCriterion("update_id <", value, "updateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdLessThanOrEqualTo(Integer value) {
+            addCriterion("update_id <=", value, "updateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdIn(List<Integer> values) {
+            addCriterion("update_id in", values, "updateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdNotIn(List<Integer> values) {
+            addCriterion("update_id not in", values, "updateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdBetween(Integer value1, Integer value2) {
+            addCriterion("update_id between", value1, value2, "updateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("update_id not between", value1, value2, "updateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

forest-portal/portal-mbg/src/main/resources/com/hwrj/cloud/portal/mapper/OmsPreItemMapper.xml

@@ -0,0 +1,464 @@
+<?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="com.hwrj.cloud.portal.mapper.OmsPreItemMapper">
+  <resultMap id="BaseResultMap" type="com.hwrj.cloud.portal.model.OmsPreItem">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="product_id" jdbcType="BIGINT" property="productId" />
+    <result column="member_id" jdbcType="BIGINT" property="memberId" />
+    <result column="company_id" jdbcType="BIGINT" property="companyId" />
+    <result column="push_id" jdbcType="BIGINT" property="pushId" />
+    <result column="origin_id" jdbcType="BIGINT" property="originId" />
+    <result column="origin_name" jdbcType="VARCHAR" property="originName" />
+    <result column="company_name" jdbcType="VARCHAR" property="companyName" />
+    <result column="price" jdbcType="DECIMAL" property="price" />
+    <result column="product_pic" jdbcType="VARCHAR" property="productPic" />
+    <result column="product_name" jdbcType="VARCHAR" property="productName" />
+    <result column="product_sub_title" jdbcType="VARCHAR" property="productSubTitle" />
+    <result column="product_sku_code" jdbcType="VARCHAR" property="productSkuCode" />
+    <result column="member_nickname" jdbcType="VARCHAR" property="memberNickname" />
+    <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
+    <result column="modify_date" jdbcType="TIMESTAMP" property="modifyDate" />
+    <result column="delete_status" jdbcType="INTEGER" property="deleteStatus" />
+    <result column="product_category_id" jdbcType="BIGINT" property="productCategoryId" />
+    <result column="product_brand" jdbcType="VARCHAR" property="productBrand" />
+    <result column="product_sn" jdbcType="VARCHAR" property="productSn" />
+    <result column="product_attr" jdbcType="VARCHAR" property="productAttr" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, product_id, member_id, company_id, push_id, origin_id, origin_name, company_name, 
+    price, product_pic, product_name, product_sub_title, product_sku_code, member_nickname, 
+    create_date, modify_date, delete_status, product_category_id, product_brand, product_sn, 
+    product_attr
+  </sql>
+  <select id="selectByExample" parameterType="com.hwrj.cloud.portal.model.OmsPreItemExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from oms_pre_item
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from oms_pre_item
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from oms_pre_item
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.hwrj.cloud.portal.model.OmsPreItemExample">
+    delete from oms_pre_item
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.hwrj.cloud.portal.model.OmsPreItem">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into oms_pre_item (product_id, member_id, company_id, 
+      push_id, origin_id, origin_name, 
+      company_name, price, product_pic, 
+      product_name, product_sub_title, product_sku_code, 
+      member_nickname, create_date, modify_date, 
+      delete_status, product_category_id, product_brand, 
+      product_sn, product_attr)
+    values (#{productId,jdbcType=BIGINT}, #{memberId,jdbcType=BIGINT}, #{companyId,jdbcType=BIGINT}, 
+      #{pushId,jdbcType=BIGINT}, #{originId,jdbcType=BIGINT}, #{originName,jdbcType=VARCHAR}, 
+      #{companyName,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL}, #{productPic,jdbcType=VARCHAR}, 
+      #{productName,jdbcType=VARCHAR}, #{productSubTitle,jdbcType=VARCHAR}, #{productSkuCode,jdbcType=VARCHAR}, 
+      #{memberNickname,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{modifyDate,jdbcType=TIMESTAMP}, 
+      #{deleteStatus,jdbcType=INTEGER}, #{productCategoryId,jdbcType=BIGINT}, #{productBrand,jdbcType=VARCHAR}, 
+      #{productSn,jdbcType=VARCHAR}, #{productAttr,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.hwrj.cloud.portal.model.OmsPreItem">
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into oms_pre_item
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="productId != null">
+        product_id,
+      </if>
+      <if test="memberId != null">
+        member_id,
+      </if>
+      <if test="companyId != null">
+        company_id,
+      </if>
+      <if test="pushId != null">
+        push_id,
+      </if>
+      <if test="originId != null">
+        origin_id,
+      </if>
+      <if test="originName != null">
+        origin_name,
+      </if>
+      <if test="companyName != null">
+        company_name,
+      </if>
+      <if test="price != null">
+        price,
+      </if>
+      <if test="productPic != null">
+        product_pic,
+      </if>
+      <if test="productName != null">
+        product_name,
+      </if>
+      <if test="productSubTitle != null">
+        product_sub_title,
+      </if>
+      <if test="productSkuCode != null">
+        product_sku_code,
+      </if>
+      <if test="memberNickname != null">
+        member_nickname,
+      </if>
+      <if test="createDate != null">
+        create_date,
+      </if>
+      <if test="modifyDate != null">
+        modify_date,
+      </if>
+      <if test="deleteStatus != null">
+        delete_status,
+      </if>
+      <if test="productCategoryId != null">
+        product_category_id,
+      </if>
+      <if test="productBrand != null">
+        product_brand,
+      </if>
+      <if test="productSn != null">
+        product_sn,
+      </if>
+      <if test="productAttr != null">
+        product_attr,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="productId != null">
+        #{productId,jdbcType=BIGINT},
+      </if>
+      <if test="memberId != null">
+        #{memberId,jdbcType=BIGINT},
+      </if>
+      <if test="companyId != null">
+        #{companyId,jdbcType=BIGINT},
+      </if>
+      <if test="pushId != null">
+        #{pushId,jdbcType=BIGINT},
+      </if>
+      <if test="originId != null">
+        #{originId,jdbcType=BIGINT},
+      </if>
+      <if test="originName != null">
+        #{originName,jdbcType=VARCHAR},
+      </if>
+      <if test="companyName != null">
+        #{companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="price != null">
+        #{price,jdbcType=DECIMAL},
+      </if>
+      <if test="productPic != null">
+        #{productPic,jdbcType=VARCHAR},
+      </if>
+      <if test="productName != null">
+        #{productName,jdbcType=VARCHAR},
+      </if>
+      <if test="productSubTitle != null">
+        #{productSubTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="productSkuCode != null">
+        #{productSkuCode,jdbcType=VARCHAR},
+      </if>
+      <if test="memberNickname != null">
+        #{memberNickname,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null">
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifyDate != null">
+        #{modifyDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deleteStatus != null">
+        #{deleteStatus,jdbcType=INTEGER},
+      </if>
+      <if test="productCategoryId != null">
+        #{productCategoryId,jdbcType=BIGINT},
+      </if>
+      <if test="productBrand != null">
+        #{productBrand,jdbcType=VARCHAR},
+      </if>
+      <if test="productSn != null">
+        #{productSn,jdbcType=VARCHAR},
+      </if>
+      <if test="productAttr != null">
+        #{productAttr,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.hwrj.cloud.portal.model.OmsPreItemExample" resultType="java.lang.Long">
+    select count(*) from oms_pre_item
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update oms_pre_item
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.productId != null">
+        product_id = #{record.productId,jdbcType=BIGINT},
+      </if>
+      <if test="record.memberId != null">
+        member_id = #{record.memberId,jdbcType=BIGINT},
+      </if>
+      <if test="record.companyId != null">
+        company_id = #{record.companyId,jdbcType=BIGINT},
+      </if>
+      <if test="record.pushId != null">
+        push_id = #{record.pushId,jdbcType=BIGINT},
+      </if>
+      <if test="record.originId != null">
+        origin_id = #{record.originId,jdbcType=BIGINT},
+      </if>
+      <if test="record.originName != null">
+        origin_name = #{record.originName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.companyName != null">
+        company_name = #{record.companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.price != null">
+        price = #{record.price,jdbcType=DECIMAL},
+      </if>
+      <if test="record.productPic != null">
+        product_pic = #{record.productPic,jdbcType=VARCHAR},
+      </if>
+      <if test="record.productName != null">
+        product_name = #{record.productName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.productSubTitle != null">
+        product_sub_title = #{record.productSubTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="record.productSkuCode != null">
+        product_sku_code = #{record.productSkuCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.memberNickname != null">
+        member_nickname = #{record.memberNickname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createDate != null">
+        create_date = #{record.createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.modifyDate != null">
+        modify_date = #{record.modifyDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.deleteStatus != null">
+        delete_status = #{record.deleteStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.productCategoryId != null">
+        product_category_id = #{record.productCategoryId,jdbcType=BIGINT},
+      </if>
+      <if test="record.productBrand != null">
+        product_brand = #{record.productBrand,jdbcType=VARCHAR},
+      </if>
+      <if test="record.productSn != null">
+        product_sn = #{record.productSn,jdbcType=VARCHAR},
+      </if>
+      <if test="record.productAttr != null">
+        product_attr = #{record.productAttr,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update oms_pre_item
+    set id = #{record.id,jdbcType=BIGINT},
+      product_id = #{record.productId,jdbcType=BIGINT},
+      member_id = #{record.memberId,jdbcType=BIGINT},
+      company_id = #{record.companyId,jdbcType=BIGINT},
+      push_id = #{record.pushId,jdbcType=BIGINT},
+      origin_id = #{record.originId,jdbcType=BIGINT},
+      origin_name = #{record.originName,jdbcType=VARCHAR},
+      company_name = #{record.companyName,jdbcType=VARCHAR},
+      price = #{record.price,jdbcType=DECIMAL},
+      product_pic = #{record.productPic,jdbcType=VARCHAR},
+      product_name = #{record.productName,jdbcType=VARCHAR},
+      product_sub_title = #{record.productSubTitle,jdbcType=VARCHAR},
+      product_sku_code = #{record.productSkuCode,jdbcType=VARCHAR},
+      member_nickname = #{record.memberNickname,jdbcType=VARCHAR},
+      create_date = #{record.createDate,jdbcType=TIMESTAMP},
+      modify_date = #{record.modifyDate,jdbcType=TIMESTAMP},
+      delete_status = #{record.deleteStatus,jdbcType=INTEGER},
+      product_category_id = #{record.productCategoryId,jdbcType=BIGINT},
+      product_brand = #{record.productBrand,jdbcType=VARCHAR},
+      product_sn = #{record.productSn,jdbcType=VARCHAR},
+      product_attr = #{record.productAttr,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.portal.model.OmsPreItem">
+    update oms_pre_item
+    <set>
+      <if test="productId != null">
+        product_id = #{productId,jdbcType=BIGINT},
+      </if>
+      <if test="memberId != null">
+        member_id = #{memberId,jdbcType=BIGINT},
+      </if>
+      <if test="companyId != null">
+        company_id = #{companyId,jdbcType=BIGINT},
+      </if>
+      <if test="pushId != null">
+        push_id = #{pushId,jdbcType=BIGINT},
+      </if>
+      <if test="originId != null">
+        origin_id = #{originId,jdbcType=BIGINT},
+      </if>
+      <if test="originName != null">
+        origin_name = #{originName,jdbcType=VARCHAR},
+      </if>
+      <if test="companyName != null">
+        company_name = #{companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="price != null">
+        price = #{price,jdbcType=DECIMAL},
+      </if>
+      <if test="productPic != null">
+        product_pic = #{productPic,jdbcType=VARCHAR},
+      </if>
+      <if test="productName != null">
+        product_name = #{productName,jdbcType=VARCHAR},
+      </if>
+      <if test="productSubTitle != null">
+        product_sub_title = #{productSubTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="productSkuCode != null">
+        product_sku_code = #{productSkuCode,jdbcType=VARCHAR},
+      </if>
+      <if test="memberNickname != null">
+        member_nickname = #{memberNickname,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null">
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="modifyDate != null">
+        modify_date = #{modifyDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deleteStatus != null">
+        delete_status = #{deleteStatus,jdbcType=INTEGER},
+      </if>
+      <if test="productCategoryId != null">
+        product_category_id = #{productCategoryId,jdbcType=BIGINT},
+      </if>
+      <if test="productBrand != null">
+        product_brand = #{productBrand,jdbcType=VARCHAR},
+      </if>
+      <if test="productSn != null">
+        product_sn = #{productSn,jdbcType=VARCHAR},
+      </if>
+      <if test="productAttr != null">
+        product_attr = #{productAttr,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.portal.model.OmsPreItem">
+    update oms_pre_item
+    set product_id = #{productId,jdbcType=BIGINT},
+      member_id = #{memberId,jdbcType=BIGINT},
+      company_id = #{companyId,jdbcType=BIGINT},
+      push_id = #{pushId,jdbcType=BIGINT},
+      origin_id = #{originId,jdbcType=BIGINT},
+      origin_name = #{originName,jdbcType=VARCHAR},
+      company_name = #{companyName,jdbcType=VARCHAR},
+      price = #{price,jdbcType=DECIMAL},
+      product_pic = #{productPic,jdbcType=VARCHAR},
+      product_name = #{productName,jdbcType=VARCHAR},
+      product_sub_title = #{productSubTitle,jdbcType=VARCHAR},
+      product_sku_code = #{productSkuCode,jdbcType=VARCHAR},
+      member_nickname = #{memberNickname,jdbcType=VARCHAR},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      modify_date = #{modifyDate,jdbcType=TIMESTAMP},
+      delete_status = #{deleteStatus,jdbcType=INTEGER},
+      product_category_id = #{productCategoryId,jdbcType=BIGINT},
+      product_brand = #{productBrand,jdbcType=VARCHAR},
+      product_sn = #{productSn,jdbcType=VARCHAR},
+      product_attr = #{productAttr,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

forest-portal/portal-mbg/src/main/resources/com/hwrj/cloud/portal/mapper/PmsProductMapper.xml

@@ -40,6 +40,20 @@
     <result column="promotion_type" jdbcType="INTEGER" property="promotionType" />
     <result column="brand_name" jdbcType="VARCHAR" property="brandName" />
     <result column="product_category_name" jdbcType="VARCHAR" property="productCategoryName" />
+    <result column="ums_company_info_id" jdbcType="BIGINT" property="umsCompanyInfoId" />
+    <result column="ums_company_info" jdbcType="VARCHAR" property="umsCompanyInfo" />
+    <result column="trade_price" jdbcType="DECIMAL" property="tradePrice" />
+    <result column="spec" jdbcType="VARCHAR" property="spec" />
+    <result column="date_of_manufacture" jdbcType="VARCHAR" property="dateOfManufacture" />
+    <result column="place_of_production_id" jdbcType="BIGINT" property="placeOfProductionId" />
+    <result column="place_of_production" jdbcType="VARCHAR" property="placeOfProduction" />
+    <result column="instructions" jdbcType="VARCHAR" property="instructions" />
+    <result column="quality_guarantee_period" jdbcType="VARCHAR" property="qualityGuaranteePeriod" />
+    <result column="points_for_attention" jdbcType="VARCHAR" property="pointsForAttention" />
+    <result column="create_user" jdbcType="BIGINT" property="createUser" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_user" jdbcType="BIGINT" property="updateUser" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.hwrj.cloud.portal.model.PmsProduct">
     <result column="description" jdbcType="LONGVARCHAR" property="description" />
@@ -111,7 +125,10 @@
     verify_status, sort, sale, price, promotion_price, gift_growth, gift_point, use_point_limit, 
     sub_title, original_price, stock, low_stock, unit, weight, preview_status, service_ids, 
     keywords, note, album_pics, detail_title, promotion_start_time, promotion_end_time, 
-    promotion_per_limit, promotion_type, brand_name, product_category_name
+    promotion_per_limit, promotion_type, brand_name, product_category_name, ums_company_info_id, 
+    ums_company_info, trade_price, spec, date_of_manufacture, place_of_production_id, 
+    place_of_production, instructions, quality_guarantee_period, points_for_attention, 
+    create_user, create_time, update_user, update_time
   </sql>
   <sql id="Blob_Column_List">
     description, detail_desc, detail_html, detail_mobile_html
@@ -180,7 +197,12 @@
       keywords, note, album_pics, 
       detail_title, promotion_start_time, promotion_end_time, 
       promotion_per_limit, promotion_type, brand_name, 
-      product_category_name, description, detail_desc, 
+      product_category_name, ums_company_info_id, ums_company_info, 
+      trade_price, spec, date_of_manufacture, 
+      place_of_production_id, place_of_production, 
+      instructions, quality_guarantee_period, points_for_attention, 
+      create_user, create_time, update_user, 
+      update_time, description, detail_desc, 
       detail_html, detail_mobile_html)
     values (#{brandId,jdbcType=BIGINT}, #{productCategoryId,jdbcType=BIGINT}, #{feightTemplateId,jdbcType=BIGINT}, 
       #{productAttributeCategoryId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{pic,jdbcType=VARCHAR}, 
@@ -194,7 +216,12 @@
       #{keywords,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, #{albumPics,jdbcType=VARCHAR}, 
       #{detailTitle,jdbcType=VARCHAR}, #{promotionStartTime,jdbcType=TIMESTAMP}, #{promotionEndTime,jdbcType=TIMESTAMP}, 
       #{promotionPerLimit,jdbcType=INTEGER}, #{promotionType,jdbcType=INTEGER}, #{brandName,jdbcType=VARCHAR}, 
-      #{productCategoryName,jdbcType=VARCHAR}, #{description,jdbcType=LONGVARCHAR}, #{detailDesc,jdbcType=LONGVARCHAR}, 
+      #{productCategoryName,jdbcType=VARCHAR}, #{umsCompanyInfoId,jdbcType=BIGINT}, #{umsCompanyInfo,jdbcType=VARCHAR}, 
+      #{tradePrice,jdbcType=DECIMAL}, #{spec,jdbcType=VARCHAR}, #{dateOfManufacture,jdbcType=VARCHAR}, 
+      #{placeOfProductionId,jdbcType=BIGINT}, #{placeOfProduction,jdbcType=VARCHAR}, 
+      #{instructions,jdbcType=VARCHAR}, #{qualityGuaranteePeriod,jdbcType=VARCHAR}, #{pointsForAttention,jdbcType=VARCHAR}, 
+      #{createUser,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=BIGINT}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{description,jdbcType=LONGVARCHAR}, #{detailDesc,jdbcType=LONGVARCHAR}, 
       #{detailHtml,jdbcType=LONGVARCHAR}, #{detailMobileHtml,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.hwrj.cloud.portal.model.PmsProduct">
@@ -314,6 +341,48 @@
       <if test="productCategoryName != null">
         product_category_name,
       </if>
+      <if test="umsCompanyInfoId != null">
+        ums_company_info_id,
+      </if>
+      <if test="umsCompanyInfo != null">
+        ums_company_info,
+      </if>
+      <if test="tradePrice != null">
+        trade_price,
+      </if>
+      <if test="spec != null">
+        spec,
+      </if>
+      <if test="dateOfManufacture != null">
+        date_of_manufacture,
+      </if>
+      <if test="placeOfProductionId != null">
+        place_of_production_id,
+      </if>
+      <if test="placeOfProduction != null">
+        place_of_production,
+      </if>
+      <if test="instructions != null">
+        instructions,
+      </if>
+      <if test="qualityGuaranteePeriod != null">
+        quality_guarantee_period,
+      </if>
+      <if test="pointsForAttention != null">
+        points_for_attention,
+      </if>
+      <if test="createUser != null">
+        create_user,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateUser != null">
+        update_user,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
       <if test="description != null">
         description,
       </if>
@@ -439,6 +508,48 @@
       <if test="productCategoryName != null">
         #{productCategoryName,jdbcType=VARCHAR},
       </if>
+      <if test="umsCompanyInfoId != null">
+        #{umsCompanyInfoId,jdbcType=BIGINT},
+      </if>
+      <if test="umsCompanyInfo != null">
+        #{umsCompanyInfo,jdbcType=VARCHAR},
+      </if>
+      <if test="tradePrice != null">
+        #{tradePrice,jdbcType=DECIMAL},
+      </if>
+      <if test="spec != null">
+        #{spec,jdbcType=VARCHAR},
+      </if>
+      <if test="dateOfManufacture != null">
+        #{dateOfManufacture,jdbcType=VARCHAR},
+      </if>
+      <if test="placeOfProductionId != null">
+        #{placeOfProductionId,jdbcType=BIGINT},
+      </if>
+      <if test="placeOfProduction != null">
+        #{placeOfProduction,jdbcType=VARCHAR},
+      </if>
+      <if test="instructions != null">
+        #{instructions,jdbcType=VARCHAR},
+      </if>
+      <if test="qualityGuaranteePeriod != null">
+        #{qualityGuaranteePeriod,jdbcType=VARCHAR},
+      </if>
+      <if test="pointsForAttention != null">
+        #{pointsForAttention,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null">
+        #{createUser,jdbcType=BIGINT},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null">
+        #{updateUser,jdbcType=BIGINT},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
       <if test="description != null">
         #{description,jdbcType=LONGVARCHAR},
       </if>
@@ -576,6 +687,48 @@
       <if test="record.productCategoryName != null">
         product_category_name = #{record.productCategoryName,jdbcType=VARCHAR},
       </if>
+      <if test="record.umsCompanyInfoId != null">
+        ums_company_info_id = #{record.umsCompanyInfoId,jdbcType=BIGINT},
+      </if>
+      <if test="record.umsCompanyInfo != null">
+        ums_company_info = #{record.umsCompanyInfo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.tradePrice != null">
+        trade_price = #{record.tradePrice,jdbcType=DECIMAL},
+      </if>
+      <if test="record.spec != null">
+        spec = #{record.spec,jdbcType=VARCHAR},
+      </if>
+      <if test="record.dateOfManufacture != null">
+        date_of_manufacture = #{record.dateOfManufacture,jdbcType=VARCHAR},
+      </if>
+      <if test="record.placeOfProductionId != null">
+        place_of_production_id = #{record.placeOfProductionId,jdbcType=BIGINT},
+      </if>
+      <if test="record.placeOfProduction != null">
+        place_of_production = #{record.placeOfProduction,jdbcType=VARCHAR},
+      </if>
+      <if test="record.instructions != null">
+        instructions = #{record.instructions,jdbcType=VARCHAR},
+      </if>
+      <if test="record.qualityGuaranteePeriod != null">
+        quality_guarantee_period = #{record.qualityGuaranteePeriod,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pointsForAttention != null">
+        points_for_attention = #{record.pointsForAttention,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createUser != null">
+        create_user = #{record.createUser,jdbcType=BIGINT},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateUser != null">
+        update_user = #{record.updateUser,jdbcType=BIGINT},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
       <if test="record.description != null">
         description = #{record.description,jdbcType=LONGVARCHAR},
       </if>
@@ -633,6 +786,20 @@
       promotion_type = #{record.promotionType,jdbcType=INTEGER},
       brand_name = #{record.brandName,jdbcType=VARCHAR},
       product_category_name = #{record.productCategoryName,jdbcType=VARCHAR},
+      ums_company_info_id = #{record.umsCompanyInfoId,jdbcType=BIGINT},
+      ums_company_info = #{record.umsCompanyInfo,jdbcType=VARCHAR},
+      trade_price = #{record.tradePrice,jdbcType=DECIMAL},
+      spec = #{record.spec,jdbcType=VARCHAR},
+      date_of_manufacture = #{record.dateOfManufacture,jdbcType=VARCHAR},
+      place_of_production_id = #{record.placeOfProductionId,jdbcType=BIGINT},
+      place_of_production = #{record.placeOfProduction,jdbcType=VARCHAR},
+      instructions = #{record.instructions,jdbcType=VARCHAR},
+      quality_guarantee_period = #{record.qualityGuaranteePeriod,jdbcType=VARCHAR},
+      points_for_attention = #{record.pointsForAttention,jdbcType=VARCHAR},
+      create_user = #{record.createUser,jdbcType=BIGINT},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_user = #{record.updateUser,jdbcType=BIGINT},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       description = #{record.description,jdbcType=LONGVARCHAR},
       detail_desc = #{record.detailDesc,jdbcType=LONGVARCHAR},
       detail_html = #{record.detailHtml,jdbcType=LONGVARCHAR},
@@ -680,7 +847,21 @@
       promotion_per_limit = #{record.promotionPerLimit,jdbcType=INTEGER},
       promotion_type = #{record.promotionType,jdbcType=INTEGER},
       brand_name = #{record.brandName,jdbcType=VARCHAR},
-      product_category_name = #{record.productCategoryName,jdbcType=VARCHAR}
+      product_category_name = #{record.productCategoryName,jdbcType=VARCHAR},
+      ums_company_info_id = #{record.umsCompanyInfoId,jdbcType=BIGINT},
+      ums_company_info = #{record.umsCompanyInfo,jdbcType=VARCHAR},
+      trade_price = #{record.tradePrice,jdbcType=DECIMAL},
+      spec = #{record.spec,jdbcType=VARCHAR},
+      date_of_manufacture = #{record.dateOfManufacture,jdbcType=VARCHAR},
+      place_of_production_id = #{record.placeOfProductionId,jdbcType=BIGINT},
+      place_of_production = #{record.placeOfProduction,jdbcType=VARCHAR},
+      instructions = #{record.instructions,jdbcType=VARCHAR},
+      quality_guarantee_period = #{record.qualityGuaranteePeriod,jdbcType=VARCHAR},
+      points_for_attention = #{record.pointsForAttention,jdbcType=VARCHAR},
+      create_user = #{record.createUser,jdbcType=BIGINT},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_user = #{record.updateUser,jdbcType=BIGINT},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -799,6 +980,48 @@
       <if test="productCategoryName != null">
         product_category_name = #{productCategoryName,jdbcType=VARCHAR},
       </if>
+      <if test="umsCompanyInfoId != null">
+        ums_company_info_id = #{umsCompanyInfoId,jdbcType=BIGINT},
+      </if>
+      <if test="umsCompanyInfo != null">
+        ums_company_info = #{umsCompanyInfo,jdbcType=VARCHAR},
+      </if>
+      <if test="tradePrice != null">
+        trade_price = #{tradePrice,jdbcType=DECIMAL},
+      </if>
+      <if test="spec != null">
+        spec = #{spec,jdbcType=VARCHAR},
+      </if>
+      <if test="dateOfManufacture != null">
+        date_of_manufacture = #{dateOfManufacture,jdbcType=VARCHAR},
+      </if>
+      <if test="placeOfProductionId != null">
+        place_of_production_id = #{placeOfProductionId,jdbcType=BIGINT},
+      </if>
+      <if test="placeOfProduction != null">
+        place_of_production = #{placeOfProduction,jdbcType=VARCHAR},
+      </if>
+      <if test="instructions != null">
+        instructions = #{instructions,jdbcType=VARCHAR},
+      </if>
+      <if test="qualityGuaranteePeriod != null">
+        quality_guarantee_period = #{qualityGuaranteePeriod,jdbcType=VARCHAR},
+      </if>
+      <if test="pointsForAttention != null">
+        points_for_attention = #{pointsForAttention,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null">
+        create_user = #{createUser,jdbcType=BIGINT},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null">
+        update_user = #{updateUser,jdbcType=BIGINT},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
       <if test="description != null">
         description = #{description,jdbcType=LONGVARCHAR},
       </if>
@@ -853,6 +1076,20 @@
       promotion_type = #{promotionType,jdbcType=INTEGER},
       brand_name = #{brandName,jdbcType=VARCHAR},
       product_category_name = #{productCategoryName,jdbcType=VARCHAR},
+      ums_company_info_id = #{umsCompanyInfoId,jdbcType=BIGINT},
+      ums_company_info = #{umsCompanyInfo,jdbcType=VARCHAR},
+      trade_price = #{tradePrice,jdbcType=DECIMAL},
+      spec = #{spec,jdbcType=VARCHAR},
+      date_of_manufacture = #{dateOfManufacture,jdbcType=VARCHAR},
+      place_of_production_id = #{placeOfProductionId,jdbcType=BIGINT},
+      place_of_production = #{placeOfProduction,jdbcType=VARCHAR},
+      instructions = #{instructions,jdbcType=VARCHAR},
+      quality_guarantee_period = #{qualityGuaranteePeriod,jdbcType=VARCHAR},
+      points_for_attention = #{pointsForAttention,jdbcType=VARCHAR},
+      create_user = #{createUser,jdbcType=BIGINT},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=BIGINT},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
       description = #{description,jdbcType=LONGVARCHAR},
       detail_desc = #{detailDesc,jdbcType=LONGVARCHAR},
       detail_html = #{detailHtml,jdbcType=LONGVARCHAR},
@@ -897,7 +1134,21 @@
       promotion_per_limit = #{promotionPerLimit,jdbcType=INTEGER},
       promotion_type = #{promotionType,jdbcType=INTEGER},
       brand_name = #{brandName,jdbcType=VARCHAR},
-      product_category_name = #{productCategoryName,jdbcType=VARCHAR}
+      product_category_name = #{productCategoryName,jdbcType=VARCHAR},
+      ums_company_info_id = #{umsCompanyInfoId,jdbcType=BIGINT},
+      ums_company_info = #{umsCompanyInfo,jdbcType=VARCHAR},
+      trade_price = #{tradePrice,jdbcType=DECIMAL},
+      spec = #{spec,jdbcType=VARCHAR},
+      date_of_manufacture = #{dateOfManufacture,jdbcType=VARCHAR},
+      place_of_production_id = #{placeOfProductionId,jdbcType=BIGINT},
+      place_of_production = #{placeOfProduction,jdbcType=VARCHAR},
+      instructions = #{instructions,jdbcType=VARCHAR},
+      quality_guarantee_period = #{qualityGuaranteePeriod,jdbcType=VARCHAR},
+      points_for_attention = #{pointsForAttention,jdbcType=VARCHAR},
+      create_user = #{createUser,jdbcType=BIGINT},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=BIGINT},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

forest-portal/portal-mbg/src/main/resources/com/hwrj/cloud/portal/mapper/UmsCompanyFileMapper.xml

@@ -8,9 +8,9 @@
     <result column="file_type" jdbcType="VARCHAR" property="fileType" />
     <result column="file_status" jdbcType="INTEGER" property="fileStatus" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="create_id" jdbcType="INTEGER" property="createId" />
+    <result column="create_id" jdbcType="BIGINT" property="createId" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="update_id" jdbcType="INTEGER" property="updateId" />
+    <result column="update_id" jdbcType="BIGINT" property="updateId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -112,8 +112,8 @@
       file_status, create_time, create_id, 
       update_time, update_id)
     values (#{compId,jdbcType=BIGINT}, #{fileUrl,jdbcType=VARCHAR}, #{fileType,jdbcType=VARCHAR}, 
-      #{fileStatus,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{createId,jdbcType=INTEGER}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{updateId,jdbcType=INTEGER})
+      #{fileStatus,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{createId,jdbcType=BIGINT}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{updateId,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.hwrj.cloud.portal.model.UmsCompanyFile">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
@@ -163,13 +163,13 @@
         #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="createId != null">
-        #{createId,jdbcType=INTEGER},
+        #{createId,jdbcType=BIGINT},
       </if>
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="updateId != null">
-        #{updateId,jdbcType=INTEGER},
+        #{updateId,jdbcType=BIGINT},
       </if>
     </trim>
   </insert>
@@ -201,13 +201,13 @@
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.createId != null">
-        create_id = #{record.createId,jdbcType=INTEGER},
+        create_id = #{record.createId,jdbcType=BIGINT},
       </if>
       <if test="record.updateTime != null">
         update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.updateId != null">
-        update_id = #{record.updateId,jdbcType=INTEGER},
+        update_id = #{record.updateId,jdbcType=BIGINT},
       </if>
     </set>
     <if test="_parameter != null">
@@ -222,9 +222,9 @@
       file_type = #{record.fileType,jdbcType=VARCHAR},
       file_status = #{record.fileStatus,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      create_id = #{record.createId,jdbcType=INTEGER},
+      create_id = #{record.createId,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      update_id = #{record.updateId,jdbcType=INTEGER}
+      update_id = #{record.updateId,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -248,13 +248,13 @@
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="createId != null">
-        create_id = #{createId,jdbcType=INTEGER},
+        create_id = #{createId,jdbcType=BIGINT},
       </if>
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="updateId != null">
-        update_id = #{updateId,jdbcType=INTEGER},
+        update_id = #{updateId,jdbcType=BIGINT},
       </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
@@ -266,9 +266,9 @@
       file_type = #{fileType,jdbcType=VARCHAR},
       file_status = #{fileStatus,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      create_id = #{createId,jdbcType=INTEGER},
+      create_id = #{createId,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      update_id = #{updateId,jdbcType=INTEGER}
+      update_id = #{updateId,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

forest-portal/portal-mbg/src/main/resources/com/hwrj/cloud/portal/mapper/UmsCompanyInfoMapper.xml

@@ -4,12 +4,16 @@
   <resultMap id="BaseResultMap" type="com.hwrj.cloud.portal.model.UmsCompanyInfo">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="comp_name" jdbcType="VARCHAR" property="compName" />
+    <result column="company_type" jdbcType="VARCHAR" property="companyType" />
+    <result column="comp_level" jdbcType="INTEGER" property="compLevel" />
+    <result column="comp_qual" jdbcType="VARCHAR" property="compQual" />
     <result column="comp_imgs" jdbcType="VARCHAR" property="compImgs" />
     <result column="comp_url" jdbcType="VARCHAR" property="compUrl" />
     <result column="comp_prod_license_num" jdbcType="VARCHAR" property="compProdLicenseNum" />
     <result column="comp_manage_license_num" jdbcType="VARCHAR" property="compManageLicenseNum" />
     <result column="comp_social_code" jdbcType="VARCHAR" property="compSocialCode" />
     <result column="comp_con_person" jdbcType="VARCHAR" property="compConPerson" />
+    <result column="is_cert" jdbcType="INTEGER" property="isCert" />
     <result column="comp_con_type" jdbcType="VARCHAR" property="compConType" />
     <result column="comp_con_num" jdbcType="VARCHAR" property="compConNum" />
     <result column="comp_qq" jdbcType="VARCHAR" property="compQq" />
@@ -24,12 +28,12 @@
     <result column="latitude" jdbcType="VARCHAR" property="latitude" />
     <result column="comp_status" jdbcType="INTEGER" property="compStatus" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="create_id" jdbcType="INTEGER" property="createId" />
+    <result column="create_id" jdbcType="BIGINT" property="createId" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="update_id" jdbcType="INTEGER" property="updateId" />
+    <result column="update_id" jdbcType="BIGINT" property="updateId" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.hwrj.cloud.portal.model.UmsCompanyInfo">
-    <result column="comp_introduction" jdbcType="LONGVARCHAR" property="compIntroduction" />
+    <result column="comp_sum" jdbcType="LONGVARCHAR" property="compSum" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -90,13 +94,14 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, comp_name, comp_imgs, comp_url, comp_prod_license_num, comp_manage_license_num, 
-    comp_social_code, comp_con_person, comp_con_type, comp_con_num, comp_qq, comp_manage_product, 
-    province_id, city_id, county_id, town_id, village_id, detail_address, longitude, 
-    latitude, comp_status, create_time, create_id, update_time, update_id
+    id, comp_name, company_type, comp_level, comp_qual, comp_imgs, comp_url, comp_prod_license_num, 
+    comp_manage_license_num, comp_social_code, comp_con_person, is_cert, comp_con_type, 
+    comp_con_num, comp_qq, comp_manage_product, province_id, city_id, county_id, town_id, 
+    village_id, detail_address, longitude, latitude, comp_status, create_time, create_id, 
+    update_time, update_id
   </sql>
   <sql id="Blob_Column_List">
-    comp_introduction
+    comp_sum
   </sql>
   <select id="selectByExampleWithBLOBs" parameterType="com.hwrj.cloud.portal.model.UmsCompanyInfoExample" resultMap="ResultMapWithBLOBs">
     select
@@ -150,24 +155,28 @@
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into ums_company_info (comp_name, comp_imgs, comp_url, 
+    insert into ums_company_info (comp_name, company_type, comp_level, 
+      comp_qual, comp_imgs, comp_url, 
       comp_prod_license_num, comp_manage_license_num, 
-      comp_social_code, comp_con_person, comp_con_type, 
-      comp_con_num, comp_qq, comp_manage_product, 
-      province_id, city_id, county_id, 
-      town_id, village_id, detail_address, 
-      longitude, latitude, comp_status, 
-      create_time, create_id, update_time, 
-      update_id, comp_introduction)
-    values (#{compName,jdbcType=VARCHAR}, #{compImgs,jdbcType=VARCHAR}, #{compUrl,jdbcType=VARCHAR}, 
+      comp_social_code, comp_con_person, is_cert, 
+      comp_con_type, comp_con_num, comp_qq, 
+      comp_manage_product, province_id, city_id, 
+      county_id, town_id, village_id, 
+      detail_address, longitude, latitude, 
+      comp_status, create_time, create_id, 
+      update_time, update_id, comp_sum
+      )
+    values (#{compName,jdbcType=VARCHAR}, #{companyType,jdbcType=VARCHAR}, #{compLevel,jdbcType=INTEGER}, 
+      #{compQual,jdbcType=VARCHAR}, #{compImgs,jdbcType=VARCHAR}, #{compUrl,jdbcType=VARCHAR}, 
       #{compProdLicenseNum,jdbcType=VARCHAR}, #{compManageLicenseNum,jdbcType=VARCHAR}, 
-      #{compSocialCode,jdbcType=VARCHAR}, #{compConPerson,jdbcType=VARCHAR}, #{compConType,jdbcType=VARCHAR}, 
-      #{compConNum,jdbcType=VARCHAR}, #{compQq,jdbcType=VARCHAR}, #{compManageProduct,jdbcType=VARCHAR}, 
-      #{provinceId,jdbcType=VARCHAR}, #{cityId,jdbcType=VARCHAR}, #{countyId,jdbcType=VARCHAR}, 
-      #{townId,jdbcType=VARCHAR}, #{villageId,jdbcType=VARCHAR}, #{detailAddress,jdbcType=VARCHAR}, 
-      #{longitude,jdbcType=VARCHAR}, #{latitude,jdbcType=VARCHAR}, #{compStatus,jdbcType=INTEGER}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{createId,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{updateId,jdbcType=INTEGER}, #{compIntroduction,jdbcType=LONGVARCHAR})
+      #{compSocialCode,jdbcType=VARCHAR}, #{compConPerson,jdbcType=VARCHAR}, #{isCert,jdbcType=INTEGER}, 
+      #{compConType,jdbcType=VARCHAR}, #{compConNum,jdbcType=VARCHAR}, #{compQq,jdbcType=VARCHAR}, 
+      #{compManageProduct,jdbcType=VARCHAR}, #{provinceId,jdbcType=VARCHAR}, #{cityId,jdbcType=VARCHAR}, 
+      #{countyId,jdbcType=VARCHAR}, #{townId,jdbcType=VARCHAR}, #{villageId,jdbcType=VARCHAR}, 
+      #{detailAddress,jdbcType=VARCHAR}, #{longitude,jdbcType=VARCHAR}, #{latitude,jdbcType=VARCHAR}, 
+      #{compStatus,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{createId,jdbcType=BIGINT}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{updateId,jdbcType=BIGINT}, #{compSum,jdbcType=LONGVARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.hwrj.cloud.portal.model.UmsCompanyInfo">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
@@ -178,6 +187,15 @@
       <if test="compName != null">
         comp_name,
       </if>
+      <if test="companyType != null">
+        company_type,
+      </if>
+      <if test="compLevel != null">
+        comp_level,
+      </if>
+      <if test="compQual != null">
+        comp_qual,
+      </if>
       <if test="compImgs != null">
         comp_imgs,
       </if>
@@ -196,6 +214,9 @@
       <if test="compConPerson != null">
         comp_con_person,
       </if>
+      <if test="isCert != null">
+        is_cert,
+      </if>
       <if test="compConType != null">
         comp_con_type,
       </if>
@@ -247,14 +268,23 @@
       <if test="updateId != null">
         update_id,
       </if>
-      <if test="compIntroduction != null">
-        comp_introduction,
+      <if test="compSum != null">
+        comp_sum,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="compName != null">
         #{compName,jdbcType=VARCHAR},
       </if>
+      <if test="companyType != null">
+        #{companyType,jdbcType=VARCHAR},
+      </if>
+      <if test="compLevel != null">
+        #{compLevel,jdbcType=INTEGER},
+      </if>
+      <if test="compQual != null">
+        #{compQual,jdbcType=VARCHAR},
+      </if>
       <if test="compImgs != null">
         #{compImgs,jdbcType=VARCHAR},
       </if>
@@ -273,6 +303,9 @@
       <if test="compConPerson != null">
         #{compConPerson,jdbcType=VARCHAR},
       </if>
+      <if test="isCert != null">
+        #{isCert,jdbcType=INTEGER},
+      </if>
       <if test="compConType != null">
         #{compConType,jdbcType=VARCHAR},
       </if>
@@ -316,16 +349,16 @@
         #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="createId != null">
-        #{createId,jdbcType=INTEGER},
+        #{createId,jdbcType=BIGINT},
       </if>
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="updateId != null">
-        #{updateId,jdbcType=INTEGER},
+        #{updateId,jdbcType=BIGINT},
       </if>
-      <if test="compIntroduction != null">
-        #{compIntroduction,jdbcType=LONGVARCHAR},
+      <if test="compSum != null">
+        #{compSum,jdbcType=LONGVARCHAR},
       </if>
     </trim>
   </insert>
@@ -344,6 +377,15 @@
       <if test="record.compName != null">
         comp_name = #{record.compName,jdbcType=VARCHAR},
       </if>
+      <if test="record.companyType != null">
+        company_type = #{record.companyType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.compLevel != null">
+        comp_level = #{record.compLevel,jdbcType=INTEGER},
+      </if>
+      <if test="record.compQual != null">
+        comp_qual = #{record.compQual,jdbcType=VARCHAR},
+      </if>
       <if test="record.compImgs != null">
         comp_imgs = #{record.compImgs,jdbcType=VARCHAR},
       </if>
@@ -362,6 +404,9 @@
       <if test="record.compConPerson != null">
         comp_con_person = #{record.compConPerson,jdbcType=VARCHAR},
       </if>
+      <if test="record.isCert != null">
+        is_cert = #{record.isCert,jdbcType=INTEGER},
+      </if>
       <if test="record.compConType != null">
         comp_con_type = #{record.compConType,jdbcType=VARCHAR},
       </if>
@@ -405,16 +450,16 @@
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.createId != null">
-        create_id = #{record.createId,jdbcType=INTEGER},
+        create_id = #{record.createId,jdbcType=BIGINT},
       </if>
       <if test="record.updateTime != null">
         update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="record.updateId != null">
-        update_id = #{record.updateId,jdbcType=INTEGER},
+        update_id = #{record.updateId,jdbcType=BIGINT},
       </if>
-      <if test="record.compIntroduction != null">
-        comp_introduction = #{record.compIntroduction,jdbcType=LONGVARCHAR},
+      <if test="record.compSum != null">
+        comp_sum = #{record.compSum,jdbcType=LONGVARCHAR},
       </if>
     </set>
     <if test="_parameter != null">
@@ -425,12 +470,16 @@
     update ums_company_info
     set id = #{record.id,jdbcType=BIGINT},
       comp_name = #{record.compName,jdbcType=VARCHAR},
+      company_type = #{record.companyType,jdbcType=VARCHAR},
+      comp_level = #{record.compLevel,jdbcType=INTEGER},
+      comp_qual = #{record.compQual,jdbcType=VARCHAR},
       comp_imgs = #{record.compImgs,jdbcType=VARCHAR},
       comp_url = #{record.compUrl,jdbcType=VARCHAR},
       comp_prod_license_num = #{record.compProdLicenseNum,jdbcType=VARCHAR},
       comp_manage_license_num = #{record.compManageLicenseNum,jdbcType=VARCHAR},
       comp_social_code = #{record.compSocialCode,jdbcType=VARCHAR},
       comp_con_person = #{record.compConPerson,jdbcType=VARCHAR},
+      is_cert = #{record.isCert,jdbcType=INTEGER},
       comp_con_type = #{record.compConType,jdbcType=VARCHAR},
       comp_con_num = #{record.compConNum,jdbcType=VARCHAR},
       comp_qq = #{record.compQq,jdbcType=VARCHAR},
@@ -445,10 +494,10 @@
       latitude = #{record.latitude,jdbcType=VARCHAR},
       comp_status = #{record.compStatus,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      create_id = #{record.createId,jdbcType=INTEGER},
+      create_id = #{record.createId,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      update_id = #{record.updateId,jdbcType=INTEGER},
-      comp_introduction = #{record.compIntroduction,jdbcType=LONGVARCHAR}
+      update_id = #{record.updateId,jdbcType=BIGINT},
+      comp_sum = #{record.compSum,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -457,12 +506,16 @@
     update ums_company_info
     set id = #{record.id,jdbcType=BIGINT},
       comp_name = #{record.compName,jdbcType=VARCHAR},
+      company_type = #{record.companyType,jdbcType=VARCHAR},
+      comp_level = #{record.compLevel,jdbcType=INTEGER},
+      comp_qual = #{record.compQual,jdbcType=VARCHAR},
       comp_imgs = #{record.compImgs,jdbcType=VARCHAR},
       comp_url = #{record.compUrl,jdbcType=VARCHAR},
       comp_prod_license_num = #{record.compProdLicenseNum,jdbcType=VARCHAR},
       comp_manage_license_num = #{record.compManageLicenseNum,jdbcType=VARCHAR},
       comp_social_code = #{record.compSocialCode,jdbcType=VARCHAR},
       comp_con_person = #{record.compConPerson,jdbcType=VARCHAR},
+      is_cert = #{record.isCert,jdbcType=INTEGER},
       comp_con_type = #{record.compConType,jdbcType=VARCHAR},
       comp_con_num = #{record.compConNum,jdbcType=VARCHAR},
       comp_qq = #{record.compQq,jdbcType=VARCHAR},
@@ -477,9 +530,9 @@
       latitude = #{record.latitude,jdbcType=VARCHAR},
       comp_status = #{record.compStatus,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      create_id = #{record.createId,jdbcType=INTEGER},
+      create_id = #{record.createId,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      update_id = #{record.updateId,jdbcType=INTEGER}
+      update_id = #{record.updateId,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -490,6 +543,15 @@
       <if test="compName != null">
         comp_name = #{compName,jdbcType=VARCHAR},
       </if>
+      <if test="companyType != null">
+        company_type = #{companyType,jdbcType=VARCHAR},
+      </if>
+      <if test="compLevel != null">
+        comp_level = #{compLevel,jdbcType=INTEGER},
+      </if>
+      <if test="compQual != null">
+        comp_qual = #{compQual,jdbcType=VARCHAR},
+      </if>
       <if test="compImgs != null">
         comp_imgs = #{compImgs,jdbcType=VARCHAR},
       </if>
@@ -508,6 +570,9 @@
       <if test="compConPerson != null">
         comp_con_person = #{compConPerson,jdbcType=VARCHAR},
       </if>
+      <if test="isCert != null">
+        is_cert = #{isCert,jdbcType=INTEGER},
+      </if>
       <if test="compConType != null">
         comp_con_type = #{compConType,jdbcType=VARCHAR},
       </if>
@@ -551,16 +616,16 @@
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="createId != null">
-        create_id = #{createId,jdbcType=INTEGER},
+        create_id = #{createId,jdbcType=BIGINT},
       </if>
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="updateId != null">
-        update_id = #{updateId,jdbcType=INTEGER},
+        update_id = #{updateId,jdbcType=BIGINT},
       </if>
-      <if test="compIntroduction != null">
-        comp_introduction = #{compIntroduction,jdbcType=LONGVARCHAR},
+      <if test="compSum != null">
+        comp_sum = #{compSum,jdbcType=LONGVARCHAR},
       </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
@@ -568,12 +633,16 @@
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.hwrj.cloud.portal.model.UmsCompanyInfo">
     update ums_company_info
     set comp_name = #{compName,jdbcType=VARCHAR},
+      company_type = #{companyType,jdbcType=VARCHAR},
+      comp_level = #{compLevel,jdbcType=INTEGER},
+      comp_qual = #{compQual,jdbcType=VARCHAR},
       comp_imgs = #{compImgs,jdbcType=VARCHAR},
       comp_url = #{compUrl,jdbcType=VARCHAR},
       comp_prod_license_num = #{compProdLicenseNum,jdbcType=VARCHAR},
       comp_manage_license_num = #{compManageLicenseNum,jdbcType=VARCHAR},
       comp_social_code = #{compSocialCode,jdbcType=VARCHAR},
       comp_con_person = #{compConPerson,jdbcType=VARCHAR},
+      is_cert = #{isCert,jdbcType=INTEGER},
       comp_con_type = #{compConType,jdbcType=VARCHAR},
       comp_con_num = #{compConNum,jdbcType=VARCHAR},
       comp_qq = #{compQq,jdbcType=VARCHAR},
@@ -588,21 +657,25 @@
       latitude = #{latitude,jdbcType=VARCHAR},
       comp_status = #{compStatus,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      create_id = #{createId,jdbcType=INTEGER},
+      create_id = #{createId,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      update_id = #{updateId,jdbcType=INTEGER},
-      comp_introduction = #{compIntroduction,jdbcType=LONGVARCHAR}
+      update_id = #{updateId,jdbcType=BIGINT},
+      comp_sum = #{compSum,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.portal.model.UmsCompanyInfo">
     update ums_company_info
     set comp_name = #{compName,jdbcType=VARCHAR},
+      company_type = #{companyType,jdbcType=VARCHAR},
+      comp_level = #{compLevel,jdbcType=INTEGER},
+      comp_qual = #{compQual,jdbcType=VARCHAR},
       comp_imgs = #{compImgs,jdbcType=VARCHAR},
       comp_url = #{compUrl,jdbcType=VARCHAR},
       comp_prod_license_num = #{compProdLicenseNum,jdbcType=VARCHAR},
       comp_manage_license_num = #{compManageLicenseNum,jdbcType=VARCHAR},
       comp_social_code = #{compSocialCode,jdbcType=VARCHAR},
       comp_con_person = #{compConPerson,jdbcType=VARCHAR},
+      is_cert = #{isCert,jdbcType=INTEGER},
       comp_con_type = #{compConType,jdbcType=VARCHAR},
       comp_con_num = #{compConNum,jdbcType=VARCHAR},
       comp_qq = #{compQq,jdbcType=VARCHAR},
@@ -617,9 +690,9 @@
       latitude = #{latitude,jdbcType=VARCHAR},
       comp_status = #{compStatus,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      create_id = #{createId,jdbcType=INTEGER},
+      create_id = #{createId,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      update_id = #{updateId,jdbcType=INTEGER}
+      update_id = #{updateId,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>