Merge branch 'developer' into 'master'

Developer

See merge request !24

gic-platform-auth-api/pom.xml

@@ -16,6 +16,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <libraryVersion>4.0-SNAPSHOT</libraryVersion>
+        <gic-platform-config>4.0-SNAPSHOT</gic-platform-config>
     </properties>
 
     <dependencies>
@@ -89,6 +90,58 @@
                     <skipTests>true</skipTests>
                 </configuration>
             </plugin>
+<!--
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-pmd-plugin</artifactId>
+                <version>3.11.0</version>
+                <configuration>
+                    <skip>true</skip>
+                    <sourceEncoding>${project.build.sourceEncoding}</sourceEncoding>
+                    <targetJdk>1.8</targetJdk>
+                    <printFailingErrors>true</printFailingErrors>
+                    <excludes>
+                        <exclude>**/FixClassTypeResolver.java</exclude>
+                    </excludes>
+                    &lt;!&ndash; 代码检查规则 &ndash;&gt;
+                    <rulesets>
+                        <ruleset>rulesets/java/gic-ali-comment.xml</ruleset>
+                        <ruleset>rulesets/java/gic-ali-naming.xml</ruleset>
+                        <ruleset>rulesets/java/gic-ali-concurrent.xml</ruleset>
+                        <ruleset>rulesets/java/gic-ali-constant.xml</ruleset>
+                        <ruleset>rulesets/java/gic-ali-exception.xml</ruleset>
+                        <ruleset>rulesets/java/gic-ali-flowcontrol.xml</ruleset>
+                        <ruleset>rulesets/java/gic-ali-oop.xml</ruleset>
+                        <ruleset>rulesets/java/gic-ali-orm.xml</ruleset>
+                        <ruleset>rulesets/java/gic-ali-other.xml</ruleset>
+                        <ruleset>rulesets/java/gic-ali-set.xml</ruleset>
+                        <ruleset>rulesets/java/gic-common.xml</ruleset>
+                    </rulesets>
+                </configuration>
+                <executions>
+                    &lt;!&ndash; 绑定pmd:pmd到site生命周期 &ndash;&gt;
+                    <execution>
+                        <id>pmd-pmd-site</id>
+                        <phase>site</phase>
+                        <goals>
+                            <goal>pmd</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                &lt;!&ndash; p3c依赖 &ndash;&gt;
+                <dependencies>
+                    <dependency>
+                        <groupId>com.alibaba.p3c</groupId>
+                        <artifactId>p3c-pmd</artifactId>
+                        <version>2.0.2-SNAPSHOT</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>com.gic</groupId>
+                        <artifactId>gic-platform-config</artifactId>
+                        <version>${gic-platform-config}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>-->
         </plugins>
     </build>
 

gic-platform-auth-api/src/main/java/com/gic/auth/constant/AccountGroupMemberTypeEnum.java

