Merge branch 'developer' into 'master'

Developer

See merge request !2

haoban-manage3-api/pom.xml

@@ -9,17 +9,17 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>haoban-manage-api</artifactId>
+    <artifactId>haoban-manage3-api</artifactId>
     <version>${libraryVersion}</version>
 
-    <name>haoban-manage-api</name>
+    <name>haoban-manage3-api</name>
     <!-- FIXME change it to the project's website -->
     <url>http://www.example.com</url>
     
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.7</maven.compiler.source>
-        <haobanService>3.0-SNAPSHOT</haobanService>
+        <haobanService>1.0-SNAPSHOT</haobanService>
         <libraryVersion>3.0-SNAPSHOT</libraryVersion>
     </properties>
 	<distributionManagement>
@@ -52,10 +52,15 @@
             <artifactId>haoban-base-api</artifactId>
             <version>${haoban-base-api}</version>
         </dependency>
+        <dependency>
+        <groupId>com.gic</groupId>
+        <artifactId>haoban-common</artifactId>
+        <version>${haoban-common}</version>
+    </dependency>
     </dependencies>
 
     <build>
-        <finalName>haoban-manage-api</finalName>
+        <finalName>haoban-manage3-api</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/ApplicationDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class ApplicationDTO implements Serializable {
+	
+	private String applicationId;
+
+    private String applicationName;
+
+    private String appApplicationUrl;
+
+    private String appApplicationIconUrl;
+
+    private String applicationUrl;
+    
+    private String applicationPath;
+
+    private Integer statusFlag;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getApplicationId() {
+        return applicationId;
+    }
+
+    public void setApplicationId(String applicationId) {
+        this.applicationId = applicationId == null ? null : applicationId.trim();
+    }
+
+    public String getApplicationName() {
+        return applicationName;
+    }
+
+    public void setApplicationName(String applicationName) {
+        this.applicationName = applicationName == null ? null : applicationName.trim();
+    }
+
+    public String getAppApplicationUrl() {
+        return appApplicationUrl;
+    }
+
+    public void setAppApplicationUrl(String appApplicationUrl) {
+        this.appApplicationUrl = appApplicationUrl == null ? null : appApplicationUrl.trim();
+    }
+
+    public String getAppApplicationIconUrl() {
+        return appApplicationIconUrl;
+    }
+
+    public void setAppApplicationIconUrl(String appApplicationIconUrl) {
+        this.appApplicationIconUrl = appApplicationIconUrl == null ? null : appApplicationIconUrl.trim();
+    }
+
+    public String getApplicationUrl() {
+        return applicationUrl;
+    }
+
+    public void setApplicationUrl(String applicationUrl) {
+        this.applicationUrl = applicationUrl == null ? null : applicationUrl.trim();
+    }
+
+    public Integer getStatusFlag() {
+        return statusFlag;
+    }
+
+    public void setStatusFlag(Integer statusFlag) {
+        this.statusFlag = statusFlag;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+	public String getApplicationPath() {
+		return applicationPath;
+	}
+
+	public void setApplicationPath(String applicationPath) {
+		this.applicationPath = applicationPath;
+	}
+    
+    
+
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/ApplicationSettingDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class ApplicationSettingDTO implements Serializable {
+    private String settingId;
+
+    private String applicationId;
+
+    private String wxEnterpriseId;
+
+    private Integer statusFlag;
+
+    private Integer openFlag;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getSettingId() {
+        return settingId;
+    }
+
+    public void setSettingId(String settingId) {
+        this.settingId = settingId == null ? null : settingId.trim();
+    }
+
+    public String getApplicationId() {
+        return applicationId;
+    }
+
+    public void setApplicationId(String applicationId) {
+        this.applicationId = applicationId == null ? null : applicationId.trim();
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId == null ? null : wxEnterpriseId.trim();
+    }
+
+    public Integer getStatusFlag() {
+        return statusFlag;
+    }
+
+    public void setStatusFlag(Integer statusFlag) {
+        this.statusFlag = statusFlag;
+    }
+
+    public Integer getOpenFlag() {
+        return openFlag;
+    }
+
+    public void setOpenFlag(Integer openFlag) {
+        this.openFlag = openFlag;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+}
\ No newline at end of file

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/AuditDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class AuditDTO implements Serializable {
+    private String auditId;
+
+    private Integer auditType;
+
+    private String commitName;
+
+    private String commitStaffId;
+
+    private String commitStaffName;
+
+    private String commitStaffImg;
+
+    private String commitStoreId;
+
+    private String changeField;
+
+    private String oldValue;
+
+    private String newValue;
+
+    private Date commitTime;
+
+    private String enterpriseId;
+
+    private String auditName;
+
+    private Integer auditStatus;
+
+    private String auditReason;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Integer statusFlag;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getAuditId() {
+        return auditId;
+    }
+
+    public void setAuditId(String auditId) {
+        this.auditId = auditId == null ? null : auditId.trim();
+    }
+
+    public Integer getAuditType() {
+        return auditType;
+    }
+
+    public void setAuditType(Integer auditType) {
+        this.auditType = auditType;
+    }
+
+    public String getCommitName() {
+        return commitName;
+    }
+
+    public void setCommitName(String commitName) {
+        this.commitName = commitName == null ? null : commitName.trim();
+    }
+
+    public String getCommitStaffId() {
+        return commitStaffId;
+    }
+
+    public void setCommitStaffId(String commitStaffId) {
+        this.commitStaffId = commitStaffId == null ? null : commitStaffId.trim();
+    }
+
+    public String getCommitStaffName() {
+        return commitStaffName;
+    }
+
+    public void setCommitStaffName(String commitStaffName) {
+        this.commitStaffName = commitStaffName == null ? null : commitStaffName.trim();
+    }
+
+    public String getCommitStaffImg() {
+        return commitStaffImg;
+    }
+
+    public void setCommitStaffImg(String commitStaffImg) {
+        this.commitStaffImg = commitStaffImg == null ? null : commitStaffImg.trim();
+    }
+
+    public String getCommitStoreId() {
+        return commitStoreId;
+    }
+
+    public void setCommitStoreId(String commitStoreId) {
+        this.commitStoreId = commitStoreId == null ? null : commitStoreId.trim();
+    }
+
+    public String getChangeField() {
+        return changeField;
+    }
+
+    public void setChangeField(String changeField) {
+        this.changeField = changeField == null ? null : changeField.trim();
+    }
+
+    public String getOldValue() {
+        return oldValue;
+    }
+
+    public void setOldValue(String oldValue) {
+        this.oldValue = oldValue == null ? null : oldValue.trim();
+    }
+
+    public String getNewValue() {
+        return newValue;
+    }
+
+    public void setNewValue(String newValue) {
+        this.newValue = newValue == null ? null : newValue.trim();
+    }
+
+    public Date getCommitTime() {
+        return commitTime;
+    }
+
+    public void setCommitTime(Date commitTime) {
+        this.commitTime = commitTime;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId == null ? null : enterpriseId.trim();
+    }
+
+    public String getAuditName() {
+        return auditName;
+    }
+
+    public void setAuditName(String auditName) {
+        this.auditName = auditName == null ? null : auditName.trim();
+    }
+
+    public Integer getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditStatus(Integer auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+
+    public String getAuditReason() {
+        return auditReason;
+    }
+
+    public void setAuditReason(String auditReason) {
+        this.auditReason = auditReason == null ? null : auditReason.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getStatusFlag() {
+        return statusFlag;
+    }
+
+    public void setStatusFlag(Integer statusFlag) {
+        this.statusFlag = statusFlag;
+    }
+}
\ No newline at end of file

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/AuditSettingDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class AuditSettingDTO implements Serializable {
+    private String settingId;
+
+    private String wxEnterpriseId;
+
+    private Integer auditFlag;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Integer statusFlag;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getSettingId() {
+        return settingId;
+    }
+
+    public void setSettingId(String settingId) {
+        this.settingId = settingId == null ? null : settingId.trim();
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId == null ? null : wxEnterpriseId.trim();
+    }
+
+    public Integer getAuditFlag() {
+        return auditFlag;
+    }
+
+    public void setAuditFlag(Integer auditFlag) {
+        this.auditFlag = auditFlag;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getStatusFlag() {
+        return statusFlag;
+    }
+
+    public void setStatusFlag(Integer statusFlag) {
+        this.statusFlag = statusFlag;
+    }
+}
\ No newline at end of file

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/DepartmentDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class DepartmentDTO implements Serializable {
+	
+	private String departmentId;
+
+    private String departmentName;
+
+    private String parentDepartmentId;
+
+    private String relatedId;
+
+    private String chainId;
+    
+    private String chainName;
+
+    private Integer isStore;
+
+    private Integer statusFlag;
+
+    private Integer recycleFlag;
+
+    private Date createTime;
+
+    private Date updateTime;
+    
+    private String wxDepartmentId;
+    
+    private Integer level;
+    
+    private Integer sort;
+    
+    private Integer staffCount;
+    
+    private String wxEnterpriseId;
+    
+    private Integer type;
+    
+    private String storeCode;
+    
+    private Integer bindFlag;
+    
+    private String relatedCode;
+    
+    private String gicEnterpriseName;
+    
+    private String enterpriseId;
+    
+    private Boolean hasSonNode;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getDepartmentId() {
+        return departmentId;
+    }
+
+    public void setDepartmentId(String departmentId) {
+        this.departmentId = departmentId == null ? null : departmentId.trim();
+    }
+
+    public String getDepartmentName() {
+        return departmentName;
+    }
+
+    public void setDepartmentName(String departmentName) {
+        this.departmentName = departmentName == null ? null : departmentName.trim();
+    }
+
+    public String getParentDepartmentId() {
+        return parentDepartmentId;
+    }
+
+    public void setParentDepartmentId(String parentDepartmentId) {
+        this.parentDepartmentId = parentDepartmentId == null ? null : parentDepartmentId.trim();
+    }
+
+    public String getRelatedId() {
+        return relatedId;
+    }
+
+    public void setRelatedId(String relatedId) {
+        this.relatedId = relatedId == null ? null : relatedId.trim();
+    }
+
+    public String getChainId() {
+        return chainId;
+    }
+
+    public void setChainId(String chainId) {
+        this.chainId = chainId == null ? null : chainId.trim();
+    }
+
+    public Integer getIsStore() {
+        return isStore;
+    }
+
+    public void setIsStore(Integer isStore) {
+        this.isStore = isStore;
+    }
+
+    public Integer getStatusFlag() {
+        return statusFlag;
+    }
+
+    public void setStatusFlag(Integer statusFlag) {
+        this.statusFlag = statusFlag;
+    }
+
+    public Integer getRecycleFlag() {
+        return recycleFlag;
+    }
+
+    public void setRecycleFlag(Integer recycleFlag) {
+        this.recycleFlag = recycleFlag;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+	public String getWxDepartmentId() {
+		return wxDepartmentId;
+	}
+
+	public void setWxDepartmentId(String wxDepartmentId) {
+		this.wxDepartmentId = wxDepartmentId;
+	}
+
+	public Integer getLevel() {
+		return level;
+	}
+
+	public void setLevel(Integer level) {
+		this.level = level;
+	}
+
+	public Integer getSort() {
+		return sort;
+	}
+
+	public void setSort(Integer sort) {
+		this.sort = sort;
+	}
+
+	public String getWxEnterpriseId() {
+		return wxEnterpriseId;
+	}
+
+	public void setWxEnterpriseId(String wxEnterpriseId) {
+		this.wxEnterpriseId = wxEnterpriseId;
+	}
+
+	public String getChainName() {
+		return chainName;
+	}
+
+	public void setChainName(String chainName) {
+		this.chainName = chainName;
+	}
+
+	public Integer getStaffCount() {
+		return staffCount;
+	}
+
+	public void setStaffCount(Integer staffCount) {
+		this.staffCount = staffCount;
+	}
+
+	public Integer getType() {
+		return type;
+	}
+
+	public void setType(Integer type) {
+		this.type = type;
+	}
+
+	public String getStoreCode() {
+		return storeCode;
+	}
+
+	public void setStoreCode(String storeCode) {
+		this.storeCode = storeCode;
+	}
+
+	public Integer getBindFlag() {
+		return bindFlag;
+	}
+
+	public void setBindFlag(Integer bindFlag) {
+		this.bindFlag = bindFlag;
+	}
+
+	public String getRelatedCode() {
+		return relatedCode;
+	}
+
+	public void setRelatedCode(String relatedCode) {
+		this.relatedCode = relatedCode;
+	}
+
+	public String getGicEnterpriseName() {
+		return gicEnterpriseName;
+	}
+
+	public void setGicEnterpriseName(String gicEnterpriseName) {
+		this.gicEnterpriseName = gicEnterpriseName;
+	}
+
+	public String getEnterpriseId() {
+		return enterpriseId;
+	}
+
+	public void setEnterpriseId(String enterpriseId) {
+		this.enterpriseId = enterpriseId;
+	}
+
+	public Boolean getHasSonNode() {
+		return hasSonNode;
+	}
+
+	public void setHasSonNode(Boolean hasSonNode) {
+		this.hasSonNode = hasSonNode;
+	}
+	
+	
+
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/DictDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+
+public class DictDTO implements Serializable {
+    private String dictId;
+
+    private String dictName;
+
+    private String dictKey;
+
+    private String dictTitle;
+
+    private String dictDesc;
+
+    private String dictContent;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getDictId() {
+        return dictId;
+    }
+
+    public void setDictId(String dictId) {
+        this.dictId = dictId == null ? null : dictId.trim();
+    }
+
+    public String getDictName() {
+        return dictName;
+    }
+
+    public void setDictName(String dictName) {
+        this.dictName = dictName == null ? null : dictName.trim();
+    }
+
+    public String getDictKey() {
+        return dictKey;
+    }
+
+    public void setDictKey(String dictKey) {
+        this.dictKey = dictKey == null ? null : dictKey.trim();
+    }
+
+    public String getDictTitle() {
+        return dictTitle;
+    }
+
+    public void setDictTitle(String dictTitle) {
+        this.dictTitle = dictTitle == null ? null : dictTitle.trim();
+    }
+
+    public String getDictDesc() {
+        return dictDesc;
+    }
+
+    public void setDictDesc(String dictDesc) {
+        this.dictDesc = dictDesc == null ? null : dictDesc.trim();
+    }
+
+    public String getDictContent() {
+        return dictContent;
+    }
+
+    public void setDictContent(String dictContent) {
+        this.dictContent = dictContent == null ? null : dictContent.trim();
+    }
+}
\ No newline at end of file

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/EnterpriseDetailDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+
+/**
+ * Created by tgs on 2020/2/9.
+ */
+public class EnterpriseDetailDTO implements Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private String wxEnterpriseRelatedId;
+	private String enterpriseName;
+	private String wxEnterpriseId;
+	private String enterpriseId;
+	private String version;
+	private int nodeCount;
+	private String enterpriseLogo;
+	public String getWxEnterpriseRelatedId() {
+		return wxEnterpriseRelatedId;
+	}
+	public void setWxEnterpriseRelatedId(String wxEnterpriseRelatedId) {
+		this.wxEnterpriseRelatedId = wxEnterpriseRelatedId;
+	}
+	public String getEnterpriseName() {
+		return enterpriseName;
+	}
+	public void setEnterpriseName(String enterpriseName) {
+		this.enterpriseName = enterpriseName;
+	}
+	public String getWxEnterpriseId() {
+		return wxEnterpriseId;
+	}
+	public void setWxEnterpriseId(String wxEnterpriseId) {
+		this.wxEnterpriseId = wxEnterpriseId;
+	}
+	public String getEnterpriseId() {
+		return enterpriseId;
+	}
+	public void setEnterpriseId(String enterpriseId) {
+		this.enterpriseId = enterpriseId;
+	}
+	public String getVersion() {
+		return version;
+	}
+	public void setVersion(String version) {
+		this.version = version;
+	}
+	public int getNodeCount() {
+		return nodeCount;
+	}
+	public void setNodeCount(int nodeCount) {
+		this.nodeCount = nodeCount;
+	}
+	public String getEnterpriseLogo() {
+		return enterpriseLogo;
+	}
+	public void setEnterpriseLogo(String enterpriseLogo) {
+		this.enterpriseLogo = enterpriseLogo;
+	}
+
+	
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/GicMessageDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+
+/**
+ * Created by tgs on 2020/2/20.
+ */
+public class GicMessageDTO implements Serializable {
+    private String enterpriseId;
+    private String parentId;
+    private String parentChain;
+    private String id;
+    //1gic企业部门，2分组，3门店
+    private Integer type;
+    private String name;
+    //1新增，2修改，3删除
+    private Integer changeType;
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getChangeType() {
+        return changeType;
+    }
+
+    public void setChangeType(Integer changeType) {
+        this.changeType = changeType;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getParentChain() {
+        return parentChain;
+    }
+
+    public void setParentChain(String parentChain) {
+        this.parentChain = parentChain;
+    }
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/MemberUnionidRelatedDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class MemberUnionidRelatedDTO implements Serializable{
+
+    private String corpid;
+
+    private String suiteid;
+
+	private String memberUnionidRelatedId;
+
+    private String memberId;
+
+    private String unionid;
+
+    private String wxEnterpriseId;
+
+    private Integer statusFlag;
+
+    private String externalUserid;
+
+    private String wxUserId;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getMemberUnionidRelatedId() {
+        return memberUnionidRelatedId;
+    }
+
+    public void setMemberUnionidRelatedId(String memberUnionidRelatedId) {
+        this.memberUnionidRelatedId = memberUnionidRelatedId == null ? null : memberUnionidRelatedId.trim();
+    }
+
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId == null ? null : memberId.trim();
+    }
+
+    public String getUnionid() {
+        return unionid;
+    }
+
+    public void setUnionid(String unionid) {
+        this.unionid = unionid == null ? null : unionid.trim();
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId == null ? null : wxEnterpriseId.trim();
+    }
+
+    public Integer getStatusFlag() {
+        return statusFlag;
+    }
+
+    public void setStatusFlag(Integer statusFlag) {
+        this.statusFlag = statusFlag;
+    }
+
+    public String getExternalUserid() {
+        return externalUserid;
+    }
+
+    public void setExternalUserid(String externalUserid) {
+        this.externalUserid = externalUserid == null ? null : externalUserid.trim();
+    }
+
+    public String getWxUserId() {
+        return wxUserId;
+    }
+
+    public void setWxUserId(String wxUserId) {
+        this.wxUserId = wxUserId == null ? null : wxUserId.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getCorpid() {
+        return corpid;
+    }
+
+    public void setCorpid(String corpid) {
+        this.corpid = corpid;
+    }
+
+    public String getSuiteid() {
+        return suiteid;
+    }
+
+    public void setSuiteid(String suiteid) {
+        this.suiteid = suiteid;
+    }
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/QywxCallBackDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import java.io.Serializable;
+
+/**
+ * Created by tgs on 2020/2/15.
+ */
+public class QywxCallBackDTO implements Serializable{
+    private String suiteId;
+    private String infoType;
+    private String timeStamp;
+    private String authCode;
+    private String suiteTicket;
+    private String authCorpId;
+    private String userid;
+    private String userName;
+    /**1男  2女***/
+    private Integer gender;
+    private String alias;
+    private String[] department;
+    private String newUserid;
+    private String mobile;
+    private String position;
+    private Integer status;  //激活状态：1=激活或关注， 2=禁用， 4=未激活
+
+    private Integer id;
+    private String departmentName;
+    private Integer parentId;
+    private Integer order;
+    /**部门创建：create_party；部门修改：update_party；部门删除：delete_party*
+     * 成员创建：create_user；成员修改：update_user；成员删除：delete_user*/
+    private String changeType;
+
+    public String getSuiteId() {
+        return suiteId;
+    }
+
+    public void setSuiteId(String suiteId) {
+        this.suiteId = suiteId;
+    }
+
+    public String getInfoType() {
+        return infoType;
+    }
+
+    public void setInfoType(String infoType) {
+        this.infoType = infoType;
+    }
+
+    public String getTimeStamp() {
+        return timeStamp;
+    }
+
+    public void setTimeStamp(String timeStamp) {
+        this.timeStamp = timeStamp;
+    }
+
+    public String getAuthCode() {
+        return authCode;
+    }
+
+    public void setAuthCode(String authCode) {
+        this.authCode = authCode;
+    }
+
+    public String getSuiteTicket() {
+        return suiteTicket;
+    }
+
+    public void setSuiteTicket(String suiteTicket) {
+        this.suiteTicket = suiteTicket;
+    }
+
+    public String getUserid() {
+        return userid;
+    }
+
+    public void setUserid(String userid) {
+        this.userid = userid;
+    }
+
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+
+    public Integer getOrder() {
+        return order;
+    }
+
+    public void setOrder(Integer order) {
+        this.order = order;
+    }
+
+    public String getNewUserid() {
+        return newUserid;
+    }
+
+    public void setNewUserid(String newUserid) {
+        this.newUserid = newUserid;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getDepartmentName() {
+        return departmentName;
+    }
+
+    public void setDepartmentName(String departmentName) {
+        this.departmentName = departmentName;
+    }
+
+    public String getAuthCorpId() {
+        return authCorpId;
+    }
+
+    public void setAuthCorpId(String authCorpId) {
+        this.authCorpId = authCorpId;
+    }
+
+    public String getChangeType() {
+        return changeType;
+    }
+
+    public void setChangeType(String changeType) {
+        this.changeType = changeType;
+    }
+
+    public String[] getDepartment() {
+        return department;
+    }
+
+    public void setDepartment(String[] department) {
+        this.department = department;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public Integer getGender() {
+        return gender;
+    }
+
+    public void setGender(Integer gender) {
+        this.gender = gender;
+    }
+
+    public String getAlias() {
+        return alias;
+    }
+
+    public void setAlias(String alias) {
+        this.alias = alias;
+    }
+
+    public String getPosition() {
+        return position;
+    }
+
+    public void setPosition(String position) {
+        this.position = position;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/QywxCorpInfoDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+
+/**
+ * 
+ * 企业微信授权信息
+ *
+ */
+public class QywxCorpInfoDTO implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private Integer errcode;
+
+	private String errmsg;
+
+	/* 授权方企业微信id */
+	private String corpid;
+
+	/* 授权方企业微信名称 */
+	private String corpName;
+
+	/* 授权方企业微信类型，认证号：verified, 注册号：unverified */
+	private String corpType;
+
+	/* 授权方企业微信方形头像 */
+	private String corpSquareLogoUrl;
+
+	/* 授权管理员的userid，可能为空（内部管理员一定有，不可更改） */
+	private String userid;
+
+	/* 授权管理员的name，可能为空（内部管理员一定有，不可更改） */
+	private String name;
+
+	/* 授权管理员的头像url */
+	private String avatar;
+
+	/* 授权方应用id */
+	private String agentid;
+
+	/* 授权方应用名字 */
+	private String agentName;
+
+	/* 授权方应用方形头像 */
+	private String agentSquareLogoUrl;
+
+	/* 授权方应用圆形头像 */
+	private String roundLogoUrl;
+
+	/* 应用id */
+	private String suiteId;
+
+	public Integer getErrcode() {
+		return errcode;
+	}
+
+	public void setErrcode(Integer errcode) {
+		this.errcode = errcode;
+	}
+
+	public String getErrmsg() {
+		return errmsg;
+	}
+
+	public void setErrmsg(String errmsg) {
+		this.errmsg = errmsg;
+	}
+
+	public String getCorpid() {
+		return corpid;
+	}
+
+	public void setCorpid(String corpid) {
+		this.corpid = corpid;
+	}
+
+	public String getCorpName() {
+		return corpName;
+	}
+
+	public void setCorpName(String corpName) {
+		this.corpName = corpName;
+	}
+
+	public String getCorpType() {
+		return corpType;
+	}
+
+	public void setCorpType(String corpType) {
+		this.corpType = corpType;
+	}
+
+	public String getCorpSquareLogoUrl() {
+		return corpSquareLogoUrl;
+	}
+
+	public void setCorpSquareLogoUrl(String corpSquareLogoUrl) {
+		this.corpSquareLogoUrl = corpSquareLogoUrl;
+	}
+
+	public String getUserid() {
+		return userid;
+	}
+
+	public void setUserid(String userid) {
+		this.userid = userid;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getAvatar() {
+		return avatar;
+	}
+
+	public void setAvatar(String avatar) {
+		this.avatar = avatar;
+	}
+
+	public String getAgentid() {
+		return agentid;
+	}
+
+	public void setAgentid(String agentid) {
+		this.agentid = agentid;
+	}
+
+	public String getAgentName() {
+		return agentName;
+	}
+
+	public void setAgentName(String agentName) {
+		this.agentName = agentName;
+	}
+
+	public String getAgentSquareLogoUrl() {
+		return agentSquareLogoUrl;
+	}
+
+	public void setAgentSquareLogoUrl(String agentSquareLogoUrl) {
+		this.agentSquareLogoUrl = agentSquareLogoUrl;
+	}
+
+	public String getRoundLogoUrl() {
+		return roundLogoUrl;
+	}
+
+	public void setRoundLogoUrl(String roundLogoUrl) {
+		this.roundLogoUrl = roundLogoUrl;
+	}
+
+	public String getSuiteId() {
+		return suiteId;
+	}
+
+	public void setSuiteId(String suiteId) {
+		this.suiteId = suiteId;
+	}
+
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/QywxCorpInfoSimpleDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+
+public class QywxCorpInfoSimpleDTO implements Serializable{
+	
+	private static final long serialVersionUID = 1L;
+
+	private Integer errcode;
+
+	private String errmsg;
+
+	/* 授权方企业微信id */
+	private String corpid;
+
+	/* 授权方企业微信名称 */
+	private String corpName;
+
+	/* 授权方企业微信类型，认证号：verified, 注册号：unverified */
+	private String corpType;
+
+	/* 授权方企业微信方形头像 */
+	private String corpSquareLogoUrl;
+
+	/* 授权管理员的userid，可能为空（内部管理员一定有，不可更改） */
+	private String userid;
+
+	/* 授权管理员的name，可能为空（内部管理员一定有，不可更改） */
+	private String name;
+
+	/* 授权管理员的头像url */
+	private String avatar;
+
+	/* 授权方应用id */
+	private String agentid;
+
+	/* 授权方应用名字 */
+	private String agentName;
+
+	/* 授权方应用方形头像 */
+	private String agentSquareLogoUrl;
+
+	/* 授权方应用圆形头像 */
+	private String roundLogoUrl;
+
+	/* 授权方（企业）access_token,最长为512字节 */
+	private String accessToken;
+	
+	/* 授权方access_token 更新时间戳 */
+	private String updateAccessTokenTimestamp;
+	
+	/* 企业微信永久授权码,最长为512字节 */
+	private String permanentCode;
+
+	/* 应用id */
+	private String suiteId;
+	
+	/* 有效0 删除1 */
+	private Integer delStatus = 0;
+
+	/**
+	 * 权限等级。
+	 1:通讯录基本信息只读
+	 2:通讯录全部信息只读（已废弃）
+	 3:通讯录全部信息读写
+	 4:单个基本信息只读
+	 5:通讯录全部信息只写（已废弃）
+	 * **/
+	private Integer level;
+
+	public Integer getErrcode() {
+		return errcode;
+	}
+
+	public void setErrcode(Integer errcode) {
+		this.errcode = errcode;
+	}
+
+	public String getErrmsg() {
+		return errmsg;
+	}
+
+	public void setErrmsg(String errmsg) {
+		this.errmsg = errmsg;
+	}
+
+	public String getCorpid() {
+		return corpid;
+	}
+
+	public void setCorpid(String corpid) {
+		this.corpid = corpid;
+	}
+
+	public String getCorpName() {
+		return corpName;
+	}
+
+	public void setCorpName(String corpName) {
+		this.corpName = corpName;
+	}
+
+	public String getCorpType() {
+		return corpType;
+	}
+
+	public void setCorpType(String corpType) {
+		this.corpType = corpType;
+	}
+
+	public String getCorpSquareLogoUrl() {
+		return corpSquareLogoUrl;
+	}
+
+	public void setCorpSquareLogoUrl(String corpSquareLogoUrl) {
+		this.corpSquareLogoUrl = corpSquareLogoUrl;
+	}
+
+	public String getUserid() {
+		return userid;
+	}
+
+	public void setUserid(String userid) {
+		this.userid = userid;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getAvatar() {
+		return avatar;
+	}
+
+	public void setAvatar(String avatar) {
+		this.avatar = avatar;
+	}
+
+	public String getAgentid() {
+		return agentid;
+	}
+
+	public void setAgentid(String agentid) {
+		this.agentid = agentid;
+	}
+
+	public String getAgentName() {
+		return agentName;
+	}
+
+	public void setAgentName(String agentName) {
+		this.agentName = agentName;
+	}
+
+	public String getAgentSquareLogoUrl() {
+		return agentSquareLogoUrl;
+	}
+
+	public void setAgentSquareLogoUrl(String agentSquareLogoUrl) {
+		this.agentSquareLogoUrl = agentSquareLogoUrl;
+	}
+
+	public String getRoundLogoUrl() {
+		return roundLogoUrl;
+	}
+
+	public void setRoundLogoUrl(String roundLogoUrl) {
+		this.roundLogoUrl = roundLogoUrl;
+	}
+
+	public String getAccessToken() {
+		return accessToken;
+	}
+
+	public void setAccessToken(String accessToken) {
+		this.accessToken = accessToken;
+	}
+
+	public String getUpdateAccessTokenTimestamp() {
+		return updateAccessTokenTimestamp;
+	}
+
+	public void setUpdateAccessTokenTimestamp(String updateAccessTokenTimestamp) {
+		this.updateAccessTokenTimestamp = updateAccessTokenTimestamp;
+	}
+
+	public String getPermanentCode() {
+		return permanentCode;
+	}
+
+	public void setPermanentCode(String permanentCode) {
+		this.permanentCode = permanentCode;
+	}
+
+	public String getSuiteId() {
+		return suiteId;
+	}
+
+	public void setSuiteId(String suiteId) {
+		this.suiteId = suiteId;
+	}
+
+	public Integer getDelStatus() {
+		return delStatus;
+	}
+
+	public void setDelStatus(Integer delStatus) {
+		this.delStatus = delStatus;
+	}
+
+	public Integer getLevel() {
+		return level;
+	}
+
+	public void setLevel(Integer level) {
+		this.level = level;
+	}
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+public class StaffDTO implements Serializable{
+	
+	private String staffId;
+	
+	private String wxEnterpriseId;
+
+    private String wxUserId;
+
+    private String phoneNumber;
+
+    private String staffName;
+
+    private String nationCode;
+
+    private String nickName;
+
+    private Integer sex;
+
+    private String postion;
+
+    private Integer activeFlag;
+
+    private String extendPostion;
+
+    private Integer statusFlag;
+
+    private Date createTime;
+
+    private Date updateTime;
+    
+    private String departmentIds;
+    
+    private String headImg;
+    
+    private Integer sort;
+    
+    private List<DepartmentDTO> departmentList;
+
+    private int bindFlag;
+    
+    private String clerkCode;
+
+    private String staffDepartmentRelatedId;
+
+    private int clerkType;
+    
+    private Integer syncPostionFlag;
+    
+    private Integer superManagerFlag;
+    
+    private Boolean weixinPush;
+
+    private static final long serialVersionUID = 1L;
+
+    public int getClerkType() {
+		return clerkType;
+	}
+
+	public void setClerkType(int clerkType) {
+		this.clerkType = clerkType;
+	}
+
+	public String getStaffDepartmentRelatedId() {
+		return staffDepartmentRelatedId;
+	}
+
+	public void setStaffDepartmentRelatedId(String staffDepartmentRelatedId) {
+		this.staffDepartmentRelatedId = staffDepartmentRelatedId;
+	}
+
+	public String getClerkCode() {
+		return clerkCode;
+	}
+
+	public void setClerkCode(String clerkCode) {
+		this.clerkCode = clerkCode;
+	}
+
+
+	public int getBindFlag() {
+		return bindFlag;
+	}
+
+	public void setBindFlag(int bindFlag) {
+		this.bindFlag = bindFlag;
+	}
+
+	public String getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId == null ? null : staffId.trim();
+    }
+    
+    
+
+    public String getWxEnterpriseId() {
+		return wxEnterpriseId;
+	}
+
+	public void setWxEnterpriseId(String wxEnterpriseId) {
+		this.wxEnterpriseId = wxEnterpriseId;
+	}
+
+	public String getExtendPostion() {
+		return extendPostion;
+	}
+
+	public void setExtendPostion(String extendPostion) {
+		this.extendPostion = extendPostion;
+	}
+
+	public Integer getStatusFlag() {
+		return statusFlag;
+	}
+
+	public void setStatusFlag(Integer statusFlag) {
+		this.statusFlag = statusFlag;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public String getWxUserId() {
+        return wxUserId;
+    }
+
+    public void setWxUserId(String wxUserId) {
+        this.wxUserId = wxUserId == null ? null : wxUserId.trim();
+    }
+
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public void setPhoneNumber(String phoneNumber) {
+        this.phoneNumber = phoneNumber == null ? null : phoneNumber.trim();
+    }
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName == null ? null : staffName.trim();
+    }
+
+    public String getNationCode() {
+        return nationCode;
+    }
+
+    public void setNationCode(String nationCode) {
+        this.nationCode = nationCode == null ? null : nationCode.trim();
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName == null ? null : nickName.trim();
+    }
+
+    public Integer getSex() {
+        return sex;
+    }
+
+    public void setSex(Integer sex) {
+        this.sex = sex;
+    }
+
+    public String getPostion() {
+        return postion;
+    }
+
+    public void setPostion(String postion) {
+        this.postion = postion == null ? null : postion.trim();
+    }
+
+    public Integer getActiveFlag() {
+        return activeFlag;
+    }
+
+    public void setActiveFlag(Integer activeFlag) {
+        this.activeFlag = activeFlag;
+    }
+
+	public String getDepartmentIds() {
+		return departmentIds;
+	}
+
+	public void setDepartmentIds(String departmentIds) {
+		this.departmentIds = departmentIds;
+	}
+
+	public String getHeadImg() {
+		return headImg;
+	}
+
+	public void setHeadImg(String headImg) {
+		this.headImg = headImg;
+	}
+
+	public List<DepartmentDTO> getDepartmentList() {
+		return departmentList;
+	}
+
+	public void setDepartmentList(List<DepartmentDTO> departmentList) {
+		this.departmentList = departmentList;
+	}
+
+	public Integer getSort() {
+		return sort;
+	}
+
+	public void setSort(Integer sort) {
+		this.sort = sort;
+	}
+
+	public Integer getSyncPostionFlag() {
+		return syncPostionFlag;
+	}
+
+	public void setSyncPostionFlag(Integer syncPostionFlag) {
+		this.syncPostionFlag = syncPostionFlag;
+	}
+
+	public Integer getSuperManagerFlag() {
+		return superManagerFlag;
+	}
+
+	public void setSuperManagerFlag(Integer superManagerFlag) {
+		this.superManagerFlag = superManagerFlag;
+	}
+
+	public Boolean getWeixinPush() {
+		return weixinPush;
+	}
+
+	public void setWeixinPush(Boolean weixinPush) {
+		this.weixinPush = weixinPush;
+	}
+
+    
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffDepartmentRelatedDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class StaffDepartmentRelatedDTO implements Serializable {
+    private String staffDepartmentRelatedId;
+
+    private String staffId;
+
+    private String phoneNumber;
+
+    private String nationCode;
+
+    private String wxUserId;
+    
+    private String wxEnterpriseId;
+
+    private String departmentId;
+
+    private Integer statusFlag;
+
+    private String clerkCode;
+    
+    private String staffName;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getStaffDepartmentRelatedId() {
+        return staffDepartmentRelatedId;
+    }
+
+    public void setStaffDepartmentRelatedId(String staffDepartmentRelatedId) {
+        this.staffDepartmentRelatedId = staffDepartmentRelatedId == null ? null : staffDepartmentRelatedId.trim();
+    }
+
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId == null ? null : staffId.trim();
+    }
+
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public void setPhoneNumber(String phoneNumber) {
+        this.phoneNumber = phoneNumber == null ? null : phoneNumber.trim();
+    }
+
+    public String getNationCode() {
+        return nationCode;
+    }
+
+    public void setNationCode(String nationCode) {
+        this.nationCode = nationCode == null ? null : nationCode.trim();
+    }
+
+    public String getWxUserId() {
+        return wxUserId;
+    }
+
+    public void setWxUserId(String wxUserId) {
+        this.wxUserId = wxUserId == null ? null : wxUserId.trim();
+    }
+
+    public String getDepartmentId() {
+        return departmentId;
+    }
+
+    public void setDepartmentId(String departmentId) {
+        this.departmentId = departmentId == null ? null : departmentId.trim();
+    }
+
+    public Integer getStatusFlag() {
+        return statusFlag;
+    }
+
+    public void setStatusFlag(Integer statusFlag) {
+        this.statusFlag = statusFlag;
+    }
+
+    public String getClerkCode() {
+        return clerkCode;
+    }
+
+    public void setClerkCode(String clerkCode) {
+        this.clerkCode = clerkCode == null ? null : clerkCode.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+	public String getWxEnterpriseId() {
+		return wxEnterpriseId;
+	}
+
+	public void setWxEnterpriseId(String wxEnterpriseId) {
+		this.wxEnterpriseId = wxEnterpriseId;
+	}
+
+	public String getStaffName() {
+		return staffName;
+	}
+
+	public void setStaffName(String staffName) {
+		this.staffName = staffName;
+	}
+    
+    
+}
\ No newline at end of file

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StoreAddressDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class StoreAddressDTO implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private String areaId;
+
+    private String storeAddress;
+
+	public String getAreaId() {
+		return areaId;
+	}
+
+	public void setAreaId(String areaId) {
+		this.areaId = areaId;
+	}
+
+	public String getStoreAddress() {
+		return storeAddress;
+	}
+
+	public void setStoreAddress(String storeAddress) {
+		this.storeAddress = storeAddress;
+	}
+
+    
+}
\ No newline at end of file

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/SyncJsonColumnDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+
+public class SyncJsonColumnDTO implements Serializable{
+	
+	private Integer fieldType;
+
+    private String name;
+
+    private boolean primary;
+
+    private String value;
+
+    public Integer getFieldType() {
+        return fieldType;
+    }
+
+    public void setFieldType(Integer fieldType) {
+        this.fieldType = fieldType;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public boolean isPrimary() {
+        return primary;
+    }
+
+    public void setPrimary(boolean primary) {
+        this.primary = primary;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/UserLoginLogDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class UserLoginLogDTO implements Serializable {
+    private String userLoginLog;
+
+    private String wxEnterpriseId;
+
+    private String version;
+
+    private String sdkVersion;
+
+    private String system;
+
+    private String brand;
+
+    private String model;
+
+    private String platform;
+
+    private String systemInfo;
+
+    private Integer status;
+
+    private String staffId;
+    
+    private String phoneNumber;
+    
+    private String hbversion;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getUserLoginLog() {
+        return userLoginLog;
+    }
+
+    public void setUserLoginLog(String userLoginLog) {
+        this.userLoginLog = userLoginLog == null ? null : userLoginLog.trim();
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId == null ? null : wxEnterpriseId.trim();
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version == null ? null : version.trim();
+    }
+
+    public String getSdkVersion() {
+        return sdkVersion;
+    }
+
+    public void setSdkVersion(String sdkVersion) {
+        this.sdkVersion = sdkVersion == null ? null : sdkVersion.trim();
+    }
+
+    public String getSystem() {
+        return system;
+    }
+
+    public void setSystem(String system) {
+        this.system = system == null ? null : system.trim();
+    }
+
+    public String getBrand() {
+        return brand;
+    }
+
+    public void setBrand(String brand) {
+        this.brand = brand == null ? null : brand.trim();
+    }
+
+    public String getModel() {
+        return model;
+    }
+
+    public void setModel(String model) {
+        this.model = model == null ? null : model.trim();
+    }
+
+    public String getPlatform() {
+        return platform;
+    }
+
+    public void setPlatform(String platform) {
+        this.platform = platform == null ? null : platform.trim();
+    }
+
+    public String getSystemInfo() {
+        return systemInfo;
+    }
+
+    public void setSystemInfo(String systemInfo) {
+        this.systemInfo = systemInfo == null ? null : systemInfo.trim();
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+
+    public String getStaffId() {
+		return staffId;
+	}
+
+	public void setStaffId(String staffId) {
+		this.staffId = staffId;
+	}
+
+	public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+	public String getPhoneNumber() {
+		return phoneNumber;
+	}
+
+	public void setPhoneNumber(String phoneNumber) {
+		this.phoneNumber = phoneNumber;
+	}
+
+	public String getHbversion() {
+		return hbversion;
+	}
+
+	public void setHbversion(String hbversion) {
+		this.hbversion = hbversion;
+	}
+    
+    
+}
\ No newline at end of file

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/WxApplicationDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class WxApplicationDTO implements Serializable {
+    private String wxApplicationId;
+
+    private String siteId;
+
+    private String name;
+
+    private String permanentCode;
+
+    private String agentName;
+
+    private String agentId;
+
+    private Integer applicationType;
+
+    private String wxEnterpriseId;
+
+    private Integer statusFlag;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getWxApplicationId() {
+        return wxApplicationId;
+    }
+
+    public void setWxApplicationId(String wxApplicationId) {
+        this.wxApplicationId = wxApplicationId == null ? null : wxApplicationId.trim();
+    }
+
+    public String getSiteId() {
+        return siteId;
+    }
+
+    public void setSiteId(String siteId) {
+        this.siteId = siteId == null ? null : siteId.trim();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public String getPermanentCode() {
+        return permanentCode;
+    }
+
+    public void setPermanentCode(String permanentCode) {
+        this.permanentCode = permanentCode == null ? null : permanentCode.trim();
+    }
+
+    public String getAgentName() {
+        return agentName;
+    }
+
+    public void setAgentName(String agentName) {
+        this.agentName = agentName == null ? null : agentName.trim();
+    }
+
+    public String getAgentId() {
+        return agentId;
+    }
+
+    public void setAgentId(String agentId) {
+        this.agentId = agentId == null ? null : agentId.trim();
+    }
+
+    public Integer getApplicationType() {
+        return applicationType;
+    }
+
+    public void setApplicationType(Integer applicationType) {
+        this.applicationType = applicationType;
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId == null ? null : wxEnterpriseId.trim();
+    }
+
+    public Integer getStatusFlag() {
+        return statusFlag;
+    }
+
+    public void setStatusFlag(Integer statusFlag) {
+        this.statusFlag = statusFlag;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+}
\ No newline at end of file

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/WxEnterpriseDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class WxEnterpriseDTO implements Serializable {
+	
+	private String wxEnterpriseId;
+
+    private String corpid;
+
+    private String permanentCode;
+
+    private String corpName;
+
+    private String corpType;
+
+    private String corpSquareLogoUrl;
+
+    private String corpUserMax;
+
+    private String corpFullName;
+
+    private String subjectType;
+
+    private Date verifiedEndTime;
+
+    private String corpWxqrcode;
+
+    private String corpScale;
+
+    private String corpIndustry;
+
+    private String corpSubIndustry;
+
+    private String location;
+
+    private String authInfo;
+
+    private String agent;
+
+    private String agentid;
+
+    private String appid;
+
+    private String name;
+
+    private String squareLogoUrl;
+
+    private String roundLogoUrl;
+
+    private Integer level;
+
+    private Integer bindFlag;
+
+    private Integer statusFlag;
+    
+    private Integer contactFlag;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId == null ? null : wxEnterpriseId.trim();
+    }
+
+    public String getCorpid() {
+        return corpid;
+    }
+
+    public void setCorpid(String corpid) {
+        this.corpid = corpid == null ? null : corpid.trim();
+    }
+
+    public String getPermanentCode() {
+        return permanentCode;
+    }
+
+    public void setPermanentCode(String permanentCode) {
+        this.permanentCode = permanentCode == null ? null : permanentCode.trim();
+    }
+
+    public String getCorpName() {
+        return corpName;
+    }
+
+    public void setCorpName(String corpName) {
+        this.corpName = corpName == null ? null : corpName.trim();
+    }
+
+    public String getCorpType() {
+        return corpType;
+    }
+
+    public void setCorpType(String corpType) {
+        this.corpType = corpType == null ? null : corpType.trim();
+    }
+
+    public String getCorpSquareLogoUrl() {
+        return corpSquareLogoUrl;
+    }
+
+    public void setCorpSquareLogoUrl(String corpSquareLogoUrl) {
+        this.corpSquareLogoUrl = corpSquareLogoUrl == null ? null : corpSquareLogoUrl.trim();
+    }
+
+    public String getCorpUserMax() {
+        return corpUserMax;
+    }
+
+    public void setCorpUserMax(String corpUserMax) {
+        this.corpUserMax = corpUserMax == null ? null : corpUserMax.trim();
+    }
+
+    public String getCorpFullName() {
+        return corpFullName;
+    }
+
+    public void setCorpFullName(String corpFullName) {
+        this.corpFullName = corpFullName == null ? null : corpFullName.trim();
+    }
+
+    public String getSubjectType() {
+        return subjectType;
+    }
+
+    public void setSubjectType(String subjectType) {
+        this.subjectType = subjectType == null ? null : subjectType.trim();
+    }
+
+    public Date getVerifiedEndTime() {
+        return verifiedEndTime;
+    }
+
+    public void setVerifiedEndTime(Date verifiedEndTime) {
+        this.verifiedEndTime = verifiedEndTime;
+    }
+
+    public String getCorpWxqrcode() {
+        return corpWxqrcode;
+    }
+
+    public void setCorpWxqrcode(String corpWxqrcode) {
+        this.corpWxqrcode = corpWxqrcode == null ? null : corpWxqrcode.trim();
+    }
+
+    public String getCorpScale() {
+        return corpScale;
+    }
+
+    public void setCorpScale(String corpScale) {
+        this.corpScale = corpScale == null ? null : corpScale.trim();
+    }
+
+    public String getCorpIndustry() {
+        return corpIndustry;
+    }
+
+    public void setCorpIndustry(String corpIndustry) {
+        this.corpIndustry = corpIndustry == null ? null : corpIndustry.trim();
+    }
+
+    public String getCorpSubIndustry() {
+        return corpSubIndustry;
+    }
+
+    public void setCorpSubIndustry(String corpSubIndustry) {
+        this.corpSubIndustry = corpSubIndustry == null ? null : corpSubIndustry.trim();
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location == null ? null : location.trim();
+    }
+
+    public String getAuthInfo() {
+        return authInfo;
+    }
+
+    public void setAuthInfo(String authInfo) {
+        this.authInfo = authInfo == null ? null : authInfo.trim();
+    }
+
+    public String getAgent() {
+        return agent;
+    }
+
+    public void setAgent(String agent) {
+        this.agent = agent == null ? null : agent.trim();
+    }
+
+    public String getAgentid() {
+        return agentid;
+    }
+
+    public void setAgentid(String agentid) {
+        this.agentid = agentid == null ? null : agentid.trim();
+    }
+
+    public String getAppid() {
+        return appid;
+    }
+
+    public void setAppid(String appid) {
+        this.appid = appid == null ? null : appid.trim();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public String getSquareLogoUrl() {
+        return squareLogoUrl;
+    }
+
+    public void setSquareLogoUrl(String squareLogoUrl) {
+        this.squareLogoUrl = squareLogoUrl == null ? null : squareLogoUrl.trim();
+    }
+
+    public String getRoundLogoUrl() {
+        return roundLogoUrl;
+    }
+
+    public void setRoundLogoUrl(String roundLogoUrl) {
+        this.roundLogoUrl = roundLogoUrl == null ? null : roundLogoUrl.trim();
+    }
+
+    public Integer getLevel() {
+        return level;
+    }
+
+    public void setLevel(Integer level) {
+        this.level = level;
+    }
+
+    public Integer getBindFlag() {
+        return bindFlag;
+    }
+
+    public void setBindFlag(Integer bindFlag) {
+        this.bindFlag = bindFlag;
+    }
+
+    public Integer getStatusFlag() {
+        return statusFlag;
+    }
+
+    public void setStatusFlag(Integer statusFlag) {
+        this.statusFlag = statusFlag;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+	public Integer getContactFlag() {
+		return contactFlag;
+	}
+
+	public void setContactFlag(Integer contactFlag) {
+		this.contactFlag = contactFlag;
+	}
+
+    
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/YwWxEnterpriseDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class YwWxEnterpriseDTO implements Serializable {
+	
+	private String wxEnterpriseId;
+
+    private String corpid;
+
+    private String corpName;
+
+    private String name;
+
+    private Integer bindFlag;
+
+    private Integer statusFlag;
+    //gic通讯录助手
+    private String contactFlag;
+    //订购状态
+    private String buyStatus;
+    //订购时间
+    private Date  buyDate;
+    //版本号
+    private String version;
+
+    private String corpSquareLogoUrl;
+    //关联商户数量
+    private Integer relationCount=0;
+
+    
+    public static long getSerialversionuid() {
+		return serialVersionUID;
+	}
+
+	public Integer getRelationCount() {
+		return relationCount;
+	}
+
+	public void setRelationCount(Integer relationCount) {
+		this.relationCount = relationCount;
+	}
+
+	private static final long serialVersionUID = 1L;
+
+	public String getCorpSquareLogoUrl() {
+		return corpSquareLogoUrl;
+	}
+
+	public void setCorpSquareLogoUrl(String corpSquareLogoUrl) {
+		this.corpSquareLogoUrl = corpSquareLogoUrl;
+	}
+
+	public String getWxEnterpriseId() {
+		return wxEnterpriseId;
+	}
+
+	public void setWxEnterpriseId(String wxEnterpriseId) {
+		this.wxEnterpriseId = wxEnterpriseId;
+	}
+
+	public String getCorpid() {
+		return corpid;
+	}
+
+	public void setCorpid(String corpid) {
+		this.corpid = corpid;
+	}
+
+	public String getCorpName() {
+		return corpName;
+	}
+
+	public void setCorpName(String corpName) {
+		this.corpName = corpName;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Integer getBindFlag() {
+		return bindFlag;
+	}
+
+	public void setBindFlag(Integer bindFlag) {
+		this.bindFlag = bindFlag;
+	}
+
+	public Integer getStatusFlag() {
+		return statusFlag;
+	}
+
+	public void setStatusFlag(Integer statusFlag) {
+		this.statusFlag = statusFlag;
+	}
+
+
+	public String getContactFlag() {
+		return contactFlag;
+	}
+
+	public void setContactFlag(String contactFlag) {
+		this.contactFlag = contactFlag;
+	}
+
+	public String getBuyStatus() {
+		return buyStatus;
+	}
+
+	public void setBuyStatus(String buyStatus) {
+		this.buyStatus = buyStatus;
+	}
+
+	public Date getBuyDate() {
+		return buyDate;
+	}
+
+	public void setBuyDate(Date buyDate) {
+		this.buyDate = buyDate;
+	}
+
+	public String getVersion() {
+		return version;
+	}
+
+	public void setVersion(String version) {
+		this.version = version;
+	}
+
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/GicDataType.java

+package com.gic.haoban.manage.api.enums;
+
+/**
+ * Created by tgs on 2020/2/20.
+ */
+public enum GicDataType {
+    DEPARTMENT(1, "企业部门"),
+    GROUP(2,"门店分组"),
+    STORE(3,"门店");
+
+    GicDataType(Integer type, String desc){
+        this.code = type;
+        this.desc = desc;
+    }
+
+    private int code;
+    private String desc;
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/GicEditType.java

+package com.gic.haoban.manage.api.enums;
+
+/**
+ * Created by tgs on 2020/2/20.
+ */
+public enum GicEditType {
+    ADD(1, "新增"),
+    UPDATE(2,"修改"),
+    DELETE(3,"删除");
+
+    GicEditType(Integer type, String desc){
+        this.code = type;
+        this.desc = desc;
+    }
+
+    private int code;
+    private String desc;
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/StoreFieldEnum.java

+package com.gic.haoban.manage.api.enums;
+
+/**
+ * 门店枚举
+ *
+ * @author huang
+ */
+public enum StoreFieldEnum {
+
+	//门店名称
+    STORE_NAME("1"),
+	//门店面积
+    STORE_AREA("2"),
+	//联系电话
+    CONACTS_PHONE("3"),
+    //营业时间
+    BUSINESS_TIME_STRING("4"),
+    //门店地址
+    STORE_ADDRESS("5"),
+    //门店图片
+    STORE_IMAG("6");
+    /**
+     * 类型
+     */
+    private String value;
+
+    StoreFieldEnum(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/WxEditType.java

+package com.gic.haoban.manage.api.enums;
+
+/**
+ * Created by tgs on 2020/2/20.
+ */
+public enum WxEditType {
+    ADDDEPART("create_party", "创建部门"),
+    UPDATEDEPART("update_party", "更新部门"),
+    DELETEDEPART("delete_party", "删除部门"),
+    ADDUSER("create_user", "新增用户"),
+    UPDATEUSER("update_user", "更新用户"),
+    DELETEUSER("delete_user", "删除用户");
+
+    WxEditType(String type, String desc){
+        this.code = type;
+        this.desc = desc;
+    }
+
+    private String code;
+    private String desc;
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/ApplicationApiService.java

+package com.gic.haoban.manage.api.service;
+
+import java.util.List;
+
+import com.gic.haoban.manage.api.dto.ApplicationDTO;
+
+public interface ApplicationApiService {
+
+	List<ApplicationDTO> listApplication();
+
+	
+
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/ApplicationSettingApiService.java

+package com.gic.haoban.manage.api.service;
+
+import com.gic.haoban.manage.api.dto.ApplicationSettingDTO;
+
+/**
+ * Created by tgs on 2020/2/9.
+ */
+public interface ApplicationSettingApiService {
+	
+	void saveSetting(String wxEnterpriseId,String applicationId, int openFlag);
+
+	ApplicationSettingDTO findSettingByWxEnterpriseIdAndApplicationId(String wxEnterpriseId,String applicationId);
+
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/AuditApiService.java

+package com.gic.haoban.manage.api.service;
+
+import java.util.List;
+
+import com.gic.api.base.commons.Page;
+import com.gic.haoban.base.api.common.BasePageInfo;
+import com.gic.haoban.manage.api.dto.AuditDTO;
+
+
+/**
+ * Created by tgs on 2020/2/9.
+ */
+public interface AuditApiService {
+	
+	Page<AuditDTO> page(Integer auditType, String search,String wxEnterpriseId,String enterpriseId,Integer auditStatus,BasePageInfo pageInfo);
+	
+	void audit(String auditId);
+	
+	void refuse(String auditId,String auditReason);
+	
+	int save(Integer auditType,String wxEnterpriseId,String enterpriseId,String commitStaffId,String commitStoreId,String changeField,String oldValue,String newValue);
+	
+	void editStoreInfo(String storeId,String changeField,String oldValue, String newValue);
+	
+	List<AuditDTO> listByStoreId(String storeId);
+
+	AuditDTO findByStoreIdAndChangeField(String storeId,String changeField);
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/AuditSettingApiService.java

+package com.gic.haoban.manage.api.service;
+
+import com.gic.haoban.manage.api.dto.AuditSettingDTO;
+
+/**
+ * Created by tgs on 2020/2/9.
+ */
+public interface AuditSettingApiService {
+	
+	void saveSetting(String wxEnterpriseId , int auditFlag);
+
+	AuditSettingDTO findSettingByWxEnterpriseId(String wxEnterpriseId);
+
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/BindApiService.java

+package com.gic.haoban.manage.api.service;
+
+public interface BindApiService {
+
+	void clerkManagerTranfer(String departmentId,String fromClerkCode,String toStaffDepartmentRelatedId);
+
+	void clerkUnbind(String departmentId,String fromClerkCode,String toStaffId,String manager);
+
+	void clerkSingleUnbind(String fromClerkCode,String departmentId);
+	
+	void staffBind(String departmentId,String fromClerkCode,String fromStaffDepartmentRelatedId);
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/DepartmentApiService.java

+package com.gic.haoban.manage.api.service;
+
+import java.util.List;
+
+import com.gic.api.base.commons.Page;
+import com.gic.haoban.base.api.common.BasePageInfo;
+import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.api.dto.DepartmentDTO;
+
+public interface DepartmentApiService {
+
+	List<DepartmentDTO> listByParentId(String parentId);
+	/**
+	 * 查门店/部门列表
+	 * @param parentId
+	 * @return
+	 */
+	List<DepartmentDTO> listByDepartmentIds(List<String> departmentIds,int storeFlag);
+	/**
+	 * 查门店列表
+	 * @param relatedIds
+	 * @return
+	 */
+	List<DepartmentDTO> listByRelatedIds(List<String> relatedIds);
+	/**
+	 * 查wxEnterprise下所有门店
+	 * @param wxEnterpriseId
+	 * @return
+	 */
+	List<DepartmentDTO> listStoreByWxEnterpriseId(String wxEnterpriseId);
+	
+	/**
+	 * 查wxEnterprise下所有门店(溢出门店)
+	 * @param wxEnterpriseId
+	 * @return
+	 */
+	Page<DepartmentDTO> pageFullStoreByWxEnterpriseId(
+			String wxEnterpriseId, String search,List<String> storeId,int count,BasePageInfo pageInfo);
+	/**
+	 * 根据部门id查询部门
+	 * @param departmentId
+	 * @return
+	 */
+	DepartmentDTO selectById(String departmentId);
+	/**
+	 * 新增部门
+	 * @param department
+	 * @return
+	 */
+	HaobanResponse add(DepartmentDTO department);
+	/**
+	 * 修改部门
+	 * @param department
+	 * @return
+	 */
+	HaobanResponse edit(DepartmentDTO department);
+	/**
+	 * 删除部门
+	 * @param departmentId
+	 * @return
+	 */
+	HaobanResponse del(String departmentId);
+	/**
+	 * 根据关联id 获取部门
+	 * @param departId
+	 * @return
+	 */
+	DepartmentDTO selectByRelatedId(String departId);
+	/**
+	 * 放入回收站
+	 * @param departmentId
+	 * @return
+	 */
+	HaobanResponse recycle(String departmentId);
+	
+	/**
+	 * 根据参数查询
+	 * @param pageInfo
+	 * @param wxEnterpriseId
+	 * @param keyword
+	 * @param storeFlag
+	 * @param recycleFlag
+	 * @return
+	 */
+	Page<DepartmentDTO> pageDepartmentByParams(BasePageInfo pageInfo, String wxEnterpriseId, String keyword,
+			Integer storeFlag, Integer recycleFlag);
+	/**
+	 * 回收站恢复
+	 * @param departmentId
+	 */
+	HaobanResponse repairRecycle(String departmentId,String parentId);
+	/**
+	 * 获取根节点
+	 * @param wxEnterpriseId
+	 * @return
+	 */
+	DepartmentDTO getRootByEnterpriseId(String wxEnterpriseId);
+	/**
+	 * gic同步
+	 * @param fieldListString
+	 */
+	void syncGicStore(String fieldListString);
+	/**
+	 * gic同步部门
+	 * @param fieldListString
+	 */
+	void syncGicDepartment(String fieldListString);
+	/**
+	 * 分页查询
+	 * @param parentId
+	 * @param pageInfo
+	 * @return
+	 */
+	Page<DepartmentDTO> pageByParentId(String parentId,String keyword, BasePageInfo pageInfo);
+	/**
+	 * 根据链查询子部门和自己
+	 * @param chainId
+	 * @return
+	 */
+	List<DepartmentDTO> listByChainId(String chainId,String wxEnterpriseId);
+
+
+	void initwxDepartment(String corpid, String suiteid, String wxEnterpriseId);
+	/**
+	 * 回收站的数量
+	 * @param wxEnterpriseId
+	 * @return
+	 */
+	Integer departmentRecycleCount(String wxEnterpriseId);
+	/**
+	 * 微信回调删除部门
+	 * @param departmentId
+	 * @return
+	 */
+	HaobanResponse wxCallBackDel(String departmentId);
+	/**
+	 * 微信回调放回收站
+	 * @param departmentId
+	 * @return
+	 */
+	HaobanResponse wxCallBackrecycle(String departmentId);
+	/**
+	 * 判断节点下面有没有子节点
+	 * @param departmentId
+	 * @return
+	 */
+	boolean hasSonNode(String departmentId);
+	/**
+	 * gic回调删除部门
+	 * @param departmentId
+	 */
+	HaobanResponse gicDel(String departmentId);
+	
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/DictApiService.java

+package com.gic.haoban.manage.api.service;
+
+import com.gic.api.base.commons.Page;
+import com.gic.haoban.base.api.common.BasePageInfo;
+import com.gic.haoban.manage.api.dto.DictDTO;
+
+/**
+ * Created by tgs on 2020/2/9.
+ */
+public interface DictApiService {
+	void saveDict(DictDTO dto);
+
+	DictDTO findOneDict(String dictId);
+
+	Page<DictDTO> pageList(BasePageInfo pageInfo);
+	
+	void deleteOne(String dictId);
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MemberUnionidRelatedApiService.java

+package com.gic.haoban.manage.api.service;
+
+import java.util.List;
+
+import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
+
+public interface MemberUnionidRelatedApiService {
+
+	MemberUnionidRelatedDTO getByUnionId(String staffId, String memberId);
+	
+	String addMemberUnionidRelated(MemberUnionidRelatedDTO dto);
+	
+	void delMemberUnionidRelated(MemberUnionidRelatedDTO dto);
+
+	MemberUnionidRelatedDTO getByMemberId(String staffId, String memberId);
+
+	List<MemberUnionidRelatedDTO> getByWxUserIdAndWxEnterpriseId(String wxUserId, String wxEnterpriseId);
+
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MessageApiService.java

+package com.gic.haoban.manage.api.service;
+
+import com.gic.haoban.manage.api.dto.GicMessageDTO;
+import com.gic.haoban.manage.api.dto.QywxCallBackDTO;
+
+/**
+ * Created by tgs on 2020/2/20.
+ */
+public interface MessageApiService {
+    /**接收企业微信的推送消息*/
+    void gicMessageReceive(GicMessageDTO gicMessageDTO);
+
+    /**接收企业微信的推送消息*/
+    void wxMessageReceive(QywxCallBackDTO qywxCallBackDTO);
+
+    /**
+     * 队列消费gic推送数据
+     * @param param
+     */
+    void dealGicMessage(String param);
+
+    /**
+     * 队列消费企业微信推送数据
+     * @param param
+     */
+    void dealWxMessage(String param);
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffApiService.java

+package com.gic.haoban.manage.api.service;
+
+import java.util.List;
+
+import com.gic.api.base.commons.Page;
+import com.gic.haoban.base.api.common.BasePageInfo;
+import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.api.dto.StaffDTO;
+import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
+import com.gic.haoban.manage.api.dto.UserLoginLogDTO;
+
+public interface StaffApiService {
+
+	public StaffDTO selectById(String staffId);
+	
+	public StaffDTO selectSuperByWxEnterpriseId(String wxEnterpriseId);
+
+	public List<StaffDTO> listByIds(List<String> staffIds);
+
+	
+	public StaffDTO selectByNationcodeAndPhoneNumber(String wxEnterpriseId,String nationcode, String phoneNumber);
+
+	public HaobanResponse add(StaffDTO staff, String departmentIds);
+
+	public List<StaffDepartmentRelatedDTO> listStaffDepartmentByStaffId(String staffId);
+
+	public Page<StaffDTO> pageStaff(String departmentId, Integer activeFlag, String keyword, BasePageInfo pageInfo);
+
+	public void del(String staffDepartmentStaffRelatedId);
+
+	public void wxGetAdd(String userId,String wxEnterpriseId);
+
+	public void staffEdit(StaffDTO staffDTO, String departmentIds);
+
+	public void syscGicClerk(String fieldListString);
+
+	public StaffDTO selectByUserIdAndEnterpriseId(String userId,String wxEnterpriseId);
+
+	public StaffDepartmentRelatedDTO getDepartmentIdAndStaffId(String departmentId, String staffId);
+
+	public int countByDepartmentId(String departmentId);
+
+	public void syncGicClerk(String fieldListString);
+
+	StaffDepartmentRelatedDTO getDepartmentIdAndCode(String departmentId, String code);
+
+	void initWxUser(String corpid, String suiteid, String wxEnterpriseId, Integer wxDepartmentId);
+
+	public List<String> listUnBindClerk(String storeId);
+
+	public void cleanGicClerk(String clerkCode, String departmentId);
+
+	public String insertUserLoginLog(UserLoginLogDTO userLoginLogDTO);
+
+	public int countByDepartmentIds(List<String> departmentIds);
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffDepartmentRelatedApiService.java

+package com.gic.haoban.manage.api.service;
+
+import java.util.List;
+
+import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
+
+public interface StaffDepartmentRelatedApiService {
+
+    List<StaffDepartmentRelatedDTO> listByDepartmentId(String departmentId);
+
+    List<StaffDepartmentRelatedDTO> listByStaffId(String staffId);
+
+    void updateById(StaffDepartmentRelatedDTO dto);
+
+
+    /**
+     * 根据员工与部门的关联关系查询
+     *
+     * @param staffDepartmentRelatedId
+     * @return
+     */
+    StaffDepartmentRelatedDTO getByStaffDepartmentRelatedId(String staffDepartmentRelatedId);
+
+    void deleteCode(StaffDepartmentRelatedDTO dto);
+
+	StaffDepartmentRelatedDTO getOneByClerkCodeAndDepartmentId(String clerkCode, String departmentId);
+
+	StaffDepartmentRelatedDTO getOneByStaffIdAndDepartmentId(String staffId, String departmentId);
+
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxApplicationApiService.java

+package com.gic.haoban.manage.api.service;
+
+import com.gic.haoban.manage.api.dto.WxApplicationDTO;
+
+/**
+ * Created by tgs on 2020/2/22.
+ */
+public interface WxApplicationApiService {
+    /**
+     * 绑定通讯录应用
+     * @param dto
+     */
+    void addSuite(WxApplicationDTO dto);
+
+    /**
+     * 取消应用授权，暂时只是删除wxapplication应用绑定
+     * @param corpId
+     * @param suiteId
+     */
+    void cancelSuite(String corpId, String suiteId);
+    
+    /**
+     * 
+     * @param wxEnterpriseId
+     * @param type
+     * @return
+     */
+	WxApplicationDTO selectByWxEnterpriseIdAndApplicationType(String wxEnterpriseId, int type);
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxEnterpriseApiService.java

+package com.gic.haoban.manage.api.service;
+
+import java.util.List;
+
+import com.gic.haoban.base.api.common.BasePageInfo;
+import com.gic.haoban.manage.api.dto.QywxCorpInfoSimpleDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
+import com.gic.haoban.manage.api.dto.YwWxEnterpriseDTO;
+import com.github.pagehelper.Page;
+
+public interface WxEnterpriseApiService {
+
+	/**
+	 * 接收企业回调信息
+	 * @param dto
+	 */
+	void callbackReviceEnterprise(QywxCorpInfoSimpleDTO dto);
+	/**
+	 * 运维后台获取微信企业id列表
+	 * @return
+	 */
+	com.gic.api.base.commons.Page<YwWxEnterpriseDTO> list(BasePageInfo pageInfo,String keyword,Integer gicContactFlag,String version);
+	/**
+	 * 获取一个
+	 * @param wxEnterpriseId
+	 * @return
+	 */
+	WxEnterpriseDTO getOne(String wxEnterpriseId);
+
+	WxEnterpriseDTO getEnterpriseBycorpId(String corpId);
+	/**
+	 * 更新企业
+	 * @param enterpriseDTO
+	 */
+	void update(WxEnterpriseDTO enterpriseDTO);
+	
+	List<YwWxEnterpriseDTO> listAll();
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxEnterpriseRelatedApiService.java

+package com.gic.haoban.manage.api.service;
+
+import java.util.List;
+
+import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
+
+public interface WxEnterpriseRelatedApiService {
+	List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(String wxEnterpriseId);
+	
+	int  wxEnterpriseBind(String enterpriseId,String wxEnterpriseId,String version);
+	
+	String getGicEnterpriseIdByEnterpriseRelatedId(String wxEnterpriseRelatedId);
+
+	boolean enterpriseUseNew(String enterpriseId);
+
+	EnterpriseDetailDTO getByEnterpriseId(String enterpriseId);
+
+	List<EnterpriseDetailDTO> queryAllHasGicEnterpriseId();
+}

haoban-manage3-operation-web/pom.xml

+<?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>
+		<groupId>com.gic</groupId>
+		<artifactId>gic-pom-base</artifactId>
+		<version>3.0-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>haoban-manage3-operation-web</artifactId>
+	<version>${libraryVersion}</version>
+	<packaging>war</packaging>
+
+	<name>haoban-manage3-operation-web Maven Webapp</name>
+	<!-- FIXME change it to the project's website -->
+	<url>http://www.example.com</url>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<haobanService>1.0-SNAPSHOT</haobanService>
+		<commonVersion>3.0-SNAPSHOT</commonVersion>
+		<libraryVersion>1.0-SNAPSHOT</libraryVersion>
+	</properties>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-framework-bom</artifactId>
+				<version>4.2.4.RELEASE</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<dependency>
+				<groupId>com.alibaba</groupId>
+				<artifactId>fastjson</artifactId>
+				<version>1.2.47</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.11</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.session</groupId>
+			<artifactId>spring-session-data-redis</artifactId>
+			<version>1.2.1.RELEASE</version>
+		</dependency>
+		<dependency>
+			<groupId>redis.clients</groupId>
+			<artifactId>jedis</artifactId>
+			<version>2.8.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.gic</groupId>
+			<artifactId>gic-dict-api</artifactId>
+			<version>${gic-dict-api}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.gic</groupId>
+			<artifactId>gic-commons</artifactId>
+			<version>${gic-commons}</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>httpclient</artifactId>
+					<groupId>org.apache.httpcomponents</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>httpcore</artifactId>
+					<groupId>org.apache.httpcomponents</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>spring-beans</artifactId>
+					<groupId>org.springframework</groupId>
+				</exclusion>
+				
+				<exclusion>
+					<artifactId>slf4j-api</artifactId>
+					<groupId>org.slf4j</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>com.gic</groupId>
+			<artifactId>gic-platform-config</artifactId>
+			<version>${gic-platform-config}</version>
+		</dependency>
+		<dependency>
+			<groupId>net.sourceforge.jexcelapi</groupId>
+			<artifactId>jxl</artifactId>
+			<version>2.6.12</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi</artifactId>
+			<version>3.9</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-ooxml</artifactId>
+			<version>3.9</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-ooxml-schemas</artifactId>
+			<version>3.9</version>
+		</dependency>
+		<dependency>
+			<groupId>com.gic</groupId>
+			<artifactId>haoban-contacts-api</artifactId>
+			<version>${haoban-contacts-api}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.gic</groupId>
+			<artifactId>haoban-manage3-api</artifactId>
+			<version>${haoban-manage3-api}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.gic</groupId>
+			<artifactId>haoban-manage-api</artifactId>
+			<version>${haoban-manage-api}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.gic</groupId>
+			<artifactId>haoban-contacts-manage-api</artifactId>
+			<version>${haoban-contacts-manage-api}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.gic</groupId>
+			<artifactId>haoban-common</artifactId>
+			<version>${haoban-common}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.gic</groupId>
+			<artifactId>haoban-auth-api</artifactId>
+			<version>${haoban-auth-api}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.gic</groupId>
+			<artifactId>haoban-operation-api</artifactId>
+			<version>${haoban-operation-api}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.gic</groupId>
+			<artifactId>haoban-config</artifactId>
+			<version>${haoban-config}</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>3.1.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.gic</groupId>
+			<artifactId>gic-thirdparty-api</artifactId>
+			<version>${gic-thirdparty-api}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.gic</groupId>
+			<artifactId>haoban-message-api</artifactId>
+			<version>${haoban-message-api}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.gic</groupId>
+			<artifactId>haoban-app-announcement-api</artifactId>
+			<version>${haoban-app-announcement-api}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.gic</groupId>
+			<artifactId>haoban-communicate-api</artifactId>
+			<version>${haoban-communicate-api}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.gic</groupId>
+			<artifactId>haoban-mobile-app-api</artifactId>
+			<version>${haoban-mobile-app-api}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.gic</groupId>
+			<artifactId>gic-thirdparty-sdk</artifactId>
+			<version>${gic-thirdparty-sdk}</version>
+		</dependency>
+		
+		
+		<dependency>
+			<groupId>com.gic.operation</groupId>
+			<artifactId>gic-operation-api</artifactId>
+			<version>${gic-operation-api}</version>
+		</dependency>
+		<dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-enterprise-api</artifactId>
+            <version>${gic-enterprise-api}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-clerk-api</artifactId>
+            <version>${gic-clerk-api}</version>
+        </dependency>
+        
+        <dependency>
+			<groupId>com.gic</groupId>
+			<artifactId>gic-quartz-api</artifactId>
+			<version>${gic-quartz-api}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<finalName>haoban-manage3-operation-web</finalName>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<encoding>UTF-8</encoding>
+					<source>1.8</source>
+					<target>1.8</target>
+					<compilerArgs>
+						<arg>-parameters</arg>
+					</compilerArgs>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<type>jar</type>
+							<includeTypes>jar</includeTypes>
+							<outputDirectory>
+								${project.build.directory}/lib
+							</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-maven-plugin</artifactId>
+				<version>9.4.12.RC2</version>
+				<configuration>
+					<stopKey>gic-mall</stopKey>
+					<httpConnector>
+						<port>802</port>
+					</httpConnector>
+					<webApp>
+						<contextPath>/</contextPath>
+					</webApp>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/auth/AuthRequestUtil.java

+package com.gic.haoban.manage.web.auth;
+
+import com.gic.redis.data.util.RedisUtil;
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Created 2018/7/26.
+ *
+ * @author hua
+ */
+public class AuthRequestUtil {
+
+    private static final Logger logger = LoggerFactory.getLogger(AuthRequestUtil.class);
+
+    public static final String REDIS_LOGIN_USER_TOKEN_PREFIX = "GIC:HAOBAN:HAOBAN_MOBILE_APP:LOGIN_USER:";
+    public static final String REDIS_FAKE_LOGIN_FLAG_PREFIX = "GIC:HAOBAN:HAOBAN_MOBILE_APP:FAKE_LOGIN_TOKEN:";
+    public static String LOGIN_SESSION_KEY = "HAOBAN:LOGINUSER";
+
+    public static Object getSessionUser() {
+        return getSession().getAttribute(LOGIN_SESSION_KEY);
+    }
+
+    public static void setSessionUser(Object obj) {
+        getSession().setAttribute(LOGIN_SESSION_KEY, obj);
+    }
+    
+    public static void delSessionUser() {
+        getSession().removeAttribute(LOGIN_SESSION_KEY);
+    }
+
+    public static Object getAppLoginUser() {
+        String token = getRequest().getHeader("token");
+        logger.info("token1111111111=" + token);
+        if (StringUtils.isBlank(token)) {
+            return null;
+        }
+        Object cache = RedisUtil.getCache(token);
+        return cache;
+    }
+
+    private static void setLoginUserLastToken(String token, Object obj) {
+        try {
+            String userId = BeanUtils.getProperty(obj, "user.userId");
+            if (StringUtils.isNotBlank(userId) && StringUtils.isNotBlank(token)) {
+                RedisUtil.setCache(REDIS_LOGIN_USER_TOKEN_PREFIX + userId, token, 31L, TimeUnit.DAYS);
+            }
+        } catch (Exception e) {
+            logger.error(e.getMessage());
+        }
+    }
+
+    /**
+     * 是否为用户最后一次登录token
+     *
+     * @param token
+     * @param userId
+     * @return
+     */
+    public static boolean isLoginUserLastToken(String token, String userId) {
+        Object lastUserLoginToken = RedisUtil.getCache(REDIS_LOGIN_USER_TOKEN_PREFIX + userId);
+        // 如果用户最后一次登录token不符则返回false
+        return !(lastUserLoginToken instanceof CharSequence) || StringUtils.equals(token, (CharSequence) lastUserLoginToken);
+    }
+
+    private static void setFakeLoginFlag(String token) {
+        if (StringUtils.isNotBlank(token)) {
+            RedisUtil.setCache(REDIS_FAKE_LOGIN_FLAG_PREFIX + token, new Date(), 30L, TimeUnit.DAYS);
+        }
+    }
+
+    /**
+     * 是否为伪登录token
+     *
+     * @param token
+     * @return
+     */
+    public static boolean isFakeLoginToken(String token) {
+        return StringUtils.isNotBlank(token) && RedisUtil.getCache(REDIS_FAKE_LOGIN_FLAG_PREFIX + token) != null;
+    }
+
+    public static void setAppLoginUser(String token, Object obj) {
+        RedisUtil.setCache(token, obj, 30L, TimeUnit.DAYS);
+        getResponse().setHeader("token", token);
+        setLoginUserLastToken(token, obj);
+    }
+
+    public static void setAppFakeLoginUser(String token, Object obj) {
+        RedisUtil.setCache(token, obj, 30L, TimeUnit.DAYS);
+        getResponse().setHeader("token", token);
+        setFakeLoginFlag(token);
+    }
+
+    public static void delToken() {
+        String token = getRequest().getHeader("token");
+        RedisUtil.delCache(token);
+    }
+
+    public static void setAppLoginUser(Object obj) {
+        String token = getRequest().getHeader("token");
+        RedisUtil.setCache(token, obj, 30L, TimeUnit.DAYS);
+        getResponse().setHeader("token", token);
+        setLoginUserLastToken(token, obj);
+    }
+    public static void setAppFakeLoginUser(Object obj) {
+        String token = getRequest().getHeader("token");
+        RedisUtil.setCache(token, obj, 30L, TimeUnit.DAYS);
+        getResponse().setHeader("token", token);
+    }
+    public static HttpSession getSession() {
+        HttpSession session = null;
+        try {
+            session = getRequest().getSession();
+        } catch (Exception e) {
+        }
+        return session;
+    }
+
+    public static HttpServletRequest getRequest() {
+        ServletRequestAttributes attrs = (ServletRequestAttributes) RequestContextHolder
+                .getRequestAttributes();
+        return attrs.getRequest();
+    }
+
+    public static HttpServletResponse getResponse() {
+        ServletRequestAttributes attrs = (ServletRequestAttributes) RequestContextHolder
+                .getRequestAttributes();
+        return attrs.getResponse();
+    }
+}

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/DictController.java

+package com.gic.haoban.manage.web.controller;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.gic.api.base.commons.Page;
+import com.gic.haoban.base.api.common.BasePageInfo;
+import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.api.dto.DictDTO;
+import com.gic.haoban.manage.api.service.DictApiService;
+import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+
+@RestController
+public class DictController extends WebBaseController{
+    private static final String LOGIN_URL = "/haoban-manage3-web/yw-login";
+	private static Logger logger  = LoggerFactory.getLogger(DictController.class);
+
+	@Autowired
+	private DictApiService dictApiService;
+	//获取字典列表
+	@RequestMapping("get-dict-list")
+	public HaobanResponse getDictList(BasePageInfo pageInfo) {
+		Page<DictDTO> page = dictApiService.pageList(pageInfo);
+		return resultResponse(HaoBanErrCode.ERR_1,page);
+	}
+	//保存字典
+	@RequestMapping("save-dict")
+	public HaobanResponse saveDict(DictDTO dto) {
+		dictApiService.saveDict(dto);
+		return resultResponse(HaoBanErrCode.ERR_1);
+	}
+	//查看字典详情
+	@RequestMapping("find-dict-detail")
+	public HaobanResponse findDictDetail(String  dictId) {
+		DictDTO dictDTO = dictApiService.findOneDict(dictId);
+		return resultResponse(HaoBanErrCode.ERR_1,dictDTO);
+	}
+	//删除字典
+	@RequestMapping("del-dict")
+	public HaobanResponse deleteDict(String  dictId) {
+		dictApiService.deleteOne(dictId);
+		return resultResponse(HaoBanErrCode.ERR_1);
+	}
+}

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/EnterpriseController.java

+package com.gic.haoban.manage.web.controller;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import cn.hutool.core.collection.CollectionUtil;
+
+import com.gic.api.base.commons.Page;
+import com.gic.commons.util.GlobalVar;
+import com.gic.enterprise.api.dto.StoreDTO;
+import com.gic.enterprise.api.service.StoreService;
+import com.gic.haoban.base.api.common.BasePageInfo;
+import com.gic.haoban.base.api.common.PageResult;
+import com.gic.haoban.common.utils.EntityUtil;
+import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.api.dto.DepartmentDTO;
+import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
+import com.gic.haoban.manage.api.dto.YwWxEnterpriseDTO;
+import com.gic.haoban.manage.api.service.DepartmentApiService;
+import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
+import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
+import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+import com.gic.haoban.manage.web.vo.EnterpriseDetailVo;
+
+@RestController
+public class EnterpriseController extends WebBaseController{
+    private static final String LOGIN_URL = "/haoban-manage3-web/yw-login";
+	private static Logger logger  = LoggerFactory.getLogger(EnterpriseController.class);
+
+	@Autowired
+	private WxEnterpriseApiService wxEnterpriseApiService;
+	@Autowired
+	private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService;
+	@Autowired
+	private DepartmentApiService departmentApiService;
+	@Autowired
+	private StoreService storeService;
+	//企业列表
+	@RequestMapping("wx-enterprise-list")
+	public HaobanResponse wxEnterpriseList(BasePageInfo pageInfo,String keyword,Integer gicContactHelper,String version) {
+		Page<YwWxEnterpriseDTO> page = wxEnterpriseApiService.list(pageInfo,keyword,gicContactHelper,version);
+		PageResult<YwWxEnterpriseDTO> pageVo = new PageResult<>();
+		List<YwWxEnterpriseDTO> list = EntityUtil.changeEntityListByJSON(YwWxEnterpriseDTO.class, page.getResult());
+		for(YwWxEnterpriseDTO dto : list){
+			dto.setVersion("3.0");
+			dto.setBuyDate(new Date());
+			dto.setBuyStatus("1");
+			List<EnterpriseDetailDTO> counts = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(dto.getWxEnterpriseId());
+			dto.setRelationCount(counts.size());
+		}
+		pageVo.setList(list);
+        pageVo.setPageNum(page.getCurrentPage());
+        pageVo.setPages(page.getPages());
+        pageVo.setPageSize(page.getPageSize());
+        pageVo.setTotal(page.getTotalCount());
+		return resultResponse(HaoBanErrCode.ERR_1,pageVo);
+ 
+	}
+	//授权详情列表
+	@RequestMapping("authorize-detail")
+	public HaobanResponse authorizeDetail(String wxEnterpriseId) {
+		List<EnterpriseDetailDTO>  list = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId);
+		List<EnterpriseDetailVo> result = EntityUtil.changeEntityListByJSON(EnterpriseDetailVo.class, list);
+		for(EnterpriseDetailVo vo:result){
+			List<StoreDTO>  stores = storeService.getStoreByEnterId(vo.getEnterpriseId(), null, null);
+			if(CollectionUtil.isEmpty(stores)){
+				continue;
+			}else{
+				List<String> storeIds = stores.stream().map(s->s.getStoreId()).collect(Collectors.toList());
+				List<DepartmentDTO> countList = departmentApiService.listByRelatedIds(storeIds);
+				vo.setStoreCount(countList.size());
+			}
+			
+		}
+		return resultResponse(HaoBanErrCode.ERR_1,result);
+	}
+	
+	//登录
+	@RequestMapping("yw-login")
+	public void ywLogin(String wxEnterpriseId,HttpServletResponse httpServletResponse) throws IOException {
+        String host = GlobalVar.ctxPropertiesMap.get("haoban_service_host");
+        logger.info("host============================>{}",host);
+        String url=host+LOGIN_URL+"?wxEnterpriseId="+wxEnterpriseId;
+        httpServletResponse.sendRedirect(url);
+	}
+}

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/WebBaseController.java

+package com.gic.haoban.manage.web.controller;
+
+import com.gic.haoban.auth.api.dto.DisplayRelationShortInfoDTO;
+import com.gic.haoban.auth.api.dto.UserRightDetailDTO;
+import com.gic.haoban.common.utils.AuthRequestUtil;
+import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+import org.apache.commons.collections.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created 2018/7/18.
+ *
+ * @author hua
+ */
+public class WebBaseController {
+
+    protected final String defaultReturn = "json";
+
+    public HaobanResponse resultResponse(HaoBanErrCode errCode, Object data, String detailError) {
+        HaobanResponse response = new HaobanResponse();
+        response.setMessage(errCode.getMsg());
+        response.setErrorCode(errCode.getCode());
+        response.setResult(data);
+        response.setDetailError(detailError);
+        return response;
+    }
+
+    public HaobanResponse resultResponse(HaoBanErrCode errCode, Object data) {
+        return resultResponse(errCode, data, null);
+    }
+
+    public HaobanResponse resultResponse(HaoBanErrCode errCode) {
+        return resultResponse(errCode, null, null);
+    }
+    public HaobanResponse resultResponse(HaoBanErrCode errCode, String message) {
+        HaobanResponse response = new HaobanResponse();
+        response.setMessage(message);
+        response.setErrorCode(errCode.getCode());
+        return response;
+    }
+    
+
+    /**
+     * 获取登陆信息
+     *
+     * @return
+     */
+    protected UserRightDetailDTO getLoginUser() {
+        return (UserRightDetailDTO) AuthRequestUtil.getSessionUser();
+    }
+
+    public boolean haveRight(List<DisplayRelationShortInfoDTO> list){
+    	List<String> groupList = new ArrayList<String>();
+    	List<String> storeList = new ArrayList<String>();
+    	List<String> clerkList = new ArrayList<String>();
+    	if(list==null){
+    		return false;
+    	}
+        for(DisplayRelationShortInfoDTO showDto :list){
+        	if(showDto.getGroupId()!=null){
+        		groupList.add(showDto.getGroupId());
+        	}
+        	if(showDto.getStoreId()!=null){
+        		storeList.add(showDto.getStoreId());
+        	}
+        	if(showDto.getClerkId()!=null){
+        		clerkList.add(showDto.getClerkId());
+        	}
+        }
+        if(CollectionUtils.isEmpty(groupList) && CollectionUtils.isEmpty(storeList) && CollectionUtils.isEmpty(clerkList)){
+        	return false;
+        }
+        return true;
+    }
+}

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/test/TestController.java

+package com.gic.haoban.manage.web.controller.test;
+
+import com.alibaba.fastjson.JSONObject;
+import com.gic.api.base.commons.Page;
+import com.gic.commons.util.EntityUtil;
+import com.gic.haoban.base.api.common.BasePageInfo;
+import com.gic.haoban.common.utils.CheckContainUtil;
+import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.api.dto.TestDTO;
+import com.gic.haoban.manage.api.service.TestService;
+import com.gic.haoban.manage.web.controller.WebBaseController;
+import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+import com.gic.haoban.manage.web.qo.TestQo;
+import com.gic.haoban.manage.web.vo.TestVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created 2018/12/17.
+ *
+ * @author hua
+ */
+@Controller
+@RequestMapping("/test")
+public class TestController extends WebBaseController {
+
+//    @Autowired
+//    private TestService testService;
+//
+//    @RequestMapping("/testList")
+//    @ResponseBody
+//    public HaobanResponse testList(String id, BasePageInfo info) {
+//        HaoBanErrCode errCode = HaoBanErrCode.ERR_1;
+//        Page<TestDTO> testDTOPage = testService.queryPage(info);
+//        return resultResponse(errCode, testDTOPage);
+//    }
+//
+//    @RequestMapping("/imcallback")
+//    @ResponseBody
+//    public JSONObject imcallback(@RequestBody JSONObject msg) {
+//        System.out.println(msg);
+//        System.out.println(msg.toJSONString());
+//        String rest = "{\n" +
+//                "    \"ActionStatus\": \"OK\",\n" +
+//                "    \"ErrorInfo\": \"\",\n" +
+//                "    \"ErrorCode\": 0 // 0 为允许发言\n" +
+//                "}";
+//        return JSONObject.parseObject(rest);
+//    }
+//
+//
+//    @RequestMapping("/testListVo")
+//    @ResponseBody
+//    public HaobanResponse testListVo(TestQo qo, BasePageInfo info) {
+//        HaoBanErrCode errCode = HaoBanErrCode.ERR_1;
+//        String s = CheckContainUtil.checkAttr(qo);
+//        if (s != null) {
+//            System.out.println("缺少参数");
+//            errCode = HaoBanErrCode.ERR_5;
+//            return resultResponse(errCode);
+//        }
+//        Page<TestDTO> testDTOPage = testService.queryPage(info);
+//        List<TestVo> res = EntityUtil.changeEntityListByJSON(TestVo.class, testDTOPage.getResult());
+//        return resultResponse(errCode, res);
+//    }
+}

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java

+package com.gic.haoban.manage.web.errCode;
+
+/**
+ * Created by fudh on 2018/3/4.
+ */
+public enum HaoBanErrCode {
+    //update by 牧峰 2018-7-25 19:58:06
+    /**
+     * 操作失败
+     */
+    ERR_0(0, "操作失败"),
+    /**
+     * 操作成功
+     */
+    ERR_1(1, "操作成功"),
+    /**
+     * 缺少参数
+     */
+    ERR_2(2, "缺少参数"),
+    /**
+     * 系统异常
+     */
+    ERR_3(3, "系统异常"),
+    /**
+     * 登录异常
+     */
+    ERR_4(4, "登录异常"),
+    /**
+     * 输入参数错误
+     */
+    ERR_5(5, "输入参数错误"),
+    /**
+     * 该企业登录用户不存在
+     */
+    ERR_6(6, "该企业登录用户不存在"),
+    /**
+     * 该用户缺少该权限
+     */
+    ERR_7(7, "该用户缺少该权限"),
+    /**
+     * 查无数据
+     */
+    ERR_8(8, "查无数据"),
+    /**
+     * 非法操作
+     */
+    ERR_9(9, "非法操作"),
+
+    /**
+     * 用户已经登录
+     */
+    ERR_10(10, "用户已经登录"),
+
+    /**
+     * 验证码发送失败
+     */
+    ERR_11(11, "验证码发送失败"),
+
+    /**
+     * 验证码校验失败
+     */
+    ERR_12(12, "验证码校验失败"),
+
+    ERR_10001(10001,"父部门不存在"),
+    ERR_10002(10002,"门店类型部门不能新增子节点"),
+    ERR_10003(10003,"部门不存在"),
+    
+    ERR_10004(10004,"成员名称不能为空"),
+    ERR_10005(10005,"成员已存在"),
+
+
+    ERR_DEFINE(-888, "自定义错误"),
+    ERR_OTHER(-999, "未知错误code");
+    private int code;
+    private String msg;
+
+    private HaoBanErrCode(int code, String value) {
+        this.code = code;
+        this.msg = value;
+    }
+
+    public static HaoBanErrCode getValue(int code) {
+        for (HaoBanErrCode sec : HaoBanErrCode.values()) {
+            if (code == sec.getCode()) {
+                return sec;
+            }
+        }
+        ERR_OTHER.setMsg("未知错误code：" + code);
+        return ERR_OTHER;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+}

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/exception/ControllerException.java

+package com.gic.haoban.manage.web.exception;
+
+/**
+ * Created 2018/7/24.
+ *
+ * @author hua
+ */
+public class ControllerException extends Exception {
+
+}

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/exception/GlobalExceptionHandler.java

+package com.gic.haoban.manage.web.exception;
+
+import com.gic.haoban.base.api.common.ShowFrontMessageException;
+import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.web.controller.WebBaseController;
+import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintWriter;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Created 2018/7/24.
+ *
+ * @author hua
+ */
+@ControllerAdvice
+public class GlobalExceptionHandler extends WebBaseController {
+    private static Logger logger = LoggerFactory.getLogger(GlobalExceptionHandler.class);
+
+    private static final Pattern pattern = Pattern.compile("(.*: )(.*)(\\n.*)");
+
+
+    @ResponseBody
+    @ExceptionHandler(ShowFrontMessageException.class)
+    public HaobanResponse ControllerException(HttpServletResponse response, ShowFrontMessageException ex) {
+        HaobanResponse res = new HaobanResponse();
+        res.setErrorCode(HaoBanErrCode.ERR_0.getCode());
+        res.setMessage(ex.getMessage());
+        return res;
+    }
+
+
+    @ResponseBody
+    @ExceptionHandler(RuntimeException.class)
+    public HaobanResponse ControllerException(HttpServletResponse response, RuntimeException ex) {
+        HaobanResponse res = new HaobanResponse();
+        res.setErrorCode(HaoBanErrCode.ERR_3.getCode());
+        String message = ex.getMessage();
+        if (message != null && message.indexOf(ShowFrontMessageException.class.getName()) > -1) {
+            Matcher matcher = pattern.matcher(message);
+            while (matcher.find()) {
+                message = (matcher.group(2));
+            }
+        } else {
+            message = HaoBanErrCode.ERR_3.getMsg();
+        }
+        res.setMessage(message);
+        return res;
+    }
+
+    @ResponseBody
+    @ExceptionHandler(Exception.class)
+    public HaobanResponse ControllerException(HttpServletResponse response, Exception ex) {
+        logger.error("err");
+        ex.printStackTrace();
+        HaoBanErrCode errCode = HaoBanErrCode.ERR_3;
+        StringBuilder sb = new StringBuilder();
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        try (PrintWriter printWriter = new PrintWriter(baos)) {
+            ex.printStackTrace(printWriter);
+        }
+        try {
+            sb.append(baos.toString());
+        } catch (Exception ignored) {
+        }
+        if (sb.length() == 0) {
+            sb.append(ex.getMessage());
+        }
+
+        // 输出详细错误信息，便于调试
+        return resultResponse(errCode, null, sb.toString());
+    }
+
+
+    @ResponseBody
+    @ExceptionHandler(NoLoginException.class)
+    public HaobanResponse ControllerException(HttpServletResponse response, NoLoginException ex) {
+        return resultResponse(HaoBanErrCode.ERR_4);
+    }
+
+}

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/exception/NoLoginException.java

+package com.gic.haoban.manage.web.exception;
+
+/**
+ * 用户未登陆异常
+ *
+ * @author zhurz
+ */
+public class NoLoginException extends RuntimeException {
+}

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/init/MyApplicationContextAware.java

+package com.gic.haoban.manage.web.init;
+
+import com.gic.dict.api.dto.GlobalDictMap;
+import com.gic.dict.api.service.ManagerDictService;
+import com.gic.quartz.api.dto.QuartzTaskDTO;
+import com.gic.quartz.api.service.QuartzService;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+@Component
+public class MyApplicationContextAware implements ApplicationContextAware {
+    private Logger log = LogManager.getLogger(MyApplicationContextAware.class);
+
+    private static ApplicationContext applicationContext;
+
+	@Override
+	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+		// TODO Auto-generated method stub
+		
+	}
+
+    
+}

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/interceptor/ResponseInterceptor.java

+package com.gic.haoban.manage.web.interceptor;
+
+import com.alibaba.fastjson.JSONObject;
+import com.gic.haoban.common.utils.HaobanResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.MethodParameter;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.server.ServerHttpRequest;
+import org.springframework.http.server.ServerHttpResponse;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
+
+import java.lang.reflect.Method;
+
+/**
+ * Created 2019/2/20.
+ *
+ * @author hua
+ */
+@ControllerAdvice
+public class ResponseInterceptor implements ResponseBodyAdvice<HaobanResponse> {
+
+    private Logger logger = LoggerFactory.getLogger(ResponseInterceptor.class);
+
+    @Override
+    public boolean supports(MethodParameter methodParameter, Class<? extends HttpMessageConverter<?>> aClass) {
+        Method method = methodParameter.getMethod();
+        String name = method.getName();
+        logger.info("method：{}", name);
+        return true;
+    }
+
+    @Override
+    public HaobanResponse beforeBodyWrite(HaobanResponse haobanResponse, MethodParameter methodParameter, MediaType mediaType, Class<? extends HttpMessageConverter<?>> aClass, ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse) {
+        String response = JSONObject.toJSONString(haobanResponse);
+        logger.info("response:{}", response);
+        return haobanResponse;
+    }
+}

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/interceptor/TestLoginInterceptor.java

+package com.gic.haoban.manage.web.interceptor;
+
+import com.gic.haoban.auth.api.dto.UserRightDetailDTO;
+import com.gic.haoban.common.utils.AuthRequestUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 测试登录拦截器
+ *
+ * @author zhurz
+ */
+public class TestLoginInterceptor extends HandlerInterceptorAdapter {
+
+    private static Logger logger = LoggerFactory.getLogger(TestLoginInterceptor.class);
+
+    @Override
+    public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o) throws Exception {
+        // 测试用
+        HttpServletRequest request = AuthRequestUtil.getRequest();
+        String testFlag = request.getHeader("testFlag");
+        if (!"Y".equals(testFlag)) return true;
+        String testEnterpriseId = request.getHeader("testEnterpriseId");
+        String testUserId = request.getHeader("testUserId");
+        UserRightDetailDTO sessionUser = new UserRightDetailDTO();
+        sessionUser.setUserId(testUserId);
+        sessionUser.setEnterpriseId(testEnterpriseId);
+        AuthRequestUtil.setSessionUser(sessionUser);
+        return true;
+    }
+
+}

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/interceptor/WebInterceptor.java

+package com.gic.haoban.manage.web.interceptor;
+
+import com.alibaba.fastjson.JSONObject;
+import com.gic.haoban.auth.api.anno.MenuCheck;
+import com.gic.haoban.auth.api.dto.UserRightDetailDTO;
+import com.gic.haoban.auth.api.enums.RoleCodeEnum;
+import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.web.auth.AuthRequestUtil;
+import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Arrays;
+import java.util.Map;
+
+/**
+ * Created 2018/7/20.
+ *
+ * @author hua
+ */
+public class WebInterceptor extends HandlerInterceptorAdapter {
+
+    private static Logger logger= LoggerFactory.getLogger(WebInterceptor.class);
+
+//    @Autowired
+//    private ClerkRightManageService clerkRightManageService;
+
+
+    private void errorResult(HttpServletResponse httpServletResponse, HaoBanErrCode errCode) {
+        HaobanResponse response = new HaobanResponse();
+        response.setErrorCode(errCode.getCode());
+        response.setMessage(errCode.getMsg());
+        PrintWriter writer = null;
+        try {
+            httpServletResponse.setHeader("Content-type", "application/json;charset=UTF-8");
+            writer = httpServletResponse.getWriter();
+            writer.append(JSONObject.toJSONString(response));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o) throws Exception {
+        String requestURI = httpServletRequest.getRequestURI();
+        logger.info("post-url:{}", requestURI);
+        Map<String, String[]> parameterMap = httpServletRequest.getParameterMap();
+        logger.info("post-params:{}", JSONObject.toJSONString(parameterMap));
+        
+        HandlerMethod method = null;
+        if (o instanceof HandlerMethod) {
+            method = (HandlerMethod) (o);
+        }
+        if (method == null) {
+            return true;
+        }
+        MenuCheck methodAnnotation = method.getMethodAnnotation(MenuCheck.class);
+        
+        return true;
+    }
+
+    @Override
+    public void postHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, ModelAndView modelAndView) throws Exception {
+        logger.info("end");
+    }
+
+    @Override
+    public void afterCompletion(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, Exception e) throws Exception {
+        logger.info("end");
+    }
+}

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/qo/TestQo.java

+package com.gic.haoban.manage.web.qo;
+
+import com.gic.haoban.base.api.common.AppJSONField;
+
+import java.io.Serializable;
+
+/**
+ * Created 2018/10/22.
+ *
+ * @author hua
+ */
+public class TestQo implements Serializable {
+    private String id;
+    @AppJSONField(format = "ignore")
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+}

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/response/MenuDetailResponse.java

+package com.gic.haoban.manage.web.response;
+
+import com.gic.haoban.auth.api.dto.MenuRightDTO;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Created 2018/12/27.
+ *
+ * @author hua
+ */
+public class MenuDetailResponse implements Serializable {
+    private MenuRightDTO top;
+    private List<MenuRightDTO> leftMenu;
+    private MenuRightDTO current;
+
+    public MenuRightDTO getTop() {
+        return top;
+    }
+
+    public void setTop(MenuRightDTO top) {
+        this.top = top;
+    }
+
+    public List<MenuRightDTO> getLeftMenu() {
+        return leftMenu;
+    }
+
+    public void setLeftMenu(List<MenuRightDTO> leftMenu) {
+        this.leftMenu = leftMenu;
+    }
+
+    public MenuRightDTO getCurrent() {
+        return current;
+    }
+
+    public void setCurrent(MenuRightDTO current) {
+        this.current = current;
+    }
+}

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/response/RoleDetailResponse.java

+package com.gic.haoban.manage.web.response;
+
+import com.gic.haoban.auth.api.dto.MenuRightInfoDTO;
+import com.gic.haoban.auth.api.dto.RoleDTO;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Created 2018/12/17.
+ *
+ * @author hua
+ */
+public class RoleDetailResponse implements Serializable {
+    public RoleDTO role;
+    public List<MenuRightInfoDTO> menuRightList;
+
+    public RoleDTO getRole() {
+        return role;
+    }
+
+    public void setRole(RoleDTO role) {
+        this.role = role;
+    }
+
+    public List<MenuRightInfoDTO> getMenuRightList() {
+        return menuRightList;
+    }
+
+    public void setMenuRightList(List<MenuRightInfoDTO> menuRightList) {
+        this.menuRightList = menuRightList;
+    }
+}
\ No newline at end of file

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/response/WebLoginResponse.java

+package com.gic.haoban.manage.web.response;
+
+
+import com.gic.haoban.manage.api.dto.EnterpriseDTO;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Created 2018/12/28.
+ *
+ * @author hua
+ */
+public class WebLoginResponse implements Serializable {
+    private String userId;
+    private List<EnterpriseDTO> enterpriseList;
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public List<EnterpriseDTO> getEnterpriseList() {
+        return enterpriseList;
+    }
+
+    public void setEnterpriseList(List<EnterpriseDTO> enterpriseList) {
+        this.enterpriseList = enterpriseList;
+    }
+}

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/utils/IOUtils.java

+package com.gic.haoban.manage.web.utils;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
+
+public class IOUtils {
+	
+
+
+	/**
+	 * 6.编写一个程序，将D:\\java目录下的所有.java文件复制到D:\\jad目录下，
+	 *   并将原来文件的扩展名从.java改为.jad。
+	 */
+
+//	public static class FileCopy {
+//	    public static void main(String[] args) {
+//
+//	        File oriFile = new File("D:\\java");//原文件目录
+//	        //file.exists():判断文件目录是否存在
+//	        //file.isDirectory():判断文件目录是否是一个目录
+//	        if(!(oriFile.exists() && oriFile.isDirectory())){
+//	            System.out.println("文件目录不存在！");
+//	        }
+//
+//	        File[] files = oriFile.listFiles(
+//	            new FilenameFilter(){ //文件名称过滤器
+//	                public boolean accept(File file, String name) {
+//	                    return name.endsWith(".java");
+//	                }
+//	            }
+//	        );
+//	        System.out.println(files.length);//原文件个数
+//
+//	        File objFile = new File("D:\\jad");//目标文件目录
+//	        //objFile.exists():判断目标文件目录是否存在
+//	        //objFile.mkdir():创建目标文件目录
+//	        if(!objFile.exists()){ 
+//	            objFile.mkdir();
+//	        } 
+//
+//	        //copyByte(files,objFile);
+//	        copyChar(files,objFile);
+//	        System.out.println("写入完成！");
+//
+//	    }
+
+	    //使用字节流进行文件复制(字节缓冲流可以不使用，使用其目的主要是为了提高性能)
+	    private static void copyByte(File[] files,File objFile){
+
+	        InputStream  inputStream = null;
+	        OutputStream outputStream = null;
+	        BufferedInputStream bufferedInputStream = null;
+	        BufferedOutputStream bufferedOutputStream = null;
+
+	        for(File f : files){
+
+	            //替换文件后缀
+	            String objFileName = f.getName().replaceAll("\\.ACC$", ".mp3");
+	            try {
+
+	                inputStream = new FileInputStream(f);
+	                outputStream = new FileOutputStream(new File(objFile,objFileName));
+	                bufferedInputStream = new BufferedInputStream(inputStream);
+	                bufferedOutputStream = new BufferedOutputStream(outputStream);
+
+	                int c = 0;
+	                while((c = bufferedInputStream.read()) != -1){
+	                    bufferedOutputStream.write(c);
+	                }
+
+	            } catch (Exception e) {
+	                e.printStackTrace();
+	            } finally {
+	                try {
+	                    bufferedOutputStream.close();
+	                    bufferedInputStream.close();
+	                    outputStream.close();
+	                    inputStream.close();
+
+	                } catch (IOException e) {
+	                    e.printStackTrace();
+	                }
+	            }
+
+	        }
+
+	    }
+
+	    //使用字符流进行文件复制(字符缓冲流可以不使用，使用其目的主要是为了提高性能)
+	    public static void copyChar(File file,File objFile){
+
+	        Reader reader = null;
+	        Writer writer = null;
+	        BufferedReader bufferedReader = null;
+	        BufferedWriter bufferedWriter = null;
+
+            //替换文件后缀
+            String objFileName = file.getName().replaceAll("\\.AAC$", ".mp3");
+            try {
+
+                reader = new FileReader(file);
+                writer = new FileWriter(new File(objFile,objFileName));
+                bufferedReader = new BufferedReader(reader);
+                bufferedWriter = new BufferedWriter(writer);
+
+                int c = 0;
+                while ((c=bufferedReader.read()) != -1) {
+                    bufferedWriter.write(c);
+                }
+
+            } catch (Exception e) {
+                e.printStackTrace();
+            } finally {
+                try {
+                    bufferedWriter.close();
+                    bufferedReader.close();
+                    writer.close();
+                    reader.close();
+
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+
+}

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/utils/NationCodePhoneFormater.java

+package com.gic.haoban.manage.web.utils;
+
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * @author yao
+ * NationCodePhoneFormater
+ */
+public class NationCodePhoneFormater {
+
+    /**
+     * 大陆手机号码
+     */
+    public static final String CHINA = "86";
+
+    public static String format(String nationCode, String phone) {
+        if (CHINA.equals(nationCode)) {
+            return phone;
+        }
+
+        if (StringUtils.isBlank(phone)){
+            return "";
+        }
+
+        return StringUtils.isBlank(nationCode)? phone:  ("+" + nationCode + "-" + phone);
+    }
+}