修复银行清分功能，去除admin模块

.idea/misc.xml

@@ -6,6 +6,11 @@
         <option value="$PROJECT_DIR$/pom.xml" />
       </list>
     </option>
+    <option name="ignoredFiles">
+      <set>
+        <option value="$PROJECT_DIR$/carbon-admin/pom.xml" />
+      </set>
+    </option>
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
 </project>

carbon-admin/carbon-admin-common/pom.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>carbon-admin</artifactId>
-        <groupId>com.hcloud.microserver</groupId>
-        <version>0.0.1-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>carbon-admin-common</artifactId>
-    <groupId>com.hcloud.microserver</groupId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>carbon-admin-common</name>
-    <packaging>jar</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-    </dependencies>
-</project>

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/sys/facade/entity/BaseDictionary.java

@@ -1,131 +0,0 @@
-package com.hcloud.microserver.sys.facade.entity;
-
-import lombok.ToString;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@ToString
-public class BaseDictionary implements Serializable {
-
-    private static final long serialVersionUID = -9045464053839476883L;
-    private String guid;
-
-    private String fkOrgGuid;
-
-    private String fkTypeGuid;
-
-    private String dicname;
-
-    private String diccode;
-
-    private Integer isForbiden;
-
-    private Integer orderby;
-
-    private String remark;
-
-    private Integer state;
-
-    private Date createTime;
-
-    private Date modifiedTime;
-
-    private String typeName;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getFkOrgGuid() {
-        return fkOrgGuid;
-    }
-
-    public void setFkOrgGuid(String fkOrgGuid) {
-        this.fkOrgGuid = fkOrgGuid == null ? null : fkOrgGuid.trim();
-    }
-
-    public String getFkTypeGuid() {
-        return fkTypeGuid;
-    }
-
-    public void setFkTypeGuid(String fkTypeGuid) {
-        this.fkTypeGuid = fkTypeGuid == null ? null : fkTypeGuid.trim();
-    }
-
-    public String getDicname() {
-        return dicname;
-    }
-
-    public void setDicname(String dicname) {
-        this.dicname = dicname == null ? null : dicname.trim();
-    }
-
-    public String getDiccode() {
-        return diccode;
-    }
-
-    public void setDiccode(String diccode) {
-        this.diccode = diccode == null ? null : diccode.trim();
-    }
-
-    public Integer getIsForbiden() {
-        return isForbiden;
-    }
-
-    public void setIsForbiden(Integer isForbiden) {
-        this.isForbiden = isForbiden;
-    }
-
-    public Integer getOrderby() {
-        return orderby;
-    }
-
-    public void setOrderby(Integer orderby) {
-        this.orderby = orderby;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark == null ? null : remark.trim();
-    }
-
-    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 Date getModifiedTime() {
-        return modifiedTime;
-    }
-
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-
-    public String getTypeName() {
-        return typeName;
-    }
-
-    public void setTypeName(String typeName) {
-        this.typeName = typeName;
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/sys/facade/entity/BaseDictionaryType.java

@@ -1,85 +0,0 @@
-package com.hcloud.microserver.sys.facade.entity;
-
-import java.util.Date;
-
-public class BaseDictionaryType {
-    private String guid;
-
-    private String fkOrgGuid;
-
-    private String parentTypeId;
-
-    private String typeCode;
-
-    private String typeName;
-
-    private Integer state;
-
-    private Date createTime;
-
-    private Date modifiedTime;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getFkOrgGuid() {
-        return fkOrgGuid;
-    }
-
-    public void setFkOrgGuid(String fkOrgGuid) {
-        this.fkOrgGuid = fkOrgGuid == null ? null : fkOrgGuid.trim();
-    }
-
-    public String getParentTypeId() {
-        return parentTypeId;
-    }
-
-    public void setParentTypeId(String parentTypeId) {
-        this.parentTypeId = parentTypeId == null ? null : parentTypeId.trim();
-    }
-
-    public String getTypeCode() {
-        return typeCode;
-    }
-
-    public void setTypeCode(String typeCode) {
-        this.typeCode = typeCode == null ? null : typeCode.trim();
-    }
-
-    public String getTypeName() {
-        return typeName;
-    }
-
-    public void setTypeName(String typeName) {
-        this.typeName = typeName == null ? null : typeName.trim();
-    }
-
-    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 Date getModifiedTime() {
-        return modifiedTime;
-    }
-
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/sys/facade/entity/SysDepartment.java

@@ -1,157 +0,0 @@
-package com.hcloud.microserver.sys.facade.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-public class SysDepartment implements Serializable {
-
-    private String guid;
-
-    private String cname;
-
-    private String ccode;
-
-    private String cstatus;
-
-    private String createuser;
-
-    private Date createdate;
-
-    private String updateuser;
-
-    private Date updatedate;
-
-    private String cver;
-
-    private String refSysApp;
-
-    private String parentId;
-
-    private String refSysUser;
-
-    private String phone;
-
-    private String chargename;
-
-    private String cdesc;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getCname() {
-        return cname;
-    }
-
-    public void setCname(String cname) {
-        this.cname = cname == null ? null : cname.trim();
-    }
-
-    public String getCcode() {
-        return ccode;
-    }
-
-    public void setCcode(String ccode) {
-        this.ccode = ccode == null ? null : ccode.trim();
-    }
-
-    public String getCstatus() {
-        return cstatus;
-    }
-
-    public void setCstatus(String cstatus) {
-        this.cstatus = cstatus == null ? null : cstatus.trim();
-    }
-
-    public String getCreateuser() {
-        return createuser;
-    }
-
-    public void setCreateuser(String createuser) {
-        this.createuser = createuser == null ? null : createuser.trim();
-    }
-
-    public Date getCreatedate() {
-        return createdate;
-    }
-
-    public void setCreatedate(Date createdate) {
-        this.createdate = createdate;
-    }
-
-    public String getUpdateuser() {
-        return updateuser;
-    }
-
-    public void setUpdateuser(String updateuser) {
-        this.updateuser = updateuser == null ? null : updateuser.trim();
-    }
-
-    public Date getUpdatedate() {
-        return updatedate;
-    }
-
-    public void setUpdatedate(Date updatedate) {
-        this.updatedate = updatedate;
-    }
-
-    public String getCver() {
-        return cver;
-    }
-
-    public void setCver(String cver) {
-        this.cver = cver == null ? null : cver.trim();
-    }
-
-    public String getRefSysApp() {
-        return refSysApp;
-    }
-
-    public void setRefSysApp(String refSysApp) {
-        this.refSysApp = refSysApp == null ? null : refSysApp.trim();
-    }
-
-    public String getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(String parentId) {
-        this.parentId = parentId == null ? null : parentId.trim();
-    }
-
-    public String getRefSysUser() {
-        return refSysUser;
-    }
-
-    public void setRefSysUser(String refSysUser) {
-        this.refSysUser = refSysUser == null ? null : refSysUser.trim();
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone == null ? null : phone.trim();
-    }
-
-    public String getChargename() {
-        return chargename;
-    }
-
-    public void setChargename(String chargename) {
-        this.chargename = chargename == null ? null : chargename.trim();
-    }
-
-    public String getCdesc() {
-        return cdesc;
-    }
-
-    public void setCdesc(String cdesc) {
-        this.cdesc = cdesc == null ? null : cdesc.trim();
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/sys/facade/entity/SysParameters.java

@@ -1,126 +0,0 @@
-package com.hcloud.microserver.sys.facade.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-public class SysParameters implements Serializable {
-    private String guid;
-
-    private String cname;
-
-    private String ccode;
-
-    private String cstatus;
-
-    private String createuser;
-
-    private Date createdate;
-
-    private String updateuser;
-
-    private Date updatedate;
-
-    private String cver;
-
-    private String ctype;
-
-    private String orgId;
-
-    private String cdesc;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getCname() {
-        return cname;
-    }
-
-    public void setCname(String cname) {
-        this.cname = cname == null ? null : cname.trim();
-    }
-
-    public String getCcode() {
-        return ccode;
-    }
-
-    public void setCcode(String ccode) {
-        this.ccode = ccode == null ? null : ccode.trim();
-    }
-
-    public String getCstatus() {
-        return cstatus;
-    }
-
-    public void setCstatus(String cstatus) {
-        this.cstatus = cstatus == null ? null : cstatus.trim();
-    }
-
-    public String getCreateuser() {
-        return createuser;
-    }
-
-    public void setCreateuser(String createuser) {
-        this.createuser = createuser == null ? null : createuser.trim();
-    }
-
-    public Date getCreatedate() {
-        return createdate;
-    }
-
-    public void setCreatedate(Date createdate) {
-        this.createdate = createdate;
-    }
-
-    public String getUpdateuser() {
-        return updateuser;
-    }
-
-    public void setUpdateuser(String updateuser) {
-        this.updateuser = updateuser == null ? null : updateuser.trim();
-    }
-
-    public Date getUpdatedate() {
-        return updatedate;
-    }
-
-    public void setUpdatedate(Date updatedate) {
-        this.updatedate = updatedate;
-    }
-
-    public String getCver() {
-        return cver;
-    }
-
-    public void setCver(String cver) {
-        this.cver = cver == null ? null : cver.trim();
-    }
-
-    public String getCtype() {
-        return ctype;
-    }
-
-    public void setCtype(String ctype) {
-        this.ctype = ctype == null ? null : ctype.trim();
-    }
-
-    public String getOrgId() {
-        return orgId;
-    }
-
-    public void setOrgId(String orgId) {
-        this.orgId = orgId == null ? null : orgId.trim();
-    }
-
-    public String getCdesc() {
-        return cdesc;
-    }
-
-    public void setCdesc(String cdesc) {
-        this.cdesc = cdesc == null ? null : cdesc.trim();
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/sys/facade/entity/SysPermission.java

@@ -1,179 +0,0 @@
-package com.hcloud.microserver.sys.facade.entity;
-
-import lombok.ToString;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@ToString
-public class SysPermission implements Serializable {
-    private String guid;
-
-    private String cname;
-
-    private String ccode;
-
-    private String cstatus;
-
-    private String createuser;
-
-    private Date createdate;
-
-    private String updateuser;
-
-    private Date updatedate;
-
-    private String cver;
-
-    private String refSysApp;
-
-    private String parentId;
-
-    private String icon;
-
-    private Integer seq;
-
-    private Boolean ismenu;
-
-    private String permission;
-
-    private String description;
-
-    private String url;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getCname() {
-        return cname;
-    }
-
-    public void setCname(String cname) {
-        this.cname = cname == null ? null : cname.trim();
-    }
-
-    public String getCcode() {
-        return ccode;
-    }
-
-    public void setCcode(String ccode) {
-        this.ccode = ccode == null ? null : ccode.trim();
-    }
-
-    public String getCstatus() {
-        return cstatus;
-    }
-
-    public void setCstatus(String cstatus) {
-        this.cstatus = cstatus == null ? null : cstatus.trim();
-    }
-
-    public String getCreateuser() {
-        return createuser;
-    }
-
-    public void setCreateuser(String createuser) {
-        this.createuser = createuser == null ? null : createuser.trim();
-    }
-
-    public Date getCreatedate() {
-        return createdate;
-    }
-
-    public void setCreatedate(Date createdate) {
-        this.createdate = createdate;
-    }
-
-    public String getUpdateuser() {
-        return updateuser;
-    }
-
-    public void setUpdateuser(String updateuser) {
-        this.updateuser = updateuser == null ? null : updateuser.trim();
-    }
-
-    public Date getUpdatedate() {
-        return updatedate;
-    }
-
-    public void setUpdatedate(Date updatedate) {
-        this.updatedate = updatedate;
-    }
-
-    public String getCver() {
-        return cver;
-    }
-
-    public void setCver(String cver) {
-        this.cver = cver == null ? null : cver.trim();
-    }
-
-    public String getRefSysApp() {
-        return refSysApp;
-    }
-
-    public void setRefSysApp(String refSysApp) {
-        this.refSysApp = refSysApp == null ? null : refSysApp.trim();
-    }
-
-    public String getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(String parentId) {
-        this.parentId = parentId == null ? null : parentId.trim();
-    }
-
-    public String getIcon() {
-        return icon;
-    }
-
-    public void setIcon(String icon) {
-        this.icon = icon == null ? null : icon.trim();
-    }
-
-    public Integer getSeq() {
-        return seq;
-    }
-
-    public void setSeq(Integer seq) {
-        this.seq = seq;
-    }
-
-    public Boolean getIsmenu() {
-        return ismenu;
-    }
-
-    public void setIsmenu(Boolean ismenu) {
-        this.ismenu = ismenu;
-    }
-
-    public String getPermission() {
-        return permission;
-    }
-
-    public void setPermission(String permission) {
-        this.permission = permission == null ? null : permission.trim();
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description == null ? null : description.trim();
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url == null ? null : url.trim();
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/sys/facade/entity/SysRole.java

@@ -1,116 +0,0 @@
-package com.hcloud.microserver.sys.facade.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-public class SysRole implements Serializable {
-    private String guid;
-
-    private String cname;
-
-    private String ccode;
-
-    private String cstatus;
-
-    private String createuser;
-
-    private Date createdate;
-
-    private String updateuser;
-
-    private Date updatedate;
-
-    private String cver;
-
-    private String refSysApp;
-
-    private String cdesc;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getCname() {
-        return cname;
-    }
-
-    public void setCname(String cname) {
-        this.cname = cname == null ? null : cname.trim();
-    }
-
-    public String getCcode() {
-        return ccode;
-    }
-
-    public void setCcode(String ccode) {
-        this.ccode = ccode == null ? null : ccode.trim();
-    }
-
-    public String getCstatus() {
-        return cstatus;
-    }
-
-    public void setCstatus(String cstatus) {
-        this.cstatus = cstatus == null ? null : cstatus.trim();
-    }
-
-    public String getCreateuser() {
-        return createuser;
-    }
-
-    public void setCreateuser(String createuser) {
-        this.createuser = createuser == null ? null : createuser.trim();
-    }
-
-    public Date getCreatedate() {
-        return createdate;
-    }
-
-    public void setCreatedate(Date createdate) {
-        this.createdate = createdate;
-    }
-
-    public String getUpdateuser() {
-        return updateuser;
-    }
-
-    public void setUpdateuser(String updateuser) {
-        this.updateuser = updateuser == null ? null : updateuser.trim();
-    }
-
-    public Date getUpdatedate() {
-        return updatedate;
-    }
-
-    public void setUpdatedate(Date updatedate) {
-        this.updatedate = updatedate;
-    }
-
-    public String getCver() {
-        return cver;
-    }
-
-    public void setCver(String cver) {
-        this.cver = cver == null ? null : cver.trim();
-    }
-
-    public String getRefSysApp() {
-        return refSysApp;
-    }
-
-    public void setRefSysApp(String refSysApp) {
-        this.refSysApp = refSysApp == null ? null : refSysApp.trim();
-    }
-
-    public String getCdesc() {
-        return cdesc;
-    }
-
-    public void setCdesc(String cdesc) {
-        this.cdesc = cdesc == null ? null : cdesc.trim();
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/sys/facade/entity/SysRolePermission.java

@@ -1,35 +0,0 @@
-package com.hcloud.microserver.sys.facade.entity;
-
-import java.io.Serializable;
-
-public class SysRolePermission implements Serializable {
-    private String guid;
-
-    private String refSysRole;
-
-    private String refSysPermission;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getRefSysRole() {
-        return refSysRole;
-    }
-
-    public void setRefSysRole(String refSysRole) {
-        this.refSysRole = refSysRole == null ? null : refSysRole.trim();
-    }
-
-    public String getRefSysPermission() {
-        return refSysPermission;
-    }
-
-    public void setRefSysPermission(String refSysPermission) {
-        this.refSysPermission = refSysPermission == null ? null : refSysPermission.trim();
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/sys/facade/entity/SysUser.java

@@ -1,320 +0,0 @@
-package com.hcloud.microserver.sys.facade.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author xiezt
- */
-public class SysUser implements Serializable {
-
-    private String guid;
-
-    private String cname;
-
-    private String ccode;
-
-    private String cstatus;
-
-    private String createuser;
-
-    private Date createdate;
-
-    private String updateuser;
-
-    private Date updatedate;
-
-    private String cver;
-
-    private String realName;
-
-    private String password;
-
-    private String photo;
-
-    private Integer sex;
-
-    private String refSysDepartment;
-
-    private String refPj;
-
-    private String refZhccSRole;
-
-    private String phone;
-
-    private String weixin;
-
-    private String qq;
-
-    private String email;
-
-    private String idCard;
-
-    private Date birthday;
-
-    private Integer height;
-
-    private Float weight;
-
-    private String nativePlace;
-
-    private Integer nation;
-
-    private String currAddress;
-
-    private String loginIp;
-
-    private Date loginDate;
-
-    private Long loginCount;
-
-    private String orgId;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getCname() {
-        return cname;
-    }
-
-    public void setCname(String cname) {
-        this.cname = cname == null ? null : cname.trim();
-    }
-
-    public String getCcode() {
-        return ccode;
-    }
-
-    public void setCcode(String ccode) {
-        this.ccode = ccode == null ? null : ccode.trim();
-    }
-
-    public String getCstatus() {
-        return cstatus;
-    }
-
-    public void setCstatus(String cstatus) {
-        this.cstatus = cstatus == null ? null : cstatus.trim();
-    }
-
-    public String getCreateuser() {
-        return createuser;
-    }
-
-    public void setCreateuser(String createuser) {
-        this.createuser = createuser == null ? null : createuser.trim();
-    }
-
-    public Date getCreatedate() {
-        return createdate;
-    }
-
-    public void setCreatedate(Date createdate) {
-        this.createdate = createdate;
-    }
-
-    public String getUpdateuser() {
-        return updateuser;
-    }
-
-    public void setUpdateuser(String updateuser) {
-        this.updateuser = updateuser == null ? null : updateuser.trim();
-    }
-
-    public Date getUpdatedate() {
-        return updatedate;
-    }
-
-    public void setUpdatedate(Date updatedate) {
-        this.updatedate = updatedate;
-    }
-
-    public String getCver() {
-        return cver;
-    }
-
-    public void setCver(String cver) {
-        this.cver = cver == null ? null : cver.trim();
-    }
-
-    public String getRealName() {
-        return realName;
-    }
-
-    public void setRealName(String realName) {
-        this.realName = realName == null ? null : realName.trim();
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password == null ? null : password.trim();
-    }
-
-    public String getPhoto() {
-        return photo;
-    }
-
-    public void setPhoto(String photo) {
-        this.photo = photo == null ? null : photo.trim();
-    }
-
-    public Integer getSex() {
-        return sex;
-    }
-
-    public void setSex(Integer sex) {
-        this.sex = sex;
-    }
-
-    public String getRefSysDepartment() {
-        return refSysDepartment;
-    }
-
-    public void setRefSysDepartment(String refSysDepartment) {
-        this.refSysDepartment = refSysDepartment == null ? null : refSysDepartment.trim();
-    }
-
-    public String getRefPj() {
-        return refPj;
-    }
-
-    public void setRefPj(String refPj) {
-        this.refPj = refPj == null ? null : refPj.trim();
-    }
-
-    public String getRefZhccSRole() {
-        return refZhccSRole;
-    }
-
-    public void setRefZhccSRole(String refZhccSRole) {
-        this.refZhccSRole = refZhccSRole == null ? null : refZhccSRole.trim();
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone == null ? null : phone.trim();
-    }
-
-    public String getWeixin() {
-        return weixin;
-    }
-
-    public void setWeixin(String weixin) {
-        this.weixin = weixin == null ? null : weixin.trim();
-    }
-
-    public String getQq() {
-        return qq;
-    }
-
-    public void setQq(String qq) {
-        this.qq = qq == null ? null : qq.trim();
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email == null ? null : email.trim();
-    }
-
-    public String getIdCard() {
-        return idCard;
-    }
-
-    public void setIdCard(String idCard) {
-        this.idCard = idCard == null ? null : idCard.trim();
-    }
-
-    public Date getBirthday() {
-        return birthday;
-    }
-
-    public void setBirthday(Date birthday) {
-        this.birthday = birthday;
-    }
-
-    public Integer getHeight() {
-        return height;
-    }
-
-    public void setHeight(Integer height) {
-        this.height = height;
-    }
-
-    public Float getWeight() {
-        return weight;
-    }
-
-    public void setWeight(Float weight) {
-        this.weight = weight;
-    }
-
-    public String getNativePlace() {
-        return nativePlace;
-    }
-
-    public void setNativePlace(String nativePlace) {
-        this.nativePlace = nativePlace == null ? null : nativePlace.trim();
-    }
-
-    public Integer getNation() {
-        return nation;
-    }
-
-    public void setNation(Integer nation) {
-        this.nation = nation;
-    }
-
-    public String getCurrAddress() {
-        return currAddress;
-    }
-
-    public void setCurrAddress(String currAddress) {
-        this.currAddress = currAddress == null ? null : currAddress.trim();
-    }
-
-    public String getLoginIp() {
-        return loginIp;
-    }
-
-    public void setLoginIp(String loginIp) {
-        this.loginIp = loginIp == null ? null : loginIp.trim();
-    }
-
-    public Date getLoginDate() {
-        return loginDate;
-    }
-
-    public void setLoginDate(Date loginDate) {
-        this.loginDate = loginDate;
-    }
-
-    public Long getLoginCount() {
-        return loginCount;
-    }
-
-    public void setLoginCount(Long loginCount) {
-        this.loginCount = loginCount;
-    }
-
-    public String getOrgId() {
-        return orgId;
-    }
-
-    public void setOrgId(String orgId) {
-        this.orgId = orgId == null ? null : orgId.trim();
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/sys/facade/entity/SysUserPermission.java

@@ -1,36 +0,0 @@
-package com.hcloud.microserver.sys.facade.entity;
-
-import java.io.Serializable;
-
-public class SysUserPermission implements Serializable {
-
-    private String guid;
-
-    private String refSysUser;
-
-    private String refSysPermission;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getRefSysUser() {
-        return refSysUser;
-    }
-
-    public void setRefSysUser(String refSysUser) {
-        this.refSysUser = refSysUser == null ? null : refSysUser.trim();
-    }
-
-    public String getRefSysPermission() {
-        return refSysPermission;
-    }
-
-    public void setRefSysPermission(String refSysPermission) {
-        this.refSysPermission = refSysPermission == null ? null : refSysPermission.trim();
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/sys/facade/forms/BaseDictionaryForm.java

@@ -1,34 +0,0 @@
-package com.hcloud.microserver.sys.facade.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class BaseDictionaryForm extends BaseForm {
-
-    private String guid;
-
-    private String fkOrgGuid;
-
-    private String fkTypeGuid;
-
-    private String dicname;
-
-    private String diccode;
-
-    private Integer isForbiden;
-
-    private Integer orderby;
-
-    private String remark;
-
-    private Integer state;
-
-    private Date createTime;
-
-    private Date modifiedTime;
-
-    private String typeName;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/sys/facade/forms/SysDeptForm.java

@@ -1,28 +0,0 @@
-package com.hcloud.microserver.sys.facade.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class SysDeptForm extends BaseForm {
-
-    private String ccode;
-
-    private String cdesc;
-
-    private String chargeName;
-
-    private String cname;
-
-    private String guid;
-
-    private String phone;
-
-    private String userId;
-
-    private String condition;
-
-
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/sys/facade/forms/SysMangerForm.java

@@ -1,42 +0,0 @@
-package com.hcloud.microserver.sys.facade.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- *
- * @author apple
- * @date 2018/9/8
- */
-@Data
-public class SysMangerForm extends BaseForm  {
-
-    /**
-     * user search attr
-     */
-    private String userId;
-
-    private String account;
-
-    private String password;
-
-    private String userName;
-
-    private String phone;
-
-    private String roleId;
-
-    private String deptId;
-
-    private String orgGuid;
-
-    private String cstatus;
-
-    private String condition;
-
-    private String guid;
-
-
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/sys/facade/forms/SysPermissionForm.java

@@ -1,46 +0,0 @@
-package com.hcloud.microserver.sys.facade.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class SysPermissionForm extends BaseForm {
-
-    private String guid;
-
-    private String cname;
-
-    private String ccode;
-
-    private String cstatus;
-
-    private String createuser;
-
-    private Date createdate;
-
-    private String updateuser;
-
-    private Date updatedate;
-
-    private String cver;
-
-    private String refSysApp;
-
-    private String parentId;
-
-    private String icon;
-
-    private Integer seq;
-
-    private Boolean ismenu;
-
-    private String permission;
-
-    private String description;
-
-    private String url;
-
-    private String condition;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/sys/facade/forms/SysRoleForm.java

@@ -1,23 +0,0 @@
-package com.hcloud.microserver.sys.facade.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-
-@Data
-public class SysRoleForm extends BaseForm {
-
-
-    private String cdesc;
-
-    private String cname;
-
-    private String guid;
-
-    private String condition;
-
-    private String roleId;
-
-    private String realName;
-
-    private String[] permIds;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/sys/facade/forms/SysUserForm.java

@@ -1,40 +0,0 @@
-package com.hcloud.microserver.sys.facade.forms;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-public class SysUserForm implements Serializable {
-
-    private Integer page;
-
-    private Integer pageSize;
-
-    private String accessToken;
-
-    private String guid;
-
-    private String cname;
-
-    private String realName;
-
-    private String password;
-
-    private String deptId;
-
-    private String roleId;
-
-    private String phone;
-
-    private String cstatus;
-
-    private String checkPassword;
-
-    private int isChange = 0;
-
-    private String[] permIds;
-
-    private String userId;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/sys/facade/vo/SysTreeNode.java

@@ -1,59 +0,0 @@
-package com.hcloud.microserver.sys.facade.vo;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-@Data
-public class SysTreeNode implements Serializable {
-
-    /**
-     * 当前权限ID
-     */
-    private String id;
-    /**
-     * 当前权限父ID
-     */
-    private String pId;
-    /**
-     * 当前权限名称
-     */
-    private String name;
-    /**
-     * 菜单编码
-     */
-    private String ccode;
-    /**
-     * 当前权限状态：false未授权，true已授权
-     */
-    private boolean checked = false;
-    /**
-     * 状态   0：失效    1：未启用      2：启用
-     */
-    private String cstatus;
-    /**
-     * 描述
-     */
-    private String description;
-    /**
-     * 图标
-     */
-    private String icon;
-    /**
-     * 是否为目录（是否可展开）
-     */
-    private Integer isMenu;
-    /**
-     * 是否可删除
-     */
-    private Integer canDel;
-    /**
-     * 指向菜单的URL
-     */
-    private String targetMenuGuid;
-    /**
-     * 当前权限的子权限集合
-     */
-    private List<SysTreeNode> children = null;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/CarbonManageApplication.java

@@ -1,10 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon;
-
-import org.springframework.boot.SpringApplication;
-
-
-public class CarbonManageApplication {
-    public static void main(String[] args) {
-        SpringApplication.run(CarbonManageApplication.class, args);
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/BasePosition.java

@@ -1,24 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import lombok.Data;
-
-@Data
-public class BasePosition {
-    private Integer id;
-
-    private String upCode;
-
-    private String name;
-
-    private Integer level;
-
-    private String pinyin;
-
-    private String acronym;
-
-    private String code;
-
-    private String areaCode;
-
-    private String zip;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CarbonCalculateRule.java

@@ -1,125 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import java.util.Date;
-
-public class CarbonCalculateRule {
-    private String guid;
-
-    private String fkProductTypeId;
-
-    private String ruleName;
-
-    private String paramA;
-
-    private String paramB;
-
-    private String paramC;
-
-    private String paramD;
-
-    private String paramE;
-
-    private String paramR;
-
-    private Integer state;
-
-    private Date createTime;
-
-    private Date modifiedTime;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getFkProductTypeId() {
-        return fkProductTypeId;
-    }
-
-    public void setFkProductTypeId(String fkProductTypeId) {
-        this.fkProductTypeId = fkProductTypeId == null ? null : fkProductTypeId.trim();
-    }
-
-    public String getRuleName() {
-        return ruleName;
-    }
-
-    public void setRuleName(String ruleName) {
-        this.ruleName = ruleName == null ? null : ruleName.trim();
-    }
-
-    public String getParamA() {
-        return paramA;
-    }
-
-    public void setParamA(String paramA) {
-        this.paramA = paramA == null ? null : paramA.trim();
-    }
-
-    public String getParamB() {
-        return paramB;
-    }
-
-    public void setParamB(String paramB) {
-        this.paramB = paramB == null ? null : paramB.trim();
-    }
-
-    public String getParamC() {
-        return paramC;
-    }
-
-    public void setParamC(String paramC) {
-        this.paramC = paramC == null ? null : paramC.trim();
-    }
-
-    public String getParamD() {
-        return paramD;
-    }
-
-    public void setParamD(String paramD) {
-        this.paramD = paramD == null ? null : paramD.trim();
-    }
-
-    public String getParamE() {
-        return paramE;
-    }
-
-    public void setParamE(String paramE) {
-        this.paramE = paramE == null ? null : paramE.trim();
-    }
-
-    public String getParamR() {
-        return paramR;
-    }
-
-    public void setParamR(String paramR) {
-        this.paramR = paramR == null ? null : paramR.trim();
-    }
-
-    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 Date getModifiedTime() {
-        return modifiedTime;
-    }
-
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CarbonPlatformStatiticsNum.java

@@ -1,56 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-@Data
-@ApiModel(value = "碳汇平台统计",description = "碳汇平台的用户量统计")
-public class CarbonPlatformStatiticsNum {
-    @ApiModelProperty("企业总数")
-    private BigDecimal compNum;
-
-    @ApiModelProperty("用户总数")
-    private BigDecimal customerNum;
-
-    @ApiModelProperty("企业用户占总用户的占比")
-    private BigDecimal compCustomerPercentage;
-
-    @ApiModelProperty("不是企业用户占总用户的占比")
-    private BigDecimal NoCompCustomerPercentage;
-
-    @ApiModelProperty("平台用户访问量")
-    private BigDecimal views;
-
-    @ApiModelProperty("产品总量")
-    private BigDecimal productNum;
-
-    @ApiModelProperty("产品各类别占量")
-    private List<CarbonStatisticsProduct> productList;
-
-    @ApiModelProperty("交易订单量")
-    private BigDecimal orderNum;
-
-
-    @ApiModelProperty("农户数量")
-    private BigDecimal farmerTotalNum;
-
-    @ApiModelProperty("集体数量")
-    private BigDecimal collectiveTotalNum;
-
-    @ApiModelProperty("各集体农户占比")
-    private List<CarbonStatisticsFarmer> farmerList;
-
-    @ApiModelProperty("总销售量")
-    private BigDecimal carbonTotalBuy;
-
-
-
-
-
-
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CarbonStatisticsBuyTrend.java

@@ -1,34 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@ApiModel(value = "CarbonStatisticsBuyTrend",description = "统计购买趋势")
-@Data
-public class CarbonStatisticsBuyTrend {
-
-    @ApiModelProperty("时间")
-    private String time;
-
-    @ApiModelProperty("碳汇量")
-    private BigDecimal carbonAmount;
-
-    @ApiModelProperty("最小碳汇量")
-    private BigDecimal minCarbonAmount;
-
-    @ApiModelProperty("最大碳汇量")
-    private BigDecimal maxCarbonAmount;
-
-    @ApiModelProperty("总价格")
-    private BigDecimal totalMoney;
-
-    @ApiModelProperty("最小价格")
-    private BigDecimal minMoney;
-
-    @ApiModelProperty("最大价格")
-    private BigDecimal maxMoney;
-
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CarbonStatisticsFarmer.java

@@ -1,17 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "CarbonStatisticsFarmer",description = "平台农户占量")
-@Data
-public class CarbonStatisticsFarmer {
-
-    @ApiModelProperty("集体名称")
-    private String collectiveName;
-
-    @ApiModelProperty("集体农户数量")
-    private String farmerNum;
-
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CarbonStatisticsProduct.java

@@ -1,20 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-@Data
-@ApiModel(value = "CarbonStatisticsProduct",description = "产品类别统计")
-public class CarbonStatisticsProduct {
-
-    @ApiModelProperty("类别名称")
-    private String productTypeName;
-    @ApiModelProperty("数量")
-    private BigDecimal num;
-
-    @ApiModelProperty("占比")
-    private BigDecimal ratio;
-
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CollectiveFarmer.java

@@ -1,213 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import lombok.ToString;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-@ToString
-public class CollectiveFarmer implements Serializable {
-
-    private static final long serialVersionUID = -5328351127753129451L;
-    private String guid;
-
-    private String fkPovertyAreaId;
-
-    private String collectiveCode;
-
-    private String collectiveName;
-
-    private Integer collectivePersonNum;
-
-    private String orgUnit;
-
-    private String remark;
-
-    private String collectiveImages;
-
-    private String bankName;
-
-    private String bankCardNo;
-
-    private Integer isEnable;
-
-    private Integer state;
-
-    private String createUser;
-
-    private Date createTime;
-
-    private String modifiedUser;
-
-    private Date modifiedTime;
-
-    private BigDecimal recieveMoney;
-
-    private BigDecimal actualMoney;
-
-    private String phone;
-
-    private List<FarmerInfo> farmerInfos;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getFkPovertyAreaId() {
-        return fkPovertyAreaId;
-    }
-
-    public void setFkPovertyAreaId(String fkPovertyAreaId) {
-        this.fkPovertyAreaId = fkPovertyAreaId == null ? null : fkPovertyAreaId.trim();
-    }
-
-    public String getCollectiveCode() {
-        return collectiveCode;
-    }
-
-    public void setCollectiveCode(String collectiveCode) {
-        this.collectiveCode = collectiveCode == null ? null : collectiveCode.trim();
-    }
-
-    public String getCollectiveName() {
-        return collectiveName;
-    }
-
-    public void setCollectiveName(String collectiveName) {
-        this.collectiveName = collectiveName == null ? null : collectiveName.trim();
-    }
-
-    public Integer getCollectivePersonNum() {
-        return collectivePersonNum;
-    }
-
-    public void setCollectivePersonNum(Integer collectivePersonNum) {
-        this.collectivePersonNum = collectivePersonNum;
-    }
-
-    public String getOrgUnit() {
-        return orgUnit;
-    }
-
-    public void setOrgUnit(String orgUnit) {
-        this.orgUnit = orgUnit == null ? null : orgUnit.trim();
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark == null ? null : remark.trim();
-    }
-
-    public String getCollectiveImages() {
-        return collectiveImages;
-    }
-
-    public void setCollectiveImages(String collectiveImages) {
-        this.collectiveImages = collectiveImages == null ? null : collectiveImages.trim();
-    }
-
-    public String getBankName() {
-        return bankName;
-    }
-
-    public void setBankName(String bankName) {
-        this.bankName = bankName == null ? null : bankName.trim();
-    }
-
-    public String getBankCardNo() {
-        return bankCardNo;
-    }
-
-    public void setBankCardNo(String bankCardNo) {
-        this.bankCardNo = bankCardNo == null ? null : bankCardNo.trim();
-    }
-
-    public Integer getIsEnable() {
-        return isEnable;
-    }
-
-    public void setIsEnable(Integer isEnable) {
-        this.isEnable = isEnable;
-    }
-
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public String getCreateUser() {
-        return createUser;
-    }
-
-    public void setCreateUser(String createUser) {
-        this.createUser = createUser == null ? null : createUser.trim();
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getModifiedUser() {
-        return modifiedUser;
-    }
-
-    public void setModifiedUser(String modifiedUser) {
-        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
-    }
-
-    public Date getModifiedTime() {
-        return modifiedTime;
-    }
-
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-
-    public BigDecimal getRecieveMoney() {
-        return recieveMoney;
-    }
-
-    public void setRecieveMoney(BigDecimal recieveMoney) {
-        this.recieveMoney = recieveMoney;
-    }
-
-    public BigDecimal getActualMoney() {
-        return actualMoney;
-    }
-
-    public void setActualMoney(BigDecimal actualMoney) {
-        this.actualMoney = actualMoney;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public List<FarmerInfo> getFarmerInfos() {
-        return farmerInfos;
-    }
-
-    public void setFarmerInfos(List<FarmerInfo> farmerInfos) {
-        this.farmerInfos = farmerInfos;
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CollectiveProductBelong.java

@@ -1,20 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import lombok.ToString;
-
-import java.io.Serializable;
-
-@ToString
-public class CollectiveProductBelong extends ProductBelong implements Serializable {
-
-    private static final long serialVersionUID = 4861049796598851983L;
-    private CollectiveFarmer collectiveFarmer;
-
-    public CollectiveFarmer getCollectiveFarmer() {
-        return collectiveFarmer;
-    }
-
-    public void setCollectiveFarmer(CollectiveFarmer collectiveFarmer) {
-        this.collectiveFarmer = collectiveFarmer;
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CustomerChannel.java

@@ -1,76 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-/**
- * @author xiezt
- */
-public class CustomerChannel {
-    private String guid;
-
-    private String fkCustomerId;
-
-    private Integer channelType;
-
-    private String channelName;
-
-    private String channelKeywordOne;
-
-    private String channelKeywordTwo;
-
-    private String channelKeywordThree;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getFkCustomerId() {
-        return fkCustomerId;
-    }
-
-    public void setFkCustomerId(String fkCustomerId) {
-        this.fkCustomerId = fkCustomerId == null ? null : fkCustomerId.trim();
-    }
-
-    public String getChannelName() {
-        return channelName;
-    }
-
-    public void setChannelName(String channelName) {
-        this.channelName = channelName == null ? null : channelName.trim();
-    }
-
-    public String getChannelKeywordOne() {
-        return channelKeywordOne;
-    }
-
-    public void setChannelKeywordOne(String channelKeywordOne) {
-        this.channelKeywordOne = channelKeywordOne == null ? null : channelKeywordOne.trim();
-    }
-
-    public String getChannelKeywordTwo() {
-        return channelKeywordTwo;
-    }
-
-    public void setChannelKeywordTwo(String channelKeywordTwo) {
-        this.channelKeywordTwo = channelKeywordTwo == null ? null : channelKeywordTwo.trim();
-    }
-
-    public String getChannelKeywordThree() {
-        return channelKeywordThree;
-    }
-
-    public void setChannelKeywordThree(String channelKeywordThree) {
-        this.channelKeywordThree = channelKeywordThree == null ? null : channelKeywordThree.trim();
-    }
-
-    public Integer getChannelType() {
-        return channelType;
-    }
-
-    public void setChannelType(Integer channelType) {
-        this.channelType = channelType;
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CustomerCompanyInfo.java

@@ -1,134 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import lombok.ToString;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author xiezt
- */
-@ToString
-public class CustomerCompanyInfo implements Serializable {
-    private static final long serialVersionUID = -8242664522405565533L;
-
-    private String guid;
-
-    private String fkCustomerId;
-
-    private String companyName;
-
-    private String orgCode;
-
-    private String principals;
-
-    private String phone;
-
-    private String email;
-
-    private String companyAddress;
-
-    private String companyImages;
-
-    private Integer state;
-
-    private Date createTime;
-
-    private Date modifiedTime;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getFkCustomerId() {
-        return fkCustomerId;
-    }
-
-    public void setFkCustomerId(String fkCustomerId) {
-        this.fkCustomerId = fkCustomerId == null ? null : fkCustomerId.trim();
-    }
-
-    public String getCompanyName() {
-        return companyName;
-    }
-
-    public void setCompanyName(String companyName) {
-        this.companyName = companyName == null ? null : companyName.trim();
-    }
-
-    public String getOrgCode() {
-        return orgCode;
-    }
-
-    public void setOrgCode(String orgCode) {
-        this.orgCode = orgCode == null ? null : orgCode.trim();
-    }
-
-    public String getPrincipals() {
-        return principals;
-    }
-
-    public void setPrincipals(String principals) {
-        this.principals = principals == null ? null : principals.trim();
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone == null ? null : phone.trim();
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email == null ? null : email.trim();
-    }
-
-    public String getCompanyAddress() {
-        return companyAddress;
-    }
-
-    public void setCompanyAddress(String companyAddress) {
-        this.companyAddress = companyAddress == null ? null : companyAddress.trim();
-    }
-
-    public String getCompanyImages() {
-        return companyImages;
-    }
-
-    public void setCompanyImages(String companyImages) {
-        this.companyImages = companyImages == null ? null : companyImages.trim();
-    }
-
-    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 Date getModifiedTime() {
-        return modifiedTime;
-    }
-
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CustomerCompanyType.java

@@ -1,117 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import javax.validation.constraints.NotEmpty;
-import java.util.Date;
-
-public class CustomerCompanyType {
-    private String guid;
-
-    private String parentId;
-
-    @NotEmpty(message = "企业类型不能为空")
-    private String typeName;
-
-    private String typeVal;
-
-    private Integer state;
-
-    private Date modifiedTime;
-
-    private String methodology;
-
-    private String typeDesc;
-
-    private String createUser;
-
-    private Date createTime;
-
-    private String modifiedUser;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(String parentId) {
-        this.parentId = parentId == null ? null : parentId.trim();
-    }
-
-    public String getTypeName() {
-        return typeName;
-    }
-
-    public void setTypeName(String typeName) {
-        this.typeName = typeName == null ? null : typeName.trim();
-    }
-
-    public String getTypeVal() {
-        return typeVal;
-    }
-
-    public void setTypeVal(String typeVal) {
-        this.typeVal = typeVal == null ? null : typeVal.trim();
-    }
-
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public Date getModifiedTime() {
-        return modifiedTime;
-    }
-
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-
-    public String getMethodology() {
-        return methodology;
-    }
-
-    public void setMethodology(String methodology) {
-        this.methodology = methodology == null ? null : methodology.trim();
-    }
-
-    public String getTypeDesc() {
-        return typeDesc;
-    }
-
-    public void setTypeDesc(String typeDesc) {
-        this.typeDesc = typeDesc == null ? null : typeDesc.trim();
-    }
-
-    public String getCreateUser() {
-        return createUser;
-    }
-
-    public void setCreateUser(String createUser) {
-        this.createUser = createUser;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getModifiedUser() {
-        return modifiedUser;
-    }
-
-    public void setModifiedUser(String modifiedUser) {
-        this.modifiedUser = modifiedUser;
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CustomerInfo.java

@@ -1,218 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import java.util.Date;
-
-/**
- * @author xiezt
- */
-public class CustomerInfo {
-    private String guid;
-
-    private String account;
-
-    private String passwd;
-
-    private Integer customerType;
-
-    private String customerName;
-
-    private String nickName;
-
-    private String pid;
-
-    private String phone;
-
-    private Integer sex;
-
-    private Integer score;
-
-    private String wxId;
-
-    private String unionId;
-
-    private String headImage;
-
-    private Integer isCompany;
-
-    private Integer isValidate;
-
-    private Integer isEnable;
-
-    private Integer state;
-
-    private String createUser;
-
-    private Date createTime;
-
-    private String modifiedUser;
-
-    private Date modifiedTime;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getAccount() {
-        return account;
-    }
-
-    public void setAccount(String account) {
-        this.account = account == null ? null : account.trim();
-    }
-
-    public String getPasswd() {
-        return passwd;
-    }
-
-    public void setPasswd(String passwd) {
-        this.passwd = passwd == null ? null : passwd.trim();
-    }
-
-    public Integer getCustomerType() {
-        return customerType;
-    }
-
-    public void setCustomerType(Integer customerType) {
-        this.customerType = customerType;
-    }
-
-    public String getCustomerName() {
-        return customerName;
-    }
-
-    public void setCustomerName(String customerName) {
-        this.customerName = customerName == null ? null : customerName.trim();
-    }
-
-    public String getNickName() {
-        return nickName;
-    }
-
-    public void setNickName(String nickName) {
-        this.nickName = nickName == null ? null : nickName.trim();
-    }
-
-    public String getPid() {
-        return pid;
-    }
-
-    public void setPid(String pid) {
-        this.pid = pid == null ? null : pid.trim();
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone == null ? null : phone.trim();
-    }
-
-    public Integer getSex() {
-        return sex;
-    }
-
-    public void setSex(Integer sex) {
-        this.sex = sex;
-    }
-
-    public Integer getScore() {
-        return score;
-    }
-
-    public void setScore(Integer score) {
-        this.score = score;
-    }
-
-    public String getWxId() {
-        return wxId;
-    }
-
-    public void setWxId(String wxId) {
-        this.wxId = wxId == null ? null : wxId.trim();
-    }
-
-    public String getUnionId() {
-        return unionId;
-    }
-
-    public void setUnionId(String unionId) {
-        this.unionId = unionId == null ? null : unionId.trim();
-    }
-
-    public Integer getIsCompany() {
-        return isCompany;
-    }
-
-    public void setIsCompany(Integer isCompany) {
-        this.isCompany = isCompany;
-    }
-
-    public Integer getIsValidate() {
-        return isValidate;
-    }
-
-    public void setIsValidate(Integer isValidate) {
-        this.isValidate = isValidate;
-    }
-
-    public Integer getIsEnable() {
-        return isEnable;
-    }
-
-    public void setIsEnable(Integer isEnable) {
-        this.isEnable = isEnable;
-    }
-
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public String getCreateUser() {
-        return createUser;
-    }
-
-    public void setCreateUser(String createUser) {
-        this.createUser = createUser == null ? null : createUser.trim();
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getModifiedUser() {
-        return modifiedUser;
-    }
-
-    public void setModifiedUser(String modifiedUser) {
-        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
-    }
-
-    public Date getModifiedTime() {
-        return modifiedTime;
-    }
-
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-
-    public String getHeadImage() {
-        return headImage;
-    }
-
-    public void setHeadImage(String headImage) {
-        this.headImage = headImage == null ? null : headImage.trim();
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/DayCarbonBO.java

@@ -1,17 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-@ApiModel
-public class DayCarbonBO implements Serializable {
-    @ApiModelProperty("碳汇量")
-    private long carbonNum;
-
-    @ApiModelProperty("订单数量")
-    private long orderNum;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/FarmerInfo.java

@@ -1,282 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import lombok.ToString;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-@ToString
-public class FarmerInfo implements Serializable {
-
-    private static final long serialVersionUID = 764011447211904341L;
-    private String guid;
-
-    private String fkPovertyAreaId;
-
-    private String fkCollectiveId;
-
-    private String farmerCode;
-
-    private String farmerName;
-
-    private Integer familyNum;
-
-    private Integer sex;
-
-    private String pid;
-
-    private String nation;
-
-    private String education;
-
-    private String phone;
-
-    private String bankCardNo;
-
-    private BigDecimal incomeVal;
-
-    private String farmerType;
-
-    private String farmerRemark;
-
-    private String farmerImages;
-
-    private String villageOrg;
-
-    private Integer isEnable;
-
-    private Integer state;
-
-    private String createUser;
-
-    private Date createTime;
-
-    private String modifiedUser;
-
-    private Date modifiedTime;
-
-    private String bankClearingMsg;
-
-    private BigDecimal recieveMoney;
-
-    private BigDecimal actualMoney;
-
-    private PovertyArea povertyArea;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getFkPovertyAreaId() {
-        return fkPovertyAreaId;
-    }
-
-    public void setFkPovertyAreaId(String fkPovertyAreaId) {
-        this.fkPovertyAreaId = fkPovertyAreaId == null ? null : fkPovertyAreaId.trim();
-    }
-
-    public String getFkCollectiveId() {
-        return fkCollectiveId;
-    }
-
-    public void setFkCollectiveId(String fkCollectiveId) {
-        this.fkCollectiveId = fkCollectiveId == null ? null : fkCollectiveId.trim();
-    }
-
-    public String getFarmerCode() {
-        return farmerCode;
-    }
-
-    public void setFarmerCode(String farmerCode) {
-        this.farmerCode = farmerCode == null ? null : farmerCode.trim();
-    }
-
-    public String getFarmerName() {
-        return farmerName;
-    }
-
-    public void setFarmerName(String farmerName) {
-        this.farmerName = farmerName == null ? null : farmerName.trim();
-    }
-
-    public Integer getFamilyNum() {
-        return familyNum;
-    }
-
-    public void setFamilyNum(Integer familyNum) {
-        this.familyNum = familyNum;
-    }
-
-    public Integer getSex() {
-        return sex;
-    }
-
-    public void setSex(Integer sex) {
-        this.sex = sex;
-    }
-
-    public String getPid() {
-        return pid;
-    }
-
-    public void setPid(String pid) {
-        this.pid = pid == null ? null : pid.trim();
-    }
-
-    public String getNation() {
-        return nation;
-    }
-
-    public void setNation(String nation) {
-        this.nation = nation == null ? null : nation.trim();
-    }
-
-    public String getEducation() {
-        return education;
-    }
-
-    public void setEducation(String education) {
-        this.education = education == null ? null : education.trim();
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone == null ? null : phone.trim();
-    }
-
-    public String getBankCardNo() {
-        return bankCardNo;
-    }
-
-    public void setBankCardNo(String bankCardNo) {
-        this.bankCardNo = bankCardNo == null ? null : bankCardNo.trim();
-    }
-
-    public BigDecimal getIncomeVal() {
-        return incomeVal;
-    }
-
-    public void setIncomeVal(BigDecimal incomeVal) {
-        this.incomeVal = incomeVal;
-    }
-
-    public String getFarmerType() {
-        return farmerType;
-    }
-
-    public void setFarmerType(String farmerType) {
-        this.farmerType = farmerType == null ? null : farmerType.trim();
-    }
-
-    public String getFarmerRemark() {
-        return farmerRemark;
-    }
-
-    public void setFarmerRemark(String farmerRemark) {
-        this.farmerRemark = farmerRemark == null ? null : farmerRemark.trim();
-    }
-
-    public String getFarmerImages() {
-        return farmerImages;
-    }
-
-    public void setFarmerImages(String farmerImages) {
-        this.farmerImages = farmerImages == null ? null : farmerImages.trim();
-    }
-
-    public String getVillageOrg() {
-        return villageOrg;
-    }
-
-    public void setVillageOrg(String villageOrg) {
-        this.villageOrg = villageOrg == null ? null : villageOrg.trim();
-    }
-
-    public Integer getIsEnable() {
-        return isEnable;
-    }
-
-    public void setIsEnable(Integer isEnable) {
-        this.isEnable = isEnable;
-    }
-
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public String getCreateUser() {
-        return createUser;
-    }
-
-    public void setCreateUser(String createUser) {
-        this.createUser = createUser == null ? null : createUser.trim();
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getModifiedUser() {
-        return modifiedUser;
-    }
-
-    public void setModifiedUser(String modifiedUser) {
-        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
-    }
-
-    public Date getModifiedTime() {
-        return modifiedTime;
-    }
-
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-
-    public String getBankClearingMsg() {
-        return bankClearingMsg;
-    }
-
-    public void setBankClearingMsg(String bankClearingMsg) {
-        this.bankClearingMsg = bankClearingMsg == null ? null : bankClearingMsg.trim();
-    }
-
-    public BigDecimal getRecieveMoney() {
-        return recieveMoney;
-    }
-
-    public void setRecieveMoney(BigDecimal recieveMoney) {
-        this.recieveMoney = recieveMoney;
-    }
-
-    public BigDecimal getActualMoney() {
-        return actualMoney;
-    }
-
-    public void setActualMoney(BigDecimal actualMoney) {
-        this.actualMoney = actualMoney;
-    }
-
-    public PovertyArea getPovertyArea() {
-        return povertyArea;
-    }
-
-    public void setPovertyArea(PovertyArea povertyArea) {
-        this.povertyArea = povertyArea;
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/FarmerProductBelong.java

@@ -1,21 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import lombok.ToString;
-
-import java.io.Serializable;
-
-@ToString
-public class FarmerProductBelong extends ProductBelong implements Serializable {
-
-    private static final long serialVersionUID = -8900020095725959361L;
-
-    private FarmerInfo farmerInfo;
-
-    public FarmerInfo getFarmerInfo() {
-        return farmerInfo;
-    }
-
-    public void setFarmerInfo(FarmerInfo farmerInfo) {
-        this.farmerInfo = farmerInfo;
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsCredentialInfo.java

@@ -1,169 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author xiezt
- */
-public class GoodsCredentialInfo {
-    private String guid;
-
-    private String fkCustomerId;
-
-    private String fkOrderId;
-
-    private String fkOrderDetailId;
-
-    private String credentialNo;
-
-    private Date buyDate;
-
-    private BigDecimal carbonAmount;
-
-    private String productAddress;
-
-    private Integer farmerCount;
-
-    private String farmerNames;
-
-    private String creImages;
-
-    private Integer state;
-
-    private String createUser;
-
-    private Date createTime;
-
-    private CustomerInfo customerInfo;
-
-    private GoodsOrderInfo goodsOrderInfo;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getFkOrderId() {
-        return fkOrderId;
-    }
-
-    public void setFkOrderId(String fkOrderId) {
-        this.fkOrderId = fkOrderId == null ? null : fkOrderId.trim();
-    }
-
-    public String getFkOrderDetailId() {
-        return fkOrderDetailId;
-    }
-
-    public void setFkOrderDetailId(String fkOrderDetailId) {
-        this.fkOrderDetailId = fkOrderDetailId == null ? null : fkOrderDetailId.trim();
-    }
-
-    public Date getBuyDate() {
-        return buyDate;
-    }
-
-    public void setBuyDate(Date buyDate) {
-        this.buyDate = buyDate;
-    }
-
-    public BigDecimal getCarbonAmount() {
-        return carbonAmount;
-    }
-
-    public void setCarbonAmount(BigDecimal carbonAmount) {
-        this.carbonAmount = carbonAmount;
-    }
-
-    public String getProductAddress() {
-        return productAddress;
-    }
-
-    public void setProductAddress(String productAddress) {
-        this.productAddress = productAddress == null ? null : productAddress.trim();
-    }
-
-    public Integer getFarmerCount() {
-        return farmerCount;
-    }
-
-    public void setFarmerCount(Integer farmerCount) {
-        this.farmerCount = farmerCount;
-    }
-
-    public String getFarmerNames() {
-        return farmerNames;
-    }
-
-    public void setFarmerNames(String farmerNames) {
-        this.farmerNames = farmerNames == null ? null : farmerNames.trim();
-    }
-
-    public String getCreImages() {
-        return creImages;
-    }
-
-    public void setCreImages(String creImages) {
-        this.creImages = creImages == null ? null : creImages.trim();
-    }
-
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public String getCreateUser() {
-        return createUser;
-    }
-
-    public void setCreateUser(String createUser) {
-        this.createUser = createUser == null ? null : createUser.trim();
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getCredentialNo() {
-        return credentialNo;
-    }
-
-    public void setCredentialNo(String credentialNo) {
-        this.credentialNo = credentialNo==null?null:credentialNo.trim();
-    }
-
-    public String getFkCustomerId() {
-        return fkCustomerId;
-    }
-
-    public void setFkCustomerId(String fkCustomerId) {
-        this.fkCustomerId = fkCustomerId==null ? null : fkCustomerId.trim();
-    }
-
-    public CustomerInfo getCustomerInfo() {
-        return customerInfo;
-    }
-
-    public void setCustomerInfo(CustomerInfo customerInfo) {
-        this.customerInfo = customerInfo;
-    }
-
-    public GoodsOrderInfo getGoodsOrderInfo() {
-        return goodsOrderInfo;
-    }
-
-    public void setGoodsOrderInfo(GoodsOrderInfo goodsOrderInfo) {
-        this.goodsOrderInfo = goodsOrderInfo;
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsDetail.java

@@ -1,147 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class GoodsDetail implements Serializable {
-
-    private static final long serialVersionUID = 4150521701359158295L;
-    private String guid;
-
-    private String fkGoodsGuid;
-
-    private String fkProductGuid;
-
-    private String productName;
-
-    private String productCode;
-
-    private String saleUnit;
-
-    private BigDecimal carbonVal;
-
-    private Integer isEnable;
-
-    private Integer farmerNums;
-
-    private Integer state;
-
-    private Date createTime;
-
-    private Date modifiedTime;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getFkGoodsGuid() {
-        return fkGoodsGuid;
-    }
-
-    public void setFkGoodsGuid(String fkGoodsGuid) {
-        this.fkGoodsGuid = fkGoodsGuid == null ? null : fkGoodsGuid.trim();
-    }
-
-    public String getFkProductGuid() {
-        return fkProductGuid;
-    }
-
-    public void setFkProductGuid(String fkProductGuid) {
-        this.fkProductGuid = fkProductGuid == null ? null : fkProductGuid.trim();
-    }
-
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName == null ? null : productName.trim();
-    }
-
-    public String getProductCode() {
-        return productCode;
-    }
-
-    public void setProductCode(String productCode) {
-        this.productCode = productCode == null ? null : productCode.trim();
-    }
-
-    public String getSaleUnit() {
-        return saleUnit;
-    }
-
-    public void setSaleUnit(String saleUnit) {
-        this.saleUnit = saleUnit == null ? null : saleUnit.trim();
-    }
-
-    public BigDecimal getCarbonVal() {
-        return carbonVal;
-    }
-
-    public void setCarbonVal(BigDecimal carbonVal) {
-        this.carbonVal = carbonVal;
-    }
-
-    public Integer getIsEnable() {
-        return isEnable;
-    }
-
-    public void setIsEnable(Integer isEnable) {
-        this.isEnable = isEnable;
-    }
-
-    public Integer getFarmerNums() {
-        return farmerNums;
-    }
-
-    public void setFarmerNums(Integer farmerNums) {
-        this.farmerNums = farmerNums;
-    }
-
-    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 Date getModifiedTime() {
-        return modifiedTime;
-    }
-
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-
-    @Override
-    public String toString() {
-        return "GoodsDetail{" +
-                "guid='" + guid + '\'' +
-                ", fkGoodsGuid='" + fkGoodsGuid + '\'' +
-                ", fkProductGuid='" + fkProductGuid + '\'' +
-                ", productName='" + productName + '\'' +
-                ", productCode='" + productCode + '\'' +
-                ", saleUnit='" + saleUnit + '\'' +
-                ", carbonVal=" + carbonVal +
-                ", isEnable=" + isEnable +
-                ", farmerNums=" + farmerNums +
-                ", state=" + state +
-                ", createTime=" + createTime +
-                ", modifiedTime=" + modifiedTime +
-                '}';
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsInfo.java

@@ -1,227 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import lombok.ToString;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author JYJ
- */
-@ToString
-public class GoodsInfo implements Serializable {
-
-    private static final long serialVersionUID = -2833811165241905425L;
-
-    private String guid;
-
-    private String goodsType;
-
-    private String goodsCode;
-
-    private String goodsName;
-
-    private BigDecimal carbonVal;
-
-    private BigDecimal price;
-
-    private String goodsDesc;
-
-    private String goodsImages;
-
-    private Date goodsSaleDate;
-
-    private Integer isSale;
-
-    private Integer state;
-
-    private String createUser;
-
-    private Date createTime;
-
-    private String modifiedUser;
-
-    private Date modifiedTime;
-
-    private String goodsUse;
-
-    // 非t_goods_info表字段,需要join其他表用于显示的字段
-    private String productTypeName;
-
-    private BigDecimal saledCarbonSkin;
-
-    private BigDecimal unsaledCarbonSkin;
-
-    private String saleTargets;
-
-    private String saleType;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getGoodsType() {
-        return goodsType;
-    }
-
-    public void setGoodsType(String goodsType) {
-        this.goodsType = goodsType==null?null:goodsType.trim();
-    }
-
-    public String getGoodsCode() {
-        return goodsCode;
-    }
-
-    public void setGoodsCode(String goodsCode) {
-        this.goodsCode = goodsCode == null ? null : goodsCode.trim();
-    }
-
-    public String getGoodsName() {
-        return goodsName;
-    }
-
-    public void setGoodsName(String goodsName) {
-        this.goodsName = goodsName == null ? null : goodsName.trim();
-    }
-
-    public BigDecimal getCarbonVal() {
-        return carbonVal;
-    }
-
-    public void setCarbonVal(BigDecimal carbonVal) {
-        this.carbonVal = carbonVal;
-    }
-
-    public BigDecimal getPrice() {
-        return price;
-    }
-
-    public void setPrice(BigDecimal price) {
-        this.price = price;
-    }
-
-    public String getGoodsDesc() {
-        return goodsDesc;
-    }
-
-    public void setGoodsDesc(String goodsDesc) {
-        this.goodsDesc = goodsDesc == null ? null : goodsDesc.trim();
-    }
-
-    public String getGoodsImages() {
-        return goodsImages;
-    }
-
-    public void setGoodsImages(String goodsImages) {
-        this.goodsImages = goodsImages == null ? null : goodsImages.trim();
-    }
-
-    public Integer getIsSale() {
-        return isSale;
-    }
-
-    public void setIsSale(Integer isSale) {
-        this.isSale = isSale;
-    }
-
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public String getCreateUser() {
-        return createUser;
-    }
-
-    public void setCreateUser(String createUser) {
-        this.createUser = createUser == null ? null : createUser.trim();
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getModifiedUser() {
-        return modifiedUser;
-    }
-
-    public void setModifiedUser(String modifiedUser) {
-        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
-    }
-
-    public Date getModifiedTime() {
-        return modifiedTime;
-    }
-
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-
-    public String getGoodsUse() {
-        return goodsUse;
-    }
-
-    public void setGoodsUse(String goodsUse) {
-        this.goodsUse = goodsUse;
-    }
-
-    public Date getGoodsSaleDate() {
-        return goodsSaleDate;
-    }
-
-    public void setGoodsSaleDate(Date goodsSaleDate) {
-        this.goodsSaleDate = goodsSaleDate;
-    }
-
-    public String getProductTypeName() {
-        return productTypeName;
-    }
-
-    public void setProductTypeName(String productTypeName) {
-        this.productTypeName = productTypeName;
-    }
-
-    public BigDecimal getSaledCarbonSkin() {
-        return saledCarbonSkin;
-    }
-
-    public void setSaledCarbonSkin(BigDecimal saledCarbonSkin) {
-        this.saledCarbonSkin = saledCarbonSkin;
-    }
-
-    public BigDecimal getUnsaledCarbonSkin() {
-        return unsaledCarbonSkin;
-    }
-
-    public void setUnsaledCarbonSkin(BigDecimal unsaledCarbonSkin) {
-        this.unsaledCarbonSkin = unsaledCarbonSkin;
-    }
-
-    public String getSaleTargets() {
-        return saleTargets;
-    }
-
-    public void setSaleTargets(String saleTargets) {
-        this.saleTargets = saleTargets;
-    }
-
-    public String getSaleType() {
-        return saleType;
-    }
-
-    public void setSaleType(String saleType) {
-        this.saleType = saleType;
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsOrderDetail.java

@@ -1,120 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author xiezt
- */
-public class GoodsOrderDetail {
-
-    private String guid;
-
-    private String fkOrderGuid;
-
-    private String fkGoodsGuid;
-
-    private String goodsName;
-
-    private BigDecimal goodsPrice;
-
-    private BigDecimal saleNum;
-
-    private BigDecimal amount;
-
-    private Integer state;
-
-    private String createUser;
-
-    private Date createTime;
-
-    private GoodsInfo goodsInfo;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getFkOrderGuid() {
-        return fkOrderGuid;
-    }
-
-    public void setFkOrderGuid(String fkOrderGuid) {
-        this.fkOrderGuid = fkOrderGuid == null ? null : fkOrderGuid.trim();
-    }
-
-    public String getFkGoodsGuid() {
-        return fkGoodsGuid;
-    }
-
-    public void setFkGoodsGuid(String fkGoodsGuid) {
-        this.fkGoodsGuid = fkGoodsGuid == null ? null : fkGoodsGuid.trim();
-    }
-
-    public String getGoodsName() {
-        return goodsName;
-    }
-
-    public void setGoodsName(String goodsName) {
-        this.goodsName = goodsName == null ? null : goodsName.trim();
-    }
-
-    public BigDecimal getGoodsPrice() {
-        return goodsPrice;
-    }
-
-    public void setGoodsPrice(BigDecimal goodsPrice) {
-        this.goodsPrice = goodsPrice;
-    }
-
-    public BigDecimal getSaleNum() {
-        return saleNum;
-    }
-
-    public void setSaleNum(BigDecimal saleNum) {
-        this.saleNum = saleNum;
-    }
-
-    public BigDecimal getAmount() {
-        return amount;
-    }
-
-    public void setAmount(BigDecimal amount) {
-        this.amount = amount;
-    }
-
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public String getCreateUser() {
-        return createUser;
-    }
-
-    public void setCreateUser(String createUser) {
-        this.createUser = createUser == null ? null : createUser.trim();
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public GoodsInfo getGoodsInfo() {
-        return goodsInfo;
-    }
-
-    public void setGoodsInfo(GoodsInfo goodsInfo) {
-        this.goodsInfo = goodsInfo;
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsOrderInfo.java

@@ -1,146 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class GoodsOrderInfo {
-    private String guid;
-
-    private String fkCustomerGuid;
-
-    private String orderNo;
-
-    private String customerName;
-
-    private String customerType;
-
-    private BigDecimal orderAmount;
-
-    private BigDecimal orderCarbonAmount;
-
-    private Integer orderStatus;
-
-    private Integer state;
-
-    private String createUser;
-
-    private Date createTime;
-
-    private String modifiedUser;
-
-    private Date modifiedTime;
-
-    private String payNo;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getFkCustomerGuid() {
-        return fkCustomerGuid;
-    }
-
-    public void setFkCustomerGuid(String fkCustomerGuid) {
-        this.fkCustomerGuid = fkCustomerGuid == null ? null : fkCustomerGuid.trim();
-    }
-
-    public String getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo == null ? null : orderNo.trim();
-    }
-
-    public BigDecimal getOrderAmount() {
-        return orderAmount;
-    }
-
-    public void setOrderAmount(BigDecimal orderAmount) {
-        this.orderAmount = orderAmount;
-    }
-
-    public BigDecimal getOrderCarbonAmount() {
-        return orderCarbonAmount;
-    }
-
-    public void setOrderCarbonAmount(BigDecimal orderCarbonAmount) {
-        this.orderCarbonAmount = orderCarbonAmount;
-    }
-
-    public Integer getOrderStatus() {
-        return orderStatus;
-    }
-
-    public void setOrderStatus(Integer orderStatus) {
-        this.orderStatus = orderStatus;
-    }
-
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public String getCreateUser() {
-        return createUser;
-    }
-
-    public void setCreateUser(String createUser) {
-        this.createUser = createUser == null ? null : createUser.trim();
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getModifiedUser() {
-        return modifiedUser;
-    }
-
-    public void setModifiedUser(String modifiedUser) {
-        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
-    }
-
-    public Date getModifiedTime() {
-        return modifiedTime;
-    }
-
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-
-    public String getCustomerName() {
-        return customerName;
-    }
-
-    public void setCustomerName(String customerName) {
-        this.customerName = customerName==null?null:customerName.trim();
-    }
-
-    public String getCustomerType() {
-        return customerType;
-    }
-
-    public void setCustomerType(String customerType) {
-        this.customerType = customerType==null?null:customerType.trim();
-    }
-
-    public String getPayNo() {
-        return payNo;
-    }
-
-    public void setPayNo(String payNo) {
-        this.payNo = payNo==null?null:payNo.trim();
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsPayOrder.java

@@ -1,116 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class GoodsPayOrder {
-    private String guid;
-
-    private String fkCustomerId;
-
-    private String fkOrderId;
-
-    private String orderNo;
-
-    private String payNo;
-
-    private BigDecimal payAmount;
-
-    private Integer payChannel;
-
-    private Date payTime;
-
-    private Integer payStatus;
-
-    private Integer state;
-
-    private Date createTime;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getFkCustomerId() {
-        return fkCustomerId;
-    }
-
-    public void setFkCustomerId(String fkCustomerId) {
-        this.fkCustomerId = fkCustomerId == null ? null : fkCustomerId.trim();
-    }
-
-    public String getFkOrderId() {
-        return fkOrderId;
-    }
-
-    public void setFkOrderId(String fkOrderId) {
-        this.fkOrderId = fkOrderId == null ? null : fkOrderId.trim();
-    }
-
-    public String getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo == null ? null : orderNo.trim();
-    }
-
-    public String getPayNo() {
-        return payNo;
-    }
-
-    public void setPayNo(String payNo) {
-        this.payNo = payNo == null ? null : payNo.trim();
-    }
-
-    public BigDecimal getPayAmount() {
-        return payAmount;
-    }
-
-    public void setPayAmount(BigDecimal payAmount) {
-        this.payAmount = payAmount;
-    }
-
-    public Integer getPayChannel() {
-        return payChannel;
-    }
-
-    public void setPayChannel(Integer payChannel) {
-        this.payChannel = payChannel;
-    }
-
-    public Date getPayTime() {
-        return payTime;
-    }
-
-    public void setPayTime(Date payTime) {
-        this.payTime = payTime;
-    }
-
-    public Integer getPayStatus() {
-        return payStatus;
-    }
-
-    public void setPayStatus(Integer payStatus) {
-        this.payStatus = payStatus;
-    }
-
-    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;
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GoodsSaleInfo.java

@@ -1,143 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import lombok.ToString;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-@ToString
-public class GoodsSaleInfo implements Serializable {
-
-    private static final long serialVersionUID = 7343587609332991440L;
-
-    private String guid;
-
-    private String fkGoodsGuid;
-
-    private BigDecimal salePrice;
-
-    private BigDecimal companyPrice;
-
-    private BigDecimal memberPrice;
-
-    private BigDecimal saledCarbonSkin;
-
-    private BigDecimal unsaledCarbonSkin;
-
-    private Integer isEnable;
-
-    private Integer state;
-
-    private Date modifiedTime;
-
-    private Integer saleType;
-
-    private String saleTargets;
-
-    private String saleUnit;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getFkGoodsGuid() {
-        return fkGoodsGuid;
-    }
-
-    public void setFkGoodsGuid(String fkGoodsGuid) {
-        this.fkGoodsGuid = fkGoodsGuid == null ? null : fkGoodsGuid.trim();
-    }
-
-    public BigDecimal getSalePrice() {
-        return salePrice;
-    }
-
-    public void setSalePrice(BigDecimal salePrice) {
-        this.salePrice = salePrice;
-    }
-
-    public BigDecimal getCompanyPrice() {
-        return companyPrice;
-    }
-
-    public void setCompanyPrice(BigDecimal companyPrice) {
-        this.companyPrice = companyPrice;
-    }
-
-    public BigDecimal getMemberPrice() {
-        return memberPrice;
-    }
-
-    public void setMemberPrice(BigDecimal memberPrice) {
-        this.memberPrice = memberPrice;
-    }
-
-    public BigDecimal getSaledCarbonSkin() {
-        return saledCarbonSkin;
-    }
-
-    public void setSaledCarbonSkin(BigDecimal saledCarbonSkin) {
-        this.saledCarbonSkin = saledCarbonSkin;
-    }
-
-    public BigDecimal getUnsaledCarbonSkin() {
-        return unsaledCarbonSkin;
-    }
-
-    public void setUnsaledCarbonSkin(BigDecimal unsaledCarbonSkin) {
-        this.unsaledCarbonSkin = unsaledCarbonSkin;
-    }
-
-    public Integer getIsEnable() {
-        return isEnable;
-    }
-
-    public void setIsEnable(Integer isEnable) {
-        this.isEnable = isEnable;
-    }
-
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public Date getModifiedTime() {
-        return modifiedTime;
-    }
-
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-
-    public Integer getSaleType() {
-        return saleType;
-    }
-
-    public void setSaleType(Integer saleType) {
-        this.saleType = saleType;
-    }
-
-    public String getSaleTargets() {
-        return saleTargets;
-    }
-
-    public void setSaleTargets(String saleTargets) {
-        this.saleTargets = saleTargets;
-    }
-
-    public String getSaleUnit() {
-        return saleUnit;
-    }
-
-    public void setSaleUnit(String saleUnit) {
-        this.saleUnit = saleUnit;
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/GroupNumBO.java

@@ -1,24 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-@Data
-@ApiModel
-public class GroupNumBO implements Serializable {
-
-    private String num;
-
-    @ApiModelProperty("金钱")
-    private BigDecimal moneyNum;
-
-    @ApiModelProperty("碳汇量")
-    private BigDecimal carbonNum;
-
-    @ApiModelProperty("数量")
-    private long saleNum;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/OrderPayApply.java

@@ -1,106 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class OrderPayApply {
-    private String guid;
-
-    private String fkCustomerId;
-
-    private String fkOrderId;
-
-    private String applyUserName;
-
-    private BigDecimal payAmount;
-
-    private String remark;
-
-    private Integer applyStatus;
-
-    private Integer state;
-
-    private Date createTime;
-
-    private Date modifiedTime;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getFkCustomerId() {
-        return fkCustomerId;
-    }
-
-    public void setFkCustomerId(String fkCustomerId) {
-        this.fkCustomerId = fkCustomerId == null ? null : fkCustomerId.trim();
-    }
-
-    public String getFkOrderId() {
-        return fkOrderId;
-    }
-
-    public void setFkOrderId(String fkOrderId) {
-        this.fkOrderId = fkOrderId == null ? null : fkOrderId.trim();
-    }
-
-    public String getApplyUserName() {
-        return applyUserName;
-    }
-
-    public void setApplyUserName(String applyUserName) {
-        this.applyUserName = applyUserName == null ? null : applyUserName.trim();
-    }
-
-    public BigDecimal getPayAmount() {
-        return payAmount;
-    }
-
-    public void setPayAmount(BigDecimal payAmount) {
-        this.payAmount = payAmount;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark == null ? null : remark.trim();
-    }
-
-    public Integer getApplyStatus() {
-        return applyStatus;
-    }
-
-    public void setApplyStatus(Integer applyStatus) {
-        this.applyStatus = applyStatus;
-    }
-
-    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 Date getModifiedTime() {
-        return modifiedTime;
-    }
-
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/OrderPayVoucher.java

@@ -1,140 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author xiezt
- */
-public class OrderPayVoucher {
-
-    private String guid;
-
-    private String fkOrderId;
-
-    private String fkCustomerId;
-
-    private String fkApplyId;
-
-    private String payUserName;
-
-    private String payBank;
-
-    private String payCardNo;
-
-    private BigDecimal payAmount;
-
-    private Date payTime;
-
-    private String voucherImages;
-
-    private Integer state;
-
-    private Date createTime;
-
-    private Date modifiedTime;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getFkOrderId() {
-        return fkOrderId;
-    }
-
-    public void setFkOrderId(String fkOrderId) {
-        this.fkOrderId = fkOrderId == null ? null : fkOrderId.trim();
-    }
-
-    public String getFkCustomerId() {
-        return fkCustomerId;
-    }
-
-    public void setFkCustomerId(String fkCustomerId) {
-        this.fkCustomerId = fkCustomerId == null ? null : fkCustomerId.trim();
-    }
-
-    public String getFkApplyId() {
-        return fkApplyId;
-    }
-
-    public void setFkApplyId(String fkApplyId) {
-        this.fkApplyId = fkApplyId == null ? null : fkApplyId.trim();
-    }
-
-    public String getPayUserName() {
-        return payUserName;
-    }
-
-    public void setPayUserName(String payUserName) {
-        this.payUserName = payUserName == null ? null : payUserName.trim();
-    }
-
-    public String getPayBank() {
-        return payBank;
-    }
-
-    public void setPayBank(String payBank) {
-        this.payBank = payBank == null ? null : payBank.trim();
-    }
-
-    public String getPayCardNo() {
-        return payCardNo;
-    }
-
-    public void setPayCardNo(String payCardNo) {
-        this.payCardNo = payCardNo == null ? null : payCardNo.trim();
-    }
-
-    public BigDecimal getPayAmount() {
-        return payAmount;
-    }
-
-    public void setPayAmount(BigDecimal payAmount) {
-        this.payAmount = payAmount;
-    }
-
-    public Date getPayTime() {
-        return payTime;
-    }
-
-    public void setPayTime(Date payTime) {
-        this.payTime = payTime;
-    }
-
-    public String getVoucherImages() {
-        return voucherImages;
-    }
-
-    public void setVoucherImages(String voucherImages) {
-        this.voucherImages = voucherImages == null ? null : voucherImages.trim();
-    }
-
-    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 Date getModifiedTime() {
-        return modifiedTime;
-    }
-
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/PovertyArea.java

@@ -1,45 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author xiezt
- */
-@Data
-public class PovertyArea {
-    private String guid;
-
-    private String povertyAreaName;
-
-    private String areaAddress;
-
-    private String areaDesc;
-
-    private String cityId;
-
-    private String countyId;
-
-    private String townId;
-
-    private String villageId;
-
-    private String areaImages;
-
-    private Integer isEnable;
-
-    private Integer state;
-
-    private String createUser;
-
-    private Date createTime;
-
-    private String modifiedUser;
-
-    private Date modifiedTime;
-
-    private String provinceId;
-
-    private Integer familyNum;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/ProductBelong.java

@@ -1,121 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import lombok.ToString;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-@ToString
-public class ProductBelong implements Serializable {
-    private static final long serialVersionUID = -5693556988379041946L;
-    private String guid;
-
-    private String fkProductGuid;
-
-    private String fkFarmerGuid;
-
-    private String fkCollectiveGuid;
-
-    private String farmerName;
-
-    private String farmerVillage;
-
-    private Integer farmerNum;
-
-    private Integer state;
-
-    private Date createTime;
-
-    private Date modifiedTime;
-
-    private Integer belongType;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getFkProductGuid() {
-        return fkProductGuid;
-    }
-
-    public void setFkProductGuid(String fkProductGuid) {
-        this.fkProductGuid = fkProductGuid == null ? null : fkProductGuid.trim();
-    }
-
-    public String getFkFarmerGuid() {
-        return fkFarmerGuid;
-    }
-
-    public void setFkFarmerGuid(String fkFarmerGuid) {
-        this.fkFarmerGuid = fkFarmerGuid == null ? null : fkFarmerGuid.trim();
-    }
-
-    public String getFkCollectiveGuid() {
-        return fkCollectiveGuid;
-    }
-
-    public void setFkCollectiveGuid(String fkCollectiveGuid) {
-        this.fkCollectiveGuid = fkCollectiveGuid;
-    }
-
-    public String getFarmerName() {
-        return farmerName;
-    }
-
-    public void setFarmerName(String farmerName) {
-        this.farmerName = farmerName == null ? null : farmerName.trim();
-    }
-
-    public String getFarmerVillage() {
-        return farmerVillage;
-    }
-
-    public void setFarmerVillage(String farmerVillage) {
-        this.farmerVillage = farmerVillage == null ? null : farmerVillage.trim();
-    }
-
-    public Integer getFarmerNum() {
-        return farmerNum;
-    }
-
-    public void setFarmerNum(Integer farmerNum) {
-        this.farmerNum = farmerNum;
-    }
-
-    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 Date getModifiedTime() {
-        return modifiedTime;
-    }
-
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-
-    public Integer getBelongType() {
-        return belongType;
-    }
-
-    public void setBelongType(Integer belongType) {
-        this.belongType = belongType;
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/ProductExpansion.java

@@ -1,101 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-public class ProductExpansion implements Serializable {
-    private static final long serialVersionUID = -8280719751518169272L;
-    private String guid;
-
-    private String fkProductGuid;
-
-    private String fkProductTypeGuid;
-
-    private String expansionItem;
-
-    private String expansionVal;
-
-    private Integer state;
-
-    private Date createTime;
-
-    private Date modifiedTime;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getFkProductGuid() {
-        return fkProductGuid;
-    }
-
-    public void setFkProductGuid(String fkProductGuid) {
-        this.fkProductGuid = fkProductGuid == null ? null : fkProductGuid.trim();
-    }
-
-    public String getExpansionItem() {
-        return expansionItem;
-    }
-
-    public void setExpansionItem(String expansionItem) {
-        this.expansionItem = expansionItem == null ? null : expansionItem.trim();
-    }
-
-    public String getExpansionVal() {
-        return expansionVal;
-    }
-
-    public void setExpansionVal(String expansionVal) {
-        this.expansionVal = expansionVal == null ? null : expansionVal.trim();
-    }
-
-    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 Date getModifiedTime() {
-        return modifiedTime;
-    }
-
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-
-    public String getFkProductTypeGuid() {
-        return fkProductTypeGuid;
-    }
-
-    public void setFkProductTypeGuid(String fkProductTypeGuid) {
-        this.fkProductTypeGuid = fkProductTypeGuid;
-    }
-
-    @Override
-    public String toString() {
-        return "ProductExpansion{" +
-                "guid='" + guid + '\'' +
-                ", fkProductGuid='" + fkProductGuid + '\'' +
-                ", fkProductTypeGuid='" + fkProductTypeGuid + '\'' +
-                ", expansionItem='" + expansionItem + '\'' +
-                ", expansionVal='" + expansionVal + '\'' +
-                ", state=" + state +
-                ", createTime=" + createTime +
-                ", modifiedTime=" + modifiedTime +
-                '}';
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/ProductInfo.java

@@ -1,233 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import lombok.ToString;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-@ToString
-public class ProductInfo implements Serializable {
-
-    private static final long serialVersionUID = -4385146356458594027L;
-    private String guid;
-
-    private String fkProductType;
-
-    private String fkCarbonRule;
-
-    private String fkPovertyArea;
-
-    private String productName;
-
-    private String productCode;
-
-    private Date carbonGenerateDate;
-
-    private Integer productValidateNum;
-
-    private Date carbonRefreshTime;
-
-    private BigDecimal carbonSink;
-
-    private String productImgs;
-
-    private Integer isEnable;
-
-    private String remark;
-
-    private Integer state;
-
-    private String createUser;
-
-    private Date createTime;
-
-    private String modifiedUser;
-
-    private Date modifiedTime;
-
-    private List<ProductExpansion> productExpansions;
-
-    private List<ProductBelong> productBelongs;
-
-    private ProductType productType;
-
-    private PovertyArea povertyArea;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid;
-    }
-
-    public String getFkProductType() {
-        return fkProductType;
-    }
-
-    public void setFkProductType(String fkProductType) {
-        this.fkProductType = fkProductType;
-    }
-
-    public String getFkCarbonRule() {
-        return fkCarbonRule;
-    }
-
-    public void setFkCarbonRule(String fkCarbonRule) {
-        this.fkCarbonRule = fkCarbonRule;
-    }
-
-    public String getFkPovertyArea() {
-        return fkPovertyArea;
-    }
-
-    public void setFkPovertyArea(String fkPovertyArea) {
-        this.fkPovertyArea = fkPovertyArea;
-    }
-
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-
-    public String getProductCode() {
-        return productCode;
-    }
-
-    public void setProductCode(String productCode) {
-        this.productCode = productCode;
-    }
-
-    public Date getCarbonGenerateDate() {
-        return carbonGenerateDate;
-    }
-
-    public void setCarbonGenerateDate(Date carbonGenerateDate) {
-        this.carbonGenerateDate = carbonGenerateDate;
-    }
-
-    public Integer getProductValidateNum() {
-        return productValidateNum;
-    }
-
-    public void setProductValidateNum(Integer productValidateNum) {
-        this.productValidateNum = productValidateNum;
-    }
-
-    public Date getCarbonRefreshTime() {
-        return carbonRefreshTime;
-    }
-
-    public void setCarbonRefreshTime(Date carbonRefreshTime) {
-        this.carbonRefreshTime = carbonRefreshTime;
-    }
-
-    public BigDecimal getCarbonSink() {
-        return carbonSink;
-    }
-
-    public void setCarbonSink(BigDecimal carbonSink) {
-        this.carbonSink = carbonSink;
-    }
-
-    public String getProductImgs() {
-        return productImgs;
-    }
-
-    public void setProductImgs(String productImgs) {
-        this.productImgs = productImgs;
-    }
-
-    public Integer getIsEnable() {
-        return isEnable;
-    }
-
-    public void setIsEnable(Integer isEnable) {
-        this.isEnable = isEnable;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public String getCreateUser() {
-        return createUser;
-    }
-
-    public void setCreateUser(String createUser) {
-        this.createUser = createUser;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getModifiedUser() {
-        return modifiedUser;
-    }
-
-    public void setModifiedUser(String modifiedUser) {
-        this.modifiedUser = modifiedUser;
-    }
-
-    public Date getModifiedTime() {
-        return modifiedTime;
-    }
-
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-
-    public List<ProductExpansion> getProductExpansions() {
-        return productExpansions;
-    }
-
-    public void setProductExpansions(List<ProductExpansion> productExpansions) {
-        this.productExpansions = productExpansions;
-    }
-
-    public List<ProductBelong> getProductBelongs() {
-        return productBelongs;
-    }
-
-    public void setProductBelongs(List<ProductBelong> productBelongs) {
-        this.productBelongs = productBelongs;
-    }
-
-    public ProductType getProductType() {
-        return productType;
-    }
-
-    public void setProductType(ProductType productType) {
-        this.productType = productType;
-    }
-
-    public PovertyArea getPovertyArea() {
-        return povertyArea;
-    }
-
-    public void setPovertyArea(PovertyArea povertyArea) {
-        this.povertyArea = povertyArea;
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/ProductType.java

@@ -1,102 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import lombok.ToString;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-@ToString
-public class ProductType implements Serializable {
-    private static final long serialVersionUID = 7596000431263823352L;
-
-    private String guid;
-
-    private String parentId;
-
-    private String typeName;
-
-    private String typeVal;
-
-    private Integer state;
-
-    private Date modifiedTime;
-
-    private String methodology;
-
-    private String typeDesc;
-
-    private List<ProductTypeExpansion> productTypeExpansions;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid;
-    }
-
-    public String getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(String parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getTypeName() {
-        return typeName;
-    }
-
-    public void setTypeName(String typeName) {
-        this.typeName = typeName;
-    }
-
-    public String getTypeVal() {
-        return typeVal;
-    }
-
-    public void setTypeVal(String typeVal) {
-        this.typeVal = typeVal;
-    }
-
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public Date getModifiedTime() {
-        return modifiedTime;
-    }
-
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-
-    public String getMethodology() {
-        return methodology;
-    }
-
-    public void setMethodology(String methodology) {
-        this.methodology = methodology;
-    }
-
-    public String getTypeDesc() {
-        return typeDesc;
-    }
-
-    public void setTypeDesc(String typeDesc) {
-        this.typeDesc = typeDesc;
-    }
-
-    public List<ProductTypeExpansion> getProductTypeExpansions() {
-        return productTypeExpansions;
-    }
-
-    public void setProductTypeExpansions(List<ProductTypeExpansion> productTypeExpansions) {
-        this.productTypeExpansions = productTypeExpansions;
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/ProductTypeExpansion.java

@@ -1,85 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-public class ProductTypeExpansion implements Serializable {
-
-    private static final long serialVersionUID = 3286665272122183240L;
-    private String guid;
-    private String fkProductTypeGuid;
-    private String fkProductGuid;
-    private String expansionItem;
-    private Integer state;
-    private Date createTime;
-    private Date modifiedTime;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid;
-    }
-
-    public String getFkProductTypeGuid() {
-        return fkProductTypeGuid;
-    }
-
-    public void setFkProductTypeGuid(String fkProductTypeGuid) {
-        this.fkProductTypeGuid = fkProductTypeGuid;
-    }
-
-    public String getFkProductGuid() {
-        return fkProductGuid;
-    }
-
-    public void setFkProductGuid(String fkProductGuid) {
-        this.fkProductGuid = fkProductGuid;
-    }
-
-    public String getExpansionItem() {
-        return expansionItem;
-    }
-
-    public void setExpansionItem(String expansionItem) {
-        this.expansionItem = expansionItem;
-    }
-
-    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 Date getModifiedTime() {
-        return modifiedTime;
-    }
-
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-
-    @Override
-    public String toString() {
-        return "ProductTypeExpansion{" +
-                "guid='" + guid + '\'' +
-                ", fkProductTypeGuid='" + fkProductTypeGuid + '\'' +
-                ", fkProductGuid='" + fkProductGuid + '\'' +
-                ", expansionItem='" + expansionItem + '\'' +
-                ", state=" + state +
-                ", createTime=" + createTime +
-                ", modifiedTime=" + modifiedTime +
-                '}';
-    }
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/UserBuyBO.java

@@ -1,25 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.entity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-@ApiModel
-public class UserBuyBO {
-
-    @ApiModelProperty("用户名称")
-    private String userName;
-
-    @ApiModelProperty("金钱")
-    private BigDecimal moneyNum;
-
-    @ApiModelProperty("碳汇量")
-    private BigDecimal carbonNum;
-
-    @ApiModelProperty("数量")
-    private long saleNum;
-
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/CarbonTrendForm.java

@@ -1,27 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.forms;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-@Data
-@ApiModel(value = "CarbonTrendForm",description = "时间段查询方式")
-public class CarbonTrendForm extends BaseForm {
-
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
-    @ApiModelProperty("开始时间")
-    private Date startTime;
-
-
-    @ApiModelProperty("结束时间")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
-    private Date endTime;
-
-
-    @ApiModelProperty("查询方式")
-    private String way;
-
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/CollectiveFarmerForm.java

@@ -1,64 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class CollectiveFarmerForm extends BaseForm {
-    private String guid;
-
-    private String fkPovertyAreaId;
-
-    private String collectiveCode;
-
-    private String collectiveName;
-
-    private Integer collectivePersonNum;
-
-    private String orgUnit;
-
-    private String remark;
-
-    private String collectiveImages;
-
-    private String bankName;
-
-    private String bankCardNo;
-
-    private Integer isEnable;
-
-    private Integer state;
-
-    private String createUser;
-
-    private Date createTime;
-
-    private String modifiedUser;
-
-    private Date modifiedTime;
-
-    private BigDecimal recieveMoney;
-
-    private BigDecimal actualMoney;
-
-    private String phone;
-
-    private String condition;
-
-    private List<FarmerInfoForm> farmerInfoForms;
-
-    private String provinceId;
-
-    private String cityId;
-
-    private String townId;
-
-    private String countyId;
-
-    private String villageId;
-
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/CustomerChannelForm.java

@@ -1,25 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * @author xiezt
- */
-@Data
-@Slf4j
-public class CustomerChannelForm extends BaseForm {
-
-    private String guid;
-
-    private String fkCustomerId;
-
-    private String channelName;
-
-    private String channelKeywordOne;
-
-    private String channelKeywordTwo;
-
-    private String channelKeywordThree;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/CustomerCompanyInfoForm.java

@@ -1,49 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.List;
-
-
-/**
- * @author JYJ
- */
-@Data
-@Slf4j
-public class CustomerCompanyInfoForm extends BaseForm {
-
-    private String guid;
-
-    private String fkCustomerId;
-
-    private String companyName;
-
-    private String orgCode;
-
-    private String principals;
-
-    private String phone;
-
-    private String email;
-
-    private String companyAddress;
-
-    private String companyImages;
-
-    private String condition;
-
-    private Integer customerType;
-
-    private String pid;
-
-    /**
-     * 手机验证码
-     */
-    private String phoneMsg;
-
-    private List<String> imageList;
-
-    private Integer companyType;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/CustomerCompanyTypeForm.java

@@ -1,28 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-@ApiModel("企业类型信息")
-public class CustomerCompanyTypeForm extends BaseForm {
-    private String guid;
-
-    private String parentId;
-
-    private String typeName;
-
-    private String typeVal;
-
-    private Integer state;
-
-    private Date modifiedTime;
-
-    private String methodology;
-
-    private String typeDesc;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/CustomerInfoForm.java

@@ -1,80 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * @author xiezt
- */
-@Data
-@Slf4j
-public class CustomerInfoForm extends BaseForm {
-
-    private String guid;
-
-    private String account;
-
-    private String passwd;
-
-    private Integer customerType;
-
-    private String customerName;
-
-    private String nickName;
-
-    private String pid;
-
-    private String phone;
-
-    private Integer sex;
-
-    private Integer score;
-
-    private String wxId;
-
-    private String unionId;
-
-    private String headImage;
-
-    private Integer isCompany;
-
-    private Integer isValidate;
-
-    private Integer isEnable;
-
-    private String queryStr;
-
-    private BigDecimal carbonAmount;
-
-    private Integer goodsNum;
-
-    private Integer farmerNum;
-
-    private Integer farmerPersonNum;
-    /**
-     * 购物车商品列表
-     */
-    private List<GoodsInfoForm> goodsList;
-
-    /**
-     * 登录渠道
-     */
-    private Integer loginType;
-
-    /**
-     * 企业认证信息
-     */
-    private CustomerCompanyInfoForm customerCompanyInfoForm;
-
-    /**
-     * 渠道类型
-     */
-    private Integer channelType;
-
-
-
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/DayCarbonFrom.java

@@ -1,14 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.forms;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-@ApiModel
-public class DayCarbonFrom implements Serializable {
-    @ApiModelProperty("时间参数")
-    private String dataFrom;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/FarmerInfoForm.java

@@ -1,80 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author xiezt
- */
-@Data
-public class FarmerInfoForm extends BaseForm {
-
-    private String guid;
-
-    private String fkPovertyAreaId;
-
-    private String fkCollectiveId;
-
-    private String farmerCode;
-
-    private String farmerName;
-
-    private Integer familyNum;
-
-    private Integer sex;
-
-    private String pid;
-
-    private String nation;
-
-    private String education;
-
-    private String phone;
-
-    private String bankCardNo;
-
-    private BigDecimal incomeVal;
-
-    private String farmerType;
-
-    private String farmerRemark;
-
-    private String farmerImages;
-
-    private String villageOrg;
-
-    private Integer isEnable;
-
-    private Integer state;
-
-    private String createUser;
-
-    private Date createTime;
-
-    private String modifiedUser;
-
-    private Date modifiedTime;
-
-    private String bankClearingMsg;
-
-    private BigDecimal recieveMoney;
-
-    private BigDecimal actualMoney;
-
-    private String condition;
-
-    private String provinceId;
-
-    private String cityId;
-
-    private String townId;
-
-    private String countyId;
-
-    private String villageId;
-
-    private Integer queryFlag;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/GoodsCredentialInfoForm.java

@@ -1,37 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author xiezt
- */
-@Data
-public class GoodsCredentialInfoForm extends BaseForm {
-
-    private String guid;
-
-    private String fkCustomerId;
-
-    private String fkOrderId;
-
-    private String fkOrderDetailId;
-
-    private String credentialNo;
-
-    private Date buyDate;
-
-    private BigDecimal carbonAmount;
-
-    private String productAddress;
-
-    private Integer farmerCount;
-
-    private String farmerNames;
-
-    private String creImages;
-
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/GoodsDetailForm.java

@@ -1,37 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-public class GoodsDetailForm extends BaseForm {
-
-    private String guid;
-
-    private String fkGoodsGuid;
-
-    private String fkProductGuid;
-
-    private String productName;
-
-    private String productCode;
-
-    private String saleUnit;
-
-    private BigDecimal carbonVal;
-
-    private Integer isEnable;
-
-    private Integer farmerNums;
-
-    private Integer state;
-
-    private Date createTime;
-
-    private Date modifiedTime;
-
-    private String condition;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/GoodsInfoForm.java

@@ -1,80 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author xiezt
- */
-@Data
-public class GoodsInfoForm extends BaseForm {
-
-    private String guid;
-
-    private String goodsType;
-
-    private String goodsCode;
-
-    private String goodsName;
-
-    private BigDecimal carbonVal;
-
-    private BigDecimal price;
-
-    private String goodsDesc;
-
-    private String goodsImages;
-
-    private Date goodsSaleDate;
-
-    private Integer isSale;
-
-    private Integer state;
-
-    private String createUser;
-
-    private Date createTime;
-
-    private String modifiedUser;
-
-    private Date modifiedTime;
-
-    private String goodsUse;
-
-    /**
-     * 非t_goods_info表字段,需要join其他表用于显示的字段
-     */
-    private String productTypeName;
-
-    private BigDecimal saledCarbonSkin;
-
-
-    private BigDecimal unsaledCarbonSkin;
-
-    /**
-     * 页面用到的参数
-     */
-    private String condition;
-
-    private List<GoodsDetailForm> goodsDetailForms;
-
-    private String queryStr;
-
-    /**
-     * 冗余t_goods_sale_info的字段
-     */
-    private String saleTargets; // 销售对象
-
-    private Integer saleType; // 销售类型
-
-    /**
-     * 购买数量
-     */
-    private BigDecimal carbonSkin;
-
-
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/GoodsOrderDetailForm.java

@@ -1,48 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author JYJ
- */
-@Data
-public class GoodsOrderDetailForm extends BaseForm {
-
-    private String guid;
-
-    private String fkOrderGuid;
-
-    private String fkGoodsGuid;
-
-    private String goodsName;
-
-    private BigDecimal goodsPrice;
-
-    private BigDecimal saleNum;
-
-    private BigDecimal amount;
-
-    /**
-     * 商品编号
-     */
-    private String goodsNo;
-    /**
-     * 商品类型
-     */
-    private String goodsType;
-    /**
-     * 碳汇产生时间
-     */
-    private String goodsSaleDate;
-
-    private String goodsImages;
-
-    private String goodsDesc;
-    /**
-     * 商品用途
-     */
-    private String goodsUse;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/GoodsOrderInfoForm.java

@@ -1,112 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author xiezt
- */
-@Data
-public class GoodsOrderInfoForm extends BaseForm {
-
-    private String guid;
-
-    private String fkCustomerGuid;
-
-    private String orderNo;
-
-    private String customerName;
-
-    private String customerType;
-
-    private BigDecimal orderAmount;
-
-    private BigDecimal orderCarbonAmount;
-
-    private Integer orderStatus;
-
-    /**
-     * 交易方式
-     */
-    private String tradeType;
-    /**
-     * 订单支付流水编号
-     */
-    private String PayNo;
-
-    /**
-     * 商品订单详情
-     */
-    private List<GoodsOrderDetailForm> goodsOrderDetailForm;
-
-    /**
-     * 商品列表
-     */
-    private List<GoodsInfoForm> goodsList;
-    /**
-     * 支付渠道
-     */
-    private Integer payChannel;
-    /**
-     * 购买起始时间
-     */
-    private String beginDate;
-    /**
-     * 购买结束时间
-     */
-    private String endDate;
-    /**
-     * 客户账号
-     */
-    private String account;
-    /**
-     * 完成支付的支付流水信息
-     */
-    private GoodsPayOrderForm payOrderInfo;
-    /**
-     * 订单支付流水列表
-     */
-    private List<GoodsPayOrderForm> payOrderFormList;
-
-    /**
-     * 爱心用户信息
-     */
-    private CustomerInfoForm customerInfoForm;
-
-    /**
-     * 支付金额
-     */
-    private BigDecimal payAmount;
-
-    /**
-     * 购买时间
-     */
-    private Date createTime;
-    /**
-     * 证书编号
-     */
-    private String credentialNo;
-    /**
-     * 支付流水号
-     */
-    private String payNo;
-
-    /**
-     * 模糊查询条件
-     */
-    private String condition;
-
-    /**
-     * 离线支付申请备注
-     */
-    private String applyRemark;
-
-    /**
-     * 订单商品用途
-     */
-    private String goodsUse;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/GoodsPayOrderForm.java

@@ -1,35 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author xiezt
- */
-@Data
-public class GoodsPayOrderForm extends BaseForm {
-
-    private String guid;
-
-    private String fkCustomerId;
-
-    private String fkOrderId;
-
-    private String orderNo;
-
-    private String payNo;
-
-    private BigDecimal payAmount;
-
-    private Integer payChannel;
-
-    private Date payTime;
-
-    private Integer payStatus;
-
-    private String tradeType;
-
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/GoodsSaleInfoForm.java

@@ -1,35 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author xiezt
- */
-@Data
-public class GoodsSaleInfoForm extends BaseForm {
-
-    private String guid;
-
-    private String fkGoodsGuid;
-
-    private BigDecimal salePrice;
-
-    private BigDecimal companyPrice;
-
-    private BigDecimal memberPrice;
-
-    private BigDecimal saledCarbonSkin;
-
-    private BigDecimal unsaledCarbonSkin;
-
-    private Integer isEnable;
-
-    private Integer saleType;
-
-    private String saleTargets;
-
-    private String saleUnit;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/GroupNumFrom.java

@@ -1,16 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.forms;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@ApiModel
-public class GroupNumFrom implements Serializable {
-    @ApiModelProperty("时间参数")
-    private String dataFrom;
-
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/OrderPayApplyForm.java

@@ -1,39 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author xiezt
- */
-@Data
-public class OrderPayApplyForm extends BaseForm {
-
-    private String guid;
-
-    private String fkCustomerId;
-
-    private String fkOrderId;
-
-    private String applyUserName;
-
-    private BigDecimal payAmount;
-
-    private String remark;
-
-    private Integer applyStatus;
-
-    private String orderNo;
-
-    private BigDecimal orderCarbonAmount;
-
-    private Integer orderStatus;
-
-    private String beginTime;
-
-    private String endTime;
-
-    private String account;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/OrderPayVoucherForm.java

@@ -1,45 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author xiezt
- */
-@Data
-public class OrderPayVoucherForm extends BaseForm {
-
-    private String guid;
-
-    private String fkOrderId;
-
-    private String fkCustomerId;
-
-    private String fkApplyId;
-
-    private String payUserName;
-
-    private String payBank;
-
-    private String payCardNo;
-
-    private BigDecimal payAmount;
-
-    private Date payTime;
-
-    private String voucherImages;
-
-    private Date beginDate;
-
-    private Date endDate;
-
-    private Integer orderStatus;
-
-    private String account;
-
-    private String orderNo;
-
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/PaymentForm.java

@@ -1,22 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class PaymentForm extends BaseForm {
-    private String orderId;
-    private String orderNo;
-    private String payNo;
-    private String orderTime;
-    private Integer orderStatus;
-    private String account;
-    private String customerName;
-    private String payBank;
-    private String payCardNo;
-    private String payChannel;
-    private String payAmount;
-    private String payTime;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/PovertyAreaForm.java

@@ -1,67 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class PovertyAreaForm extends BaseForm {
-
-    private String guid;
-
-    private String povertyAreaName;
-
-    private String areaAddress;
-
-    private String areaDesc;
-
-    private String cityId;
-
-    private String countyId;
-
-    private String townId;
-
-    private String villageId;
-
-    private String areaImages;
-
-    private Integer isEnable;
-
-    private Integer state;
-
-    private String createUser;
-
-    private Date createTime;
-
-    private String modifiedUser;
-
-    private Date modifiedTime;
-
-    private String condition;
-
-    private String provinceId;
-
-    private Integer familyNum;
-
-    private List<FarmerInfoForm> farmerInfoList;
-
-    /**
-     * 总的农户数
-     */
-    private Integer farmerNum;
-    /**
-     * 总的贫困人口数
-     */
-    private Integer farmerPersonNum;
-    /**
-     * 总的购碳资金数
-     */
-    private BigDecimal saleAmount;
-    /**
-     * 总的涉及商品数量
-     */
-    private Integer goodsNum;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/ProductBelongForm.java

@@ -1,31 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class ProductBelongForm extends BaseForm {
-    private String guid;
-
-    private String fkProductGuid;
-
-    private String fkFarmerGuid;
-
-    private String farmerName;
-
-    private String farmerVillage;
-
-    private Integer farmerNum;
-
-    private Integer state;
-
-    private Date createTime;
-
-    private Date modifiedTime;
-
-    private Integer belongType;
-
-    private String condition;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/ProductExpansionForm.java

@@ -1,27 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.forms;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class ProductExpansionForm {
-
-    private String guid;
-
-    private String fkProductGuid;
-
-    private String fkProductTypeGuid;
-
-    private String expansionItem;
-
-    private String expansionVal;
-
-    private Integer state;
-
-    private Date createTime;
-
-    private Date modifiedTime;
-
-    private String condition;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/ProductInfoForm.java

@@ -1,59 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import com.hcloud.microserver.system.facade.carbon.entity.ProductType;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class ProductInfoForm extends BaseForm {
-    private String guid;
-
-    private String fkProductType;
-
-    private String fkCarbonRule;
-
-    private String fkPovertyArea;
-
-    private String productName;
-
-    private String productCode;
-
-    private Date carbonGenerateDate;
-
-    private Integer productValidateNum;
-
-    private Date carbonRefreshTime;
-
-    private BigDecimal carbonSink;
-
-    private String productImgs;
-
-    private Integer isEnable;
-
-    private String remark;
-
-    private Integer state;
-
-    private String createUser;
-
-    private Date createTime;
-
-    private String modifiedUser;
-
-    private Date modifiedTime;
-
-    private String condition;
-
-    private ProductType productType;
-
-    private List<ProductBelongForm> productBelongForms;
-
-    private List<ProductExpansionForm> productExpansionForms;
-
-    // 冗余一个贫困集体的参数
-    private CollectiveFarmerForm collectiveFarmerForm;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/ProductTypeExpansionForm.java

@@ -1,17 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.forms;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class ProductTypeExpansionForm {
-
-    private String guid;
-    private String fkProductTypeGuid;
-    private String fkProductGuid;
-    private String expansionItem;
-    private Integer state;
-    private Date createTime;
-    private Date modifiedTime;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/ProductTypeForm.java

@@ -1,32 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.forms;
-
-import com.hcloud.microserver.commoncore.base.BaseForm;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-@Data
-public class ProductTypeForm extends BaseForm {
-    private String guid;
-
-    private String parentId;
-
-    private String typeName;
-
-    private String typeVal;
-
-    private Integer state;
-
-    private Date modifiedTime;
-
-    private String methodology;
-
-    private String typeDesc;
-
-    private String condition;
-
-    List<ProductExpansionForm> productExpansionForms;
-
-    List<ProductTypeExpansionForm> productTypeExpansionForms;
-}

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/UserBuyFrom.java

@@ -1,9 +0,0 @@
-package com.hcloud.microserver.system.facade.carbon.forms;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class UserBuyFrom implements Serializable {
-}

carbon-admin/carbon-admin-service/pom.xml

@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>carbon-admin</artifactId>
-        <groupId>com.hcloud.microserver</groupId>
-        <version>0.0.1-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>carbon-admin-service</artifactId>
-    <groupId>com.hcloud.microserver</groupId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>carbon-admin-service</name>
-    <dependencies>
-        <dependency>
-            <groupId>com.hcloud.microserver</groupId>
-            <artifactId>carbon-security</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <!-- nacos discovery-->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-        <!-- nacos config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-        <!--zipkin-->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-zipkin</artifactId>
-        </dependency>
-        <!-- spring boot admin client -->
-        <dependency>
-            <groupId>de.codecentric</groupId>
-            <artifactId>spring-boot-admin-starter-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.logstash.logback</groupId>
-            <artifactId>logstash-logback-encoder</artifactId>
-        </dependency>
-        <!-- xls格式excel依赖包 -->
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi</artifactId>
-            <version>3.17</version>
-        </dependency>
-        <!--xlsx格式excel依赖包-->
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-            <version>3.17</version>
-        </dependency>
-        <!--easyexcel，推荐使用2.0 以上版本，功能更加完善-->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>easyexcel</artifactId>
-            <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>
-        <dependency>
-            <groupId>com.qiniu</groupId>
-            <artifactId>qiniu-java-sdk</artifactId>
-            <version>7.2.28</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-micro-spring-boot-starter</artifactId>
-            <version>2.0.4</version>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <!-- druid -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid</artifactId>
-            <version>1.2.3</version>
-        </dependency>
-
-
-        <dependency>
-            <artifactId>carbon-admin-common</artifactId>
-            <groupId>com.hcloud.microserver</groupId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-
-
-</project>

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/CarbonAdminServiceApplication.java

@@ -1,25 +0,0 @@
-package com.hcloud.microserver;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-/**
- * @author xiezt
- */
-@EnableAsync
-@EnableDiscoveryClient
-@EnableTransactionManagement
-@ComponentScan(basePackages = "com.hcloud")
-//@MapperScan(basePackages = {"com.hcloud.microserver.bank.dao"})
-@SpringBootApplication
-public class CarbonAdminServiceApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(CarbonAdminServiceApplication.class, args);
-    }
-
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/sys/service/biz/LoginSystemService.java

@@ -1,175 +0,0 @@
-package com.hcloud.microserver.sys.service.biz;
-
-import com.hcloud.microserver.commoncore.constant.GlobleConstant;
-import com.hcloud.microserver.security.util.JwtTokenUtil;
-import com.hcloud.microserver.sys.facade.entity.SysPermission;
-import com.hcloud.microserver.sys.facade.entity.SysUser;
-import com.hcloud.microserver.sys.service.bo.SysUserDetails;
-import com.hcloud.microserver.sys.service.service.*;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.ValueOperations;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Component;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @author JYJ
- */
-@Component("loginService")
-@Slf4j
-public class LoginSystemService {
-
-    //部门及角色缓存
-    private static final String DEPT_AND_ROLE_STR="deptAndRole";
-
-    @Autowired
-    private JwtTokenUtil jwtTokenUtil;
-
-    @Autowired
-    private UserManagerCacheService userManagerCacheService;
-
-    @Autowired
-    private SysUserService sysUserService;
-
-    @Autowired
-    private SysUserPermissionService sysUserPermissionService;
-
-    @Autowired
-    private SysRoleService sysRoleService;
-
-    @Autowired
-    private SysDepartmentService sysDepartmentService;
-
-    @Autowired
-    private RedisTemplate redisTemplate;
-
-    @Value("${jwt.tokenHead}")
-    private String tokenHead;
-
-    /**
-     * 用户登录接口
-     * @param loginName
-     * @param password
-     * @return
-     */
-    public SysUserDetails loadUserDetails(String loginName,String password){
-        SysUser user =  sysUserService.getSystemByUser(loginName,password);
-        if (user == null){
-            return null;
-        }
-        String guid = user.getGuid();
-        List<SysPermission> userPermissionByUserId = sysUserPermissionService.getUserPermissionByUserId(guid);
-        return new SysUserDetails(user,userPermissionByUserId);
-
-    }
-    public SysUserDetails loadUserDetails(String loginName){
-        SysUser user =  sysUserService.getSystemByUserName(loginName);
-        if (user == null){
-            return null;
-        }
-        String guid = user.getGuid();
-        List<SysPermission> userPermissionByUserId = sysUserPermissionService.getUserPermissionByUserId(guid);
-        return new SysUserDetails(user,userPermissionByUserId);
-
-    }
-
-    public Map<String,Object> loginSystemByUserInfo(String loginName,String password){
-        Map<String,Object> reslutMap = Collections.emptyMap();
-        String token = null;
-        SysUserDetails userDetails =  loadUserDetails(loginName,password);
-        if(null!=userDetails && !"".equals(userDetails.getPassword())){
-
-
-            UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
-            SecurityContextHolder.getContext().setAuthentication(authentication);
-            token = jwtTokenUtil.generateToken(userDetails);
-//            updateLoginTimeByUsername(username);
-            userManagerCacheService.setToken(loginName, tokenHead+token);
-
-        }
-        return reslutMap;
-    }
-
-
-    public Map<String, Object> getUserByUsername(String username){
-        Map<String,Object> ret = new HashMap<>();
-        SysUser admin = userManagerCacheService.getAdmin(username);
-        if (admin == null){
-            admin = sysUserService.getSystemByUserName(username);
-        }
-
-        if (admin != null){
-
-            userManagerCacheService.setAdmin(admin);
-            List<SysPermission> userPermissionByUserId = sysUserPermissionService.getUserPermissionByUserId(admin.getGuid());
-            ret.put(GlobleConstant.AUTH_LIST, userPermissionByUserId);
-            ret.put(GlobleConstant.CURRENT_USER, username);
-
-        }
-        return ret;
-    }
-
-    /**
-     * 刷新token
-     * @param oldToken
-     * @return
-     */
-    public String refreshToken(String oldToken) {
-        return jwtTokenUtil.refreshHeadToken(oldToken);
-    }
-
-    public String login(String loginName,String password){
-        String token = null;
-        SysUserDetails userDetails =  loadUserDetails(loginName,password);
-        if(null!=userDetails && !"".equals(userDetails.getPassword())){
-
-
-            UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
-            SecurityContextHolder.getContext().setAuthentication(authentication);
-            token = jwtTokenUtil.generateToken(userDetails);
-//            updateLoginTimeByUsername(username);
-            userManagerCacheService.setToken(loginName, tokenHead+token);
-
-        }
-        return token;
-    }
-
-    public Map getAllDeptAndRole(){
-        Map map = new  HashMap();
-        if(!redisTemplate.hasKey(DEPT_AND_ROLE_STR)){
-           List<Map<String,String>> roleList =  sysRoleService.queryAllRole();
-           List<Map<String,String>> deptList =  sysDepartmentService.queryAllDepartment();
-           map.put("dept",deptList);
-           map.put("role",roleList);
-            ValueOperations<String, Object> operations = redisTemplate.opsForValue();
-            operations.set(DEPT_AND_ROLE_STR,map,GlobleConstant.TOKEN_EXPIRES_SECOND,TimeUnit.SECONDS);
-        }else{
-           return (Map) redisTemplate.opsForValue().get(DEPT_AND_ROLE_STR);
-        }
-        return map;
-    }
-
-
-    public Integer deluserInfo(String userId){
-        if(null!= userId && !"".equals(userId)){
-            SysUser bean = new SysUser();
-            bean.setGuid(userId);
-            bean.setCstatus("0");
-            int success = sysUserService.modifyByPrimaryKeySelective(bean);
-            if(success>0){
-                sysUserPermissionService.delUserPermissionByUid(userId);
-                return success;
-            }
-        }
-        return 0;
-    }
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/sys/service/bo/SysUserDetails.java

@@ -1,63 +0,0 @@
-package com.hcloud.microserver.sys.service.bo;
-
-import com.hcloud.microserver.sys.facade.entity.SysPermission;
-import com.hcloud.microserver.sys.facade.entity.SysUser;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class SysUserDetails implements UserDetails {
-    private SysUser sysUser;
-
-    private List<SysPermission> sysPermissions;
-
-    public SysUserDetails(SysUser sysUser, List<SysPermission> sysPermissions) {
-        this.sysUser = sysUser;
-        this.sysPermissions = sysPermissions;
-    }
-
-    @Override
-    public Collection<? extends GrantedAuthority> getAuthorities() {
-        return sysPermissions.stream()
-                .map(role ->new SimpleGrantedAuthority(role.getGuid()+":"+role.getCname()))
-                .collect(Collectors.toList());
-    }
-
-    @Override
-    public String getPassword() {
-        return sysUser.getPassword();
-    }
-
-    @Override
-    public String getUsername() {
-        return sysUser.getCname();
-    }
-
-    @Override
-    public boolean isAccountNonExpired() {
-        return true;
-    }
-
-    @Override
-    public boolean isAccountNonLocked() {
-        return true;
-    }
-
-    @Override
-    public boolean isCredentialsNonExpired() {
-        return true;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return sysUser.getCstatus().equals(1);
-    }
-
-    public SysUser sysUser(){
-        return sysUser;
-    }
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/sys/service/controller/BaseDictionaryManageController.java

@@ -1,31 +0,0 @@
-package com.hcloud.microserver.sys.service.controller;
-
-import com.hcloud.microserver.commoncore.base.BaseController;
-import com.hcloud.microserver.commoncore.base.ResultVO;
-import com.hcloud.microserver.commoncore.util.BeanCopyUtil;
-import com.hcloud.microserver.sys.facade.entity.BaseDictionary;
-import com.hcloud.microserver.sys.facade.forms.BaseDictionaryForm;
-import com.hcloud.microserver.sys.service.service.BaseDictionaryService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-@RestController
-@RequestMapping("/dic")
-public class BaseDictionaryManageController extends BaseController  {
-
-    @Autowired
-    private BaseDictionaryService baseDictionaryService;
-
-
-    @PostMapping("/findByEntity")
-    public ResultVO findByEntity(@RequestBody BaseDictionaryForm baseDictionaryForm) {
-        BaseDictionary baseDictionary = BeanCopyUtil.convertBean(baseDictionaryForm, BaseDictionary.class);
-        List<BaseDictionary> baseDictionaries = this.baseDictionaryService.findByEntity(baseDictionary);
-        return success(baseDictionaries);
-    }
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/sys/service/controller/SysManagerController.java

@@ -1,214 +0,0 @@
-package com.hcloud.microserver.sys.service.controller;
-
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageInfo;
-import com.hcloud.microserver.commoncore.base.BaseController;
-import com.hcloud.microserver.commoncore.base.ResponseBase;
-import com.hcloud.microserver.commoncore.base.ResultVO;
-import com.hcloud.microserver.commoncore.enums.ResultEnum;
-import com.hcloud.microserver.commoncore.service.RedisUtils;
-import com.hcloud.microserver.commoncore.util.string.StringUtils;
-import com.hcloud.microserver.sys.facade.entity.SysUser;
-import com.hcloud.microserver.sys.facade.forms.SysMangerForm;
-import com.hcloud.microserver.sys.facade.forms.SysUserForm;
-import com.hcloud.microserver.sys.facade.vo.SysTreeNode;
-import com.hcloud.microserver.sys.service.biz.LoginSystemService;
-import com.hcloud.microserver.sys.service.service.SysPermissionService;
-import com.hcloud.microserver.sys.service.service.SysUserService;
-import com.hcloud.microserver.sys.service.service.UserManagerCacheService;
-import com.hcloud.microserver.sys.service.util.CurrUserUtil;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.security.Principal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- *
- * @author apple
- * @date 2018/9/8
- */
-@Slf4j
-@RestController
-@RequestMapping("/user")
-public class SysManagerController extends BaseController  {
-
-
-    @Autowired
-    private LoginSystemService loginService;
-
-    @Autowired
-    private SysUserService sysUserService;
-
-    @Autowired
-    private SysPermissionService SysPermissionService;
-
-    @Autowired
-    private RedisUtils redisUtils;
-
-    @Autowired
-    private UserManagerCacheService userManagerCacheService;
-
-    @Value("${jwt.tokenHead}")
-    private String tokenHead;
-    @Value("${jwt.tokenHeader}")
-    private String tokenHeader;
-    @GetMapping("/findUserByAccount")
-
-    public ResultVO<SysUser> queryUserInfoByAccount(@RequestParam("account") String account) {
-        log.info("account=====================>{}", account);
-        return success();
-    }
-
-    @PostMapping("/login")
-
-    public ResponseBase login(@RequestParam("account") String account, @RequestParam("password") String password) {
-        log.info("登录的用户名：[{}]", account);
-        String token = loginService.login(account, password);
-        Map<String, String> tokenMap = new HashMap<>();
-        tokenMap.put("token", token);
-        tokenMap.put("tokenHead", tokenHead);
-        if (StringUtils.isNotEmpty(token)){
-            return responseSuccess(success(tokenMap));
-        }
-
-        return responseError(failure());
-    }
-
-//    @GetMapping("/logout")
-//    public ResultVO logout(@RequestParam("token") String accessToken){
-//        if(null!=accessToken && !"".equals(accessToken)){
-//            redisUtils.deleteKey(accessToken);
-//            return success();
-//        }
-//        return new ResultVO(ResultEnum.SYS_ERROR);
-//    }
-
-    @ApiOperation(value = "登出功能")
-    @RequestMapping(value = "/logout", method = RequestMethod.POST)
-    @ResponseBody
-    public ResponseBase logout() {
-        userManagerCacheService.delToken(CurrUserUtil.getUmsAdmin().getCname());
-        return responseSuccess(success());
-    }
-    @ApiOperation(value = "刷新token")
-    @RequestMapping(value = "/refreshToken", method = RequestMethod.GET)
-    @ResponseBody
-    public ResponseBase refreshToken(HttpServletRequest request) {
-        String token = request.getHeader(tokenHeader);
-        String refreshToken = loginService.refreshToken(token);
-        UserDetails userDetails = (UserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-        if (refreshToken == null) {
-            userManagerCacheService.delToken(userDetails.getUsername());
-            return responseSuccess(failure("token已经过期!"));
-        }
-        Map<String, String> tokenMap = new HashMap<>();
-        tokenMap.put("token", refreshToken);
-        tokenMap.put("tokenHead", tokenHead);
-        userManagerCacheService.setToken(userDetails.getUsername(), tokenHead + refreshToken);
-        return responseSuccess(success(tokenMap));
-    }
-
-    @ApiOperation(value = "获取当前登录用户信息")
-    @RequestMapping(value = "/info", method = RequestMethod.GET)
-    @ResponseBody
-    public ResponseBase getAdminInfo(Principal principal) {
-        if (principal == null) {
-            return responseError(failure());
-        }
-        String username = principal.getName();
-        Map<String, Object> userByUsername = loginService.getUserByUsername(username);
-        return responseSuccess(success(userByUsername));
-    }
-
-    /**
-     * @param sysUserForm
-     * @return
-     */
-
-    @PostMapping("/saveUserInfo")
-
-    public ResultVO saveUserInfo(@RequestBody SysUserForm sysUserForm) {
-        return sysUserService.saveUserInfoAndPermission(sysUserForm);
-    }
-
-    @PostMapping("/updateUserInfo")
-
-    public ResultVO updateUserInfo(@RequestBody SysUserForm sysUserForm) {
-        return sysUserService.modifyUserInfoAndPermission(sysUserForm);
-    }
-
-    @PostMapping("/queryUserListByPage")
-
-    public ResultVO queryUserListByPage(@RequestBody SysMangerForm sysMangerForm) {
-        PageInfo<Page<Map>> pageInfo = sysUserService.queryUserInfoByPage(sysMangerForm);
-        return success(pageInfo.getList(),pageInfo.getTotal());
-    }
-
-    @PostMapping("/userPermissionTree")
-
-    public ResultVO queryUserPermissionById(@RequestBody SysMangerForm sysMangerForm) {
-        log.info("sysMangerForm================>{}", sysMangerForm);
-        List<SysTreeNode> list = SysPermissionService.selectPermTree(sysMangerForm.getUserId(), "user");
-        return success(list);
-    }
-
-    @GetMapping("/selectList")
-
-    public ResultVO getDeptAndRoleInfo(@RequestParam("sysApp") String refSysApp) {
-        Map resMap = loginService.getAllDeptAndRole();
-        if (null != resMap) {
-            return success(resMap);
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR.getCode(), ResultEnum.SYS_ERROR.getMsg());
-    }
-
-    @PostMapping("/updateUserPermission")
-
-    public ResultVO updateUserPermission(@RequestBody SysUserForm sysUserForm) {
-        if (null != sysUserForm) {
-            int success = sysUserService.updateUserPermission(sysUserForm);
-            if (success > 0) {
-                return success();
-            }
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-    @PostMapping("/delUserInfo")
-
-    public ResultVO delUserPermission(@RequestBody SysUserForm sysUserForm) {
-        if (null != sysUserForm) {
-            String guid = sysUserForm.getGuid();
-            int success = loginService.deluserInfo(guid);
-            if (success > 0) {
-                return success();
-            }
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-    @GetMapping("/enableUserInfo")
-
-    public ResultVO enableUserInfo(@RequestBody SysUserForm sysUserForm) {
-        if (null != sysUserForm) {
-            SysUser user = new SysUser();
-            user.setGuid(sysUserForm.getUserId());
-            user.setCstatus(sysUserForm.getCstatus());
-            int success = sysUserService.modifyByPrimaryKeySelective(user);
-            if (success > 0) {
-                return success();
-            }
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/sys/service/controller/SysManagerDeptController.java

@@ -1,68 +0,0 @@
-package com.hcloud.microserver.sys.service.controller;
-
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageInfo;
-import com.hcloud.microserver.commoncore.base.BaseController;
-import com.hcloud.microserver.commoncore.base.ResultVO;
-import com.hcloud.microserver.commoncore.enums.ResultEnum;
-import com.hcloud.microserver.sys.facade.forms.SysDeptForm;
-import com.hcloud.microserver.sys.service.service.SysDepartmentService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
- * @author xiezt
- */
-@RestController
-@RequestMapping("/dept")
-@Slf4j
-public class SysManagerDeptController extends BaseController {
-
-    @Autowired
-    private SysDepartmentService sysDepartmentService;
-
-    @PostMapping("/listByPage")
-
-    public ResultVO queryDeptInfoByPage(@RequestBody SysDeptForm sysDeptForm) {
-        PageInfo<Page<Map>> pageInfo = sysDepartmentService.queryDeptInfoListByPage(sysDeptForm);
-        if (null != pageInfo) {
-            return success(pageInfo.getList());
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-    @PostMapping("/saveDept")
-
-    public ResultVO saveDeptInfo(@RequestBody SysDeptForm sysDeptForm) {
-        int success = sysDepartmentService.saveDeptmentInfo(sysDeptForm);
-        if (success > 0) {
-            return success();
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-
-    @PostMapping("/delDept")
-
-    public ResultVO delDeptInfo(@RequestBody SysDeptForm sysDeptForm) {
-        int success = sysDepartmentService.delByPrimaryKey(sysDeptForm.getGuid());
-        if (success > 0) {
-            return success();
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-
-    @PostMapping("/modifyDept")
-
-    public ResultVO updateDeptInfo(@RequestBody SysDeptForm sysDeptForm) {
-        int success = sysDepartmentService.updateDepartmentInfo(sysDeptForm);
-        if (success > 0) {
-            return success();
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/sys/service/controller/SysManagerPermissionController.java

@@ -1,47 +0,0 @@
-package com.hcloud.microserver.sys.service.controller;
-
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageInfo;
-import com.hcloud.microserver.commoncore.base.BaseController;
-import com.hcloud.microserver.commoncore.base.ResultVO;
-import com.hcloud.microserver.commoncore.enums.ResultEnum;
-import com.hcloud.microserver.sys.facade.entity.SysPermission;
-import com.hcloud.microserver.sys.facade.forms.SysPermissionForm;
-import com.hcloud.microserver.sys.service.service.SysPermissionService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-@Slf4j
-@RestController
-@RequestMapping(value = "/permission")
-public class SysManagerPermissionController extends BaseController {
-
-    @Autowired
-    private SysPermissionService sysPermissionService;
-
-    @PostMapping("/permissionList")
-    public ResultVO permissionList(@RequestBody SysPermissionForm sysPermissionForm) {
-        PageInfo<Page<Map>> pageInfo = sysPermissionService.queryPermissionListByPage(sysPermissionForm);
-        if (!Objects.isNull(pageInfo)) {
-            return success(pageInfo.getList(), pageInfo.getTotal());
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-    @PostMapping("/list")
-    public ResultVO list(@RequestBody SysPermission sysPermission) {
-        log.info("参数=====================>{}", sysPermission);
-        List<SysPermission> list = this.sysPermissionService.queryByCondition(sysPermission);
-        if (Objects.nonNull(list))
-            return success(list);
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/sys/service/controller/SysManagerRoleController.java

@@ -1,118 +0,0 @@
-package com.hcloud.microserver.sys.service.controller;
-
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageInfo;
-import com.hcloud.microserver.commoncore.annotation.AuthValidate;
-import com.hcloud.microserver.commoncore.base.BaseController;
-import com.hcloud.microserver.commoncore.base.ResultVO;
-import com.hcloud.microserver.commoncore.enums.AuthEnum;
-import com.hcloud.microserver.commoncore.enums.ResultEnum;
-import com.hcloud.microserver.sys.facade.entity.SysRole;
-import com.hcloud.microserver.sys.facade.forms.SysRoleForm;
-import com.hcloud.microserver.sys.facade.vo.SysTreeNode;
-import com.hcloud.microserver.sys.service.service.SysPermissionService;
-import com.hcloud.microserver.sys.service.service.SysRolePermissionService;
-import com.hcloud.microserver.sys.service.service.SysRoleService;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * @author xiezt
- */
-@RestController
-@RequestMapping("/role")
-@Slf4j
-public class SysManagerRoleController extends BaseController {
-
-    @Autowired
-    private SysRoleService sysRoleService;
-
-    @Autowired
-    private SysRolePermissionService sysRolePermissionService;
-
-    @Autowired
-    private SysPermissionService sysPermissionService;
-
-    @PostMapping("/roleList")
-
-    public ResultVO querySysRoleInfo(@RequestBody SysRoleForm sysRoleForm) {
-        PageInfo<Page<Map>> pageInfo = sysRoleService.queryRoleListByPage(sysRoleForm);
-        if (null != pageInfo) {
-            return success(pageInfo.getList(), pageInfo.getTotal());
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-    @PostMapping("/permissionTree")
-
-    public ResultVO queryRolePermissionById(@RequestBody SysRoleForm sysRoleForm) {
-        log.info("sysRoleForm================>{}", sysRoleForm);
-        List<SysTreeNode> list = sysPermissionService.selectPermTree(sysRoleForm.getGuid(), "role");
-        return success(list);
-    }
-
-    @PostMapping("/saveInfo")
-
-    public ResultVO saveRoleInfo(@RequestBody SysRoleForm sysRoleForm) {
-        log.info("sysRoleForm================>{}", sysRoleForm);
-        int success = sysRoleService.saveRoleInfo(sysRoleForm);
-        if (success > 0) {
-            return success();
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-    @PostMapping("/updateInfo")
-
-    public ResultVO updateRoleInfo(@RequestBody SysRoleForm sysRoleForm) {
-        log.info("sysRoleForm===============>{}", sysRoleForm);
-        if (null != sysRoleForm && !"".equals(sysRoleForm.getGuid())) {
-            SysRole sysRole = new SysRole();
-            sysRole.setGuid(sysRoleForm.getGuid());
-            sysRole.setCname(sysRoleForm.getCname());
-            sysRole.setCdesc(sysRoleForm.getCdesc());
-            sysRole.setUpdatedate(new Date());
-            sysRole.setUpdateuser(sysRoleForm.getRealName());
-            int success = sysRoleService.modifyByPrimaryKeySelective(sysRole);
-            if (success > 0) {
-                return success();
-            }
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-
-    @PostMapping("/updatePermissionInfo")
-
-    public ResultVO updateRolePermissionInfo(@RequestBody SysRoleForm sysRoleForm) {
-        log.info("sysRoleForm================>{}", sysRoleForm);
-        int success = sysRolePermissionService.updateRolePermissionByPermisList(sysRoleForm);
-        if (success > 0) {
-            return success();
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-    @PostMapping("/delRoleInfo")
-
-    public ResultVO delRolePermissionInfo(@RequestBody SysRoleForm sysRoleForm) {
-        if (null != sysRoleForm) {
-            int success = sysRoleService.delRoleInfoAndPermission(sysRoleForm.getGuid());
-            if (success > 0) {
-                return success();
-            }
-        }
-        return new ResultVO(ResultEnum.SYS_ERROR);
-    }
-
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/sys/service/dao/BaseDictionaryMapper.java

@@ -1,21 +0,0 @@
-package com.hcloud.microserver.sys.service.dao;
-
-import com.hcloud.microserver.sys.facade.entity.BaseDictionary;
-
-import java.util.List;
-
-public interface BaseDictionaryMapper {
-    int deleteByPrimaryKey(String guid);
-
-    int insert(BaseDictionary record);
-
-    int insertSelective(BaseDictionary record);
-
-    BaseDictionary selectByPrimaryKey(String guid);
-
-    int updateByPrimaryKeySelective(BaseDictionary record);
-
-    int updateByPrimaryKey(BaseDictionary record);
-
-    List<BaseDictionary> selectByEntity(BaseDictionary baseDictionary);
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/sys/service/dao/BaseDictionaryTypeMapper.java

@@ -1,9 +0,0 @@
-package com.hcloud.microserver.sys.service.dao;
-
-import com.hcloud.microserver.sys.facade.entity.BaseDictionaryType;
-
-public interface BaseDictionaryTypeMapper {
-    int insert(BaseDictionaryType record);
-
-    int insertSelective(BaseDictionaryType record);
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/sys/service/dao/SysDepartmentMapper.java

@@ -1,39 +0,0 @@
-package com.hcloud.microserver.sys.service.dao;
-
-
-import com.github.pagehelper.Page;
-import com.hcloud.microserver.commoncore.base.BaseMapper;
-import com.hcloud.microserver.commoncore.base.PageBean;
-import com.hcloud.microserver.sys.facade.entity.SysDepartment;
-import com.hcloud.microserver.sys.facade.forms.SysDeptForm;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author xiezt
- */
-public interface SysDepartmentMapper extends BaseMapper<SysDepartment, String> {
-
-    /**
-     * 获取所有部门信息
-     *
-     * @return
-     */
-    List<Map<String, String>> queryAllDepartment();
-
-    /**
-     * 分页查询部门信息
-     * @param pageBean
-     * @return
-     */
-    Page<Map> findDeptInfoListByPage(PageBean<SysDeptForm> pageBean);
-
-    /**
-     * 获取最大编码
-     *
-     * @return
-     */
-    String getMaxCode();
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/sys/service/dao/SysParametersMapper.java

@@ -1,11 +0,0 @@
-package com.hcloud.microserver.sys.service.dao;
-
-import com.hcloud.microserver.commoncore.base.BaseMapper;
-import com.hcloud.microserver.sys.facade.entity.SysParameters;
-
-/**
- * @author xiezt
- */
-public interface SysParametersMapper extends BaseMapper<SysParameters, String> {
-
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/sys/service/dao/SysPermissionMapper.java

@@ -1,31 +0,0 @@
-package com.hcloud.microserver.sys.service.dao;
-
-import com.github.pagehelper.Page;
-import com.hcloud.microserver.commoncore.base.BaseMapper;
-import com.hcloud.microserver.commoncore.base.PageBean;
-import com.hcloud.microserver.sys.facade.entity.SysPermission;
-import com.hcloud.microserver.sys.facade.forms.SysPermissionForm;
-import com.hcloud.microserver.sys.facade.vo.SysTreeNode;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author xiezt
- */
-public interface SysPermissionMapper extends BaseMapper<SysPermission, String> {
-    /**
-     * 查询权限树
-     * @param guid
-     * @param status
-     * @return
-     */
-    List<SysTreeNode> selectPermTree(@Param("guid") String guid, @Param("status") String status);
-
-    Page<Map> queryListByPage(PageBean<SysPermissionForm> pageBean);
-
-    List<SysPermission> selectByCondition(SysPermission sysPermission);
-
-    List<SysPermission> selectPermission();
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/sys/service/dao/SysRoleMapper.java

@@ -1,34 +0,0 @@
-package com.hcloud.microserver.sys.service.dao;
-
-import com.github.pagehelper.Page;
-import com.hcloud.microserver.commoncore.base.BaseMapper;
-import com.hcloud.microserver.commoncore.base.PageBean;
-import com.hcloud.microserver.sys.facade.entity.SysRole;
-import com.hcloud.microserver.sys.facade.forms.SysRoleForm;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author xiezt
- */
-public interface SysRoleMapper extends BaseMapper<SysRole, String> {
-    /**
-     * 查询角色信息
-     * @return
-     */
-    List<Map<String, String>> queryAllRole();
-
-    /**
-     * 分页查询角色信息
-     * @param pageBean
-     * @return
-     */
-    Page<Map> queryRoleListByPage(PageBean<SysRoleForm> pageBean);
-
-    /**
-     * 获取最大编码
-     * @return
-     */
-    String getMaxCode();
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/sys/service/dao/SysRolePermissionMapper.java

@@ -1,32 +0,0 @@
-package com.hcloud.microserver.sys.service.dao;
-
-import com.hcloud.microserver.commoncore.base.BaseMapper;
-import com.hcloud.microserver.sys.facade.entity.SysRolePermission;
-
-import java.util.List;
-
-/**
- * @author JYJ
- */
-public interface SysRolePermissionMapper extends BaseMapper<SysRolePermission, String> {
-    /**
-     * 查询角色权限信息
-     * @param roleId
-     * @return
-     */
-    List<String> selectPermByRoleId(String roleId);
-
-    /**
-     * 删除角色权限信息
-     * @param roleId
-     * @return
-     */
-    int delPermByRoleId(String roleId);
-
-    /**
-     * 更新角色权限信息
-     * @param list
-     * @return
-     */
-    int updateRolePermissionByPermisList(List<SysRolePermission> list);
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/sys/service/dao/SysUserMapper.java

@@ -1,21 +0,0 @@
-package com.hcloud.microserver.sys.service.dao;
-
-import com.github.pagehelper.Page;
-import com.hcloud.microserver.commoncore.base.BaseMapper;
-import com.hcloud.microserver.commoncore.base.PageBean;
-import com.hcloud.microserver.sys.facade.entity.SysUser;
-import com.hcloud.microserver.sys.facade.forms.SysMangerForm;
-
-import java.util.Map;
-
-/**
- * @author xiezt
- */
-public interface SysUserMapper extends BaseMapper<SysUser, String> {
-
-    SysUser getUserByAccount(String loginName);
-
-    Page<Map> queryUserInfoByPage(PageBean<SysMangerForm> pageBean);
-
-
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/sys/service/dao/SysUserPermissionMapper.java

@@ -1,38 +0,0 @@
-package com.hcloud.microserver.sys.service.dao;
-
-import com.hcloud.microserver.commoncore.base.BaseMapper;
-import com.hcloud.microserver.sys.facade.entity.SysPermission;
-import com.hcloud.microserver.sys.facade.entity.SysUserPermission;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author xiezt
- */
-public interface SysUserPermissionMapper extends BaseMapper<SysUserPermission, String> {
-    /**
-     * 获取用户权限信息
-     * @param id
-     * @return
-     */
-    List<Map<String, Object>> getUserPermissionById(String id);
-
-    public List<SysPermission> getUserPermissionByUserId(@Param("id")String id);
-
-    /**
-     * 删除用户权限
-     * @param uid
-     * @return
-     */
-    int delUserPermissionByUid(String uid);
-
-    /**
-     * 批量查询用户权限信息
-     * @param list
-     * @return
-     */
-    int insertBatchPermissionByUid(List<SysUserPermission> list);
-
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/sys/service/service/BaseDictionaryService.java

@@ -1,11 +0,0 @@
-package com.hcloud.microserver.sys.service.service;
-
-import com.hcloud.microserver.commoncore.base.BaseServie;
-import com.hcloud.microserver.sys.facade.entity.BaseDictionary;
-
-import java.util.List;
-
-public interface BaseDictionaryService extends BaseServie<BaseDictionary, String> {
-
-    List<BaseDictionary> findByEntity(BaseDictionary baseDictionary);
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/sys/service/service/SysDepartmentService.java

@@ -1,47 +0,0 @@
-package com.hcloud.microserver.sys.service.service;
-
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageInfo;
-import com.hcloud.microserver.commoncore.base.BaseServie;
-import com.hcloud.microserver.sys.facade.entity.SysDepartment;
-import com.hcloud.microserver.sys.facade.forms.SysDeptForm;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by apple on 2018/9/7.
- */
-public interface SysDepartmentService extends BaseServie<SysDepartment, String> {
-    /**
-     * 获取所有部门信息
-     *
-     * @return
-     */
-    List<Map<String, String>> queryAllDepartment();
-
-    /**
-     * 分页查询部门信息
-     *
-     * @param sysDeptForm
-     * @return
-     */
-    PageInfo<Page<Map>> queryDeptInfoListByPage(SysDeptForm sysDeptForm);
-
-    /**
-     * 保存部门信息
-     *
-     * @param sysDeptForm
-     * @return
-     */
-    int saveDeptmentInfo(SysDeptForm sysDeptForm);
-
-    /**
-     * 更新部门信息
-     *
-     * @param sysDeptForm
-     * @return
-     */
-    int updateDepartmentInfo(SysDeptForm sysDeptForm);
-
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/sys/service/service/SysParametersService.java

@@ -1,10 +0,0 @@
-package com.hcloud.microserver.sys.service.service;
-
-import com.hcloud.microserver.commoncore.base.BaseServie;
-import com.hcloud.microserver.sys.facade.entity.SysParameters;
-
-/**
- * Created by apple on 2018/9/7.
- */
-public interface SysParametersService extends BaseServie<SysParameters, String> {
-}

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/sys/service/service/SysPermissionService.java

@@ -1,48 +0,0 @@
-package com.hcloud.microserver.sys.service.service;
-
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageInfo;
-import com.hcloud.microserver.commoncore.base.BaseServie;
-import com.hcloud.microserver.sys.facade.entity.SysPermission;
-import com.hcloud.microserver.sys.facade.forms.SysPermissionForm;
-import com.hcloud.microserver.sys.facade.vo.SysTreeNode;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author apple
- * @date 2018/9/7
- */
-public interface SysPermissionService extends BaseServie<SysPermission, String> {
-    /**
-     * 获取权限树
-     *
-     * @param guid
-     * @param states
-     * @return
-     */
-    List<SysTreeNode> selectPermTree(String guid, String states);
-
-    /**
-     * 权限列表
-     *
-     * @param
-     * @return
-     */
-    PageInfo<Page<Map>> queryPermissionListByPage(SysPermissionForm sysPermissionForm);
-
-    /**
-     * 权限列表不分页
-     * @param sysPermissionForm
-     * @return
-     */
-    List<SysPermission> queryByCondition(SysPermission sysPermission);
-
-
-    /**
-     * 权限列表不分页
-     * @return
-     */
-    List<SysPermission> queryAllList();
-}