@@ -7,7 +7,13 @@ package com.gic.auth.constant;
  * @date 2019/9/17 11:05 AM

  */
 public enum AccountGroupMemberTypeEnum {
+    /**
+     * 管理员
+     */
     ADMIN(1, "管理员"),
+    /**
+     * 协作人
+     */
     COLLABORATOR(2, "协作人");
 
     private int code;

gic-platform-auth-api/src/main/java/com/gic/auth/constant/AccountPositionEnum.java

+package com.gic.auth.constant;
+
+/**
+ * 
+ * @ClassName: AccountPositionEnum
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-09 20:27
+ */
+public enum AccountPositionEnum {
+    /**
+     * 区域经理
+     */
+    area_manager(1, "区域经理"),
+    /**
+     * 线下运营
+     */
+    OFFLINE_OPERATION(2, "线下运营"),
+    /**
+     * 电商运营
+     */
+    E_OPERATION(3, "电商运营"),
+    /**
+     * IT专员
+     */
+    IT_COMMISSIONER(4, "IT专员"),
+    /**
+     * 数据专员
+     */
+    DATA_COMMISSIONER(5, "数据专员");
+
+    private Integer code;
+    private String message;
+
+    AccountPositionEnum(Integer code, String message){
+        this.code = code;
+        this.message = message;
+    }
+
+    public static boolean isRightCode(Integer code) {
+        if (code == null) {
+            return true;
+        }
+        for (AccountPositionEnum accountPositionEnum : values()) {
+            if (accountPositionEnum.getCode().intValue() == code) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

gic-platform-auth-api/src/main/java/com/gic/auth/constant/AuthModeEnum.java

 package com.gic.auth.constant;
 
+/**
+ * 
+ * @ClassName: AuthModeEnum
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-09 20:27
+ */
 public enum AuthModeEnum {
+    /**
+     * 授权
+     */
     YES(1, "授权"),
+    /**
+     * 不授权
+     */
     NO(2, "不授权");
 
     private Integer code;

gic-platform-auth-api/src/main/java/com/gic/auth/constant/AuthorizationStatusEnum.java

 package com.gic.auth.constant;
 
+/**
+ * 
+ * @ClassName: AuthorizationStatusEnum
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-09 20:27
+ */
 public enum AuthorizationStatusEnum {
+    /**
+     * "授权中"
+     */
     NORMAL(1, "授权中"),
+    /**
+     * 授权成功
+     */
     SUCCESS(2, "授权成功"),
+    /**
+     * 授权失败
+     */
     FAIL(3, "授权失败"),
+    /**
+     * 不授权
+     */
     NO(4, "不授权"),
+    /**
+     * 部分授权成功
+     */
     PARTSUCCESS(5, "部分授权成功");
 
     private Integer code;

gic-platform-auth-api/src/main/java/com/gic/auth/constant/Constants.java

@@ -6,10 +6,14 @@ package com.gic.auth.constant;
  */
 public interface Constants {
     String STORE_BATCH_IMPORT_MQ_KEY = "storeBulkImport";
-//    String STORE_BATCH_IMPORT_MQ_KEY = "tmpStoreBatchImportTaskMq4.0";
     Integer STORE_BATCH_IMPORT_TASK_TYPE = 6;
 
-    String dateformat = "yyyy-MM-dd HH:mm:ss";
+    String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
 
+    String COMMA = ",";
+
+    Integer TEMP_ACCOUNT = 2;
+
+    String XLSX = "xlsx";
 
 }

gic-platform-auth-api/src/main/java/com/gic/auth/constant/LoginUserTypeEnum.java

@@ -7,7 +7,13 @@ package com.gic.auth.constant;
  * @date 2019/11/13 6:46 PM

  */
 public enum LoginUserTypeEnum {
+    /**
+     * GIC管理员
+     */
     GIC_USER(0, "GIC管理员"),
+    /**
+     * 运营实施管理员
+     */
     OPERATION_USER(1, "运营实施管理员");
 
     private int code;

gic-platform-auth-api/src/main/java/com/gic/auth/constant/MenuTypeEnum.java

@@ -7,8 +7,17 @@ package com.gic.auth.constant;
  * @date 2019/9/17 11:05 AM

  */
 public enum MenuTypeEnum {
+    /**
+     * 页面
+     */
     PAGE(0, "页面"),
+    /**
+     * 权限项
+     */
     ROLE(1, "权限项"),
+    /**
+     * 操作项
+     */
     OPERATION(2, "操作项");
 
     private int code;

gic-platform-auth-api/src/main/java/com/gic/auth/constant/OrderOrAppEnum.java

@@ -7,9 +7,21 @@ package com.gic.auth.constant;
  * @date 2019-09-26 18:35
  */
 public enum OrderOrAppEnum {
+    /**
+     * 订单
+     */
     ORDER(1, "订单"),
+    /**
+     * 应用
+     */
     APP(2, "应用"),
+    /**
+     * 短信签名
+     */
     SMS_SIGN(3, "短信签名"),
+    /**
+     * 渠道
+     */
     CHANNEL(4, "渠道")
     ;
 

gic-platform-auth-api/src/main/java/com/gic/auth/constant/OrderResourceChannelEnum.java

@@ -7,8 +7,17 @@ package com.gic.auth.constant;
  * @date 2019-09-26 17:46
  */
 public enum OrderResourceChannelEnum {
+    /**
+     * 线下门店
+     */
     OFFLINE(1, "线下门店"),
+    /**
+     * 达摩微商城
+     */
     DAMO_MALL(2, "达摩微商城"),
+    /**
+     * 微盟微商城
+     */
     WEIMOB_MALL(3, "微盟微商城")
     ;
 

gic-platform-auth-api/src/main/java/com/gic/auth/constant/ResourceHoldEnum.java

@@ -7,7 +7,13 @@ package com.gic.auth.constant;
  * @date 2020/2/17 9:47
  */
 public enum ResourceHoldEnum {
+    /**
+     * 全部
+     */
     ALL(1),
+    /**
+     * 部分
+     */
     DART(2)
     ;
     private Integer code;

gic-platform-auth-api/src/main/java/com/gic/auth/constant/ResourceTypeEnum.java

 package com.gic.auth.constant;
 
+/**
+ * 
+ * @ClassName: ResourceTypeEnum
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-09 20:36
+ */
 public enum ResourceTypeEnum {
+    /**
+     * 用户资源
+     */
     MEMBER_RESOURCE(1, "用户资源"),
+    /**
+     * 门店资源
+     */
     STORE_RESOURCE(2, "门店资源"),
+    /**
+     * 商品资源
+     */
     GOODS_RESOURCE(3, "商品资源"),
+    /**
+     * 订单资源
+     */
     ORDER_RESOURCE(4,"订单资源");
 
     private Integer code;

gic-platform-auth-api/src/main/java/com/gic/auth/constant/SignConstants.java

@@ -19,4 +19,5 @@ public class SignConstants {
      * 英文逗号
      */
     public final static String COMMA = ",";
+
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/AccountGroupDTO.java

@@ -134,4 +134,18 @@ public class AccountGroupDTO implements Serializable{
     public void setMemberCount(Integer memberCount) {
         this.memberCount = memberCount;
     }
+
+    @Override
+    public String toString() {
+        return "AccountGroupDTO{" +
+                "accountGroupId=" + accountGroupId +
+                ", accountGroupName='" + accountGroupName + '\'' +
+                ", enterpriseId=" + enterpriseId +
+                ", status=" + status +
+                ", sort=" + sort +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", memberCount=" + memberCount +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/AccountGroupListDTO.java

@@ -30,4 +30,12 @@ public class AccountGroupListDTO implements Serializable{
     public void setMemberCount(Integer memberCount) {
         this.memberCount = memberCount;
     }
+
+    @Override
+    public String toString() {
+        return "AccountGroupListDTO{" +
+                "accountGroupId=" + accountGroupId +
+                ", memberCount=" + memberCount +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/AccountGroupMemberDTO.java

@@ -100,4 +100,17 @@ public class AccountGroupMemberDTO implements Serializable{
     public void setEnterpriseId(Integer enterpriseId) {
         this.enterpriseId = enterpriseId;
     }
+
+    @Override
+    public String toString() {
+        return "AccountGroupMemberDTO{" +
+                "userId=" + userId +
+                ", phone='" + phone + '\'' +
+                ", memberName='" + memberName + '\'' +
+                ", type=" + type +
+                ", typeName='" + typeName + '\'' +
+                ", accountGroupId=" + accountGroupId +
+                ", enterpriseId=" + enterpriseId +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/AccountGroupRelDTO.java

@@ -117,4 +117,18 @@ public class AccountGroupRelDTO implements Serializable{
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    @Override
+    public String toString() {
+        return "AccountGroupRelDTO{" +
+                "accountGroupRelId=" + accountGroupRelId +
+                ", accountGroupId=" + accountGroupId +
+                ", userId=" + userId +
+                ", enterpriseId=" + enterpriseId +
+                ", status=" + status +
+                ", type=" + type +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/AppDTO.java

@@ -30,4 +30,12 @@ public class AppDTO implements Serializable{
     public void setAppName(String appName) {
         this.appName = appName;
     }
+
+    @Override
+    public String toString() {
+        return "AppDTO{" +
+                "appId='" + appId + '\'' +
+                ", appName='" + appName + '\'' +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/AuditedGroupDTO.java

@@ -103,4 +103,17 @@ public class AuditedGroupDTO implements Serializable{
     public void setUserIdList(List<Integer> userIdList) {
         this.userIdList = userIdList;
     }
+
+    @Override
+    public String toString() {
+        return "AuditedGroupDTO{" +
+                "auditedGroupId=" + auditedGroupId +
+                ", enterpriseId=" + enterpriseId +
+                ", auditedGroupName='" + auditedGroupName + '\'' +
+                ", createTime=" + createTime +
+                ", userIdList=" + userIdList +
+                ", allCheck=" + allCheck +
+                ", userCount=" + userCount +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/AuditedGroupUserRelDTO.java

@@ -110,4 +110,18 @@ public class AuditedGroupUserRelDTO implements Serializable {
     public List<Integer> getAuditedGroupIdList() {
         return auditedGroupIdList;
     }
+
+    @Override
+    public String toString() {
+        return "AuditedGroupUserRelDTO{" +
+                "auditedGroupUserRelId=" + auditedGroupUserRelId +
+                ", enterpriseId=" + enterpriseId +
+                ", auditedGroupId=" + auditedGroupId +
+                ", userId=" + userId +
+                ", status=" + status +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", auditedGroupIdList=" + auditedGroupIdList +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/AuditorAuditedGroupRelDTO.java

@@ -111,4 +111,18 @@ public class AuditorAuditedGroupRelDTO implements Serializable {
     public List<Integer> getAuditorIdList() {
         return auditorIdList;
     }
+
+    @Override
+    public String toString() {
+        return "AuditorAuditedGroupRelDTO{" +
+                "auditorAuditedGroupRelId=" + auditorAuditedGroupRelId +
+                ", enterpriseId=" + enterpriseId +
+                ", auditorId=" + auditorId +
+                ", auditedGroupId=" + auditedGroupId +
+                ", status=" + status +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", auditorIdList=" + auditorIdList +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/AuditorDTO.java

@@ -166,4 +166,23 @@ public class AuditorDTO implements Serializable {
     public String getWeChatNickName() {
         return weChatNickName;
     }
+
+    @Override
+    public String toString() {
+        return "AuditorDTO{" +
+                "auditorId=" + auditorId +
+                ", enterpriseId=" + enterpriseId +
+                ", auditorName='" + auditorName + '\'' +
+                ", phone='" + phone + '\'' +
+                ", userId=" + userId +
+                ", openid='" + openid + '\'' +
+                ", isUse=" + isUse +
+                ", projectItemList=" + projectItemList +
+                ", auditedGroupIdList=" + auditedGroupIdList +
+                ", projectItemCount=" + projectItemCount +
+                ", auditedGroupCount=" + auditedGroupCount +
+                ", headUrl='" + headUrl + '\'' +
+                ", weChatNickName='" + weChatNickName + '\'' +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/AuthCodeDTO.java

@@ -6,6 +6,13 @@ import java.util.Date;
 /**
  * tab_sys_auth_code
  */
+/**
+ * 
+ * @ClassName: AuthCodeDTO
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-09 20:27
+ */
 public class AuthCodeDTO implements Serializable {
     /**
      * 
@@ -85,4 +92,16 @@ public class AuthCodeDTO implements Serializable {
     public void setExpirationTime(Date expirationTime) {
         this.expirationTime = expirationTime;
     }
+
+    @Override
+    public String toString() {
+        return "AuthCodeDTO{" +
+                "authCodeId=" + authCodeId +
+                ", authCode='" + authCode + '\'' +
+                ", enterpriseId=" + enterpriseId +
+                ", relationId=" + relationId +
+                ", status=" + status +
+                ", expirationTime=" + expirationTime +
+                '}';
+    }
 }
\ No newline at end of file

gic-platform-auth-api/src/main/java/com/gic/auth/dto/AuthItemDTO.java

@@ -30,4 +30,12 @@ public class AuthItemDTO implements Serializable{
     public void setOperationItemCount(Integer operationItemCount) {
         this.operationItemCount = operationItemCount;
     }
+
+    @Override
+    public String toString() {
+        return "AuthItemDTO{" +
+                "menuId=" + menuId +
+                ", operationItemCount=" + operationItemCount +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/AuthItemListDTO.java

@@ -44,4 +44,13 @@ public class AuthItemListDTO implements Serializable{
     public void setOperationItemCount(Integer operationItemCount) {
         this.operationItemCount = operationItemCount;
     }
+
+    @Override
+    public String toString() {
+        return "AuthItemListDTO{" +
+                "menuId='" + menuId + '\'' +
+                ", menuName='" + menuName + '\'' +
+                ", operationItemCount=" + operationItemCount +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/BusinessFrontResDTO.java

@@ -142,4 +142,20 @@ public class BusinessFrontResDTO implements Serializable{
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    @Override
+    public String toString() {
+        return "BusinessFrontResDTO{" +
+                "resourceId=" + resourceId +
+                ", resourceName='" + resourceName + '\'' +
+                ", resourceCode='" + resourceCode + '\'' +
+                ", resourceType=" + resourceType +
+                ", pageName='" + pageName + '\'' +
+                ", resourceDetail='" + resourceDetail + '\'' +
+                ", enterpriseId=" + enterpriseId +
+                ", status=" + status +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/ChannelResourceDTO.java

@@ -47,4 +47,13 @@ public class ChannelResourceDTO implements Serializable {
     public void setServiceConfigIdList(List<Long> serviceConfigIdList) {
         this.serviceConfigIdList = serviceConfigIdList;
     }
+
+    @Override
+    public String toString() {
+        return "ChannelResourceDTO{" +
+                "cardConfigIdList=" + cardConfigIdList +
+                ", appletConfigIdList=" + appletConfigIdList +
+                ", serviceConfigIdList=" + serviceConfigIdList +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/CollaboratorDTO.java

@@ -238,4 +238,27 @@ public class CollaboratorDTO implements Serializable{
     public void setResourceIdList(List<Integer> resourceIdList) {
         this.resourceIdList = resourceIdList;
     }
+
+    @Override
+    public String toString() {
+        return "CollaboratorDTO{" +
+                "collaboratorId=" + collaboratorId +
+                ", collaboratorName='" + collaboratorName + '\'' +
+                ", enterpriseId=" + enterpriseId +
+                ", collaborationEnterpriseId=" + collaborationEnterpriseId +
+                ", collaborationEnterpriseName='" + collaborationEnterpriseName + '\'' +
+                ", phone='" + phone + '\'' +
+                ", appId='" + appId + '\'' +
+                ", appName='" + appName + '\'' +
+                ", creator='" + creator + '\'' +
+                ", resourceIds='" + resourceIds + '\'' +
+                ", subAppIds='" + subAppIds + '\'' +
+                ", status=" + status +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", subAppIdList=" + subAppIdList +
+                ", menuIdList=" + menuIdList +
+                ", resourceIdList=" + resourceIdList +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/CollaboratorListDTO.java

@@ -152,5 +152,20 @@ public class CollaboratorListDTO implements Serializable{
         this.createTime = createTime;
     }
 
-
+    @Override
+    public String toString() {
+        return "CollaboratorListDTO{" +
+                "collaboratorId=" + collaboratorId +
+                ", collaboratorName='" + collaboratorName + '\'' +
+                ", enterpriseId=" + enterpriseId +
+                ", collaborationEnterpriseId=" + collaborationEnterpriseId +
+                ", collaborationEnterpriseName='" + collaborationEnterpriseName + '\'' +
+                ", phone='" + phone + '\'' +
+                ", appId='" + appId + '\'' +
+                ", appName='" + appName + '\'' +
+                ", creator='" + creator + '\'' +
+                ", status=" + status +
+                ", createTime=" + createTime +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/MenuAuthDepartDTO.java

@@ -2,7 +2,13 @@ package com.gic.auth.dto;
 
 import java.io.Serializable;
 import java.util.Date;
-
+/**
+ * 
+ * @ClassName: MenuAuthDepartDTO
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-09 20:34
+ */
 public class MenuAuthDepartDTO implements Serializable{
     private static final long serialVersionUID = 4195293064485615589L;
 
@@ -132,4 +138,19 @@ public class MenuAuthDepartDTO implements Serializable{
         this.updateTime = updateTime;
         return this;
     }
+
+    @Override
+    public String toString() {
+        return "MenuAuthDepartDTO{" +
+                "menuDepartId=" + menuDepartId +
+                ", menuCode='" + menuCode + '\'' +
+                ", departCode='" + departCode + '\'' +
+                ", departName='" + departName + '\'' +
+                ", positionCode='" + positionCode + '\'' +
+                ", positionName='" + positionName + '\'' +
+                ", status=" + status +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/MenuDTO.java

@@ -5,6 +5,13 @@ import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.List;
 
+/**
+ * 
+ * @ClassName: MenuDTO
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-09 20:34
+ */
 public class MenuDTO implements Serializable {
     private static final long serialVersionUID = -3884129728015209740L;
 
@@ -18,13 +25,13 @@ public class MenuDTO implements Serializable {
     /**
      * 新增gic子页面参数校验分组
      */
-    public interface SaveGICChildPageValid {
+    public interface SaveGicChildPageValid {
     }
 
     /**
      * 编辑gic子页面参数校验分组
      */
-    public interface UpdateGICChildPageValid {
+    public interface UpdateGicChildPageValid {
     }
 
     /**
@@ -65,9 +72,9 @@ public class MenuDTO implements Serializable {
     /**
      * 菜单名称
      */
-    @NotBlank(message = "页面名称不能为空", groups = { SavePageValid.class, SaveGICChildPageValid.class,
+    @NotBlank(message = "页面名称不能为空", groups = { SavePageValid.class, SaveGicChildPageValid.class,
             SaveAppChildPageValid.class, EditAppChildPageValid.class, SaveOperationItemValid.class,
-            UpdateGICChildPageValid.class, UpdateOperationItemValid.class })
+            UpdateGicChildPageValid.class, UpdateOperationItemValid.class })
     private String menuName;
 
     /**
@@ -83,15 +90,15 @@ public class MenuDTO implements Serializable {
     /**
      * 上级菜单id
      */
-    @NotNull(message = "创建子页面，父级ID不能为空", groups = { SaveGICChildPageValid.class, SaveAppChildPageValid.class,
+    @NotNull(message = "创建子页面，父级ID不能为空", groups = { SaveGicChildPageValid.class, SaveAppChildPageValid.class,
             SaveOperationItemValid.class })
     private Integer parentId;
 
     /**
      * 0当前页1新开页
      */
-    @NotNull(message = "打开方式不能为空", groups = { SavePageValid.class, SaveGICChildPageValid.class,
-            UpdateGICChildPageValid.class })
+    @NotNull(message = "打开方式不能为空", groups = { SavePageValid.class, SaveGicChildPageValid.class,
+            UpdateGicChildPageValid.class })
     private Integer target;
 
     /**
@@ -117,16 +124,16 @@ public class MenuDTO implements Serializable {
     /**
      * 是否显示在菜单栏的菜单,0否1是
      */
-    @NotNull(message = "页面类型（是否作为菜单）不能改为空", groups = { SavePageValid.class, SaveGICChildPageValid.class,
-            UpdateGICChildPageValid.class })
+    @NotNull(message = "页面类型（是否作为菜单）不能改为空", groups = { SavePageValid.class, SaveGicChildPageValid.class,
+            UpdateGicChildPageValid.class })
     private Integer isShow;
 
     /**
      * 页面code
      */
-    @NotBlank(message = "页面code不能为空", groups = { SavePageValid.class, SaveGICChildPageValid.class,
+    @NotBlank(message = "页面code不能为空", groups = { SavePageValid.class, SaveGicChildPageValid.class,
             UpdateAppPageValid.class, SaveAppChildPageValid.class, EditAppChildPageValid.class,
-            SaveOperationItemValid.class, UpdateGICChildPageValid.class, UpdateOperationItemValid.class })
+            SaveOperationItemValid.class, UpdateGicChildPageValid.class, UpdateOperationItemValid.class })
     private String menuCode;
 
     /**
@@ -137,8 +144,8 @@ public class MenuDTO implements Serializable {
     /**
      * 多选，例如_1_2_格式，根据应用版本
      */
-    @NotBlank(message = "版本不能为空", groups = { SavePageValid.class, SaveGICChildPageValid.class,
-            SaveAppChildPageValid.class, SaveOperationItemValid.class, UpdateGICChildPageValid.class,
+    @NotBlank(message = "版本不能为空", groups = { SavePageValid.class, SaveGicChildPageValid.class,
+            SaveAppChildPageValid.class, SaveOperationItemValid.class, UpdateGicChildPageValid.class,
             EditAppChildPageValid.class, UpdateOperationItemValid.class })
     private String menuVersion;
 
@@ -156,7 +163,7 @@ public class MenuDTO implements Serializable {
     /**
      * 是否需要同步生成权限项（新增操作项的时候的可选项）
      */
-    private boolean needCreateAuthItem;
+    private Boolean needCreateAuthItem = false;
 
     /**
      * 前端使用：二级域名，也就是项目的部署路径，比如门店项目部署在/damo-store下面，那么就是/damo-store
@@ -319,11 +326,11 @@ public class MenuDTO implements Serializable {
         this.menuVersionName = menuVersionName;
     }
 
-    public boolean isNeedCreateAuthItem() {
+    public Boolean isNeedCreateAuthItem() {
         return needCreateAuthItem;
     }
 
-    public void setNeedCreateAuthItem(boolean needCreateAuthItem) {
+    public void setNeedCreateAuthItem(Boolean needCreateAuthItem) {
         this.needCreateAuthItem = needCreateAuthItem;
     }
 
@@ -369,4 +376,33 @@ public class MenuDTO implements Serializable {
         this.platformType = platformType;
         return this;
     }
+
+    @Override
+    public String toString() {
+        return "MenuDTO{" +
+                "menuId=" + menuId +
+                ", menuName='" + menuName + '\'' +
+                ", project='" + project + '\'' +
+                ", menuUrl='" + menuUrl + '\'' +
+                ", parentId=" + parentId +
+                ", target=" + target +
+                ", iconUrl='" + iconUrl + '\'' +
+                ", sort=" + sort +
+                ", status=" + status +
+                ", level=" + level +
+                ", isShow=" + isShow +
+                ", menuCode='" + menuCode + '\'' +
+                ", parentCode='" + parentCode + '\'' +
+                ", menuVersion='" + menuVersion + '\'' +
+                ", menuType=" + menuType +
+                ", menuVersionName='" + menuVersionName + '\'' +
+                ", children=" + children +
+                ", needCreateAuthItem=" + needCreateAuthItem +
+                ", projectUrlForWeb='" + projectUrlForWeb + '\'' +
+                ", adminOnlySign=" + adminOnlySign +
+                ", authType=" + authType +
+                ", menuAuthDepartList=" + menuAuthDepartList +
+                ", platformType=" + platformType +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/MenuItemDTO.java

@@ -90,4 +90,16 @@ public class MenuItemDTO implements Serializable{
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    @Override
+    public String toString() {
+        return "MenuItemDTO{" +
+                "menuItemId=" + menuItemId +
+                ", menuId=" + menuId +
+                ", itemId=" + itemId +
+                ", status=" + status +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/MenuRoleDTO.java

@@ -111,4 +111,17 @@ public class MenuRoleDTO implements Serializable{
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    @Override
+    public String toString() {
+        return "MenuRoleDTO{" +
+                "menuRoleId=" + menuRoleId +
+                ", menuId=" + menuId +
+                ", roleId=" + roleId +
+                ", enterpriseId=" + enterpriseId +
+                ", status=" + status +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/OperationUserDTO.java

@@ -116,4 +116,18 @@ public class OperationUserDTO implements Serializable{
     public void setPhoneAreaCode(String phoneAreaCode) {
         this.phoneAreaCode = phoneAreaCode;
     }
+
+    @Override
+    public String toString() {
+        return "OperationUserDTO{" +
+                "operationUserId=" + operationUserId +
+                ", operationUserName='" + operationUserName + '\'' +
+                ", phoneNumber='" + phoneNumber + '\'' +
+                ", status=" + status +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", enterpriseId=" + enterpriseId +
+                ", phoneAreaCode='" + phoneAreaCode + '\'' +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/OrderAppResourceDTO.java

@@ -101,4 +101,17 @@ public class OrderAppResourceDTO implements Serializable {
     public void setStatus(Integer status) {
         this.status = status;
     }
+
+    @Override
+    public String toString() {
+        return "OrderAppResourceDTO{" +
+                "orderAppResourceId=" + orderAppResourceId +
+                ", enterpriseId=" + enterpriseId +
+                ", type=" + type +
+                ", content='" + content + '\'' +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", status=" + status +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/OrderResourceContentDTO.java

@@ -42,4 +42,13 @@ public class OrderResourceContentDTO implements Serializable {
     public void setStoreWidgetId(Integer storeWidgetId) {
         this.storeWidgetId = storeWidgetId;
     }
+
+    @Override
+    public String toString() {
+        return "OrderResourceContentDTO{" +
+                "channel=" + channel +
+                ", storeContent=" + storeContent +
+                ", storeWidgetId=" + storeWidgetId +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/OrderResourceDTO.java

@@ -11,15 +11,21 @@ import java.util.List;
  */
 public class OrderResourceDTO implements Serializable {
     private static final long serialVersionUID = -6009818220117316815L;
-    // 1：全部   2：部分
+    /**
+     * 1：全部   2：部分
+      */
     private Integer type;
-    //
     private List<Integer> storeIdList;
+    private List<Integer> storeInfoIdList;
 
-    // 达摩微商城
+    /**
+     * 达摩微商城
+     */
     private List<Long> shopIdList;
 
-    // 微盟微商城
+    /**
+     * 微盟微商城
+     */
     private List<Long> wmStoreList;
 
     public List<Integer> getStoreIdList() {
@@ -53,4 +59,23 @@ public class OrderResourceDTO implements Serializable {
     public void setWmStoreList(List<Long> wmStoreList) {
         this.wmStoreList = wmStoreList;
     }
+
+    public void setStoreInfoIdList(List<Integer> storeInfoIdList) {
+        this.storeInfoIdList = storeInfoIdList;
+    }
+
+    public List<Integer> getStoreInfoIdList() {
+        return storeInfoIdList;
+    }
+
+    @Override
+    public String toString() {
+        return "OrderResourceDTO{" +
+                "type=" + type +
+                ", storeIdList=" + storeIdList +
+                ", storeInfoIdList=" + storeInfoIdList +
+                ", shopIdList=" + shopIdList +
+                ", wmStoreList=" + wmStoreList +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/ResourceDTO.java

@@ -205,4 +205,25 @@ public class ResourceDTO implements Serializable {
     public Integer getChannelResource() {
         return channelResource;
     }
+
+    @Override
+    public String toString() {
+        return "ResourceDTO{" +
+                "resourceId=" + resourceId +
+                ", resourceName='" + resourceName + '\'' +
+                ", enterpriseId=" + enterpriseId +
+                ", userResource=" + userResource +
+                ", storeResource=" + storeResource +
+                ", goodsResourceId=" + goodsResourceId +
+                ", orderResource=" + orderResource +
+                ", orderResourceJson='" + orderResourceJson + '\'' +
+                ", appResource=" + appResource +
+                ", appResourceJson='" + appResourceJson + '\'' +
+                ", smsSignResource=" + smsSignResource +
+                ", smsSignResourceJson='" + smsSignResourceJson + '\'' +
+                ", channelResource=" + channelResource +
+                ", channelResourceJson='" + channelResourceJson + '\'' +
+                ", userResourceCount=" + userResourceCount +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/RoleDTO.java

@@ -115,4 +115,17 @@ public class RoleDTO implements Serializable{
     public void setMenuIds(String menuIds) {
         this.menuIds = menuIds;
     }
+
+    @Override
+    public String toString() {
+        return "RoleDTO{" +
+                "roleId=" + roleId +
+                ", roleName='" + roleName + '\'' +
+                ", enterpriseId=" + enterpriseId +
+                ", status=" + status +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", menuIds='" + menuIds + '\'' +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/RoleListDTO.java

@@ -49,4 +49,13 @@ public class RoleListDTO implements Serializable{
     public void setAuthUserCount(Integer authUserCount) {
         this.authUserCount = authUserCount;
     }
+
+    @Override
+    public String toString() {
+        return "RoleListDTO{" +
+                "roleId=" + roleId +
+                ", roleName='" + roleName + '\'' +
+                ", authUserCount=" + authUserCount +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/SmsSignResourceDTO.java

@@ -12,9 +12,10 @@ import java.util.List;
 public class SmsSignResourceDTO implements Serializable {
     private static final long serialVersionUID = -6009818220117316815L;
     private String ids;
-    //
     private List<Long> idList;
-    // 1：全部   2：部分
+    /**
+     * 1：全部   2：部分
+     */
     private Integer type;
 
     public String getIds() {
@@ -40,4 +41,13 @@ public class SmsSignResourceDTO implements Serializable {
     public void setType(Integer type) {
         this.type = type;
     }
+
+    @Override
+    public String toString() {
+        return "SmsSignResourceDTO{" +
+                "ids='" + ids + '\'' +
+                ", idList=" + idList +
+                ", type=" + type +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/StoreResourceDTO.java

@@ -11,9 +11,10 @@ import java.util.List;
  */
 public class StoreResourceDTO implements Serializable {
     private static final long serialVersionUID = -6009818220117316815L;
-    //
     private List<Integer> storeIdList;
-    // 1：全部   2：部分
+    /**
+     * 1：全部   2：部分
+     */
     private Integer type;
 
     public List<Integer> getStoreIdList() {
@@ -31,4 +32,12 @@ public class StoreResourceDTO implements Serializable {
     public void setType(Integer type) {
         this.type = type;
     }
+
+    @Override
+    public String toString() {
+        return "StoreResourceDTO{" +
+                "storeIdList=" + storeIdList +
+                ", type=" + type +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/UnionEnterpriseDTO.java

@@ -7,9 +7,16 @@ import java.util.List;
 /**
  * tab_sys_union_enterprise
  */
+/**
+ * 
+ * @ClassName: UnionEnterpriseDTO
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-09 20:36
+ */
 public class UnionEnterpriseDTO implements Serializable {
     /**
-     * 
+     *
      */
     private Integer unionId;
 
@@ -168,4 +175,25 @@ public class UnionEnterpriseDTO implements Serializable {
     public void setUnionManagerPhone(String unionManagerPhone) {
         this.unionManagerPhone = unionManagerPhone;
     }
+
+    @Override
+    public String toString() {
+        return "UnionEnterpriseDTO{" +
+                "unionId=" + unionId +
+                ", unionEnterpriseId=" + unionEnterpriseId +
+                ", unionEnterpriseName='" + unionEnterpriseName + '\'' +
+                ", unionCompanyName='" + unionCompanyName + '\'' +
+                ", unionManagerName='" + unionManagerName + '\'' +
+                ", unionManagerPhone='" + unionManagerPhone + '\'' +
+                ", status=" + status +
+                ", authorizationStatus=" + authorizationStatus +
+                ", authorizationTime=" + authorizationTime +
+                ", enterpriseId=" + enterpriseId +
+                ", memberResourceId=" + memberResourceId +
+                ", storeResourceId=" + storeResourceId +
+                ", goodsResourceId=" + goodsResourceId +
+                ", orderResourceId=" + orderResourceId +
+                ", resourceList=" + resourceList +
+                '}';
+    }
 }
\ No newline at end of file

gic-platform-auth-api/src/main/java/com/gic/auth/dto/UnionEnterpriseResourceDTO.java

@@ -2,6 +2,13 @@ package com.gic.auth.dto;
 
 import java.io.Serializable;
 
+/**
+ * 
+ * @ClassName: UnionEnterpriseResourceDTO
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-09 20:36
+ */
 public class UnionEnterpriseResourceDTO implements Serializable {
     private Long resource;
     private Integer unionEnterpriseId;
@@ -48,4 +55,15 @@ public class UnionEnterpriseResourceDTO implements Serializable {
     public void setAuthorizationMessage(String authorizationMessage) {
         this.authorizationMessage = authorizationMessage;
     }
+
+    @Override
+    public String toString() {
+        return "UnionEnterpriseResourceDTO{" +
+                "resource=" + resource +
+                ", unionEnterpriseId=" + unionEnterpriseId +
+                ", resourceType=" + resourceType +
+                ", authorizationStatus=" + authorizationStatus +
+                ", authorizationMessage='" + authorizationMessage + '\'' +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/UserDTO.java

 package com.gic.auth.dto;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @author guojx
@@ -103,6 +102,27 @@ public class UserDTO implements Serializable{
      * 登陆账号类型 1:运营 0:默认GIC
      */
     private Integer loginType;
+
+    /**
+     * 账号类型 1:永久账号 2:临时账号
+     */
+    private Integer accountType;
+
+    /**
+     * 临时账号到期时间
+     */
+    private Date accountDueDate;
+
+    /**
+     * 临时账号到期时间 前端
+     */
+    private String accountDueDateStr;
+
+    /**
+     * 职位 1:区域经理、2:线下运营、3:电商运营、4:IT专员、5:数据专员 子管理员必填
+     */
+    private Integer userPosition;
+
     /**
      * 用户角色，可以多选，用英文逗号隔开
      */
@@ -263,4 +283,68 @@ public class UserDTO implements Serializable{
     public void setAccountGroupIds(String accountGroupIds) {
         this.accountGroupIds = accountGroupIds;
     }
+
+    public Integer getAccountType() {
+        return accountType;
+    }
+
+    public UserDTO setAccountType(Integer accountType) {
+        this.accountType = accountType;
+        return this;
+    }
+
+    public Date getAccountDueDate() {
+        return accountDueDate;
+    }
+
+    public UserDTO setAccountDueDate(Date accountDueDate) {
+        this.accountDueDate = accountDueDate;
+        return this;
+    }
+
+    public Integer getUserPosition() {
+        return userPosition;
+    }
+
+    public UserDTO setUserPosition(Integer userPosition) {
+        this.userPosition = userPosition;
+        return this;
+    }
+
+    public String getAccountDueDateStr() {
+        return accountDueDateStr;
+    }
+
+    public UserDTO setAccountDueDateStr(String accountDueDateStr) {
+        this.accountDueDateStr = accountDueDateStr;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "UserDTO{" +
+                "userId=" + userId +
+                ", userName='" + userName + '\'' +
+                ", phoneNumber='" + phoneNumber + '\'' +
+                ", password='" + password + '\'' +
+                ", passwordType=" + passwordType +
+                ", confirmPassword='" + confirmPassword + '\'' +
+                ", superAdmin=" + superAdmin +
+                ", status=" + status +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", enterpriseId=" + enterpriseId +
+                ", phoneAreaCode='" + phoneAreaCode + '\'' +
+                ", userGroupIds='" + userGroupIds + '\'' +
+                ", loginType=" + loginType +
+                ", accountType=" + accountType +
+                ", accountDueDate=" + accountDueDate +
+                ", accountDueDateStr='" + accountDueDateStr + '\'' +
+                ", userPosition=" + userPosition +
+                ", userRoleIds='" + userRoleIds + '\'' +
+                ", userResourceIds='" + userResourceIds + '\'' +
+                ", operPasswordType=" + operPasswordType +
+                ", accountGroupIds='" + accountGroupIds + '\'' +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/UserListDTO.java

 package com.gic.auth.dto;
 
+import com.gic.auth.constant.Constants;
+
 import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 管理员列表
  * @ClassName: UserListDTO

@@ -40,6 +44,31 @@ public class UserListDTO implements Serializable{
      */
     private String userResourceNames;
 
+    /**
+     * 账号类型 1:永久账号 2:临时账号
+     */
+    private Integer accountType;
+
+    /**
+     * 临时账号到期时间
+     */
+    private Date accountDueDate;
+
+    /**
+     * 临时账号状态 1:生效中 2:已过期
+     */
+    private Integer accountDueDateType;
+
+    /**
+     * 职位 1:区域经理、2:线下运营、3:电商运营、4:IT专员、5:数据专员 子管理员必填
+     */
+    private Integer userPosition;
+
+    /**
+     *
+     */
+    private Date createTime;
+
     public Integer getUserId() {
         return userId;
     }
@@ -87,4 +116,74 @@ public class UserListDTO implements Serializable{
     public void setUserResourceNames(String userResourceNames) {
         this.userResourceNames = userResourceNames;
     }
+
+    public Integer getAccountType() {
+        return accountType;
+    }
+
+    public UserListDTO setAccountType(Integer accountType) {
+        this.accountType = accountType;
+        return this;
+    }
+
+    public Date getAccountDueDate() {
+        return accountDueDate;
+    }
+
+    public UserListDTO setAccountDueDate(Date accountDueDate) {
+        this.accountDueDate = accountDueDate;
+        return this;
+    }
+
+    public Integer getAccountDueDateType() {
+        if (accountType != null && accountType.equals(Constants.TEMP_ACCOUNT)) {
+            //如果是临时账号
+            if (accountDueDate.getTime() >= System.currentTimeMillis()) {
+                return 1;
+            } else {
+                return 2;
+            }
+        }
+        return accountDueDateType;
+    }
+
+    public UserListDTO setAccountDueDateType(Integer accountDueDateType) {
+        this.accountDueDateType = accountDueDateType;
+        return this;
+    }
+
+    public Integer getUserPosition() {
+        return userPosition;
+    }
+
+    public UserListDTO setUserPosition(Integer userPosition) {
+        this.userPosition = userPosition;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public UserListDTO setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "UserListDTO{" +
+                "userId=" + userId +
+                ", userName='" + userName + '\'' +
+                ", phoneNumber='" + phoneNumber + '\'' +
+                ", phoneAreaCode='" + phoneAreaCode + '\'' +
+                ", userRoleNames='" + userRoleNames + '\'' +
+                ", userResourceNames='" + userResourceNames + '\'' +
+                ", accountType=" + accountType +
+                ", accountDueDate=" + accountDueDate +
+                ", accountDueDateType=" + accountDueDateType +
+                ", userPosition=" + userPosition +
+                ", createTime=" + createTime +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/UserResourceDTO.java

@@ -112,4 +112,17 @@ public class UserResourceDTO implements Serializable{
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    @Override
+    public String toString() {
+        return "UserResourceDTO{" +
+                "userResourceId=" + userResourceId +
+                ", resourceId=" + resourceId +
+                ", userId=" + userId +
+                ", enterpriseId=" + enterpriseId +
+                ", status=" + status +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/UserRoleDTO.java

@@ -111,4 +111,17 @@ public class UserRoleDTO implements Serializable{
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    @Override
+    public String toString() {
+        return "UserRoleDTO{" +
+                "userRoleId=" + userRoleId +
+                ", roleId=" + roleId +
+                ", userId=" + userId +
+                ", enterpriseId=" + enterpriseId +
+                ", status=" + status +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/open/ChannelAuthDTO.java

@@ -32,7 +32,10 @@ public class ChannelAuthDTO implements Serializable{
         this.channelList = channelList;
     }
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
+    @Override
+    public String toString() {
+        return "ChannelAuthDTO{" +
+                "channelList=" + channelList +
+                '}';
     }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/open/ChannelDTO.java

@@ -2,6 +2,13 @@ package com.gic.auth.dto.open;
 
 import java.io.Serializable;
 
+/**
+ * 
+ * @ClassName: ChannelDTO
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-09 20:27
+ */
 public class ChannelDTO implements Serializable{
     private static final long serialVersionUID = 7594299146166653493L;
 
@@ -47,4 +54,13 @@ public class ChannelDTO implements Serializable{
     public void setType(Integer type) {
         this.type = type;
     }
+
+    @Override
+    public String toString() {
+        return "ChannelDTO{" +
+                "channelId=" + channelId +
+                ", channelName='" + channelName + '\'' +
+                ", type=" + type +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/open/ChannelResourceDTO.java

 package com.gic.auth.dto.open;
 
 import java.io.Serializable;
-
+/**
+ * 
+ * @ClassName: ChannelResourceDTO
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-09 20:34
+ */
 public class ChannelResourceDTO implements Serializable{
     private static final long serialVersionUID = 8158792714988882673L;
     /**
@@ -26,4 +32,12 @@ public class ChannelResourceDTO implements Serializable{
     public void setChannelResource(Integer channelResource) {
         this.channelResource = channelResource;
     }
+
+    @Override
+    public String toString() {
+        return "ChannelResourceDTO{" +
+                "channelResource=" + channelResource +
+                ", channelAuth=" + channelAuth +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/open/GoodsResourceDTO.java

@@ -2,6 +2,13 @@ package com.gic.auth.dto.open;
 
 import java.io.Serializable;
 
+/**
+ * 
+ * @ClassName: GoodsResourceDTO
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-09 20:34
+ */
 public class GoodsResourceDTO implements Serializable{
     private static final long serialVersionUID = 368101547153742819L;
     /**
@@ -26,4 +33,12 @@ public class GoodsResourceDTO implements Serializable{
     public void setGoodsRightsAuth(GoodsRightsAuthDTO goodsRightsAuth) {
         this.goodsRightsAuth = goodsRightsAuth;
     }
+
+    @Override
+    public String toString() {
+        return "GoodsResourceDTO{" +
+                "goodsResource=" + goodsResource +
+                ", goodsRightsAuth=" + goodsRightsAuth +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/open/GoodsRightsAuthDTO.java

@@ -2,7 +2,13 @@ package com.gic.auth.dto.open;
 
 import java.io.Serializable;
 import java.util.List;
-
+/**
+ * 
+ * @ClassName: GoodsRightsAuthDTO
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-09 20:34
+ */
 public class GoodsRightsAuthDTO implements Serializable{
     private static final long serialVersionUID = 3365902031841545564L;
 
@@ -15,4 +21,11 @@ public class GoodsRightsAuthDTO implements Serializable{
     public void setGoodsRightsChannelList(List<GoodsRightsChannelDTO> goodsRightsChannelList) {
         this.goodsRightsChannelList = goodsRightsChannelList;
     }
+
+    @Override
+    public String toString() {
+        return "GoodsRightsAuthDTO{" +
+                "goodsRightsChannelList=" + goodsRightsChannelList +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/open/GoodsRightsBrandDTO.java

 package com.gic.auth.dto.open;
 
 import java.io.Serializable;
-
+/**
+ * 
+ * @ClassName: GoodsRightsBrandDTO
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-09 20:34
+ */
 public class GoodsRightsBrandDTO implements Serializable{
     private static final long serialVersionUID = 2236740261653028520L;
 
@@ -34,4 +40,13 @@ public class GoodsRightsBrandDTO implements Serializable{
     public void setBrandName(String brandName) {
         this.brandName = brandName;
     }
+
+    @Override
+    public String toString() {
+        return "GoodsRightsBrandDTO{" +
+                "brandId=" + brandId +
+                ", brandCode='" + brandCode + '\'' +
+                ", brandName='" + brandName + '\'' +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/open/GoodsRightsChannelDTO.java

@@ -2,7 +2,13 @@ package com.gic.auth.dto.open;
 
 import java.io.Serializable;
 import java.util.List;
-
+/**
+ * 
+ * @ClassName: GoodsRightsChannelDTO
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-09 20:34
+ */
 public class GoodsRightsChannelDTO implements Serializable{
     private static final long serialVersionUID = -1343276116860387848L;
 
@@ -35,4 +41,13 @@ public class GoodsRightsChannelDTO implements Serializable{
     public void setGoodsRightsDomainList(List<GoodsRightsDomainDTO> goodsRightsDomainList) {
         this.goodsRightsDomainList = goodsRightsDomainList;
     }
+
+    @Override
+    public String toString() {
+        return "GoodsRightsChannelDTO{" +
+                "channelCode='" + channelCode + '\'' +
+                ", channelName='" + channelName + '\'' +
+                ", goodsRightsDomainList=" + goodsRightsDomainList +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/open/GoodsRightsDomainDTO.java

@@ -2,7 +2,13 @@ package com.gic.auth.dto.open;
 
 import java.io.Serializable;
 import java.util.List;
-
+/**
+ * 
+ * @ClassName: GoodsRightsDomainDTO
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-09 20:34
+ */
 public class GoodsRightsDomainDTO implements Serializable{
     private static final long serialVersionUID = 6324205784953715323L;
 
@@ -46,4 +52,13 @@ public class GoodsRightsDomainDTO implements Serializable{
         this.goodsRightsBrandList = goodsRightsBrandList;
     }
 
+    @Override
+    public String toString() {
+        return "GoodsRightsDomainDTO{" +
+                "goodsDomainId=" + goodsDomainId +
+                ", goodsDomainCode='" + goodsDomainCode + '\'' +
+                ", goodsDomainName='" + goodsDomainName + '\'' +
+                ", goodsRightsBrandList=" + goodsRightsBrandList +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/open/OrderResourceDTO.java

@@ -2,6 +2,13 @@ package com.gic.auth.dto.open;
 
 import java.io.Serializable;
 
+/**
+ * 
+ * @ClassName: OrderResourceDTO
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-09 20:35
+ */
 public class OrderResourceDTO implements Serializable{
     private static final long serialVersionUID = 2909345365948325303L;
 
@@ -25,4 +32,12 @@ public class OrderResourceDTO implements Serializable{
     public void setOrderStoreAuth(OrderStoreAuthDTO orderStoreAuth) {
         this.orderStoreAuth = orderStoreAuth;
     }
+
+    @Override
+    public String toString() {
+        return "OrderResourceDTO{" +
+                "orderResource=" + orderResource +
+                ", orderStoreAuth=" + orderStoreAuth +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/open/OrderStoreAuthDTO.java

@@ -30,4 +30,11 @@ public class OrderStoreAuthDTO implements Serializable{
     public void setOrderStoreList(List<OrderStoreDTO> orderStoreList) {
         this.orderStoreList = orderStoreList;
     }
+
+    @Override
+    public String toString() {
+        return "OrderStoreAuthDTO{" +
+                "orderStoreList=" + orderStoreList +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/open/OrderStoreDTO.java

@@ -2,6 +2,13 @@ package com.gic.auth.dto.open;
 
 import java.io.Serializable;
 
+/**
+ * 
+ * @ClassName: OrderStoreDTO
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-09 20:35
+ */
 public class OrderStoreDTO implements Serializable{
     private static final long serialVersionUID = 3841064488953962444L;
 
@@ -46,4 +53,13 @@ public class OrderStoreDTO implements Serializable{
     public void setType(Integer type) {
         this.type = type;
     }
+
+    @Override
+    public String toString() {
+        return "OrderStoreDTO{" +
+                "storeId=" + storeId +
+                ", storeName='" + storeName + '\'' +
+                ", type=" + type +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/open/ResourceOpenDTO.java

@@ -73,4 +73,15 @@ public class ResourceOpenDTO implements Serializable{
     public void setGoodsResource(GoodsResourceDTO goodsResource) {
         this.goodsResource = goodsResource;
     }
+
+    @Override
+    public String toString() {
+        return "ResourceOpenDTO{" +
+                "store=" + store +
+                ", userResource=" + userResource +
+                ", channelResource=" + channelResource +
+                ", orderResource=" + orderResource +
+                ", goodsResource=" + goodsResource +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/open/StoreAuthDTO.java

@@ -33,4 +33,11 @@ public class StoreAuthDTO implements Serializable{
     public void setStoreList(List<StoreOpenDTO> storeList) {
         this.storeList = storeList;
     }
+
+    @Override
+    public String toString() {
+        return "StoreAuthDTO{" +
+                "storeList=" + storeList +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/open/StoreOpenDTO.java

@@ -45,4 +45,12 @@ public class StoreOpenDTO implements Serializable{
     public void setRegionName(String regionName) {
         this.regionName = regionName;
     }
+
+    @Override
+    public String toString() {
+        return "StoreOpenDTO{" +
+                "regionId=" + regionId +
+                ", regionName='" + regionName + '\'' +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/open/StoreResourceDTO.java

@@ -46,4 +46,12 @@ public class StoreResourceDTO implements Serializable{
     public void setStoreResource(Long storeResource) {
         this.storeResource = storeResource;
     }
+
+    @Override
+    public String toString() {
+        return "StoreResourceDTO{" +
+                "storeResource=" + storeResource +
+                ", storeAuth=" + storeAuth +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/open/UserAreaAuthDTO.java

@@ -30,4 +30,11 @@ public class UserAreaAuthDTO implements Serializable{
     public void setUserAreaList(List<UserAreaDTO> userAreaList) {
         this.userAreaList = userAreaList;
     }
+
+    @Override
+    public String toString() {
+        return "UserAreaAuthDTO{" +
+                "userAreaList=" + userAreaList +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/open/UserAreaDTO.java

@@ -2,6 +2,13 @@ package com.gic.auth.dto.open;
 
 import java.io.Serializable;
 
+/**
+ * 
+ * @ClassName: UserAreaDTO
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-09 20:36
+ */
 public class UserAreaDTO implements Serializable{
     private static final long serialVersionUID = 4186646894283704858L;
 
@@ -46,4 +53,13 @@ public class UserAreaDTO implements Serializable{
     public void setType(Integer type) {
         this.type = type;
     }
+
+    @Override
+    public String toString() {
+        return "UserAreaDTO{" +
+                "id=" + id +
+                ", name='" + name + '\'' +
+                ", type=" + type +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/open/UserResourceDTO.java

@@ -15,7 +15,7 @@ public class UserResourceDTO implements Serializable{
      */
     private Long userResource;
 
-    private UserAreaAuthDTO UserArea;
+    private UserAreaAuthDTO userArea;
 
 
     public Long getUserResource() {
@@ -27,10 +27,18 @@ public class UserResourceDTO implements Serializable{
     }
 
     public UserAreaAuthDTO getUserArea() {
-        return UserArea;
+        return userArea;
     }
 
     public void setUserArea(UserAreaAuthDTO userArea) {
-        UserArea = userArea;
+        this.userArea = userArea;
+    }
+
+    @Override
+    public String toString() {
+        return "UserResourceDTO{" +
+                "userResource=" + userResource +
+                ", userArea=" + userArea +
+                '}';
     }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/qo/UserListQO.java

@@ -27,6 +27,15 @@ public class UserListQO extends PageQO{
 
     private List<Integer> userIdList;
 
+    private Integer accountType;
+
+    private Integer userPosition;
+
+    /**
+     * 临时账号状态 生效中 已过期
+     */
+    private Integer accountDueDateType;
+
     public String getSearch() {
         return search;
     }
@@ -74,4 +83,31 @@ public class UserListQO extends PageQO{
     public void setUserIdList(List<Integer> userIdList) {
         this.userIdList = userIdList;
     }
+
+    public Integer getAccountType() {
+        return accountType;
+    }
+
+    public UserListQO setAccountType(Integer accountType) {
+        this.accountType = accountType;
+        return this;
+    }
+
+    public Integer getUserPosition() {
+        return userPosition;
+    }
+
+    public UserListQO setUserPosition(Integer userPosition) {
+        this.userPosition = userPosition;
+        return this;
+    }
+
+    public Integer getAccountDueDateType() {
+        return accountDueDateType;
+    }
+
+    public UserListQO setAccountDueDateType(Integer accountDueDateType) {
+        this.accountDueDateType = accountDueDateType;
+        return this;
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/qo/UserMenuQO.java

 package com.gic.auth.qo;
 
 import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
+/**
+ * 
+ * @ClassName: UserMenuQO
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-09 20:37
+ */
 public class UserMenuQO implements Serializable{
     private static final long serialVersionUID = 2570558155342976221L;
 

gic-platform-auth-api/src/main/java/com/gic/auth/service/AuditedGroupApiService.java

@@ -50,7 +50,7 @@ public interface AuditedGroupApiService {
     ServiceResponse<Page<AuditedGroupDTO>> listAuditedGroup(AuditedGroupQO auditedGroupQO);
 
     /**
-     *
+     * getAuditedGroup
      * @Title: getAuditedGroup
      * @Description:
      * @author zhiwj

gic-platform-auth-api/src/main/java/com/gic/auth/service/AuditorApiService.java

@@ -39,7 +39,7 @@ public interface AuditorApiService {
     ServiceResponse<Void> delAuditor(Integer auditorId);
 
     /**
-     *
+     * getAuditor
      * @Title: getAuditor
      * @Description:
      * @author zhiwj
@@ -50,7 +50,7 @@ public interface AuditorApiService {
     ServiceResponse<AuditorDTO> getAuditor(Integer auditorId);
 
     /**
-     *
+     * pageAuditor
      * @Title: pageAuditor
      * @Description:
      * @author zhiwj
@@ -90,6 +90,7 @@ public interface AuditorApiService {
      * @author zhiwj
      * @param projectItemId 审批项id
      * @param userId 管理员id
+     * @param enterpriseId
      * @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.AuditorDTO>>
      * @throws
      */
@@ -109,11 +110,12 @@ public interface AuditorApiService {
     ServiceResponse<List<AuditorDTO>> listAuditorByProject(String projectItemCode, Integer userId, Integer enterpriseId);
     
     /**
+     * listAuditorByProject
      * @Title: listAuditorByProject
      * @Description: 
      * @author zhiwj 
- * @param projectItemCode
- * @param enterpriseId
+     * @param projectItemCode
+     * @param enterpriseId
      * @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.AuditorDTO>>
      * @throws 
      */
@@ -131,7 +133,7 @@ public interface AuditorApiService {
     ServiceResponse<AuditorDTO> getAuditorByOpenid(String openid);
 
     /**
-     * 
+     * delRelByProjectItemId
      * @Title: delRelByProjectItemId
      * @Description:
      * @author zhiwj

gic-platform-auth-api/src/main/java/com/gic/auth/service/AuthCodeApiService.java

@@ -3,33 +3,66 @@ package com.gic.auth.service;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.auth.dto.AuthCodeDTO;
 
+/**
+ * 
+ * @ClassName: AuthCodeApiService
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-09 20:27
+ */
 public interface AuthCodeApiService {
     
-    /** @Description: 保存验证码
+    /**
+     * 保存验证码
+     * @Description: 保存验证码
      * @author taogs
      * @Date 11:09 2019/9/2
-     * @Param 
+     * @param authCodeDTO
      * @return 
     */
     ServiceResponse<Integer> saveAuth(AuthCodeDTO authCodeDTO);
 
-    /** @Description: 设置验证码无效
+    /**
+     * 设置验证码无效
+     * @Description: 设置验证码无效
      * @author taogs
      * @Date 11:09 2019/9/2
-     * @Param 
+     * @param authCodeId
      * @return 
     */
     ServiceResponse<Integer> expireAuthCode(Integer authCodeId);
 
-    /** @Description: 获取验证码
+    /**
+     * 获取验证码
+     * @Description: 获取验证码
      * @author taogs
      * @Date 11:10 2019/9/2
-     * @Param 
+     * @param enterpriseId
+     * @param relationId
      * @return 
     */
     ServiceResponse<AuthCodeDTO> getAuthCode(Integer enterpriseId, Integer relationId);
 
+    /**
+     * getAuthCode
+     * @Title: getAuthCode
+     * @Description:
+     * @author zhiwj
+     * @param authCodeId
+     * @return com.gic.api.base.commons.ServiceResponse<com.gic.auth.dto.AuthCodeDTO>
+     * @throws
+     */
     ServiceResponse<AuthCodeDTO> getAuthCode(Integer authCodeId);
 
+    /**
+     * validateAuthCode
+     * @Title: validateAuthCode
+     * @Description:
+     * @author zhiwj
+     * @param authCodeId
+     * @param authCode
+     * @return com.gic.api.base.commons.ServiceResponse
+     * @throws
+     */
     ServiceResponse validateAuthCode(Integer authCodeId, String authCode);
 }

gic-platform-auth-api/src/main/java/com/gic/auth/service/BusinessFrontResApiService.java

@@ -42,6 +42,7 @@ public interface BusinessFrontResApiService {
     
*/
     ServiceResponse<String> delete(Integer resourceId);
     /**
+     * listByParams
      * @Title: listByParams

      * @Description: 
     
* @author guojuxing 

gic-platform-auth-api/src/main/java/com/gic/auth/service/MenuApiService.java

@@ -32,7 +32,16 @@ public interface MenuApiService {
      * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.MenuDTO>>

     
 */
     ServiceResponse<List<MenuDTO>> listByMenuIdList(List<Integer> menuIdList);
-
+    
+    /**
+     * listByParentMenuIdList 
+     * @Title: listByParentMenuIdList
+     * @Description: 
+     * @author zhiwj 
+     * @param parentMenuIdList
+     * @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.MenuDTO>>
+     * @throws 
+     */
     ServiceResponse<List<MenuDTO>> listByParentMenuIdList(List<Integer> parentMenuIdList);
 
     /**
@@ -67,6 +76,15 @@ public interface MenuApiService {
     ServiceResponse<List<MenuDTO>> getUserMenuOfGic(Integer enterpriseId, Integer userId, Integer currentMenu,
             String versionCode);
 
+    /**
+     * getUserMenuOfGic 
+     * @Title: getUserMenuOfGic
+     * @Description: 
+     * @author zhiwj 
+     * @param params
+     * @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.MenuDTO>>
+     * @throws 
+     */
     ServiceResponse<List<MenuDTO>> getUserMenuOfGic(UserMenuQO params);
 
     /**
@@ -95,17 +113,17 @@ public interface MenuApiService {
     
*/
     ServiceResponse<List<MenuDTO>> getCollaboratorAppMenuPage(Integer enterpriseId, List<Integer> menuIdList, String appId);
 
-
     /**
      * 获取协作应用的没有权限的操作项列表数据
-     * @Title: getCollaboratorAppOperationItem

+     * @Title: getCollaboratorAppOperationItem
      * @Description:
-    
* @author guojuxing
+     * @author zhiwj
      * @param menuIdList 协作应用权限
      * @param appId 应用ID
-     * @param 
userId 管理员
-     * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.MenuDTO>>

-    
*/
+     * @param userId 管理员
+     * @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.MenuDTO>>
+     * @throws
+     */
     ServiceResponse<List<MenuDTO>> getCollaboratorAppOperationItem(List<Integer> menuIdList, String appId, Integer userId);
 
     /**
@@ -121,7 +139,19 @@ public interface MenuApiService {
     
*/
     ServiceResponse<List<MenuDTO>> getUserMenuOfApp(Integer enterpriseId, Integer userId, Integer currentMenu,
             String versionCode);
-
+    
+    /**
+     * getUserMenuOfAppNotTree 
+     * @Title: getUserMenuOfAppNotTree
+     * @Description: 
+     * @author zhiwj 
+     * @param enterpriseId
+     * @param userId
+     * @param currentMenu
+     * @param versionCode
+     * @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.MenuDTO>>
+     * @throws 
+     */
     ServiceResponse<List<MenuDTO>> getUserMenuOfAppNotTree(Integer enterpriseId, Integer userId, Integer currentMenu,
                                                     String versionCode);
 
@@ -188,7 +218,16 @@ public interface MenuApiService {
      * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.MenuDTO>>

     
*/
     ServiceResponse<List<MenuDTO>> listMenuTreeForHaoban(MenuListQO params);
-
+    
+    /**
+     * listAllAuthDepart 
+     * @Title: listAllAuthDepart
+     * @Description: 
+     * @author zhiwj 
+ * @param menuCodeList
+     * @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.MenuAuthDepartDTO>>
+     * @throws 
+     */
     ServiceResponse<List<MenuAuthDepartDTO>> listAllAuthDepart(List<String> menuCodeList);
 
     /**
@@ -442,7 +481,16 @@ public interface MenuApiService {
      * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Void>

     
*/
     ServiceResponse<Void> syncProductMenu(String menuCode);
-
+    
+    /**
+     * test 
+     * @Title: test
+     * @Description: 
+     * @author zhiwj 
+     * @param menuCode
+     * @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.MenuDTO>>
+     * @throws 
+     */
     ServiceResponse<List<MenuDTO>> test(String menuCode);
 
     /**

gic-platform-auth-api/src/main/java/com/gic/auth/service/OrderAppResourceApiService.java

@@ -12,7 +12,7 @@ import com.gic.auth.dto.OrderAppResourceDTO;
 public interface OrderAppResourceApiService {
 
     /**
-     *
+     *saveOrUpdate
      * @Title: saveOrUpdate
      * @Description:
      * @author zhiwj
@@ -23,7 +23,7 @@ public interface OrderAppResourceApiService {
     ServiceResponse<Integer> saveOrUpdate(OrderAppResourceDTO orderAppResourceDTO);
 
     /**
-     *
+     *getById
      * @Title: getById
      * @Description:
      * @author zhiwj

gic-platform-auth-api/src/main/java/com/gic/auth/service/ResourceApiService.java

@@ -75,6 +75,7 @@ public interface ResourceApiService {
      * @Title: getChannelResourceByUserId
      * @Description:
      * @author zhiwj
+     * @param userId
      * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
      * @throws
      */
@@ -114,6 +115,7 @@ public interface ResourceApiService {
     ServiceResponse<OrderResourceDTO> getOrderResourceByUserId(Integer userId);
 
     /**
+     * getUserResourceByUserId
      * @Title: getUserResourceByUserId
      * @Description:
      * @author zhiwj

gic-platform-auth-api/src/main/java/com/gic/auth/service/ResourceOpenApiService.java

@@ -2,14 +2,21 @@ package com.gic.auth.service;
 
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.auth.dto.open.ResourceOpenDTO;
-
+/**
+ * 
+ * @ClassName: ResourceOpenApiService
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-09 20:35
+ */
 public interface ResourceOpenApiService {
 
     /**
      * 对第三方开发者资源数据
      * @Title: getResource

      * @Description:
-    
* @author guojuxing
+     * @param appId
+     * @param enterpriseId
      * @return  com.gic.api.base.commons.ServiceResponse<com.gic.auth.dto.open.ResourceOpenDTO>

     
*/
     ServiceResponse<ResourceOpenDTO> getResource(String appId, Integer enterpriseId);

gic-platform-auth-api/src/main/java/com/gic/auth/service/UnionEnterpriseApiService.java

@@ -7,25 +7,132 @@ import com.gic.auth.dto.UnionEnterpriseResourceDTO;
 
 import java.util.List;
 
+/**
+ * 
+ * @ClassName: UnionEnterpriseApiService
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-09 20:36
+ */
 public interface UnionEnterpriseApiService {
+    /**
+     * saveUnionEnterprise
+     * @Title: saveUnionEnterprise
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseDTO
+     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Integer>
+     * @throws
+     */
     ServiceResponse<Integer> saveUnionEnterprise(UnionEnterpriseDTO enterpriseDTO);
 
+    /**
+     * getUnionEnterpriseByUnionEnterpriseId
+     * @Title: getUnionEnterpriseByUnionEnterpriseId
+     * @Description:
+     * @author zhiwj
+     * @param unionEnterrpiseId
+     * @return com.gic.api.base.commons.ServiceResponse<com.gic.auth.dto.UnionEnterpriseDTO>
+     * @throws
+     */
     ServiceResponse<UnionEnterpriseDTO> getUnionEnterpriseByUnionEnterpriseId(Integer unionEnterrpiseId);
 
+    /**
+     * delUnionEnterprise
+     * @Title: delUnionEnterprise
+     * @Description:
+     * @author zhiwj
+     * @param unionId
+     * @param enterpriseId
+     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Integer>
+     * @throws
+     */
     ServiceResponse<Integer> delUnionEnterprise(Integer unionId, Integer enterpriseId);
 
+    /**
+     * delUnionEnterpriseSource
+     * @Title: delUnionEnterpriseSource
+     * @Description:
+     * @author zhiwj
+     * @param resourceId
+     * @param enterpriseId
+     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Integer>
+     * @throws
+     */
     ServiceResponse<Integer> delUnionEnterpriseSource(Long resourceId, Integer enterpriseId);
 
+    /**
+     * getUnionEnterpriseById
+     * @Title: getUnionEnterpriseById
+     * @Description:
+     * @author zhiwj
+     * @param unionId
+     * @return com.gic.api.base.commons.ServiceResponse<com.gic.auth.dto.UnionEnterpriseDTO>
+     * @throws
+     */
     ServiceResponse<UnionEnterpriseDTO> getUnionEnterpriseById(Integer unionId);
 
+    /**
+     * pageUnionEnterprise
+     * @Title: pageUnionEnterprise
+     * @Description:
+     * @author zhiwj
+     * @param search
+     * @param enterpriseId
+     * @param pageNum
+     * @param pageSize
+     * @param authorizationStatus
+     * @return com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<com.gic.auth.dto.UnionEnterpriseDTO>>
+     * @throws
+     */
     ServiceResponse<Page<UnionEnterpriseDTO>> pageUnionEnterprise(String search, Integer enterpriseId, Integer pageNum,
                                                                   Integer pageSize, Integer authorizationStatus);
 
+    /**
+     * updateStoreAuthorizationStatus
+     * @Title: updateStoreAuthorizationStatus
+     * @Description:
+     * @author zhiwj
+     * @param authOrizationStatus
+     * @param enterpriseId
+     * @param message
+     * @param key
+     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
+     * @throws
+     */
     ServiceResponse<Void> updateStoreAuthorizationStatus(int authOrizationStatus, Integer enterpriseId, String message, String key);
 
+    /**
+     * listStoreResourceByEnterpriseId
+     * @Title: listStoreResourceByEnterpriseId
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.UnionEnterpriseResourceDTO>>
+     * @throws
+     */
     ServiceResponse<List<UnionEnterpriseResourceDTO>> listStoreResourceByEnterpriseId(Integer enterpriseId);
 
+    /**
+     * listResourceByUnionId
+     * @Title: listResourceByUnionId
+     * @Description:
+     * @author zhiwj
+     * @param unionId
+     * @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.UnionEnterpriseResourceDTO>>
+     * @throws
+     */
     ServiceResponse<List<UnionEnterpriseResourceDTO>> listResourceByUnionId(Integer unionId);
 
+    /**
+     * reAuthorizationResource
+     * @Title: reAuthorizationResource
+     * @Description:
+     * @author zhiwj
+     * @param resourceId
+     * @param resourceType
+     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
+     * @throws
+     */
     ServiceResponse<Void> reAuthorizationResource(Long resourceId, Integer resourceType);
 }

gic-platform-auth-api/src/main/java/com/gic/auth/service/UserApiService.java

 package com.gic.auth.service;
 
-import java.util.List;
-
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.auth.dto.UserDTO;
 import com.gic.auth.dto.UserListDTO;
 import com.gic.auth.qo.UserListQO;
 
+import java.util.List;
+
 /**
  * @author guojx
  * @date 2019/7/16 6:48 PM
@@ -43,6 +43,17 @@ public interface UserApiService {
     ServiceResponse<Void> updateOperationUser(Integer userId, String userName);
 
     /**
+     * 修改职位（个人资料）
+     * @Title: updateUserPosition

+     * @Description:
+    
* @author guojuxing
+     * @param userId
+     * @param userPosition

+     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Void>

+    
*/
+    ServiceResponse<Void> updateUserPosition(Integer userId, Integer userPosition);
+
+    /**
      * 新增超级用户
      * @Title: saveAdmin

      * @Description:
@@ -125,6 +136,17 @@ public interface UserApiService {
     
 */
     ServiceResponse<UserDTO> listUserByPhoneNumber(String phoneNumber, Integer enterpriseId);
 
+    /**
+     * listUserByPhoneNumber 
+     * @Title: listUserByPhoneNumber
+     * @Description: 
+     * @author zhiwj 
+     * @param nationCode
+     * @param phoneNumber
+     * @param enterpriseId
+     * @return com.gic.api.base.commons.ServiceResponse<com.gic.auth.dto.UserDTO>
+     * @throws 
+     */
     ServiceResponse<UserDTO> listUserByPhoneNumber(String nationCode, String phoneNumber, Integer enterpriseId);
 
     /**
@@ -138,7 +160,19 @@ public interface UserApiService {
      * @return  com.gic.api.base.commons.ServiceResponse<com.gic.auth.dto.UserDTO>

     
*/
     ServiceResponse<UserDTO> getUserByPhoneNumber(String nationCode, String phoneNumber, Integer enterpriseId);
-
+    
+    /**
+     * login 
+     * @Title: login
+     * @Description: 
+     * @author zhiwj 
+     * @param nationCode
+     * @param phoneNumber
+     * @param enterpriseId
+     * @param password
+     * @return com.gic.api.base.commons.ServiceResponse<com.gic.auth.dto.UserDTO>
+     * @throws 
+     */
     ServiceResponse<UserDTO> login(String nationCode, String phoneNumber, Integer enterpriseId, String password);
 
     /**
@@ -171,7 +205,16 @@ public interface UserApiService {
      * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.UserDTO>>

     
 */
     ServiceResponse<List<UserDTO>> listUserByIdList(List<Integer> userIdList);
-
+    
+    /**
+     * getUserDetail 
+     * @Title: getUserDetail
+     * @Description: 
+     * @author zhiwj 
+ * @param token
+     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Object>
+     * @throws 
+     */
     ServiceResponse<Object> getUserDetail(String token);
 
     /**
@@ -213,7 +256,7 @@ public interface UserApiService {
      * 查询gic用户列表
      * @Title: listGicUser

      * @Description:
-    
* @author guojuxing
+    
 * @author guojuxing
      * @param enterpriseId

      * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.UserDTO>>

     
*/

gic-platform-auth-api/src/main/java/com/gic/auth/service/UserResourceApiService.java

@@ -21,10 +21,12 @@ public interface UserResourceApiService {
     
 */
     ServiceResponse<Void> save(UserResourceDTO dto);
 
-    /** @Description: 查询用户的资源id
+    /**
+     * 查询用户的资源id
+     * @Description: 查询用户的资源id
      * @author taogs
      * @Date 15:30 2019/12/6
-     * @Param 
+     * @param userId
      * @return 
     */
     ServiceResponse<UserResourceDTO> getResourceByUserId(Integer userId);

gic-platform-auth-api/src/main/java/com/gic/auth/utils/ValidSplitUtils.java

 package com.gic.auth.utils;
 
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.auth.constant.Constants;
+
 /**
  * 英文逗号隔开的数据校验
  * @ClassName: ValidSplitUtils

@@ -11,7 +13,7 @@ import com.gic.api.base.commons.ServiceResponse;
 public class ValidSplitUtils {
 
     public static ServiceResponse<String[]> validStr(String param) {
-        if (!isNumericZidai(param.replaceAll(",", ""))) {
+        if (!isNumericZidai(param.replaceAll(Constants.COMMA, ""))) {
             return ServiceResponse.failure("0005", "数据格式有误，不是英文逗号隔开的数据");
         }
         String[] strArr = param.split(",");

gic-platform-auth-service/pom.xml

@@ -19,6 +19,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <libraryVersion>4.0-SNAPSHOT</libraryVersion>
         <gic-sharding-sdk>3.1-SNAPSHOT</gic-sharding-sdk>
+        <gic-platform-config>4.0-SNAPSHOT</gic-platform-config>
     </properties>
 
     <dependencies>
@@ -226,6 +227,58 @@
                 </configuration>
             </plugin>
 
+            <!--<plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-pmd-plugin</artifactId>
+                <version>3.11.0</version>
+                <configuration>
+                    <skip>true</skip>
+                    <sourceEncoding>${project.build.sourceEncoding}</sourceEncoding>
+                    <targetJdk>1.8</targetJdk>
+                    <printFailingErrors>true</printFailingErrors>
+                    <excludes>
+                        <exclude>**/FixClassTypeResolver.java</exclude>
+                    </excludes>
+                    &lt;!&ndash; 代码检查规则 &ndash;&gt;
+                    <rulesets>
+                        <ruleset>rulesets/java/gic-ali-comment.xml</ruleset>
+                        <ruleset>rulesets/java/gic-ali-naming.xml</ruleset>
+                        <ruleset>rulesets/java/gic-ali-concurrent.xml</ruleset>
+                        <ruleset>rulesets/java/gic-ali-constant.xml</ruleset>
+                        <ruleset>rulesets/java/gic-ali-exception.xml</ruleset>
+                        <ruleset>rulesets/java/gic-ali-flowcontrol.xml</ruleset>
+                        <ruleset>rulesets/java/gic-ali-oop.xml</ruleset>
+                        <ruleset>rulesets/java/gic-ali-orm.xml</ruleset>
+                        <ruleset>rulesets/java/gic-ali-other.xml</ruleset>
+                        <ruleset>rulesets/java/gic-ali-set.xml</ruleset>
+                        <ruleset>rulesets/java/gic-common.xml</ruleset>
+                    </rulesets>
+                </configuration>
+                <executions>
+                    &lt;!&ndash; 绑定pmd:pmd到site生命周期 &ndash;&gt;
+                    <execution>
+                        <id>pmd-pmd-site</id>
+                        <phase>site</phase>
+                        <goals>
+                            <goal>pmd</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                &lt;!&ndash; p3c依赖 &ndash;&gt;
+                <dependencies>
+                    <dependency>
+                        <groupId>com.alibaba.p3c</groupId>
+                        <artifactId>p3c-pmd</artifactId>
+                        <version>2.0.2-SNAPSHOT</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>com.gic</groupId>
+                        <artifactId>gic-platform-config</artifactId>
+                        <version>${gic-platform-config}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>-->
+
         </plugins>
     </build>
 </project>

gic-platform-auth-service/src/main/java/com/gic/auth/config/Config.java

@@ -4,6 +4,13 @@ import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
+/**
+ * 
+ * @ClassName: Config
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-10 9:37
+ */
 @Configuration
 @EnableApolloConfig
 public class Config {

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabAuditedGroupMapper.java

@@ -8,6 +8,13 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
+/**
+ * 
+ * @ClassName: TabAuditedGroupMapper
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-10 9:38
+ */
 public interface TabAuditedGroupMapper {
     /**
      * 根据主键删除
@@ -57,11 +64,47 @@ public interface TabAuditedGroupMapper {
      */
     int updateByPrimaryKey(TabAuditedGroup record);
 
+    /**
+     * getFirstAuditedGroup
+     * @Title: getFirstAuditedGroup
+     * @Description:
+     * @author zhiwj
+     * @param auditedGroupDTO
+     * @return java.lang.Integer
+     * @throws
+     */
     Integer getFirstAuditedGroup(AuditedGroupDTO auditedGroupDTO);
 
+    /**
+     * delAuditedGroup
+     * @Title: delAuditedGroup
+     * @Description:
+     * @author zhiwj
+     * @param auditedGroupId
+     * @return java.lang.Integer
+     * @throws
+     */
     Integer delAuditedGroup(@Param("auditedGroupId") Integer auditedGroupId);
 
+    /**
+     * listAuditedGroup
+     * @Title: listAuditedGroup
+     * @Description:
+     * @author zhiwj
+     * @param auditedGroupQO
+     * @return com.github.pagehelper.Page<com.gic.auth.entity.TabAuditedGroup>
+     * @throws
+     */
     Page<TabAuditedGroup> listAuditedGroup(AuditedGroupQO auditedGroupQO);
 
+    /**
+     * countByAuditedGroupIds
+     * @Title: countByAuditedGroupIds
+     * @Description:
+     * @author zhiwj
+     * @param auditedGroupIdList
+     * @return int
+     * @throws
+     */
     int countByAuditedGroupIds(@Param("ids") List<Integer> auditedGroupIdList);
 }
\ No newline at end of file

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabAuditedGroupUserRelMapper.java

@@ -8,6 +8,13 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * 
+ * @ClassName: TabAuditedGroupUserRelMapper
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-10 9:38
+ */
 public interface TabAuditedGroupUserRelMapper {
     /**
      * 根据主键删除
@@ -57,16 +64,73 @@ public interface TabAuditedGroupUserRelMapper {
      */
     int updateByPrimaryKey(TabAuditedGroupUserRel record);
 
+    /**
+     * delByAuditedGroupId
+     * @Title: delByAuditedGroupId
+     * @Description:
+     * @author zhiwj
+     * @param auditedGroupId
+     * @return int
+     * @throws
+     */
     int delByAuditedGroupId(@Param("auditedGroupId") Integer auditedGroupId);
 
+    /**
+     * insertSelectiveByNotExist
+     * @Title: insertSelectiveByNotExist
+     * @Description:
+     * @author zhiwj
+     * @param auditedGroupUserRel
+     * @return void
+     * @throws
+     */
     void insertSelectiveByNotExist(TabAuditedGroupUserRel auditedGroupUserRel);
 
+    /**
+     * updateStatusByUserIds
+     * @Title: updateStatusByUserIds
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param auditedGroupId
+     * @param userIdList
+     * @return java.lang.Integer
+     * @throws
+     */
     Integer updateStatusByUserIds(@Param("enterpriseId") Integer enterpriseId, @Param("auditedGroupId") Integer auditedGroupId, @Param("ids") List<Integer> userIdList);
 
+    /**
+     * getUserCountByAuditedGroup
+     * @Title: getUserCountByAuditedGroup
+     * @Description:
+     * @author zhiwj
+     * @param auditedGroupIds
+     * @return java.util.Map<java.lang.Integer,java.util.Map<java.lang.Integer,java.lang.Long>>
+     * @throws
+     */
     @MapKey("auditedGroupId")
     Map<Integer, Map<Integer,Long>> getUserCountByAuditedGroup(@Param("ids") List<Integer> auditedGroupIds);
 
+    /**
+     * listAuditedGroup
+     * @Title: listAuditedGroup
+     * @Description:
+     * @author zhiwj
+     * @param groupUserRel
+     * @return java.util.List<com.gic.auth.entity.TabAuditedGroupUserRel>
+     * @throws
+     */
     List<TabAuditedGroupUserRel> listAuditedGroup(AuditedGroupUserRelDTO groupUserRel);
 
+    /**
+     * listAuditedGroupByUserId
+     * @Title: listAuditedGroupByUserId
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param userId
+     * @return java.util.List<java.lang.Integer>
+     * @throws
+     */
     List<Integer> listAuditedGroupByUserId(@Param("enterpriseId") Integer enterpriseId, @Param("userId") Integer userId);
 }
\ No newline at end of file

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabAuditorAuditedGroupRelMapper.java

@@ -7,6 +7,13 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * 
+ * @ClassName: TabAuditorAuditedGroupRelMapper
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-10 9:39
+ */
 public interface TabAuditorAuditedGroupRelMapper {
     /**
      * 根据主键删除
@@ -56,18 +63,85 @@ public interface TabAuditorAuditedGroupRelMapper {
      */
     int updateByPrimaryKey(TabAuditorAuditedGroupRel record);
 
+    /**
+     * delRel
+     * @Title: delRel
+     * @Description:
+     * @author zhiwj
+     * @param auditedGroupId
+     * @return int
+     * @throws
+     */
     int delRel(@Param("auditedGroupId") Integer auditedGroupId);
 
+    /**
+     * delByAuditorId
+     * @Title: delByAuditorId
+     * @Description:
+     * @author zhiwj
+     * @param auditorId
+     * @return void
+     * @throws
+     */
     void delByAuditorId(@Param("auditorId") Integer auditorId);
 
+    /**
+     * insertSelectiveByNotExist
+     * @Title: insertSelectiveByNotExist
+     * @Description:
+     * @author zhiwj
+     * @param itemRel
+     * @return void
+     * @throws
+     */
     void insertSelectiveByNotExist(TabAuditorAuditedGroupRel itemRel);
 
+    /**
+     * updateStatusByAuditedGroupIds
+     * @Title: updateStatusByAuditedGroupIds
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param auditorId
+     * @param auditedGroupIdList
+     * @return void
+     * @throws
+     */
     void updateStatusByAuditedGroupIds(@Param("enterpriseId") Integer enterpriseId, @Param("auditorId") Integer auditorId, @Param("ids") List<Integer> auditedGroupIdList);
 
+    /**
+     * listRel
+     * @Title: listRel
+     * @Description:
+     * @author zhiwj
+     * @param auditorAuditedGroupRel
+     * @return java.util.List<com.gic.auth.entity.TabAuditorAuditedGroupRel>
+     * @throws
+     */
     List<TabAuditorAuditedGroupRel> listRel(AuditorAuditedGroupRelDTO auditorAuditedGroupRel);
 
+    /**
+     * getCountByAuditorIds
+     * @Title: getCountByAuditorIds
+     * @Description:
+     * @author zhiwj
+     * @param auditorIdList
+     * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     * @throws
+     */
     List<Map<String,Object>> getCountByAuditorIds(@Param("ids") List<Integer> auditorIdList);
 
+    /**
+     * listRelByAuditedGroupIdAndAuditId
+     * @Title: listRelByAuditedGroupIdAndAuditId
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param auditedGroupIds
+     * @param projectAuditorIds
+     * @return java.util.List<java.lang.Integer>
+     * @throws
+     */
     List<Integer> listRelByAuditedGroupIdAndAuditId(@Param("enterpriseId") Integer enterpriseId, @Param("auditedGroupIds") List<Integer> auditedGroupIds, @Param("projectAuditorIds") List<Integer> projectAuditorIds);
 
 

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabAuditorMapper.java

@@ -6,6 +6,13 @@ import com.gic.auth.qo.AuditorListQO;
 import com.github.pagehelper.Page;
 import org.apache.ibatis.annotations.Param;
 
+/**
+ * 
+ * @ClassName: TabAuditorMapper
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-10 9:39
+ */
 public interface TabAuditorMapper {
     /**
      * 根据主键删除
@@ -55,11 +62,47 @@ public interface TabAuditorMapper {
      */
     int updateByPrimaryKey(TabAuditor record);
 
+    /**
+     * getFirstAuditor
+     * @Title: getFirstAuditor
+     * @Description:
+     * @author zhiwj
+     * @param auditorDTO
+     * @return com.gic.auth.entity.TabAuditor
+     * @throws
+     */
     TabAuditor getFirstAuditor(AuditorDTO auditorDTO);
 
+    /**
+     * delAuditor
+     * @Title: delAuditor
+     * @Description:
+     * @author zhiwj
+     * @param auditorId
+     * @return java.lang.Integer
+     * @throws
+     */
     Integer delAuditor(@Param("auditorId") Integer auditorId);
 
+    /**
+     * listAuditor
+     * @Title: listAuditor
+     * @Description:
+     * @author zhiwj
+     * @param auditorListQO
+     * @return com.github.pagehelper.Page<com.gic.auth.entity.TabAuditor>
+     * @throws
+     */
     Page<TabAuditor> listAuditor(AuditorListQO auditorListQO);
 
+    /**
+     * getAuditorByOpenid
+     * @Title: getAuditorByOpenid
+     * @Description:
+     * @author zhiwj
+     * @param openid
+     * @return com.gic.auth.entity.TabAuditor
+     * @throws
+     */
     TabAuditor getAuditorByOpenid(@Param("openid") String openid);
 }
\ No newline at end of file

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabAuditorProjectItemRelMapper.java

@@ -7,6 +7,13 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * 
+ * @ClassName: TabAuditorProjectItemRelMapper
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-10 9:39
+ */
 public interface TabAuditorProjectItemRelMapper {
     /**
      * 根据主键删除
@@ -56,19 +63,85 @@ public interface TabAuditorProjectItemRelMapper {
      */
     int updateByPrimaryKey(TabAuditorProjectItemRel record);
 
+    /**
+     * delByAuditorId 
+     * @Title: delByAuditorId
+     * @Description: 
+     * @author zhiwj 
+     * @param auditorId
+     * @return int
+     * @throws 
+     */
     int delByAuditorId(@Param("auditorId") Integer auditorId);
 
+    /**
+     * delRelByProjectItemId 
+     * @Title: delRelByProjectItemId
+     * @Description: 
+     * @author zhiwj 
+     * @param projectItemId
+     * @return int
+     * @throws 
+     */
     int delRelByProjectItemId(@Param("projectItemId") Integer projectItemId);
 
+    /**
+     * insertSelectiveByNotExist 
+     * @Title: insertSelectiveByNotExist
+     * @Description: 
+     * @author zhiwj 
+     * @param itemRel
+     * @return int
+     * @throws 
+     */
     int insertSelectiveByNotExist(TabAuditorProjectItemRel itemRel);
 
+    /**
+     * updateStatusByProjectItemIds 
+     * @Title: updateStatusByProjectItemIds
+     * @Description: 
+     * @author zhiwj 
+     * @param enterpriseId
+     * @param auditorId
+     * @param projectItemList
+     * @return int
+     * @throws 
+     */
     int updateStatusByProjectItemIds(@Param("enterpriseId") Integer enterpriseId, @Param("auditorId") Integer auditorId, @Param("ids") List<Integer> projectItemList);
 
+    /**
+     * listRelByAuditorId 
+     * @Title: listRelByAuditorId
+     * @Description: 
+     * @author zhiwj 
+     * @param auditorProjectItemRel
+     * @return java.util.List<com.gic.auth.entity.TabAuditorProjectItemRel>
+     * @throws 
+     */
     List<TabAuditorProjectItemRel> listRelByAuditorId(TabAuditorProjectItemRel auditorProjectItemRel);
 
+    /**
+     * getCountByAuditorIds 
+     * @Title: getCountByAuditorIds
+     * @Description: 
+     * @author zhiwj 
+     * @param auditorIdList
+     * @return java.util.Map<java.lang.Integer,java.util.Map<java.lang.Integer,java.lang.Long>>
+     * @throws 
+     */
     @MapKey("auditorId")
     Map<Integer, Map<Integer,Long>> getCountByAuditorIds(@Param("ids") List<Integer> auditorIdList);
 
+    /**
+     * listAuditorIdByProjectItemId 
+     * @Title: listAuditorIdByProjectItemId
+     * @Description: 
+     * @author zhiwj 
+     * @param enterpriseId
+     * @param projectItemId
+     * @return java.util.List<java.lang.Integer>
+     * @throws 
+     */
     List<Integer> listAuditorIdByProjectItemId(@Param("enterpriseId") Integer enterpriseId, @Param("projectItemId") Integer projectItemId);
 
 }
\ No newline at end of file

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysAccountGroupMapper.java

 package com.gic.auth.dao.mapper;
 
-import com.gic.auth.dto.AccountGroupListDTO;
 import com.gic.auth.entity.TabSysAccountGroup;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
+/**
+ * 
+ * @ClassName: TabSysAccountGroupMapper
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-10 9:39
+ */
 public interface TabSysAccountGroupMapper {
     /**
      * 根据主键删除
@@ -87,6 +93,15 @@ public interface TabSysAccountGroupMapper {
      * @return  java.util.List<com.gic.auth.entity.TabSysAccountGroup>

     
 */
     List<TabSysAccountGroup> listAccountGroupByEnterpriseId(@Param("enterpriseId") Integer enterpriseId);
-
+    
+    /**
+     * listByIdList 
+     * @Title: listByIdList
+     * @Description: 
+     * @author zhiwj 
+     * @param accountGroupIdList
+     * @return java.util.List<com.gic.auth.entity.TabSysAccountGroup>
+     * @throws 
+     */
     List<TabSysAccountGroup> listByIdList(@Param("list") List<Integer> accountGroupIdList);
 }
\ No newline at end of file

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysAccountGroupRelMapper.java

@@ -7,6 +7,13 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
+/**
+ * 
+ * @ClassName: TabSysAccountGroupRelMapper
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-10 9:39
+ */
 public interface TabSysAccountGroupRelMapper {
     /**
      * 根据主键删除
@@ -82,11 +89,21 @@ public interface TabSysAccountGroupRelMapper {
      * @Description:
     
 * @author guojuxing
      * @param userId

+     * @param type
      * @return  void

     
 */
     void deleteByUserId(@Param("userId") Integer userId,@Param("type") Integer type);
 
-
+    /**
+     * deleteByUserIdList
+     * @Title: deleteByUserIdList
+     * @Description:
+     * @author zhiwj
+     * @param userIdList
+     * @param type
+     * @return void
+     * @throws
+     */
     void deleteByUserIdList(@Param("userIdList") List<Integer> userIdList, @Param("type") Integer type);
 
     /**
@@ -95,6 +112,7 @@ public interface TabSysAccountGroupRelMapper {
      * @Description:
     
 * @author guojuxing
      * @param userId

+     * @param type
      * @return  java.util.List<com.gic.auth.entity.TabSysAccountGroupRel>

     
 */
     List<TabSysAccountGroupRel> listByUserId(@Param("userId") Integer userId, @Param("type") Integer type);
@@ -117,11 +135,31 @@ public interface TabSysAccountGroupRelMapper {
      * @Description:
     
 * @author guojuxing
      * @param accountGroupId

+     * @param type
      * @return  java.util.List<com.gic.auth.entity.TabSysAccountGroupRel>

     
 */
     List<TabSysAccountGroupRel> listByAccountGroupId(@Param("accountGroupId") Integer accountGroupId, @Param("type") Integer type);
 
+    /**
+     * groupByAccountGroupId
+     * @Title: groupByAccountGroupId
+     * @Description:
+     * @author zhiwj
+     * @param accountGroupId
+     * @return java.util.List<com.gic.auth.dto.AccountGroupListDTO>
+     * @throws
+     */
     List<AccountGroupListDTO> groupByAccountGroupId(@Param("list") List<Integer> accountGroupId);
 
+    /**
+     * listByAccountGroupIdList
+     * @Title: listByAccountGroupIdList
+     * @Description:
+     * @author zhiwj
+     * @param accountGroupIdList
+     * @param type
+     * @return java.util.List<com.gic.auth.entity.TabSysAccountGroupRel>
+     * @throws
+     */
     List<TabSysAccountGroupRel> listByAccountGroupIdList(@Param("list") List<Integer> accountGroupIdList, @Param("type") Integer type);
 }
\ No newline at end of file

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysAuthCodeMapper.java

@@ -5,6 +5,13 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
+/**
+ * 
+ * @ClassName: TabSysAuthCodeMapper
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-10 9:39
+ */
 public interface TabSysAuthCodeMapper {
     /**
      * 根据主键删除
@@ -53,6 +60,16 @@ public interface TabSysAuthCodeMapper {
      * @return 更新条目数
      */
     int updateByPrimaryKey(TabSysAuthCode record);
-
+    
+    /**
+     * getAuthCode 
+     * @Title: getAuthCode
+     * @Description: 
+     * @author zhiwj 
+     * @param enterpriseId
+     * @param relationId
+     * @return java.util.List<com.gic.auth.entity.TabSysAuthCode>
+     * @throws 
+     */
     List<TabSysAuthCode> getAuthCode(@Param("enterpriseId") Integer enterpriseId, @Param("relationId") Integer relationId);
 }
\ No newline at end of file

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysBusinessFrontResMapper.java

@@ -5,6 +5,13 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
+/**
+ * 
+ * @ClassName: TabSysBusinessFrontResMapper
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-10 9:39
+ */
 public interface TabSysBusinessFrontResMapper {
     /**
      * 根据主键删除
@@ -54,12 +61,49 @@ public interface TabSysBusinessFrontResMapper {
      */
     int updateByPrimaryKey(TabSysBusinessFrontRes record);
 
+    /**
+     * listByParam
+     * @Title: listByParam
+     * @Description:
+     * @author zhiwj
+     * @param search
+     * @param resourceType
+     * @return java.util.List<com.gic.auth.entity.TabSysBusinessFrontRes>
+     * @throws
+     */
     List<TabSysBusinessFrontRes> listByParam(@Param("search") String search,
             @Param("resourceType") Integer resourceType);
 
+    /**
+     * listGroupResourceCode
+     * @Title: listGroupResourceCode
+     * @Description:
+     * @author zhiwj
+     * @return java.util.List<com.gic.auth.entity.TabSysBusinessFrontRes>
+     * @throws
+     */
     List<TabSysBusinessFrontRes> listGroupResourceCode();
 
+    /**
+     * listByCode
+     * @Title: listByCode
+     * @Description:
+     * @author zhiwj
+     * @param codeList
+     * @param resourceType
+     * @return java.util.List<com.gic.auth.entity.TabSysBusinessFrontRes>
+     * @throws
+     */
     List<TabSysBusinessFrontRes> listByCode(@Param("codeList") List<String> codeList, @Param("resourceType") Integer resourceType);
 
+    /**
+     * listByResourceCode
+     * @Title: listByResourceCode
+     * @Description:
+     * @author zhiwj
+     * @param resourceCode
+     * @return java.util.List<com.gic.auth.entity.TabSysBusinessFrontRes>
+     * @throws
+     */
     List<TabSysBusinessFrontRes> listByResourceCode(@Param("resourceCode")String resourceCode);
 }
\ No newline at end of file

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysCollaboratorMapper.java

@@ -7,6 +7,13 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
+/**
+ * 
+ * @ClassName: TabSysCollaboratorMapper
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-10 9:39
+ */
 public interface TabSysCollaboratorMapper {
     /**
      * 根据主键删除
@@ -89,9 +96,31 @@ public interface TabSysCollaboratorMapper {
     List<TabSysCollaborator> listNotInCollaboratorIdList(@Param("list") List<Integer> collaboratorIdList,
             @Param("search") String search, @Param("enterpriseId") Integer enterpriseId);
 
+    /**
+     * getByPhoneAndAppId
+     * @Title: getByPhoneAndAppId
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param phone
+     * @param appId
+     * @return com.gic.auth.entity.TabSysCollaborator
+     * @throws
+     */
     TabSysCollaborator getByPhoneAndAppId(@Param("enterpriseId") Integer enterpriseId, @Param("phone") String phone,
             @Param("appId") String appId);
 
+    /**
+     * deleteByPhoneAndAppId
+     * @Title: deleteByPhoneAndAppId
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param phone
+     * @param appId
+     * @return void
+     * @throws
+     */
     void deleteByPhoneAndAppId(@Param("enterpriseId") Integer enterpriseId, @Param("phone") String phone,
             @Param("appId") String appId);
 }
\ No newline at end of file

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysCollaboratorRoleRelMapper.java

@@ -5,6 +5,13 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
+/**
+ * 
+ * @ClassName: TabSysCollaboratorRoleRelMapper
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-10 9:40
+ */
 public interface TabSysCollaboratorRoleRelMapper {
     /**
      * 根据主键删除
@@ -54,9 +61,36 @@ public interface TabSysCollaboratorRoleRelMapper {
      */
     int updateByPrimaryKey(TabSysCollaboratorRoleRel record);
 
+    /**
+     * saveFetch
+     * @Title: saveFetch
+     * @Description:
+     * @author zhiwj
+     * @param list
+     * @return void
+     * @throws
+     */
     void saveFetch(@Param("list") List<TabSysCollaboratorRoleRel> list);
 
+    /**
+     * deleteByCollaboratorId
+     * @Title: deleteByCollaboratorId
+     * @Description:
+     * @author zhiwj
+     * @param collaboratorId
+     * @return void
+     * @throws
+     */
     void deleteByCollaboratorId(@Param("collaboratorId") Integer collaboratorId);
 
+    /**
+     * listByCollaboratorId
+     * @Title: listByCollaboratorId
+     * @Description:
+     * @author zhiwj
+     * @param collaboratorId
+     * @return java.util.List<com.gic.auth.entity.TabSysCollaboratorRoleRel>
+     * @throws
+     */
     List<TabSysCollaboratorRoleRel> listByCollaboratorId(@Param("collaboratorId") Integer collaboratorId);
 }
\ No newline at end of file

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysMenuAuthDepartMapper.java

@@ -6,6 +6,13 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
+/**
+ * 
+ * @ClassName: TabSysMenuAuthDepartMapper
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-10 9:40
+ */
 public interface TabSysMenuAuthDepartMapper {
     /**
      * 根据主键删除
@@ -55,11 +62,47 @@ public interface TabSysMenuAuthDepartMapper {
      */
     int updateByPrimaryKey(TabSysMenuAuthDepart record);
 
+    /**
+     * saveFetch
+     * @Title: saveFetch
+     * @Description:
+     * @author zhiwj
+     * @param list
+     * @return void
+     * @throws
+     */
     void saveFetch(@Param("list") List<MenuAuthDepartDTO> list);
 
+    /**
+     * deleteByMenuCode
+     * @Title: deleteByMenuCode
+     * @Description:
+     * @author zhiwj
+     * @param menuCode
+     * @return void
+     * @throws
+     */
     void deleteByMenuCode(String menuCode);
 
+    /**
+     * listAuthDepartByMenuCode
+     * @Title: listAuthDepartByMenuCode
+     * @Description:
+     * @author zhiwj
+     * @param menuCode
+     * @return java.util.List<com.gic.auth.entity.TabSysMenuAuthDepart>
+     * @throws
+     */
     List<TabSysMenuAuthDepart> listAuthDepartByMenuCode(String menuCode);
 
+    /**
+     * listAllAuthDepart
+     * @Title: listAllAuthDepart
+     * @Description:
+     * @author zhiwj
+     * @param menuCodeList
+     * @return java.util.List<com.gic.auth.entity.TabSysMenuAuthDepart>
+     * @throws
+     */
     List<TabSysMenuAuthDepart> listAllAuthDepart(@Param("list") List<String> menuCodeList);
 }
\ No newline at end of file

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysMenuItemMapper.java

 package com.gic.auth.dao.mapper;
 
-import java.util.List;
-
 import com.gic.auth.dto.AuthItemDTO;
-import org.apache.ibatis.annotations.Param;
-
 import com.gic.auth.dto.MenuItemDTO;
 import com.gic.auth.entity.TabSysMenuItem;
+import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
+/**
+ * 
+ * @ClassName: TabSysMenuItemMapper
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-10 9:40
+ */
 public interface TabSysMenuItemMapper {
     /**
      * 根据主键删除
@@ -86,7 +92,16 @@ public interface TabSysMenuItemMapper {
      * @return  java.util.List<com.gic.auth.entity.TabSysMenuItem>

     
 */
     List<TabSysMenuItem> listMenuItemByMenuId(@Param("menuId") Integer menuId);
-
+    
+    /**
+     * listMenuItemByMenuIdList 
+     * @Title: listMenuItemByMenuIdList
+     * @Description: 
+     * @author zhiwj 
+ * @param menuIdList
+     * @return java.util.List<com.gic.auth.entity.TabSysMenuItem>
+     * @throws 
+     */
     List<TabSysMenuItem> listMenuItemByMenuIdList(@Param("list") List<Integer> menuIdList);
 
     /**
@@ -109,9 +124,36 @@ public interface TabSysMenuItemMapper {
     List<AuthItemDTO> queryAuthItem(@Param("itemId") Integer itemId);
 
 
+    /**
+     * deleteByMenuIdList
+     * @Title: deleteByMenuIdList
+     * @Description:
+     * @author zhiwj
+     * @param menuId
+     * @return void
+     * @throws
+     */
     void deleteByMenuIdList(@Param("list") List<Integer> menuId);
 
+    /**
+     * deleteByItemId
+     * @Title: deleteByItemId
+     * @Description:
+     * @author zhiwj
+     * @param itemId
+     * @return void
+     * @throws
+     */
     void deleteByItemId(@Param("itemId") Integer itemId);
 
+    /**
+     * listByDev
+     * @Title: listByDev
+     * @Description:
+     * @author zhiwj
+     * @param menuId
+     * @return java.util.List<com.gic.auth.entity.TabSysMenuItem>
+     * @throws
+     */
     List<TabSysMenuItem> listByDev(Integer menuId);
 }
\ No newline at end of file

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysMenuMapper.java

 package com.gic.auth.dao.mapper;
 
 import com.gic.auth.dto.AuthItemListDTO;
-import com.gic.auth.dto.MenuDTO;
 import com.gic.auth.entity.TabSysMenu;
-import com.gic.auth.entity.TabSysUser;
 import com.gic.auth.qo.MenuListQO;
 import com.gic.auth.qo.MenuOperationItemListQO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
+/**
+ * 
+ * @ClassName: TabSysMenuMapper
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-10 9:41
+ */
 public interface TabSysMenuMapper {
     /**
      * 根据主键删除
@@ -96,6 +101,7 @@ public interface TabSysMenuMapper {
      * @Description:
     
 * @author guojuxing
      * @param parentId

+     * @param project
      * @return  java.util.List<com.gic.auth.entity.TabSysMenu>

     
 */
     List<TabSysMenu> listMenuByParentId(@Param("parentId") Integer parentId, @Param("project") String project);
@@ -120,8 +126,27 @@ public interface TabSysMenuMapper {
     
 */
     List<TabSysMenu> selectByIds(@Param("menuIdList") List<Integer> menuIdList);
 
+    /**
+     * listByParentMenuIdList
+     * @Title: listByParentMenuIdList
+     * @Description:
+     * @author zhiwj
+     * @param parentMenuIdList
+     * @return java.util.List<com.gic.auth.entity.TabSysMenu>
+     * @throws
+     */
     List<TabSysMenu> listByParentMenuIdList(@Param("parentMenuIdList") List<Integer> parentMenuIdList);
 
+    /**
+     * selectByIdsAndOrderBy
+     * @Title: selectByIdsAndOrderBy
+     * @Description:
+     * @author zhiwj
+     * @param menuIdList
+     * @param orderByStr
+     * @return java.util.List<com.gic.auth.entity.TabSysMenu>
+     * @throws
+     */
     List<TabSysMenu> selectByIdsAndOrderBy(@Param("menuIdList")List<Integer> menuIdList, @Param("orderByStr") String orderByStr);
 
     /**
@@ -150,6 +175,7 @@ public interface TabSysMenuMapper {
      * @Description:
     
 * @author guojuxing
      * @param project

+     * @param authTypeList
      * @param versionCode gic商户基础服务版本
      * @return  java.util.List<com.gic.auth.entity.TabSysMenu>

     
 */
@@ -157,6 +183,15 @@ public interface TabSysMenuMapper {
                                   @Param("versionCode") String versionCode,
                                   @Param("list") List<Integer> authTypeList);
 
+    /**
+     * selectByProjectList
+     * @Title: selectByProjectList
+     * @Description:
+     * @author zhiwj
+     * @param projectList
+     * @return java.util.List<com.gic.auth.entity.TabSysMenu>
+     * @throws
+     */
     @Deprecated
     List<TabSysMenu> selectByProjectList(@Param("projectList") List<String> projectList);
 
@@ -167,6 +202,7 @@ public interface TabSysMenuMapper {
     
 * @author guojuxing 
      * @param projectList appID List
      * @param versionList
 版本/拓展包 list
+     * @param authTypeList
      * @return  java.util.List<com.gic.auth.entity.TabSysMenu>

     
 */
     List<TabSysMenu> selectAppMenuByParam(@Param("projectList") List<String> projectList,
@@ -178,10 +214,20 @@ public interface TabSysMenuMapper {
      * @Description:
     
 * @author guojuxing
      * @param menuCode

+     * @param menuId
      * @return  int

     
 */
     int countByMenuCode(@Param("menuCode") String menuCode, @Param("menuId") Integer menuId);
 
+    /**
+     * getMenuByMenuCode
+     * @Title: getMenuByMenuCode
+     * @Description:
+     * @author zhiwj
+     * @param menuCode
+     * @return com.gic.auth.entity.TabSysMenu
+     * @throws
+     */
     TabSysMenu getMenuByMenuCode(String menuCode);
 
     /**
@@ -190,6 +236,7 @@ public interface TabSysMenuMapper {
      * @Description:
     
 * @author guojuxing
      * @param parentId

+     * @param parentCode
      * @return  void

     
 */
     void updateParentCodeByParentId(@Param("parentId") Integer parentId, @Param("parentCode") String parentCode);
@@ -203,6 +250,15 @@ public interface TabSysMenuMapper {
     
 */
     List<TabSysMenu> listAdminOnlyOperationItem();
 
+    /**
+     * deleteByMenuIdList 
+     * @Title: deleteByMenuIdList
+     * @Description: 
+     * @author zhiwj 
+     * @param menuIdList
+     * @return void
+     * @throws 
+     */
     void deleteByMenuIdList(@Param("list") List<Integer> menuIdList);
 
     /**
@@ -216,11 +272,47 @@ public interface TabSysMenuMapper {
     void deleteNotInApp(@Param("list") List<String> projectList);
 
 
+    /**
+     * listMenuTemp
+     * @Title: listMenuTemp
+     * @Description:
+     * @author zhiwj
+     * @param project
+     * @return java.util.List<com.gic.auth.entity.TabSysMenu>
+     * @throws
+     */
     List<TabSysMenu> listMenuTemp(String project);
 
+    /**
+     * listMenuTempByMenuCode
+     * @Title: listMenuTempByMenuCode
+     * @Description:
+     * @author zhiwj
+     * @param menuCode
+     * @return java.util.List<com.gic.auth.entity.TabSysMenu>
+     * @throws
+     */
     List<TabSysMenu> listMenuTempByMenuCode(String menuCode);
 
+    /**
+     * listMenuTempByMenuIdList
+     * @Title: listMenuTempByMenuIdList
+     * @Description:
+     * @author zhiwj
+     * @param menuIdList
+     * @return java.util.List<com.gic.auth.entity.TabSysMenu>
+     * @throws
+     */
     List<TabSysMenu> listMenuTempByMenuIdList(@Param("list") List<Integer> menuIdList);
 
+    /**
+     * getAuthItemByDevMenuId
+     * @Title: getAuthItemByDevMenuId
+     * @Description:
+     * @author zhiwj
+     * @param menuId
+     * @return java.util.List<com.gic.auth.entity.TabSysMenu>
+     * @throws
+     */
     List<TabSysMenu> getAuthItemByDevMenuId(Integer menuId);
 }
\ No newline at end of file

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysMenuRoleMapper.java

 package com.gic.auth.dao.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
 import com.gic.auth.dto.MenuRoleDTO;
 import com.gic.auth.entity.TabSysMenuRole;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
+/**
+ * 
+ * @ClassName: TabSysMenuRoleMapper
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-10 9:41
+ */
 public interface TabSysMenuRoleMapper {
     /**
      * 根据主键删除

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysOperationUserMapper.java

@@ -3,6 +3,13 @@ package com.gic.auth.dao.mapper;
 import com.gic.auth.entity.TabSysOperationUser;
 import org.apache.ibatis.annotations.Param;
 
+/**
+ * 
+ * @ClassName: TabSysOperationUserMapper
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-10 9:41
+ */
 public interface TabSysOperationUserMapper {
     /**
      * 根据主键删除

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysOrderAppResourceMapper.java

@@ -4,7 +4,13 @@ import com.gic.auth.entity.TabSysOrderAppResource;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-
+/**
+ * 
+ * @ClassName: TabSysOrderAppResourceMapper
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-10 9:41
+ */
 public interface TabSysOrderAppResourceMapper {
     /**
      * 根据主键删除
@@ -54,5 +60,15 @@ public interface TabSysOrderAppResourceMapper {
      */
     int updateByPrimaryKey(TabSysOrderAppResource record);
 
+    /**
+     * listByIds
+     * @Title: listByIds
+     * @Description:
+     * @author zhiwj
+ * @param smsSignList
+ * @param type
+     * @return java.util.List<com.gic.auth.entity.TabSysOrderAppResource>
+     * @throws
+     */
     List<TabSysOrderAppResource> listByIds(@Param("ids") List<Integer> smsSignList, @Param("type") Integer type);
 }
\ No newline at end of file

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysResourceMapper.java

@@ -7,6 +7,13 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
+/**
+ * 
+ * @ClassName: TabSysResourceMapper
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-10 9:41
+ */
 public interface TabSysResourceMapper {
     /**
      * 根据主键删除
@@ -56,9 +63,38 @@ public interface TabSysResourceMapper {
      */
     int updateByPrimaryKey(TabSysResource record);
 
+    /**
+     * listResource
+     * @Title: listResource
+     * @Description:
+     * @author zhiwj
+     * @param resourceDTO
+     * @return com.github.pagehelper.Page<com.gic.auth.entity.TabSysResource>
+     * @throws
+     */
     Page<TabSysResource> listResource(ResourceDTO resourceDTO);
 
+    /**
+     * getBySelective
+     * @Title: getBySelective
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param resourceName
+     * @param resourceId
+     * @return com.gic.auth.entity.TabSysResource
+     * @throws
+     */
     TabSysResource getBySelective(@Param("enterpriseId") Integer enterpriseId, @Param("resourceName") String resourceName, @Param("resourceId") Integer resourceId);
 
+    /**
+     * listByIds
+     * @Title: listByIds
+     * @Description:
+     * @author zhiwj
+     * @param ids
+     * @return java.util.List<com.gic.auth.entity.TabSysResource>
+     * @throws
+     */
     List<TabSysResource> listByIds(@Param("ids") List<Integer> ids);
 }
\ No newline at end of file