Merge branch 'developer' into 'master'

Developer

See merge request !54

gic-data-cloud-api/src/main/java/com/gic/cloud/constants/FunctionEnum.java

@@ -7,14 +7,41 @@ package com.gic.cloud.constants;
  * @date 2020/7/7 4:15 PM

  */
 public enum FunctionEnum {
+    /**
+     * 排行榜
+     */
     RANK_LIST("FUC001", "排行榜"),
+    /**
+     * 会员概况
+     */
     MEMBER_PROFILE("FUC002", "会员概况"),
+    /**
+     * 招募分析
+     */
     RECRUITMENT_ANALYSIS("FUC003", "招募分析"),
+    /**
+     * 会员画像
+     */
     MEMBER_PORTRAIT("FUC004", "会员画像"),
+    /**
+     * 业绩概览
+     */
     PERFORMANCE_OVERVIEW("FUC005", "业绩概览"),
+    /**
+     * 消费构成
+     */
     CONSUME_COMPOSITION("FUC006", "消费构成"),
+    /**
+     * 单品排行
+     */
     ITEM_RANK("FUC007", "单品排行"),
+    /**
+     * 基础业绩
+     */
     BASIC_PERFORMANCE("FUC008", "基础业绩"),
+    /**
+     * 会员分布
+     */
     MEMBER_DISTRIBUTION("FUC009", "会员分布");
 
     private String code;

gic-data-cloud-api/src/main/java/com/gic/cloud/constants/IndexTypeEnum.java

 package com.gic.cloud.constants;
 
 /**
+ * 指标类型
  * @author zhiwj
  * @Description:
  * @date 2020-07-10 17:02
  */
 public enum IndexTypeEnum {
+    /**
+     * 指标
+     */
     INDEX(1, "指标"),
+    /**
+     * 唯独
+     */
     DIMENSION(2, "维度"),
+    /**
+     * 说明
+     */
     NOTE(3, "说明");
 
     private Integer code;

gic-data-cloud-api/src/main/java/com/gic/cloud/dto/AccountGroupDTO.java

@@ -124,4 +124,9 @@ public class AccountGroupDTO implements Serializable{
         this.memberCount = memberCount;
         return this;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

gic-data-cloud-api/src/main/java/com/gic/cloud/dto/AttentionStoreDTO.java

@@ -2,9 +2,12 @@ package com.gic.cloud.dto;
 
 import java.io.Serializable;
 import java.util.Date;
-
 /**
- * tab_attention_store
+ * 关注门店
+ * @ClassName: AttentionStoreDTO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 11:06 AM

  */
 public class AttentionStoreDTO implements Serializable {
     /**
@@ -97,4 +100,9 @@ public class AttentionStoreDTO implements Serializable {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }
\ No newline at end of file

gic-data-cloud-api/src/main/java/com/gic/cloud/dto/DataAuthDTO.java

@@ -2,7 +2,13 @@ package com.gic.cloud.dto;
 
 import java.io.Serializable;
 import java.util.Date;
-
+/**
+ * 数据权限
+ * @ClassName: DataAuthDTO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 11:05 AM

+ */
 public class DataAuthDTO implements Serializable{
     private static final long serialVersionUID = -2015311334509633014L;
 
@@ -173,4 +179,9 @@ public class DataAuthDTO implements Serializable{
         this.noOwnerStore = noOwnerStore;
         return this;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

gic-data-cloud-api/src/main/java/com/gic/cloud/dto/DataExplainDTO.java

@@ -145,4 +145,9 @@ public class DataExplainDTO implements Serializable {
     public void setOptUserName(String optUserName) {
         this.optUserName = optUserName;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

gic-data-cloud-api/src/main/java/com/gic/cloud/dto/EnterprisePortraitRelDTO.java

@@ -2,7 +2,13 @@ package com.gic.cloud.dto;
 
 import java.io.Serializable;
 import java.util.Date;
-
+/**
+ * 会员画像
+ * @ClassName: EnterprisePortraitRelDTO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 11:06 AM

+ */
 public class EnterprisePortraitRelDTO implements Serializable{
     private static final long serialVersionUID = -2398088229114286442L;
 
@@ -128,4 +134,9 @@ public class EnterprisePortraitRelDTO implements Serializable{
         this.portraitName = portraitName;
         return this;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

gic-data-cloud-api/src/main/java/com/gic/cloud/dto/FunctionDTO.java

@@ -124,4 +124,9 @@ public class FunctionDTO implements Serializable{
         this.memberCount = memberCount;
         return this;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

gic-data-cloud-api/src/main/java/com/gic/cloud/dto/FunctionModuleDTO.java

@@ -149,4 +149,9 @@ public class FunctionModuleDTO implements Serializable{
         this.logo = logo;
         return this;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

gic-data-cloud-api/src/main/java/com/gic/cloud/dto/IndexDTO.java

@@ -383,4 +383,9 @@ public class IndexDTO implements Serializable {
     public String getRelTopLevelName() {
         return relTopLevelName;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

gic-data-cloud-api/src/main/java/com/gic/cloud/dto/IndexDescDTO.java

@@ -58,10 +58,6 @@ public class IndexDescDTO implements Serializable {
 
     private Integer updateTips;
 
-//    private Integer indexRemark;
-
-//    private Integer showStatus;
-
     private Integer indexDescEnterpriseId;
 
     private Integer updateTipsId;
@@ -69,7 +65,7 @@ public class IndexDescDTO implements Serializable {
     private Integer indexId;
 
     private String remark;
-    private int seq;
+    private Integer seq;
 
     public Integer getIndexDescId() {
         return indexDescId;
@@ -101,7 +97,8 @@ public class IndexDescDTO implements Serializable {
 
     public void setIndexCode(String indexCode) {
         this.indexCode = indexCode;
-        if("showSalesAmt".equals(this.indexCode)){
+        String amountField = "showSalesAmt";
+        if(amountField.equals(this.indexCode)){
             this.unit = "元";
         }
     }
@@ -209,4 +206,9 @@ public class IndexDescDTO implements Serializable {
     public void setIndexId(Integer indexId) {
         this.indexId = indexId;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

gic-data-cloud-api/src/main/java/com/gic/cloud/dto/IndexGroupDTO.java

@@ -112,4 +112,9 @@ public class IndexGroupDTO implements Serializable {
     public void setChildList(List<IndexGroupDTO> childList) {
         this.childList = childList;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

gic-data-cloud-api/src/main/java/com/gic/cloud/dto/IndexLogDTO.java

@@ -141,4 +141,8 @@ public class IndexLogDTO implements Serializable {
         this.type = type;
     }
 
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

gic-data-cloud-api/src/main/java/com/gic/cloud/dto/TempStoreConditionDTO.java

@@ -95,4 +95,9 @@ public class TempStoreConditionDTO implements Serializable{
         this.updateTime = updateTime;
         return this;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

gic-data-cloud-api/src/main/java/com/gic/cloud/dto/UserDTO.java

@@ -177,4 +177,9 @@ public class UserDTO implements Serializable{
         this.memberCount = memberCount;
         return this;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

gic-data-cloud-api/src/main/java/com/gic/cloud/qo/DataExplainQO.java

@@ -7,7 +7,7 @@ import java.io.Serializable;
  * @Description:
  * @date 2020-07-08 10:13
  */
-public class DataExplainQO extends PageQO implements Serializable {
+public class DataExplainQo extends PageQo implements Serializable {
     private static final long serialVersionUID = 5687670215343610800L;
 
     private String search;

gic-data-cloud-api/src/main/java/com/gic/cloud/qo/IndexQO.java

@@ -8,7 +8,7 @@ import java.util.List;
  * @Description:
  * @date 2020-07-08 10:13
  */
-public class IndexQO extends PageQO implements Serializable {
+public class IndexQo extends PageQo implements Serializable {
     private static final long serialVersionUID = 5687670215343610800L;
 
     private Integer classifyType;

gic-data-cloud-api/src/main/java/com/gic/cloud/qo/PageQO.java

@@ -4,12 +4,12 @@ import java.io.Serializable;
 
 /**
  * 分页数据
- * @ClassName: PageQO

+ * @ClassName: PageQo
  * @Description: 

  * @author guojuxing

  * @date 2019/8/13 11:29 AM

  */
-public class PageQO implements Serializable {
+public class PageQo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

gic-data-cloud-api/src/main/java/com/gic/cloud/qo/UserQO.java

 package com.gic.cloud.qo;
 
 import java.io.Serializable;
-
-public class UserQO extends PageQO implements Serializable{
+/**
+ * 用户查询参数
+ * @ClassName: UserQo
+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 11:22 AM

+ */
+public class UserQo extends PageQo implements Serializable{
     private static final long serialVersionUID = -2145306520376748998L;
 
     /**
@@ -31,7 +37,7 @@ public class UserQO extends PageQO implements Serializable{
         return search;
     }
 
-    public UserQO setSearch(String search) {
+    public UserQo setSearch(String search) {
         this.search = search;
         return this;
     }
@@ -40,7 +46,7 @@ public class UserQO extends PageQO implements Serializable{
         return enterpriseId;
     }
 
-    public UserQO setEnterpriseId(Integer enterpriseId) {
+    public UserQo setEnterpriseId(Integer enterpriseId) {
         this.enterpriseId = enterpriseId;
         return this;
     }
@@ -49,7 +55,7 @@ public class UserQO extends PageQO implements Serializable{
         return accountGroupId;
     }
 
-    public UserQO setAccountGroupId(Integer accountGroupId) {
+    public UserQo setAccountGroupId(Integer accountGroupId) {
         this.accountGroupId = accountGroupId;
         return this;
     }
@@ -58,7 +64,7 @@ public class UserQO extends PageQO implements Serializable{
         return dataAuthId;
     }
 
-    public UserQO setDataAuthId(Integer dataAuthId) {
+    public UserQo setDataAuthId(Integer dataAuthId) {
         this.dataAuthId = dataAuthId;
         return this;
     }
@@ -67,7 +73,7 @@ public class UserQO extends PageQO implements Serializable{
         return functionAuthId;
     }
 
-    public UserQO setFunctionAuthId(Integer functionAuthId) {
+    public UserQo setFunctionAuthId(Integer functionAuthId) {
         this.functionAuthId = functionAuthId;
         return this;
     }

gic-data-cloud-api/src/main/java/com/gic/cloud/service/AccountGroupApiService.java

@@ -23,6 +23,14 @@ public interface AccountGroupApiService {
     
*/
     ServiceResponse<Integer> saveAccountGroup(AccountGroupDTO dto);
 
+    /**
+     * 编辑账号分组
+     * @Title: editAccountGroup

+     * @Description:
+    
* @author guojuxing
+     * @param dto

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

+    
*/
     ServiceResponse<Void> editAccountGroup(AccountGroupDTO dto);
 
     /**
@@ -46,5 +54,13 @@ public interface AccountGroupApiService {
     
*/
     ServiceResponse<List<AccountGroupDTO>> listAccountGroupOfCountMember(Integer enterpriseId);
 
+    /**
+     * 删除账号分组
+     * @Title: deleteAccountGroup

+     * @Description:
+    
* @author guojuxing
+     * @param accountGroupId

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

+    
*/
     ServiceResponse<Void> deleteAccountGroup(Integer accountGroupId);
 }

gic-data-cloud-api/src/main/java/com/gic/cloud/service/DataAuthApiService.java

@@ -5,20 +5,87 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.cloud.dto.DataAuthDTO;
 
 import java.util.List;
-
+/**
+ * 数据权限
+ * @ClassName: DataAuthApiService

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 11:13 AM

+ */
 public interface DataAuthApiService {
 
+    /**
+     * 新增数据权限
+     * @Title: saveDataAuth

+     * @Description:
+    
* @author guojuxing
+     * @param dto

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

+    
*/
     ServiceResponse<Integer> saveDataAuth(DataAuthDTO dto);
 
+    /**
+     * 编辑权限
+     * @Title: editDataAuth

+     * @Description:
+    
* @author guojuxing
+     * @param dto

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

+    
*/
     ServiceResponse<Void> editDataAuth(DataAuthDTO dto);
 
+    /**
+     * 单条
+     * @Title: getDataAuth

+     * @Description:
+    
* @author guojuxing
+     * @param dataAuthId

+     * @return  com.gic.api.base.commons.ServiceResponse<com.gic.cloud.dto.DataAuthDTO>

+    
*/
     ServiceResponse<DataAuthDTO> getDataAuth(Integer dataAuthId);
 
+    /**
+     * 删除
+     * @Title: deleteDataAuth

+     * @Description:
+    
* @author guojuxing
+     * @param dataAuthId

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

+    
*/
     ServiceResponse<Void> deleteDataAuth(Integer dataAuthId);
 
+    /**
+     * 分页查询数据权限
+     * @Title: pageDataAuth

+     * @Description:
+    
* @author guojuxing
+     * @param enterpriseId
+     * @param dataAuthName
+     * @param currentPage
+     * @param pageSize

+     * @return  com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<com.gic.cloud.dto.DataAuthDTO>>

+    
*/
     ServiceResponse<Page<DataAuthDTO>> pageDataAuth(Integer enterpriseId, String dataAuthName, Integer currentPage, Integer pageSize);
 
+    /**
+     * 查询数据权限
+     * @Title: listDataAuth

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

+     * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.cloud.dto.DataAuthDTO>>

+    
*/
     ServiceResponse<List<DataAuthDTO>> listDataAuth(Integer enterpriseId, String dataAuthName);
 
+    /**
+     * 查询单条
+     * @Title: ggetDataAuthByUserId

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

+     * @return  com.gic.api.base.commons.ServiceResponse<com.gic.cloud.dto.DataAuthDTO>

+    
*/
     ServiceResponse<DataAuthDTO> ggetDataAuthByUserId(Integer enterpriseId, Integer userId);
 }

gic-data-cloud-api/src/main/java/com/gic/cloud/service/DataExplainApiService.java

@@ -3,7 +3,7 @@ package com.gic.cloud.service;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.cloud.dto.DataExplainDTO;
-import com.gic.cloud.qo.DataExplainQO;
+import com.gic.cloud.qo.DataExplainQo;
 
 import java.util.List;
 
@@ -15,6 +15,7 @@ import java.util.List;
 public interface DataExplainApiService {
 
     /**
+     * 新增数据解读
      * @Title: saveDataExplain
      * @Description:
      * @author zhiwj
@@ -25,25 +26,31 @@ public interface DataExplainApiService {
     ServiceResponse<Void> saveDataExplain(DataExplainDTO dataExplainDTO);
     
     /**
+     * 编辑数据解读
      * @Title: updateDataExplain
      * @Description: 
      * @author zhiwj 
      * @param dataExplainDTO
+     * @param updateType
+     * @param reason
      * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
      * @throws 
      */
     ServiceResponse<Void> updateDataExplain(DataExplainDTO dataExplainDTO, Integer updateType, String reason);
 
     /**
+     * 数据解读
      * @Title: getByDataExplainId
      * @Description: 
-     * @author zhiwj 
+     * @author zhiwj
+     * @param dataExplainId
      * @return com.gic.api.base.commons.ServiceResponse<com.gic.cloud.dto.DataExplainDTO>
      * @throws 
      */
     ServiceResponse<DataExplainDTO> getByDataExplainId(Integer dataExplainId);
 
     /**
+     * 分页查询数据解读
      * @Title: listDataExplain
      * @Description:
      * @author zhiwj
@@ -51,9 +58,10 @@ public interface DataExplainApiService {
      * @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.cloud.dto.DataExplainDTO>>
      * @throws
      */
-    ServiceResponse<Page<DataExplainDTO>> listDataExplain(DataExplainQO dataExplainQO);
+    ServiceResponse<Page<DataExplainDTO>> listDataExplain(DataExplainQo dataExplainQO);
     
     /**
+     * 查询数据解读
      * @Title: listDataExplain
      * @Description: 
      * @author zhiwj 
@@ -64,6 +72,7 @@ public interface DataExplainApiService {
     ServiceResponse<List<DataExplainDTO>> listAllDataExplain();
 
     /**
+     * 删除数据解读
      * @Title: delete
      * @Description:
      * @author zhiwj
@@ -74,6 +83,7 @@ public interface DataExplainApiService {
     ServiceResponse<Void> delete(Integer dataExplainId);
 
     /**
+     * 发布数据解读
      * @Title: publish
      * @Description:
      * @author zhiwj
@@ -88,6 +98,7 @@ public interface DataExplainApiService {
     ServiceResponse<Void> publish(List<Integer> dataExplainIdList, Integer updateType, String reason, Integer optUserId, String optUserName);
     
     /**
+     * 查询
      * @Title: listByModule
      * @Description: 
      * @author zhiwj 

gic-data-cloud-api/src/main/java/com/gic/cloud/service/EnterprisePortraitRelApiService.java

@@ -4,7 +4,13 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.cloud.dto.EnterprisePortraitRelDTO;
 
 import java.util.List;
-
+/**
+ * 会员画像
+ * @ClassName: EnterprisePortraitRelApiService

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 11:22 AM

+ */
 public interface EnterprisePortraitRelApiService {
 
     /**
@@ -29,6 +35,17 @@ public interface EnterprisePortraitRelApiService {
     
*/
     ServiceResponse<Void> insertForeach(List<EnterprisePortraitRelDTO> list);
 
+    /**
+     * 会员画像
+     * @Title: savePortraitField

+     * @Description:
+    
* @author guojuxing
+     * @param enterpriseId
+     * @param fieldCode
+     * @param fieldName
+     * @param dataType

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

+    
*/
     ServiceResponse<Void> savePortraitField( Integer enterpriseId, String fieldCode, String fieldName, Integer dataType);
 
     /**

gic-data-cloud-api/src/main/java/com/gic/cloud/service/FunctionApiService.java

@@ -6,7 +6,13 @@ import com.gic.cloud.dto.FunctionDTO;
 import com.gic.cloud.dto.FunctionModuleDTO;
 
 import java.util.List;
-
+/**
+ * 功能接口
+ * @ClassName: FunctionApiService

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 11:10 AM

+ */
 public interface FunctionApiService {
     /**
      * 新增功能权限集
@@ -18,15 +24,67 @@ public interface FunctionApiService {
     
*/
     ServiceResponse<Integer> saveFunction(FunctionDTO dto);
 
+    /**
+     * 编辑功能
+     * @Title: editFunction

+     * @Description:
+    
* @author guojuxing
+     * @param dto

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

+    
*/
     ServiceResponse<Void> editFunction(FunctionDTO dto);
 
+    /**
+     * 删除功能
+     * @Title: deleteFunction

+     * @Description:
+    
* @author guojuxing
+     * @param functionId

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

+    
*/
     ServiceResponse<Void> deleteFunction(Integer functionId);
 
+    /**
+     * 分页查询功能
+     * @Title: pageFunction

+     * @Description:
+    
* @author guojuxing
+     * @param enterpriseId
+     * @param functionName
+     * @param currentPage
+     * @param pageSize

+     * @return  com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<com.gic.cloud.dto.FunctionDTO>>

+    
*/
     ServiceResponse<Page<FunctionDTO>> pageFunction(Integer enterpriseId, String functionName, Integer currentPage, Integer pageSize);
 
+    /**
+     * 查询功能
+     * @Title: listFunction

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

+     * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.cloud.dto.FunctionDTO>>

+    
*/
     ServiceResponse<List<FunctionDTO>> listFunction(Integer enterpriseId, String functionName);
 
+    /**
+     * 查询单条
+     * @Title: getFunction

+     * @Description:
+    
* @author guojuxing
+     * @param functionId

+     * @return  com.gic.api.base.commons.ServiceResponse<com.gic.cloud.dto.FunctionDTO>

+    
*/
     ServiceResponse<FunctionDTO> getFunction(Integer functionId);
 
+    /**
+     * 获取用户下的功能权限
+     * @Title: getFunctionByUserId

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

+     * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.cloud.dto.FunctionModuleDTO>>

+    
*/
     ServiceResponse<List<FunctionModuleDTO>> getFunctionByUserId(Integer userId);
 }

gic-data-cloud-api/src/main/java/com/gic/cloud/service/FunctionModuleApiService.java

@@ -4,12 +4,42 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.cloud.dto.FunctionModuleDTO;
 
 import java.util.List;
-
+/**
+ * 功能模块
+ * @ClassName: FunctionModuleApiService

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 11:11 AM

+ */
 public interface FunctionModuleApiService {
 
+    /**
+     * 新增功能模块
+     * @Title: saveFunctionModule

+     * @Description:
+    
* @author guojuxing
+     * @param dto

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

+    
*/
     ServiceResponse<Integer> saveFunctionModule(FunctionModuleDTO dto);
 
+    /**
+     * 编辑功能模块
+     * @Title: editFunctionModule

+     * @Description:
+    
* @author guojuxing
+     * @param dto

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

+    
*/
     ServiceResponse<Void> editFunctionModule(FunctionModuleDTO dto);
 
+    /**
+     * 查询功能模块
+     * @Title: listFunctionModule

+     * @Description:
+    
* @author guojuxing
+     * @param search

+     * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.cloud.dto.FunctionModuleDTO>>

+    
*/
     ServiceResponse<List<FunctionModuleDTO>> listFunctionModule(String search);
 }

gic-data-cloud-api/src/main/java/com/gic/cloud/service/IndexApiService.java

@@ -3,7 +3,7 @@ package com.gic.cloud.service;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.cloud.dto.IndexDTO;
-import com.gic.cloud.qo.IndexQO;
+import com.gic.cloud.qo.IndexQo;
 
 import java.util.List;
 
@@ -15,6 +15,7 @@ import java.util.List;
 public interface IndexApiService {
 
     /**
+     * 新增指标
      * @Title: saveIndex
      * @Description:
      * @author zhiwj
@@ -25,16 +26,20 @@ public interface IndexApiService {
     ServiceResponse<Void> saveIndex(IndexDTO indexDTO);
 
     /**
+     * 编辑指标
      * @Title: editIndex
      * @Description:
      * @author zhiwj
      * @param indexDTO
+     * @param updateType
+     * @param reason
      * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
      * @throws
      */
     ServiceResponse<Void> updateIndex(IndexDTO indexDTO, Integer updateType, String reason);
 
     /**
+     * 获取指标信息
      * @Title: getById
      * @Description:
      * @author zhiwj
@@ -45,24 +50,29 @@ public interface IndexApiService {
     ServiceResponse<IndexDTO> getByIndexId(Integer indexId);
 
     /**
+     * 分页查询指标
      * @Title: listIndex
      * @Description: 
-     * @author zhiwj 
+     * @author zhiwj
+     * @param indexQO
      * @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.cloud.dto.IndexDTO>>
      * @throws 
      */
-    ServiceResponse<Page<IndexDTO>> listIndex(IndexQO indexQO);
+    ServiceResponse<Page<IndexDTO>> listIndex(IndexQo indexQO);
     
     /**
+     * 查询指标列表
      * @Title: listAllIndex
      * @Description: 
-     * @author zhiwj 
+     * @author zhiwj
+     * @param indexQO
      * @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.cloud.dto.IndexDTO>>
      * @throws 
      */
-    ServiceResponse<List<IndexDTO>> listAllIndex(IndexQO indexQO);
+    ServiceResponse<List<IndexDTO>> listAllIndex(IndexQo indexQO);
 
     /**
+     * 删除指标
      * @Title: delete
      * @Description:
      * @author zhiwj
@@ -88,6 +98,7 @@ public interface IndexApiService {
     ServiceResponse<Void> publish(List<Integer> indexIdList, Integer updateType, String reason, Integer optUserId, String optUserName);
 
     /**
+     * 查询指标
      * @Title: listByModule
      * @Description: 
      * @author zhiwj 

gic-data-cloud-api/src/main/java/com/gic/cloud/service/IndexDescApiService.java

@@ -20,17 +20,21 @@ public interface IndexDescApiService {
      * @author zhiwj
      * @param enterpriseId
      * @param moduleId
+     * @param indexGroupName
      * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
      * @throws
      */
     ServiceResponse<List<IndexDescDTO>> listByEnterpriseAndModule(Integer enterpriseId, String moduleId, String indexGroupName);
 
     /**
+     * 查询
      * @Title: listByEnterpriseAndModuleDetail
      * @Description:
      * @author zhiwj
      * @param enterpriseId
      * @param moduleId
+     * @param indexGroupName
+     * @param userId
      * @return com.gic.api.base.commons.ServiceResponse<com.gic.cloud.dto.IndexEnterpriseGroupDTO>
      * @throws
      */
@@ -43,6 +47,7 @@ public interface IndexDescApiService {
      * @author zhiwj
      * @param enterpriseId
      * @param moduleId
+     * @param indexGroupName
      * @param userId
      * @return com.gic.api.base.commons.ServiceResponse<com.gic.cloud.dto.IndexEnterpriseGroupDTO>
      * @throws
@@ -56,6 +61,7 @@ public interface IndexDescApiService {
      * @author zhiwj
      * @param enterpriseId 商户id
      * @param moduleId
+     * @param indexGroupName
      * @param indexDescEnterpriseId 指标id
      * @param seq 排到第几个
      * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
@@ -68,16 +74,21 @@ public interface IndexDescApiService {
      * @Title: moveToRecycle
      * @Description:
      * @author zhiwj
-     * @param indexId
+     * @param indexDescEnterpriseId
      * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
      * @throws
      */
     ServiceResponse<Void> moveToRecycle(Integer indexDescEnterpriseId);
 
     /**
+     * 查询
      * @Title: getIndexDesc
      * @Description:
      * @author zhiwj
+     * @param enterpriseId
+     * @param moduleId
+     * @param indexGroupName
+     * @param indexCode
      * @return com.gic.api.base.commons.ServiceResponse<com.gic.cloud.dto.IndexDescDTO>
      * @throws
      */
@@ -95,6 +106,7 @@ public interface IndexDescApiService {
     ServiceResponse<Void> batchUpdate(List<IndexDescDTO> descList);
 
     /**
+     * 批量更新
      * @Title: batchUpdate
      * @Description:
      * @author zhiwj
@@ -107,9 +119,12 @@ public interface IndexDescApiService {
     ServiceResponse<Void> batchUpdate(Integer enterpriseId, String moduleId, String ids);
 
     /**
+     * 置灰
      * @Title: eraseUpdateTips
      * @Description:
      * @author zhiwj
+     * @param userId
+     * @param updateTipsId
      * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
      * @throws
      */
@@ -120,10 +135,19 @@ public interface IndexDescApiService {
      * @Title: listAll
      * @Description:
      * @author zhiwj
+     * @param moduleIds 
      * @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.cloud.dto.IndexDescDTO>>
      * @throws
      */
     ServiceResponse<List<IndexDescDTO>> listAllUnRel(String moduleIds);
 
+    /**
+     * 初始化
+     * @Title: init

+     * @Description:
+    
* @author zhiwj
+     * @param enterpriseId

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

+    
*/
     ServiceResponse<Void> init(Integer enterpriseId);
 }

gic-data-cloud-api/src/main/java/com/gic/cloud/service/IndexGroupApiService.java

@@ -13,6 +13,7 @@ import java.util.List;
 public interface IndexGroupApiService {
 
     /**
+     * 新增指标分组
      * @Title: save
      * @Description:
      * @author zhiwj
@@ -23,6 +24,7 @@ public interface IndexGroupApiService {
     ServiceResponse<Void> save(IndexGroupDTO indexGroupDTO);
 
     /**
+     * 更新指标分组
      * @Title: update
      * @Description:
      * @author zhiwj
@@ -33,6 +35,7 @@ public interface IndexGroupApiService {
     ServiceResponse<Void> update(IndexGroupDTO indexGroupDTO);
 
     /**
+     * 指标分组树结构
      * @Title: tree
      * @Description:
      * @author zhiwj
@@ -42,6 +45,7 @@ public interface IndexGroupApiService {
     ServiceResponse<List<IndexGroupDTO>> tree();
 
     /**
+     * 删除指标分组
      * @Title: delete
      * @Description:
      * @author zhiwj

gic-data-cloud-api/src/main/java/com/gic/cloud/service/IndexLogApiService.java

@@ -13,6 +13,7 @@ import java.util.List;
 public interface IndexLogApiService {
 
     /**
+     * 查询指标日志
      * @Title: listIndexLog
      * @Description:
      * @author zhiwj
@@ -23,6 +24,7 @@ public interface IndexLogApiService {
     ServiceResponse<List<IndexLogDTO>> listIndexLog(Integer indexId);
 
     /**
+     * 查询数据解读日志
      * @Title: listIndexLog
      * @Description:
      * @author zhiwj

gic-data-cloud-api/src/main/java/com/gic/cloud/service/StoreAttentionApiService.java

@@ -5,13 +5,59 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.cloud.dto.AttentionStoreDTO;
 
 import java.util.Map;
-
+/**
+ * 关注门店
+ * @ClassName: StoreAttentionApiService

+ * @Description: 

+ * @author boom

+ * @date 2020/9/7 11:18 AM

+ */
 public interface StoreAttentionApiService {
+    /**
+     * 新增关注门店
+     * @Title: addStoreAttenttion

+     * @Description:
+    
* @author boom
+     * @param userId
+     * @param enterpriseId
+     * @param storeId

+     * @return  com.gic.api.base.commons.ServiceResponse

+    
*/
     ServiceResponse addStoreAttenttion(Integer userId, Integer enterpriseId, Integer storeId);
 
+    /**
+     * 删除关注门店
+     * @Title: removeStoreAttenttion

+     * @Description:
+    
* @author boom
+     * @param enterpriseId
+     * @param userId
+     * @param storeIds

+     * @return  com.gic.api.base.commons.ServiceResponse

+    
*/
     ServiceResponse removeStoreAttenttion(Integer enterpriseId, Integer userId, String storeIds);
 
+    /**
+     * 分页查询关注门店
+     * @Title: pageStoreAttention

+     * @Description:
+    
* @author boom
+     * @param userId
+     * @param enterpriseId
+     * @param pageNum
+     * @param pageSize

+     * @return  com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<com.gic.cloud.dto.AttentionStoreDTO>>

+    
*/
     ServiceResponse<Page<AttentionStoreDTO>> pageStoreAttention(Integer userId, Integer enterpriseId, Integer pageNum, Integer pageSize);
 
+    /**
+     * 查询
+     * @Title: getAllAttenttionStore

+     * @Description:
+    
* @author boom
+     * @param userId
+     * @param enterpriseId

+     * @return  com.gic.api.base.commons.ServiceResponse<java.util.Map<java.lang.Integer,com.gic.cloud.dto.AttentionStoreDTO>>

+    
*/
     ServiceResponse<Map<Integer, AttentionStoreDTO>> getAllAttenttionStore(Integer userId, Integer enterpriseId);
 }

gic-data-cloud-api/src/main/java/com/gic/cloud/service/TempStoreConditionApiService.java

@@ -2,11 +2,33 @@ package com.gic.cloud.service;
 
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.cloud.dto.TempStoreConditionDTO;
-
+/**
+ * 门店暂存区
+ * @ClassName: TempStoreConditionApiService

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 11:15 AM

+ */
 public interface TempStoreConditionApiService {
 
+    /**
+     * 新增门店暂存区配置
+     * @Title: saveOrUpdateTempStoreCondition

+     * @Description:
+    
* @author guojuxing
+     * @param dto

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

+    
*/
     ServiceResponse<Integer> saveOrUpdateTempStoreCondition(TempStoreConditionDTO dto);
 
+    /**
+     * 获取门店暂存区配置信息
+     * @Title: getTempStoreCondition

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

+     * @return  com.gic.api.base.commons.ServiceResponse<com.gic.cloud.dto.TempStoreConditionDTO>

+    
*/
     ServiceResponse<TempStoreConditionDTO> getTempStoreCondition(Integer enterpriseId);
 
 }

gic-data-cloud-api/src/main/java/com/gic/cloud/service/TestApiService.java

 package com.gic.cloud.service;
-
+/**test
+ * @ClassName: TestApiService

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 11:22 AM

+ */
 public interface TestApiService {
 }

gic-data-cloud-api/src/main/java/com/gic/cloud/service/UserApiService.java

@@ -3,10 +3,16 @@ package com.gic.cloud.service;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.cloud.dto.UserDTO;
-import com.gic.cloud.qo.UserQO;
+import com.gic.cloud.qo.UserQo;
 
 import java.util.List;
-
+/**
+ * 用户接口
+ * @ClassName: UserApiService

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 11:09 AM

+ */
 public interface UserApiService {
 
     /**
@@ -29,6 +35,14 @@ public interface UserApiService {
     
*/
     ServiceResponse<Void> editUser(UserDTO dto);
 
+    /**
+     * 删除用户
+     * @Title: deleteUser

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

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

+    
*/
     ServiceResponse<Void> deleteUser(Integer userId);
 
     /**
@@ -46,12 +60,20 @@ public interface UserApiService {
      * @Title: pageUser

      * @Description:
     
* @author guojuxing
-     * @param userQO

+     * @param userQo

      * @return  com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<com.gic.cloud.dto.UserDTO>>

     
*/
-    ServiceResponse<Page<UserDTO>> pageUser(UserQO userQO);
+    ServiceResponse<Page<UserDTO>> pageUser(UserQo userQo);
 
-    ServiceResponse<List<UserDTO>> listUser(UserQO userQO);
+    /**
+     * 用户列表数据
+     * @Title: listUser

+     * @Description:
+    
* @author guojuxing
+     * @param userQo

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

+    
*/
+    ServiceResponse<List<UserDTO>> listUser(UserQo userQo);
 
     /**
      * 批量转移分组
@@ -65,6 +87,7 @@ public interface UserApiService {
     ServiceResponse<Void> bulkTransferAccountGroup(List<Integer> userIdList, Integer targetAccountGroupId);
 
     /**
+     * 手机号查询用户
      * @Title: listUserByPhone

      * @Description:
     
* @author guojuxing
@@ -74,5 +97,13 @@ public interface UserApiService {
     
*/
     ServiceResponse<List<UserDTO>> listUserByPhone(String nationCode, String phone);
 
+    /**
+     * 获取用户
+     * @Title: getUser

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

+     * @return  com.gic.api.base.commons.ServiceResponse<com.gic.cloud.dto.UserDTO>

+    
*/
     ServiceResponse<UserDTO> getUser(Integer userId);
 }

gic-data-cloud-operation-web/src/main/java/com/gic/cloud/operation/web/controller/DataExplainController.java

@@ -6,7 +6,7 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.authcenter.security.core.util.UserUtils;
 import com.gic.cloud.dto.DataExplainDTO;
 import com.gic.cloud.dto.IndexLogDTO;
-import com.gic.cloud.qo.DataExplainQO;
+import com.gic.cloud.qo.DataExplainQo;
 import com.gic.cloud.service.DataExplainApiService;
 import com.gic.cloud.service.IndexLogApiService;
 import com.gic.commons.webapi.reponse.RestResponse;
@@ -65,8 +65,8 @@ public class DataExplainController {
     }
 
     @RequestMapping("/list-data-explain")
-    public RestResponse listDataExplain(DataExplainQO dataExplainQO) {
-        ServiceResponse<Page<DataExplainDTO>> serviceResponse = dataExplainApiService.listDataExplain(dataExplainQO);
+    public RestResponse listDataExplain(DataExplainQo dataExplainQo) {
+        ServiceResponse<Page<DataExplainDTO>> serviceResponse = dataExplainApiService.listDataExplain(dataExplainQo);
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
@@ -88,7 +88,9 @@ public class DataExplainController {
             return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), ErrorCode.PARAMETER_ERROR.getMsg());
         }
         List<Integer> dataExplainIdList;
-        if ("all".equals(dataExplainIds)) {
+
+        String allCode = "all";
+        if (allCode.equals(dataExplainIds)) {
             List<DataExplainDTO> explainDTOList = this.dataExplainApiService.listAllDataExplain().getResult();
             dataExplainIdList = explainDTOList.stream().map(DataExplainDTO::getDataExplainId).collect(Collectors.toList());
         } else {

gic-data-cloud-operation-web/src/main/java/com/gic/cloud/operation/web/controller/FunctionModuleController.java

@@ -12,7 +12,13 @@ import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
+/**
+ * 功能模块
+ * @ClassName: FunctionModuleController

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 3:04 PM

+ */
 @RestController
 @RequestMapping("function-module")
 public class FunctionModuleController {

gic-data-cloud-operation-web/src/main/java/com/gic/cloud/operation/web/controller/IndexController.java

@@ -10,7 +10,7 @@ import com.gic.cloud.dto.IndexDescDTO;
 import com.gic.cloud.dto.IndexLogDTO;
 import com.gic.cloud.operation.web.vo.IndexVO;
 import com.gic.cloud.operation.web.vo.ModuleVO;
-import com.gic.cloud.qo.IndexQO;
+import com.gic.cloud.qo.IndexQo;
 import com.gic.cloud.service.IndexApiService;
 import com.gic.cloud.service.IndexDescApiService;
 import com.gic.cloud.service.IndexLogApiService;
@@ -46,8 +46,8 @@ public class IndexController {
 
 
     @RequestMapping("/save-index")
-    public RestResponse saveIndex(IndexQO indexQO, String relModuleIds) {
-        IndexDTO indexDTO = EntityUtil.changeEntityByJSON(IndexDTO.class, indexQO);
+    public RestResponse saveIndex(IndexQo indexQo, String relModuleIds) {
+        IndexDTO indexDTO = EntityUtil.changeEntityByJSON(IndexDTO.class, indexQo);
         if (indexDTO.getClassifyType() == null ||
                 StringUtils.isBlank(indexDTO.getCode()) ||
                 StringUtils.isBlank(indexDTO.getName()) ||
@@ -90,14 +90,14 @@ public class IndexController {
     }
 
     @RequestMapping("/list-index")
-    public RestResponse listIndex(IndexQO indexQO) {
-        ServiceResponse<Page<IndexDTO>> serviceResponse = indexApiService.listIndex(indexQO);
+    public RestResponse listIndex(IndexQo indexQo) {
+        ServiceResponse<Page<IndexDTO>> serviceResponse = indexApiService.listIndex(indexQo);
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
     @RequestMapping("/list-all-index")
-    public RestResponse listAllIndex(IndexQO indexQO) {
-        ServiceResponse<List<IndexDTO>> serviceResponse = indexApiService.listAllIndex(indexQO);
+    public RestResponse listAllIndex(IndexQo indexQo) {
+        ServiceResponse<List<IndexDTO>> serviceResponse = indexApiService.listAllIndex(indexQo);
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
@@ -121,8 +121,10 @@ public class IndexController {
         Integer id = UserUtils.getUser().getId();
         String realName = UserUtils.getUser().getRealName();
         List<Integer> indexIdList;
-        if ("all".equals(indexIds)) {
-            List<IndexDTO> list = indexApiService.listAllIndex(new IndexQO()).getResult();
+
+        String allCode = "all";
+        if (allCode.equals(indexIds)) {
+            List<IndexDTO> list = indexApiService.listAllIndex(new IndexQo()).getResult();
             indexIdList = list.stream().map(IndexDTO::getIndexId).collect(Collectors.toList());
         } else {
             indexIdList = Stream.of(indexIds.split(",")).map(Integer::valueOf).collect(Collectors.toList());

gic-data-cloud-operation-web/src/main/java/com/gic/cloud/operation/web/exception/GlobalExceptionHandler.java

@@ -23,7 +23,6 @@ import java.util.Set;
  *
  * @author hua
  */
-//@ControllerAdvice
 public class GlobalExceptionHandler {
     private static Logger logger = LoggerFactory.getLogger(GlobalExceptionHandler.class);
 

gic-data-cloud-operation-web/src/main/java/com/gic/cloud/operation/web/vo/FunctionModuleVO.java

@@ -2,7 +2,13 @@ package com.gic.cloud.operation.web.vo;
 
 import java.io.Serializable;
 import java.util.Date;
-
+/**
+ * 功能模块
+ * @ClassName: FunctionModuleVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 3:04 PM

+ */
 public class FunctionModuleVO implements Serializable{
     private static final long serialVersionUID = 6083023157590374256L;
 
@@ -142,4 +148,9 @@ public class FunctionModuleVO implements Serializable{
         this.logo = logo;
         return this;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

gic-data-cloud-operation-web/src/main/java/com/gic/cloud/operation/web/vo/IndexVO.java

@@ -392,4 +392,9 @@ public class IndexVO implements Serializable {
     public void setRelTopLevelName(String relTopLevelName) {
         this.relTopLevelName = relTopLevelName;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

gic-data-cloud-operation-web/src/main/java/com/gic/cloud/operation/web/vo/ModuleVO.java

@@ -28,4 +28,9 @@ public class ModuleVO implements Serializable {
     public void setModuleId(String moduleId) {
         this.moduleId = moduleId;
     }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/EnterprisePortraitRelMapper.java

@@ -6,7 +6,13 @@ import org.apache.ibatis.annotations.Param;
 
 import com.gic.cloud.dto.EnterprisePortraitRelDTO;
 import com.gic.cloud.entity.TabGicEnterprisePortraitRel;
-
+/**
+ * 会员画像
+ * @ClassName: EnterprisePortraitRelMapper

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 10:45 AM

+ */
 public interface EnterprisePortraitRelMapper {
     /**
      * 根据主键删除
@@ -62,6 +68,8 @@ public interface EnterprisePortraitRelMapper {
      * @Description:
     
* @author guojuxing
      * @param enterpriseId

+     * @param dataType
+     * @param status
      * @return  java.util.List<com.gic.cloud.entity.TabGicEnterprisePortraitRel>

     
*/
     List<TabGicEnterprisePortraitRel> listPortraitField(@Param("enterpriseId") Integer enterpriseId,
@@ -78,11 +86,39 @@ public interface EnterprisePortraitRelMapper {
     
 */
     void insertForeach(@Param("list") List<EnterprisePortraitRelDTO> list);
 
+    /**
+     * 获取会员画像字段
+     * @Title: getPortraitField

+     * @Description:
+    
* @author guojuxing
+     * @param enterpriseId
+     * @param fieldCode
+     * @param dataType

+     * @return  com.gic.cloud.entity.TabGicEnterprisePortraitRel

+    
*/
     TabGicEnterprisePortraitRel getPortraitField(@Param("enterpriseId") Integer enterpriseId,
                            @Param("fieldCode") String fieldCode,
                            @Param("dataType") Integer dataType);
 
+    /**
+     * 获取排序最大值
+     * @Title: getMaxSort

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

+     * @return  int

+    
*/
     int getMaxSort(@Param("enterpriseId") Integer enterpriseId, @Param("dataType") Integer dataType);
 
+    /**
+     * 获取排序
+     * @Title: listByDataType

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

+     * @return  java.util.List<com.gic.cloud.entity.TabGicEnterprisePortraitRel>

+    
*/
     List<TabGicEnterprisePortraitRel> listByDataType(@Param("enterpriseId") Integer enterpriseId, @Param("dataType") Integer dataType);
 }
\ No newline at end of file

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabAttentionStoreMapper.java

@@ -5,7 +5,13 @@ import com.github.pagehelper.Page;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-
+/**
+ * 关注门店
+ * @ClassName: TabAttentionStoreMapper

+ * @Description: 

+ * @author boom

+ * @date 2020/9/7 10:41 AM

+ */
 public interface TabAttentionStoreMapper {
     /**
      * 根据主键删除
@@ -55,8 +61,27 @@ public interface TabAttentionStoreMapper {
      */
     int updateByPrimaryKey(TabAttentionStore record);
 
+    /**
+     * 分页查询关注门店
+     * @Title: pageStoreAttention

+     * @Description: 
+    
* @author boom
+     * @param userId
+     * @param enterpriseId

+     * @return  com.github.pagehelper.Page<com.gic.cloud.entity.TabAttentionStore>

+    
*/
     Page<TabAttentionStore> pageStoreAttention(@Param("userId") Integer userId, @Param("enterpriseId") Integer enterpriseId);
 
+    /**
+     * 删除关注门店
+     * @Title: removeAttention

+     * @Description:
+    
* @author boom
+     * @param userId
+     * @param enterpriseId
+     * @param storeIds

+     * @return  int

+    
*/
     int removeAttention(@Param("userId") Integer userId,
                         @Param("enterpriseId") Integer enterpriseId,
                         @Param("storeIds")List<Integer> storeIds);

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabDataExplainMapper.java

 package com.gic.cloud.dao.mapper;
 
 import com.gic.cloud.entity.TabDataExplain;
-import com.gic.cloud.qo.DataExplainQO;
+import com.gic.cloud.qo.DataExplainQo;
 import com.github.pagehelper.Page;
-
+/**
+ * 数据解读接口
+ * @ClassName: TabDataExplainMapper

+ * @Description: 
  
+ * @author zhiwj

+ * @date 2020/9/7 9:57 AM
 
+ */
 public interface TabDataExplainMapper {
     /**
      * 根据主键删除
@@ -53,7 +59,23 @@ public interface TabDataExplainMapper {
      */
     int updateByPrimaryKey(TabDataExplain record);
 
+    /**
+     * 实体参数查询数据解读
+     * @Title: getBySelective

+     * @Description:
+    
* @author zhiwj
+     * @param tabDataExplain

+     * @return  com.gic.cloud.entity.TabDataExplain

+    
*/
     TabDataExplain getBySelective(TabDataExplain tabDataExplain);
 
-    Page<TabDataExplain> listDataExplain(DataExplainQO dataExplainQO);
+    /**
+     * 查询数据解读列表数据
+     * @Title: listDataExplain

+     * @Description:
+    
* @author zhiwj
+     * @param dataExplainQo

+     * @return  com.github.pagehelper.Page<com.gic.cloud.entity.TabDataExplain>

+    
*/
+    Page<TabDataExplain> listDataExplain(DataExplainQo dataExplainQo);
 }
\ No newline at end of file

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabIndexDescEnterpriseMapper.java

@@ -4,7 +4,13 @@ import com.gic.cloud.entity.TabIndexDescEnterprise;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-
+/**
+ * 指标
+ * @ClassName: TabIndexDescEnterpriseMapper

+ * @Description: 

+ * @author zhiwj

+ * @date 2020/9/7 10:45 AM

+ */
 public interface TabIndexDescEnterpriseMapper {
     /**
      * 根据主键删除
@@ -54,7 +60,24 @@ public interface TabIndexDescEnterpriseMapper {
      */
     int updateByPrimaryKey(TabIndexDescEnterprise record);
 
+    /**
+     * 更新指标顺序
+     * @Title: updateSort

+     * @Description:
+    
* @author zhiwj
+     * @param enterpriseId
+     * @param sort

+     * @return  void

+    
*/
     void updateSort(@Param("enterpriseId") Integer enterpriseId, @Param("sort") Integer sort);
 
+    /**
+     * 删除
+     * @Title: deleteList

+     * @Description:
+    
* @author zhiwj
+     * @param deleteList

+     * @return  void

+    
*/
     void deleteList(@Param("ids") List<Integer> deleteList);
 }
\ No newline at end of file

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabIndexDescMapper.java

@@ -5,7 +5,13 @@ import com.gic.cloud.entity.TabIndexDesc;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-
+/**
+ * 指标
+ * @ClassName: TabIndexDescMapper

+ * @Description: 

+ * @author zhiwj

+ * @date 2020/9/7 10:45 AM

+ */
 public interface TabIndexDescMapper {
     /**
      * 根据主键删除
@@ -55,17 +61,72 @@ public interface TabIndexDescMapper {
      */
     int updateByPrimaryKey(TabIndexDesc record);
 
+    /**
+     * 查询指标
+     * @Title: listByEnterpriseAndModule

+     * @Description:
+    
* @author zhiwj
+     * @param enterpriseId
+     * @param moduleId
+     * @param indexGroupName

+     * @return  java.util.List<com.gic.cloud.dto.IndexDescDTO>

+    
*/
     List<IndexDescDTO> listByEnterpriseAndModule(@Param("enterpriseId") Integer enterpriseId, @Param("moduleId") String moduleId, @Param("indexGroupName") String indexGroupName);
 
+    /**
+     * 查询指标
+     * @Title: listByEnterpriseAndModuleDetail

+     * @Description:
+    
* @author zhiwj
+     * @param enterpriseId
+     * @param moduleId
+     * @param indexGroupName
+     * @param userId
+     * @param indexStatus

+     * @return  java.util.List<com.gic.cloud.dto.IndexDescDTO>

+    
*/
     List<IndexDescDTO> listByEnterpriseAndModuleDetail(@Param("enterpriseId") Integer enterpriseId, @Param("moduleId") String moduleId, @Param("indexGroupName") String indexGroupName, @Param("userId") Integer userId, @Param("indexStatus") Integer indexStatus);
 
 //    List<IndexDescDTO> listRecycle(@Param("enterpriseId") Integer enterpriseId, @Param("moduleId") String moduleId, @Param("indexGroupName") String indexGroupName, @Param("userId") Integer userId);
 
+    /**
+     * 查询指标
+     * @Title: listAll

+     * @Description:
+    
* @author zhiwj 

+     * @return  java.util.List<com.gic.cloud.entity.TabIndexDesc>

+    
*/
     List<TabIndexDesc> listAll();
 
+    /**
+     * 查询指标
+     * @Title: listAllUnRel

+     * @Description:
+    
* @author zhiwj
+     * @param relIndexDescIdList

+     * @return  java.util.List<com.gic.cloud.entity.TabIndexDesc>

+    
*/
     List<TabIndexDesc> listAllUnRel(@Param("ids") List<Integer> relIndexDescIdList);
 
+    /**
+     * 查询指标
+     * @Title: listByIds

+     * @Description:
+    
* @author zhiwj
+     * @param indexDescIdList

+     * @return  java.util.List<com.gic.cloud.entity.TabIndexDesc>

+    
*/
     List<TabIndexDesc> listByIds(@Param("ids") List<Integer> indexDescIdList);
 
+    /**
+     * 查询指标
+     * @Title: getIndexDescByIndexCode

+     * @Description:
+    
* @author zhiwj
+     * @param moduleId
+     * @param indexCode
+     * @param indexGroupName

+     * @return  com.gic.cloud.entity.TabIndexDesc

+    
*/
     TabIndexDesc getIndexDescByIndexCode(@Param("moduleId") String moduleId, @Param("indexCode") String indexCode, @Param("indexGroupName") String indexGroupName);
 }
\ No newline at end of file

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabIndexGroupMapper.java

@@ -4,7 +4,13 @@ import com.gic.cloud.entity.TabIndexGroup;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-
+/**
+ * 指标分组
+ * @ClassName: TabIndexGroupMapper

+ * @Description: 

+ * @author zhiwj

+ * @date 2020/9/7 10:30 AM

+ */
 public interface TabIndexGroupMapper {
     /**
      * 根据主键删除
@@ -54,9 +60,33 @@ public interface TabIndexGroupMapper {
      */
     int updateByPrimaryKey(TabIndexGroup record);
 
+    /**
+     * 根据实体参数查询指标分组
+     * @Title: getBySelective

+     * @Description:
+    
* @author zhiwj
+     * @param indexGroup

+     * @return  com.gic.cloud.entity.TabIndexGroup

+    
*/
     TabIndexGroup getBySelective(TabIndexGroup indexGroup);
 
+    /**
+     * 根据主键 list 查询指标列表数据
+     * @Title: listIndexGroup

+     * @Description:
+    
* @author zhiwj
+     * @param indexGroupIdList

+     * @return  java.util.List<com.gic.cloud.entity.TabIndexGroup>

+    
*/
     List<TabIndexGroup> listIndexGroup(@Param("ids") List<Integer> indexGroupIdList);
 
+    /**
+     * 根据指标分组主键查询子分组主键ID list
+     * @Title: listChildIndexGroup

+     * @Description:
+    
* @author zhiwj
+     * @param indexGroupId

+     * @return  java.util.List<java.lang.Integer>

+    
*/
     List<Integer> listChildIndexGroup(@Param("indexGroupId") Integer indexGroupId);
 }
\ No newline at end of file

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabIndexLogMapper.java

@@ -4,7 +4,13 @@ import com.gic.cloud.entity.TabIndexLog;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-
+/**
+ * 指标字典
+ * @ClassName: TabIndexLogMapper

+ * @Description: 

+ * @author zhiwj

+ * @date 2020/9/7 10:35 AM

+ */
 public interface TabIndexLogMapper {
     /**
      * 根据主键删除
@@ -54,5 +60,14 @@ public interface TabIndexLogMapper {
      */
     int updateByPrimaryKey(TabIndexLog record);
 
+    /**
+     * 查询指标字典列表数据
+     * @Title: listBusinessLog

+     * @Description: 
+    
* @author guojuxing 
+     * @param businessId
+     * @param type

+     * @return  java.util.List<com.gic.cloud.entity.TabIndexLog>

+    
*/
     List<TabIndexLog> listBusinessLog(@Param("businessId") Integer businessId, @Param("type") Integer type);
 }
\ No newline at end of file

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabIndexMapper.java

 package com.gic.cloud.dao.mapper;
 
 import com.gic.cloud.entity.TabIndex;
-import com.gic.cloud.qo.IndexQO;
+import com.gic.cloud.qo.IndexQo;
 import com.github.pagehelper.Page;
-
+/**
+ * 指标字典
+ * @ClassName: TabIndexMapper

+ * @Description: 

+ * @author zhiwj

+ * @date 2020/9/7 10:35 AM

+ */
 public interface TabIndexMapper {
     /**
      * 根据主键删除
@@ -53,7 +59,23 @@ public interface TabIndexMapper {
      */
     int updateByPrimaryKey(TabIndex record);
 
+    /**
+     * 指标字典
+     * @Title: getBySelective

+     * @Description:
+    
* @author zhiwj
+     * @param tabIndex

+     * @return  com.gic.cloud.entity.TabIndex

+    
*/
     TabIndex getBySelective(TabIndex tabIndex);
 
-    Page<TabIndex> listIndex(IndexQO indexQO);
+    /**
+     * 查询指标字典列表数据
+     * @Title: listIndex

+     * @Description:
+    
* @author guojuxing
+     * @param indexQo

+     * @return  com.github.pagehelper.Page<com.gic.cloud.entity.TabIndex>

+    
*/
+    Page<TabIndex> listIndex(IndexQo indexQo);
 }
\ No newline at end of file

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabIndexModuleRelMapper.java

@@ -4,7 +4,13 @@ import com.gic.cloud.entity.TabIndexModuleRel;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-
+/**
+ * 指标/数据解读关联
+ * @ClassName: TabIndexModuleRelMapper

+ * @Description: 

+ * @author zhiwj

+ * @date 2020/9/7 10:35 AM

+ */
 public interface TabIndexModuleRelMapper {
     /**
      * 根据主键删除
@@ -54,17 +60,79 @@ public interface TabIndexModuleRelMapper {
      */
     int updateByPrimaryKey(TabIndexModuleRel record);
 
+    /**
+     * 删除字典/数据解读关联
+     * @Title: delByBusinessId

+     * @Description:
+    
* @author zhiwj
+     * @param businessId
+     * @param type

+     * @return  void

+    
*/
     void delByBusinessId(@Param("businessId") Integer businessId, @Param("type") Integer type);
 
+    /**
+     * 新增字典/数据解读关联
+     * @Title: insertSelectiveByNotExist

+     * @Description:
+    
* @author guojuxing
+     * @param rel

+     * @return  void

+    
*/
     void insertSelectiveByNotExist(TabIndexModuleRel rel);
 
+    /**
+     * 编辑字典/数据解读关联
+     * @Title: updateStatusByBusinessIds

+     * @Description:
+    
* @author guojuxing
+     * @param businessId
+     * @param moduleIdList
+     * @param type

+     * @return  void

+    
*/
     void updateStatusByBusinessIds(@Param("businessId") Integer businessId, @Param("ids") List<String> moduleIdList, @Param("type") Integer type);
 
+    /**
+     * 查询字典/数据解读关联的模块ID
+     * @Title: listModuleIdByBusinessId

+     * @Description:
+    
* @author guojuxing
+     * @param businessId
+     * @param type

+     * @return  java.util.List<java.lang.String>

+    
*/
     List<String> listModuleIdByBusinessId(@Param("businessId") Integer businessId, @Param("type") Integer type);
 
+    /**
+     * 查询字典/数据解读的ID
+     * @Title: listBusinessIdByModuleId

+     * @Description:
+    
* @author zhiwj
+     * @param moduleId
+     * @param type

+     * @return  java.util.List<java.lang.Integer>

+    
*/
     List<Integer> listBusinessIdByModuleId(@Param("moduleId") String moduleId, @Param("type") Integer type);
 
+    /**
+     * 查询模块ID
+     * @Title: listBusinessIdByModuleIds

+     * @Description:
+    
* @author zhiwj
+     * @param moduleIdList

+     * @return  java.util.List<java.lang.Integer>

+    
*/
     List<Integer> listBusinessIdByModuleIds(@Param("ids") List<String> moduleIdList);
 
+    /**
+     * 查询字典/数据解读关联
+     * @Title: listModuleIdByBusinessIds

+     * @Description:
+    
* @author zhiwj
+     * @param businessIdList
+     * @param type

+     * @return  java.util.List<com.gic.cloud.entity.TabIndexModuleRel>

+    
*/
     List<TabIndexModuleRel> listModuleIdByBusinessIds(@Param("ids") List<Integer> businessIdList, @Param("type") Integer type);
 }
\ No newline at end of file

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabSysAccountGroupMapper.java

@@ -5,6 +5,13 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
+/**
+ * 账号分组
+ * @ClassName: TabSysAccountGroupMapper

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 10:31 AM

+ */
 public interface TabSysAccountGroupMapper {
     /**
      * 根据主键删除
@@ -54,13 +61,47 @@ public interface TabSysAccountGroupMapper {
      */
     int updateByPrimaryKey(TabSysAccountGroup record);
 
+    /**
+     * 根据账号分组ID和账号分组名称查询数量，为了判断是否账号名称重复
+     * @Title: countByAccountGroupName

+     * @Description:
+    
* @author guojuxing
+     * @param enterpriseId
+     * @param accountGroupId
+     * @param accountGroupName

+     * @return  int

+    
*/
     int countByAccountGroupName(@Param("enterpriseId") Integer enterpriseId,
                                 @Param("accountGroupId") Integer accountGroupId,
                                 @Param("accountGroupName") String accountGroupName);
 
+    /**
+     * 查询账号分组在商户下当前的最大排序值
+     * @Title: queryMaxSort

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

+     * @return  int

+    
*/
     int queryMaxSort(@Param("enterpriseId") Integer enterpriseId);
 
+    /**
+     * 查询商户下所有的账号分组列表
+     * @Title: listAccountGroupOrderBySort

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

+     * @return  java.util.List<com.gic.cloud.entity.TabSysAccountGroup>

+    
*/
     List<TabSysAccountGroup> listAccountGroupOrderBySort(@Param("enterpriseId") Integer enterpriseId);
 
+    /**
+     * 删除账号分组
+     * @Title: deleteAccountGroup

+     * @Description:
+    
* @author guojuxing
+     * @param accountGroupId

+     * @return  int

+    
*/
     int deleteAccountGroup(@Param("accountGroupId")Integer accountGroupId);
 }
\ No newline at end of file

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabSysDataAuthMapper.java

@@ -4,7 +4,13 @@ import com.gic.cloud.entity.TabSysDataAuth;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-
+/**
+ * 数据权限
+ * @ClassName: TabSysDataAuthMapper

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 10:34 AM

+ */
 public interface TabSysDataAuthMapper {
     /**
      * 根据主键删除
@@ -54,12 +60,41 @@ public interface TabSysDataAuthMapper {
      */
     int updateByPrimaryKey(TabSysDataAuth record);
 
+
+    /**
+     * 数据权限名称是否重复
+     * @Title: countByDataAuthName

+     * @Description:
+    
* @author guojuxing
+     * @param enterpriseId
+     * @param dataAuthId
+     * @param dataAuthName

+     * @return  int

+    
*/
     int countByDataAuthName(@Param("enterpriseId") Integer enterpriseId,
                             @Param("dataAuthId") Integer dataAuthId,
                             @Param("dataAuthName") String dataAuthName);
 
+    /**
+     * 删除数据权限
+     * @Title: deleteDataAuth

+     * @Description:
+    
* @author guojuxing
+     * @param dataAuthId

+     * @return  int

+    
*/
     int deleteDataAuth(@Param("dataAuthId") Integer dataAuthId);
 
+
+    /**
+     * 数据权限列表数据
+     * @Title: listDataAuth

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

+     * @return  java.util.List<com.gic.cloud.entity.TabSysDataAuth>

+    
*/
     List<TabSysDataAuth> listDataAuth(@Param("enterpriseId")Integer enterpriseId,
                                       @Param("dataAuthName")String dataAuthName);
 }
\ No newline at end of file

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabSysFunctionMapper.java

@@ -4,7 +4,13 @@ import com.gic.cloud.entity.TabSysFunction;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-
+/**
+ * 功能权限
+ * @ClassName: TabSysFunctionMapper

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 10:32 AM

+ */
 public interface TabSysFunctionMapper {
     /**
      * 根据主键删除
@@ -54,11 +60,40 @@ public interface TabSysFunctionMapper {
      */
     int updateByPrimaryKey(TabSysFunction record);
 
+
+    /**
+     * 功能权限名称是否重复
+     * @Title: countByRepeatFunctionName

+     * @Description:
+    
* @author guojuxing
+     * @param enterpriseId
+     * @param functionId
+     * @param functionName

+     * @return  int

+    
*/
     int countByRepeatFunctionName(@Param("enterpriseId") Integer enterpriseId,
                                   @Param("functionId") Integer functionId,
                                   @Param("functionName") String functionName);
 
+
+    /**
+     * 删除功能权限
+     * @Title: deleteFunction

+     * @Description:
+    
* @author guojuxing
+     * @param functionId

+     * @return  void

+    
*/
     void deleteFunction(@Param("functionId") Integer functionId);
 
+    /**
+     * 查询功能权限列表数据
+     * @Title: listFunction

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

+     * @return  java.util.List<com.gic.cloud.entity.TabSysFunction>

+    
*/
     List<TabSysFunction> listFunction(@Param("enterpriseId")Integer enterpriseId, @Param("functionName") String functionName);
 }
\ No newline at end of file

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabSysFunctionModuleMapper.java

@@ -4,7 +4,13 @@ import com.gic.cloud.entity.TabSysFunctionModule;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-
+/**
+ * 功能权限
+ * @ClassName: TabSysFunctionModuleMapper

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 10:33 AM

+ */
 public interface TabSysFunctionModuleMapper {
     /**
      * 根据主键删除
@@ -54,5 +60,13 @@ public interface TabSysFunctionModuleMapper {
      */
     int updateByPrimaryKey(TabSysFunctionModule record);
 
+    /**
+     * 查询功能模块
+     * @Title: listFunctionModule

+     * @Description:
+    
* @author guojuxing
+     * @param search

+     * @return  java.util.List<com.gic.cloud.entity.TabSysFunctionModule>

+    
*/
     List<TabSysFunctionModule> listFunctionModule(@Param("search") String search);
 }
\ No newline at end of file

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabSysTempStoreConditionMapper.java

@@ -2,7 +2,13 @@ package com.gic.cloud.dao.mapper;
 
 import com.gic.cloud.entity.TabSysTempStoreCondition;
 import org.apache.ibatis.annotations.Param;
-
+/**
+ * 门店暂存区
+ * @ClassName: TabSysTempStoreConditionMapper

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 10:34 AM

+ */
 public interface TabSysTempStoreConditionMapper {
     /**
      * 根据主键删除
@@ -52,5 +58,13 @@ public interface TabSysTempStoreConditionMapper {
      */
     int updateByPrimaryKey(TabSysTempStoreCondition record);
 
+    /**
+     * 获取暂存区信息
+     * @Title: getTempStoreCondition

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

+     * @return  com.gic.cloud.entity.TabSysTempStoreCondition

+    
*/
     TabSysTempStoreCondition getTempStoreCondition(@Param("enterpriseId") Integer enterpriseId);
 }
\ No newline at end of file

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabSysUserMapper.java

@@ -2,11 +2,17 @@ package com.gic.cloud.dao.mapper;
 
 import com.gic.cloud.dto.UserDTO;
 import com.gic.cloud.entity.TabSysUser;
-import com.gic.cloud.qo.UserQO;
+import com.gic.cloud.qo.UserQo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-
+/**
+ * 用户
+ * @ClassName: TabSysUserMapper

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 10:32 AM

+ */
 public interface TabSysUserMapper {
     /**
      * 根据主键删除
@@ -56,26 +62,109 @@ public interface TabSysUserMapper {
      */
     int updateByPrimaryKey(TabSysUser record);
 
+    /**
+     * 根据手机号查询用户个数，用于判断用户是否重复
+     * @Title: countByRepeatPhone

+     * @Description:
+    
* @author guojuxing
+     * @param enterpriseId
+     * @param userId
+     * @param nationCode
+     * @param phone

+     * @return  int

+    
*/
     int countByRepeatPhone(@Param("enterpriseId") Integer enterpriseId,
                            @Param("userId") Integer userId,
                            @Param("nationCode") String nationCode,
                            @Param("phone") String phone);
 
+    /**
+     * 删除用户
+     * @Title: deleteUser

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

+     * @return  void

+    
*/
     void deleteUser(@Param("userId") Integer userId);
 
+    /**
+     * 删除账号分组下的所有用户
+     * @Title: deleteUserByAccountGroupId

+     * @Description:
+    
* @author guojuxing
+     * @param accountGroupId

+     * @return  void

+    
*/
     void deleteUserByAccountGroupId(@Param("accountGroupId") Integer accountGroupId);
 
-    List<TabSysUser> pageUser(UserQO userQO);
 
+    /**
+     * 分页查询用户列表
+     * @Title: pageUser

+     * @Description:
+    
* @author guojuxing
+     * @param userQo

+     * @return  java.util.List<com.gic.cloud.entity.TabSysUser>

+    
*/
+    List<TabSysUser> pageUser(UserQo userQo);
+
+
+    /**
+     * 批量转移账号分组
+     * @Title: bulkTransferAccountGroup

+     * @Description:
+    
* @author guojuxing
+     * @param userIdList
+     * @param targetAccountGroupId

+     * @return  void

+    
*/
     void bulkTransferAccountGroup(@Param("userIdList") List<Integer> userIdList, @Param("targetAccountGroupId") Integer targetAccountGroupId);
 
+
+    /**
+     * 查询账号下用户个数
+     * @Title: countGroupByAccountGroupId

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

+     * @return  java.util.List<com.gic.cloud.dto.UserDTO>

+    
*/
     List<UserDTO> countGroupByAccountGroupId(@Param("enterpriseId")Integer enterpriseId);
 
+    /**
+     * 手机号查询用户
+     * @Title: listUserByPhone

+     * @Description:
+    
* @author guojuxing
+     * @param nationCode
+     * @param phone

+     * @return  java.util.List<com.gic.cloud.entity.TabSysUser>

+    
*/
     List<TabSysUser> listUserByPhone(@Param("nationCode") String nationCode, @Param("phone") String phone);
 
+
+    /**
+     * 查询用户列表（功能权限授权个数）
+     * @Title: countGroupByFunctionAuthId

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

+     * @return  java.util.List<com.gic.cloud.dto.UserDTO>

+    
*/
     List<UserDTO> countGroupByFunctionAuthId(@Param("enterpriseId") Integer enterpriseId,
                                              @Param("functionIdList") List<Integer> functionIdList);
 
+    /**
+     * 查询用户列表（功能权限授权个数）
+     * @Title: countGroupByDataAuthId

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

+     * @return  java.util.List<com.gic.cloud.dto.UserDTO>

+    
*/
     List<UserDTO> countGroupByDataAuthId(@Param("enterpriseId") Integer enterpriseId,
                                          @Param("dataAuthIdList") List<Integer> dataAuthIdList);
 }
\ No newline at end of file

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabUpdateTipsMapper.java

@@ -4,7 +4,13 @@ import com.gic.cloud.entity.TabUpdateTips;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-
+/**
+ * 小红点提示
+ * @ClassName: TabUpdateTipsMapper

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 10:35 AM

+ */
 public interface TabUpdateTipsMapper {
     /**
      * 根据主键删除
@@ -54,7 +60,28 @@ public interface TabUpdateTipsMapper {
      */
     int updateByPrimaryKey(TabUpdateTips record);
 
+    /**
+     * 更新小红点提示表状态
+     * @Title: updateStatus

+     * @Description: 
+    
* @author zhiwj
+     * @param businessId
+     * @param type
+     * @param userId
+     * @param showStatus

+     * @return  void

+    
*/
     void updateStatus(@Param("businessId") Integer businessId, @Param("type") Integer type, @Param("userId") Integer userId, @Param("showStatus") Integer showStatus);
 
+    /**
+     * 查询小红点提示列表数据
+     * @Title: listByIndexIdAndUser

+     * @Description:
+    
* @author zhiwj
+     * @param businessIdList
+     * @param type
+     * @param userId

+     * @return  java.util.List<com.gic.cloud.entity.TabUpdateTips>

+    
*/
     List<TabUpdateTips> listByIndexIdAndUser(@Param("ids") List<Integer> businessIdList, @Param("type") int type, @Param("userId") Integer userId);
 }
\ No newline at end of file

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabAttentionStore.java

@@ -3,7 +3,11 @@ package com.gic.cloud.entity;
 import java.util.Date;
 
 /**
- * tab_attention_store
+ * 关注门店
+ * @ClassName: TabAttentionStore

+ * @Description: 

+ * @author boom

+ * @date 2020/9/7 10:44 AM

  */
 public class TabAttentionStore {
     /**

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabDataExplain.java

@@ -3,7 +3,11 @@ package com.gic.cloud.entity;
 import java.util.Date;
 
 /**
- * tab_data_explain
+ * 数据解读
+ * @ClassName: TabDataExplain

+ * @Description: 

+ * @author zhiwj

+ * @date 2020/9/7 10:36 AM

  */
 public class TabDataExplain {
     /**

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabGicEnterprisePortraitRel.java

@@ -3,7 +3,11 @@ package com.gic.cloud.entity;
 import java.util.Date;
 
 /**
- * tab_gic_enterprise_portrait_rel
+ * 会员画像
+ * @ClassName: TabGicEnterprisePortraitRel

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 10:45 AM

  */
 public class TabGicEnterprisePortraitRel {
     /**

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabIndex.java

@@ -3,7 +3,11 @@ package com.gic.cloud.entity;
 import java.util.Date;
 
 /**
- * tab_index
+ * 指标字典
+ * @ClassName: TabIndex

+ * @Description: 

+ * @author zhiwj

+ * @date 2020/9/7 10:41 AM

  */
 public class TabIndex {
     /**

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabIndexDesc.java

@@ -3,7 +3,11 @@ package com.gic.cloud.entity;
 import java.util.Date;
 
 /**
- * tab_index_desc
+ * 指标
+ * @ClassName: TabIndexDesc

+ * @Description: 

+ * @author zhiwj

+ * @date 2020/9/7 10:44 AM

  */
 public class TabIndexDesc {
     /**

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabIndexDescEnterprise.java

@@ -3,7 +3,11 @@ package com.gic.cloud.entity;
 import java.util.Date;
 
 /**
- * tab_index_desc_enterprise
+ * 指标
+ * @ClassName: TabIndexDescEnterprise

+ * @Description: 

+ * @author zhiwj

+ * @date 2020/9/7 10:44 AM

  */
 public class TabIndexDescEnterprise {
     /**

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabIndexGroup.java

@@ -3,7 +3,11 @@ package com.gic.cloud.entity;
 import java.util.Date;
 
 /**
- * tab_index_group
+ * 指标分组
+ * @ClassName: TabIndexGroup

+ * @Description: 

+ * @author zhiwj

+ * @date 2020/9/7 10:30 AM

  */
 public class TabIndexGroup {
     /**

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabIndexLog.java

@@ -3,7 +3,11 @@ package com.gic.cloud.entity;
 import java.util.Date;
 
 /**
- * tab_index_log
+ * 指标字典
+ * @ClassName: TabIndexLog

+ * @Description: 

+ * @author zhiwj

+ * @date 2020/9/7 10:36 AM

  */
 public class TabIndexLog {
     /**

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabIndexModuleRel.java

@@ -3,7 +3,11 @@ package com.gic.cloud.entity;
 import java.util.Date;
 
 /**
- * tab_index_module_rel
+ * 字典
+ * @ClassName: TabIndexModuleRel

+ * @Description: 

+ * @author zhiwj

+ * @date 2020/9/7 10:36 AM

  */
 public class TabIndexModuleRel {
     /**

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabSysAccountGroup.java

@@ -3,7 +3,11 @@ package com.gic.cloud.entity;
 import java.util.Date;
 
 /**
- * tab_sys_account_group
+ * 账号分组
+ * @ClassName: TabSysAccountGroup

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 10:31 AM

  */
 public class TabSysAccountGroup {
     /**

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabSysDataAuth.java

@@ -3,7 +3,11 @@ package com.gic.cloud.entity;
 import java.util.Date;
 
 /**
- * tab_sys_data_auth
+ * 数据权限
+ * @ClassName: TabSysDataAuth

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 10:34 AM

  */
 public class TabSysDataAuth {
     /**

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabSysFunction.java

@@ -3,7 +3,11 @@ package com.gic.cloud.entity;
 import java.util.Date;
 
 /**
- * tab_sys_function
+ * 功能权限
+ * @ClassName: TabSysFunction

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 10:32 AM

  */
 public class TabSysFunction {
     /**

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabSysFunctionModule.java

@@ -3,7 +3,11 @@ package com.gic.cloud.entity;
 import java.util.Date;
 
 /**
- * tab_sys_function_module
+ * 功能权限
+ * @ClassName: TabSysFunctionModule

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 10:33 AM

  */
 public class TabSysFunctionModule {
     /**

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabSysTempStoreCondition.java

@@ -3,7 +3,11 @@ package com.gic.cloud.entity;
 import java.util.Date;
 
 /**
- * tab_sys_temp_store_condition
+ * 门店暂存区
+ * @ClassName: TabSysTempStoreCondition

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 10:34 AM

  */
 public class TabSysTempStoreCondition {
     /**

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabSysUser.java

@@ -3,7 +3,11 @@ package com.gic.cloud.entity;
 import java.util.Date;
 
 /**
- * tab_sys_user
+ * 用户
+ * @ClassName: TabSysUser

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 10:31 AM

  */
 public class TabSysUser {
     /**

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabUpdateTips.java

 package com.gic.cloud.entity;
 
 /**
- * tab_update_tips
+ * 小红点提示
+ * @ClassName: TabUpdateTips

+ * @Description: 

+ * @author zhiwj

+ * @date 2020/9/7 10:41 AM

  */
 public class TabUpdateTips {
     /**

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TestEntity.java

 package com.gic.cloud.entity;
-
+/**
+ * test
+ * @ClassName: TestEntity

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 10:31 AM

+ */
 public class TestEntity {
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/AccountGroupService.java

@@ -6,11 +6,33 @@ import com.gic.cloud.dto.AccountGroupDTO;
 import com.gic.cloud.entity.TabSysAccountGroup;
 
 import java.util.List;
-
+/**
+ * 账号分组
+ * @ClassName: AccountGroupService

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 10:31 AM

+ */
 public interface AccountGroupService {
 
+    /**
+     * 新增账号分组
+     * @Title: saveAccountGroup

+     * @Description:
+    
* @author guojuxing
+     * @param dto

+     * @return  java.lang.Integer

+    
*/
     Integer saveAccountGroup(AccountGroupDTO dto);
 
+    /**
+     * 编辑账号分组
+     * @Title: editAccountGroup

+     * @Description:
+    
* @author guojuxing
+     * @param dto

+     * @return  void

+    
*/
     void editAccountGroup(AccountGroupDTO dto);
 
     /**
@@ -42,9 +64,34 @@ public interface AccountGroupService {
     
*/
     TabSysAccountGroup getAccountGroupById(Integer accountGroupId);
 
+    /**
+     * 排序账号分组
+     * @Title: sortAccountGroup

+     * @Description:
+    
* @author guojuxing
+     * @param record
+     * @param targetSort

+     * @return  void

+    
*/
     void sortAccountGroup(TabSysAccountGroup record, Integer targetSort);
 
+    /**
+     * 查询账号分组列表数据
+     * @Title: listAccountGroupOrderBySort

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

+     * @return  java.util.List<com.gic.cloud.entity.TabSysAccountGroup>

+    
*/
     List<TabSysAccountGroup> listAccountGroupOrderBySort(Integer enterpriseId);
 
+    /**
+     * 删除账号分组
+     * @Title: deleteAccountGroup

+     * @Description:
+    
* @author guojuxing
+     * @param accountGroupId

+     * @return  void

+    
*/
     void deleteAccountGroup(Integer accountGroupId);
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/DataAuthService.java

@@ -5,20 +5,89 @@ import com.gic.cloud.entity.TabSysDataAuth;
 import com.github.pagehelper.Page;
 
 import java.util.List;
-
+/**
+ * 数据权限接口
+ * @ClassName: DataAuthService

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 9:53 AM

+ */
 public interface DataAuthService {
 
+    /**
+     * 新增数据权限
+     * @Title: saveDataAuth

+     * @Description:
+    
* @author guojuxing
+     * @param dto

+     * @return  java.lang.Integer

+    
*/
     Integer saveDataAuth(DataAuthDTO dto);
 
+    /**
+     * 编辑数据权限
+     * @Title: editDataAuth

+     * @Description:
+    
* @author guojuxing
+     * @param dto

+     * @return  void

+    
*/
     void editDataAuth(DataAuthDTO dto);
 
+
+    /**
+     * 主键查询数据权限
+     * @Title: getDataAuth

+     * @Description:
+    
* @author guojuxing
+     * @param dataAuthId

+     * @return  com.gic.cloud.entity.TabSysDataAuth

+    
*/
     TabSysDataAuth getDataAuth(Integer dataAuthId);
 
+    /**
+     * 数据权限名称是否重复
+     * @Title: isRepeatDataAuthName

+     * @Description:
+    
* @author guojuxing
+     * @param enterpriseId
+     * @param dataAuthId
+     * @param dataAuthName

+     * @return  boolean

+    
*/
     boolean isRepeatDataAuthName(Integer enterpriseId, Integer dataAuthId, String dataAuthName);
 
+    /**
+     * 主键删除数据权限
+     * @Title: deleteDataAuth

+     * @Description:
+    
* @author guojuxing
+     * @param dataAuthId

+     * @return  int

+    
*/
     int deleteDataAuth(Integer dataAuthId);
 
+    /**
+     * 分页查询数据权限
+     * @Title: pageDataAuth

+     * @Description:
+    
* @author guojuxing
+     * @param enterpriseId
+     * @param dataAuthName
+     * @param currentPage
+     * @param pageSize

+     * @return  com.github.pagehelper.Page<com.gic.cloud.entity.TabSysDataAuth>

+    
*/
     Page<TabSysDataAuth> pageDataAuth(Integer enterpriseId, String dataAuthName, Integer currentPage, Integer pageSize);
 
+    /**
+     * 查询数据权限
+     * @Title: listDataAuth

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

+     * @return  java.util.List<com.gic.cloud.entity.TabSysDataAuth>

+    
*/
     List<TabSysDataAuth> listDataAuth(Integer enterpriseId, String dataAuthName);
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/DataExplainService.java

@@ -2,7 +2,7 @@ package com.gic.cloud.service;
 
 import com.gic.cloud.dto.DataExplainDTO;
 import com.gic.cloud.entity.TabDataExplain;
-import com.gic.cloud.qo.DataExplainQO;
+import com.gic.cloud.qo.DataExplainQo;
 import com.github.pagehelper.Page;
 
 import java.util.List;
@@ -14,17 +14,74 @@ import java.util.List;
  */
 public interface DataExplainService {
 
+    /**
+     * 数据解读名称是否重复
+     * @Title: isNameRepeat

+     * @Description:
+    
* @author zhiwj
+     * @param dataName
+     * @param dataExplainId

+     * @return  boolean

+    
*/
     boolean isNameRepeat(String dataName, Integer dataExplainId);
 
+    /**
+     * 新增数据解读
+     * @Title: save

+     * @Description:
+    
* @author zhiwj
+     * @param dataExplainDTO

+     * @return  java.lang.Integer

+    
*/
     Integer save(DataExplainDTO dataExplainDTO);
 
+    /**
+     * 更新数据解读
+     * @Title: update

+     * @Description:
+    
* @author zhiwj
+     * @param dataExplainDTO

+     * @return  void

+    
*/
     void update(DataExplainDTO dataExplainDTO);
 
+    /**
+     * 获取数据解读
+     * @Title: getByDataExplainId

+     * @Description:
+    
* @author zhiwj
+     * @param dataExplainId

+     * @return  com.gic.cloud.entity.TabDataExplain

+    
*/
     TabDataExplain getByDataExplainId(Integer dataExplainId);
 
-    Page<TabDataExplain> listDataExplain(DataExplainQO dataExplainQO);
+    /**
+     * 分页查询数据解读
+     * @Title: listDataExplain

+     * @Description:
+    
* @author zhiwj
+     * @param dataExplainQo

+     * @return  com.github.pagehelper.Page<com.gic.cloud.entity.TabDataExplain>

+    
*/
+    Page<TabDataExplain> listDataExplain(DataExplainQo dataExplainQo);
 
-    List<TabDataExplain> listAllDataExplain(DataExplainQO dataExplainQO);
+    /**
+     * 查询数据解读列表数据
+     * @Title: listAllDataExplain

+     * @Description:
+    
* @author zhiwj
+     * @param dataExplainQo

+     * @return  java.util.List<com.gic.cloud.entity.TabDataExplain>

+    
*/
+    List<TabDataExplain> listAllDataExplain(DataExplainQo dataExplainQo);
 
+    /**
+     * 删除数据解读
+     * @Title: deleteById

+     * @Description:
+    
* @author zhiwj
+     * @param dataExplainId

+     * @return  void

+    
*/
     void deleteById(Integer dataExplainId);
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/FunctionModuleService.java

@@ -4,13 +4,52 @@ import com.gic.cloud.dto.FunctionModuleDTO;
 import com.gic.cloud.entity.TabSysFunctionModule;
 
 import java.util.List;
-
+/**
+ * 功能模块接口
+ * @ClassName: FunctionModuleService

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 9:51 AM

+ */
 public interface FunctionModuleService {
+    /**
+     * 新增功能模块
+     * @Title: saveFunctionModule

+     * @Description:
+    
* @author guojuxing
+     * @param dto

+     * @return  java.lang.Integer

+    
*/
     Integer saveFunctionModule(FunctionModuleDTO dto);
 
+    /**
+     * 编辑功能模块
+     * @Title: editFunctionModule

+     * @Description:
+    
* @author guojuxing
+     * @param dto

+     * @return  void

+    
*/
     void editFunctionModule(FunctionModuleDTO dto);
 
+    /**
+     * 主键查询功能模块信息
+     * @Title: getFunctionModule

+     * @Description:
+    
* @author guojuxing
+     * @param functionModuleId

+     * @return  com.gic.cloud.entity.TabSysFunctionModule

+    
*/
     TabSysFunctionModule getFunctionModule(Integer functionModuleId);
 
+
+    /**
+     * 查询功能模块列表数据
+     * @Title: listFunctionModule

+     * @Description:
+    
* @author guojuxing
+     * @param search

+     * @return  java.util.List<com.gic.cloud.entity.TabSysFunctionModule>

+    
*/
     List<TabSysFunctionModule> listFunctionModule(String search);
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/FunctionService.java

@@ -5,20 +5,89 @@ import com.gic.cloud.entity.TabSysFunction;
 import com.github.pagehelper.Page;
 
 import java.util.List;
-
+/**
+ * 功能权限接口
+ * @ClassName: FunctionService

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 9:50 AM

+ */
 public interface FunctionService {
+
+    /**
+     * 新增功能权限
+     * @Title: saveFunction

+     * @Description:
+    
* @author guojuxing
+     * @param dto

+     * @return  java.lang.Integer

+    
*/
     Integer saveFunction(FunctionDTO dto);
 
+    /**
+     * 编辑功能权限
+     * @Title: editFunction

+     * @Description:
+    
* @author guojuxing
+     * @param dto

+     * @return  void

+    
*/
     void editFunction(FunctionDTO dto);
 
+    /**
+     * 主键查询功能权限信息
+     * @Title: getFunction

+     * @Description:
+    
* @author guojuxing
+     * @param functionId

+     * @return  com.gic.cloud.entity.TabSysFunction

+    
*/
     TabSysFunction getFunction(Integer functionId);
 
+    /**
+     * 功能权限名称是否重复
+     * @Title: isRepeatFunctionName

+     * @Description:
+    
* @author guojuxing
+     * @param enterpriseId
+     * @param functionId
+     * @param functionName

+     * @return  boolean

+    
*/
     boolean isRepeatFunctionName(Integer enterpriseId, Integer functionId, String functionName);
 
+    /**
+     * 主键删除功能权限
+     * @Title: deleteFunction

+     * @Description:
+    
* @author guojuxing
+     * @param functionId

+     * @return  void

+    
*/
     void deleteFunction(Integer functionId);
 
+    /**
+     * 分页查询功能权限
+     * @Title: pageFunction

+     * @Description:
+    
* @author guojuxing
+     * @param enterpriseId
+     * @param functionName
+     * @param currentPage
+     * @param pageSize

+     * @return  com.github.pagehelper.Page<com.gic.cloud.entity.TabSysFunction>

+    
*/
     Page<TabSysFunction> pageFunction(Integer enterpriseId, String functionName,
                       Integer currentPage, Integer pageSize);
 
+    /**
+     * 查询功能权限
+     * @Title: listFunction

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

+     * @return  java.util.List<com.gic.cloud.entity.TabSysFunction>

+    
*/
     List<TabSysFunction> listFunction(Integer enterpriseId, String functionName);
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/IndexDescEnterpriseService.java

@@ -11,15 +11,65 @@ import java.util.List;
  * @date 2020-07-23 16:46
  */
 public interface IndexDescEnterpriseService {
+    /**
+     * 更新排序值
+     * @Title: updateSort

+     * @Description:
+    
* @author zhiwj
+     * @param enterpriseId
+     * @param indexDescEnterpriseId
+     * @param sort

+     * @return  void

+    
*/
     void updateSort(Integer enterpriseId, Integer indexDescEnterpriseId, Integer sort);
 
+    /**
+     * 回收站
+     * @Title: moveToRecycle

+     * @Description:
+    
* @author zhiwj
+     * @param indexDescEnterpriseId

+     * @return  void

+    
*/
     void moveToRecycle(Integer indexDescEnterpriseId);
 
+    /**
+     * 批量更新
+     * @Title: batchUpdate

+     * @Description:
+    
* @author zhiwj
+     * @param descList

+     * @return  void

+    
*/
     void batchUpdate(List<IndexDescDTO> descList);
 
+    /**
+     * 批量更新
+     * @Title: batchUpdate

+     * @Description:
+    
* @author zhiwj
+     * @param idsArr

+     * @return  void

+    
*/
     void batchUpdate(String[] idsArr);
 
+    /**
+     * 删除
+     * @Title: deleteList

+     * @Description:
+    
* @author zhiwj
+     * @param deleteList

+     * @return  void

+    
*/
     void deleteList(List<Integer> deleteList);
 
+    /**
+     * 新增
+     * @Title: insert

+     * @Description:
+    
* @author zhiwj
+     * @param indexDescEnterprise

+     * @return  void

+    
*/
     void insert(TabIndexDescEnterprise indexDescEnterprise);
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/IndexDescService.java

@@ -13,21 +13,108 @@ import java.util.List;
  */
 public interface IndexDescService {
 
+    /**
+     * 查询指标
+     * @Title: listByEnterpriseAndModule

+     * @Description:
+    
* @author zhiwj
+     * @param enterpriseId
+     * @param moduleId
+     * @param indexGroupName

+     * @return  java.util.List<com.gic.cloud.dto.IndexDescDTO>

+    
*/
     List<IndexDescDTO> listByEnterpriseAndModule(Integer enterpriseId, String moduleId, String indexGroupName);
 
+    /**
+     * 查询指标
+     * @Title: listByEnterpriseAndModuleDetail

+     * @Description:
+    
* @author zhiwj
+     * @param enterpriseId
+     * @param moduleId
+     * @param indexGroupName
+     * @param userId

+     * @return  java.util.List<com.gic.cloud.dto.IndexDescDTO>

+    
*/
     List<IndexDescDTO> listByEnterpriseAndModuleDetail(Integer enterpriseId, String moduleId, String indexGroupName, Integer userId);
 
+    /**
+     * 查询
+     * @Title: listRecycle

+     * @Description:
+    
* @author zhiwj
+     * @param enterpriseId
+     * @param moduleId
+     * @param indexGroupName
+     * @param userId

+     * @return  java.util.List<com.gic.cloud.dto.IndexDescDTO>

+    
*/
     List<IndexDescDTO> listRecycle(Integer enterpriseId, String moduleId, String indexGroupName, Integer userId);
 
+    /**
+     * 指标排序
+     * @Title: sort

+     * @Description:
+    
* @author zhiwj
+     * @param enterpriseId
+     * @param moduleId
+     * @param indexGroupName
+     * @param indexDescEnterpriseId
+     * @param seq

+     * @return  void

+    
*/
     void sort(Integer enterpriseId, String moduleId, String indexGroupName, Integer indexDescEnterpriseId, Integer seq);
 
+    /**
+     * 获取指标
+     * @Title: getIndexDesc

+     * @Description:
+    
* @author zhiwj
+     * @param enterpriseId
+     * @param indexDescId

+     * @return  com.gic.cloud.entity.TabIndexDesc

+    
*/
     TabIndexDesc getIndexDesc(Integer enterpriseId, Integer indexDescId);
 
+    /**
+     * 查询
+     * @Title: listAllUnRel

+     * @Description:
+    
* @author zhiwj
+     * @param indexDescIdList

+     * @return  java.util.List<com.gic.cloud.entity.TabIndexDesc>

+    
*/
     List<TabIndexDesc> listAllUnRel(List<Integer> indexDescIdList);
 
+    /**
+     * 查询
+     * @Title: listByIds

+     * @Description:
+    
* @author zhiwj
+     * @param indexDescIdList

+     * @return  java.util.List<com.gic.cloud.entity.TabIndexDesc>

+    
*/
     List<TabIndexDesc> listByIds(List<Integer> indexDescIdList);
 
+    /**
+     * 获取
+     * @Title: getIndexDesc

+     * @Description:
+    
* @author zhiwj
+     * @param moduleId
+     * @param indexCode
+     * @param indexGroupName

+     * @return  com.gic.cloud.entity.TabIndexDesc

+    
*/
     TabIndexDesc getIndexDesc(String moduleId, String indexCode, String indexGroupName);
 
+    /**
+     * 初始化指标
+     * @Title: init

+     * @Description:
+    
* @author zhiwj
+     * @param enterpriseId

+     * @return  void

+    
*/
     void init(Integer enterpriseId);
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/IndexGroupService.java

@@ -11,19 +11,83 @@ import java.util.List;
  * @date 2020-07-13 15:37
  */
 public interface IndexGroupService {
+    /**
+     * 是否指标分组名称重复
+     * @Title: isNameRepeat

+     * @Description: 是否指标名称重复
+    
* @author zhiwj
+     * @param indexGroupName
+     * @param indexGroupId

+     * @return  boolean

+    
*/
     boolean isNameRepeat(String indexGroupName, Integer indexGroupId);
 
+    /**
+     * 新增指标分组
+     * @Title: save

+     * @Description:
+    
* @author zhiwj
+     * @param indexGroupDTO

+     * @return  java.lang.Integer

+    
*/
     Integer save(IndexGroupDTO indexGroupDTO);
 
+    /**
+     * 根据主键ID查询指标分组
+     * @Title: getById

+     * @Description:
+    
* @author zhiwj
+     * @param indexGroupId

+     * @return  com.gic.cloud.entity.TabIndexGroup

+    
*/
     TabIndexGroup getById(Integer indexGroupId);
 
+    /**
+     * 更新指标分组
+     * @Title: update

+     * @Description:
+    
* @author zhiwj
+     * @param indexGroupDTO

+     * @return  void

+    
*/
     void update(IndexGroupDTO indexGroupDTO);
 
+    /**
+     * 删除指标分组
+     * @Title: delete

+     * @Description:
+    
* @author zhiwj
+     * @param indexGroupId

+     * @return  void

+    
*/
     void delete(Integer indexGroupId);
 
+    /**
+     * 查询指标分组列表数据
+     * @Title: listIndexGroup

+     * @Description:
+    
* @author zhiwj 

+     * @return  java.util.List<com.gic.cloud.entity.TabIndexGroup>

+    
*/
     List<TabIndexGroup> listIndexGroup();
 
+    /**
+     * 根据主键ID list 查询指名称
+     * @Title: getNameByIds

+     * @Description:
+    
* @author zhiwj
+     * @param indexGroupIdList

+     * @return  java.lang.String

+    
*/
     String getNameByIds(List<Integer> indexGroupIdList);
 
+    /**
+     * 查询子分组
+     * @Title: listChildIndexGroup

+     * @Description:
+    
* @author zhiwj
+     * @param indexGroupId

+     * @return  java.util.List<java.lang.Integer>

+    
*/
     List<Integer> listChildIndexGroup(Integer indexGroupId);
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/IndexLogService.java

@@ -12,15 +12,65 @@ import java.util.List;
  * @date 2020-07-08 10:22
  */
 public interface IndexLogService {
+    /**
+     * 新增指标字典日志
+     * @Title: saveIndexInsertLog

+     * @Description:
+    
* @author zhiwj
+     * @param indexDTO

+     * @return  void

+    
*/
     void saveIndexInsertLog(IndexDTO indexDTO);
 
+    /**
+     * 指标字典更新日志
+     * @Title: saveIndexUpdateLog

+     * @Description:
+    
* @author zhiwj
+     * @param indexDTO
+     * @param reason

+     * @return  void

+    
*/
     void saveIndexUpdateLog(IndexDTO indexDTO, String reason);
 
+    /**
+     * 新增数据解读、插入日志
+     * @Title: saveDataExplainInsertLog

+     * @Description:
+    
* @author zhiwj
+     * @param dataExplainDTO

+     * @return  void

+    
*/
     void saveDataExplainInsertLog(DataExplainDTO dataExplainDTO);
 
+    /**
+     * 数据解读更新日志
+     * @Title: saveDataExplainUpdateLog

+     * @Description:
+    
* @author zhiwj
+     * @param dataExplainDTO
+     * @param reason

+     * @return  void

+    
*/
     void saveDataExplainUpdateLog(DataExplainDTO dataExplainDTO, String reason);
 
+    /**
+     * 查询指标日志
+     * @Title: listIndexLog

+     * @Description:
+    
* @author zhiwj
+     * @param indexId

+     * @return  java.util.List<com.gic.cloud.entity.TabIndexLog>

+    
*/
     List<TabIndexLog> listIndexLog(Integer indexId);
 
+    /**
+     * 查询数据解读日志
+     * @Title: listDataExplainLog

+     * @Description:
+    
* @author zhiwj
+     * @param dataExplainId

+     * @return  java.util.List<com.gic.cloud.entity.TabIndexLog>

+    
*/
     List<TabIndexLog> listDataExplainLog(Integer dataExplainId);
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/IndexModuleRelService.java

@@ -9,17 +9,79 @@ import java.util.Map;
  * @date 2020-07-08 10:22
  */
 public interface IndexModuleRelService {
+    /**
+     * 新增字典/数据解读关联
+     * @Title: save

+     * @Description:
+    
* @author zhiwj
+     * @param indexId
+     * @param moduleId
+     * @param type

+     * @return  void

+    
*/
     void save(Integer indexId, List<String> moduleId, Integer type);
 
+    /**
+     * 查询指标模块ID
+     * @Title: listModuleIdByBusinessId

+     * @Description:
+    
* @author zhiwj
+     * @param indexId
+     * @param type

+     * @return  java.util.List<java.lang.String>

+    
*/
     List<String> listModuleIdByBusinessId(Integer indexId, Integer type);
 
+    /**
+     * 查询模块ID list
+     * @Title: listBusinessIdByModuleId

+     * @Description:
+    
* @author zhiwj
+     * @param moduleId
+     * @param type

+     * @return  java.util.List<java.lang.Integer>

+    
*/
     List<Integer> listBusinessIdByModuleId(String moduleId, Integer type);
 
+    /**
+     * 查询指标/数据解读 ID list
+     * @Title: listBusinessIdByModuleIds

+     * @Description:
+    
* @author zhiwj
+     * @param moduleIdList

+     * @return  java.util.List<java.lang.Integer>

+    
*/
     List<Integer> listBusinessIdByModuleIds(List<String> moduleIdList);
 
+    /**
+     * 删除
+     * @Title: deleteByBusinessId

+     * @Description:
+    
* @author zhiwj
+     * @param businessId
+     * @param type

+     * @return  void

+    
*/
     void deleteByBusinessId(Integer businessId, Integer type);
 
+    /**
+     * 分页查询
+     * @Title: groupModuleIdByBusinessIds

+     * @Description:
+    
* @author zhiwj
+     * @param indexIdList
+     * @param type

+     * @return  java.util.Map<java.lang.Integer,java.util.List<java.lang.String>>

+    
*/
     Map<Integer, List<String>> groupModuleIdByBusinessIds(List<Integer> indexIdList, Integer type);
 
+    /**
+     * 查询
+     * @Title: listRelModuleId

+     * @Description:
+    
* @author zhiwj
+     * @param type

+     * @return  java.util.List<java.lang.String>

+    
*/
     List<String> listRelModuleId(Integer type);
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/IndexService.java

@@ -2,7 +2,7 @@ package com.gic.cloud.service;
 
 import com.gic.cloud.dto.IndexDTO;
 import com.gic.cloud.entity.TabIndex;
-import com.gic.cloud.qo.IndexQO;
+import com.gic.cloud.qo.IndexQo;
 import com.github.pagehelper.Page;
 
 import java.util.List;
@@ -14,21 +14,96 @@ import java.util.List;
  */
 public interface IndexService {
 
+    /**
+     * 指标字典名称是否重复
+     * @Title: isNameRepeat

+     * @Description:
+    
* @author zhiwj
+     * @param name
+     * @param indexId

+     * @return  boolean

+    
*/
     boolean isNameRepeat(String name, Integer indexId);
 
+    /**
+     * 指标字典code是否重复
+     * @Title: isCodeRepeat

+     * @Description:
+    
* @author zhiwj
+     * @param code
+     * @param indexId

+     * @return  boolean

+    
*/
     boolean isCodeRepeat(String code, Integer indexId);
 
+    /**
+     * 新增指标字典
+     * @Title: save

+     * @Description:
+    
* @author zhiwj
+     * @param indexDTO

+     * @return  java.lang.Integer

+    
*/
     Integer save(IndexDTO indexDTO);
 
+    /**
+     * 更新指标字典
+     * @Title: update

+     * @Description:
+    
* @author zhiwj
+     * @param indexDTO

+     * @return  void

+    
*/
     void update(IndexDTO indexDTO);
 
+    /**
+     * 获取指标字典
+     * @Title: getByIndexId

+     * @Description:
+    
* @author zhiwj
+     * @param indexId

+     * @return  com.gic.cloud.entity.TabIndex

+    
*/
     TabIndex getByIndexId(Integer indexId);
 
-    Page<TabIndex> listIndex(IndexQO indexQO);
+    /**
+     * 分页查询指标字典
+     * @Title: listIndex

+     * @Description:
+    
* @author zhiwj
+     * @param indexQo

+     * @return  com.github.pagehelper.Page<com.gic.cloud.entity.TabIndex>

+    
*/
+    Page<TabIndex> listIndex(IndexQo indexQo);
 
-    List<TabIndex> listAllIndex(IndexQO indexQO);
+    /**
+     * 查询指标字典
+     * @Title: listAllIndex

+     * @Description:
+    
* @author zhiwj
+     * @param indexQo

+     * @return  java.util.List<com.gic.cloud.entity.TabIndex>

+    
*/
+    List<TabIndex> listAllIndex(IndexQo indexQo);
 
+    /**
+     * 删除指标字典
+     * @Title: deleteById

+     * @Description:
+    
* @author zhiwj
+     * @param indexId

+     * @return  void

+    
*/
     void deleteById(Integer indexId);
 
+    /**
+     * 获取指标字典
+     * @Title: getByIndexCode

+     * @Description:
+    
* @author zhiwj
+     * @param moduleId
+     * @param indexCode

+     * @return  com.gic.cloud.entity.TabIndex

+    
*/
     TabIndex getByIndexCode(String moduleId, String indexCode);
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/StoreAttenttionService.java

@@ -2,11 +2,44 @@ package com.gic.cloud.service;
 
 import com.gic.cloud.entity.TabAttentionStore;
 import com.github.pagehelper.Page;
-
+/**
+ * 关注门店接口
+ * @ClassName: StoreAttenttionService

+ * @Description: 

+ * @author boom

+ * @date 2020/9/7 10:21 AM

+ */
 public interface StoreAttenttionService {
+    /**
+     * 新增关注门店
+     * @Title: addStoreAttenttion

+     * @Description:
+    
* @author boom
+     * @param tabAttentionStore

+     * @return  int

+    
*/
     int addStoreAttenttion(TabAttentionStore tabAttentionStore);
 
+    /**
+     * 删除关注门店
+     * @Title: removeStoreAttenttion

+     * @Description:
+    
* @author boom
+     * @param enterpriseId
+     * @param userId
+     * @param storeIds

+     * @return  int

+    
*/
     int removeStoreAttenttion(Integer enterpriseId, Integer userId, String storeIds);
 
+    /**
+     * 分页查询关注门店
+     * @Title: pageStoreAttention

+     * @Description:
+    
* @author boom
+     * @param userId
+     * @param enterpriseId

+     * @return  com.github.pagehelper.Page<com.gic.cloud.entity.TabAttentionStore>

+    
*/
     Page<TabAttentionStore> pageStoreAttention(Integer userId, Integer enterpriseId);
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/TempStoreConditionService.java

@@ -2,12 +2,42 @@ package com.gic.cloud.service;
 
 import com.gic.cloud.dto.TempStoreConditionDTO;
 import com.gic.cloud.entity.TabSysTempStoreCondition;
-
+/**
+ * 门店暂存区接口
+ * @ClassName: TempStoreConditionService

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 9:55 AM

+ */
 public interface TempStoreConditionService {
 
+    /**
+     * 新增门店暂存区
+     * @Title: saveTempStoreCondition

+     * @Description:
+    
* @author guojuxing
+     * @param dto

+     * @return  java.lang.Integer

+    
*/
     Integer saveTempStoreCondition(TempStoreConditionDTO dto);
 
+    /**
+     * 编辑门店暂存区
+     * @Title: editTempStoreCondition

+     * @Description:
+    
* @author guojuxing
+     * @param dto

+     * @return  void

+    
*/
     void editTempStoreCondition(TempStoreConditionDTO dto);
 
+    /**
+     * 获取门店暂存区
+     * @Title: getTempStoreCondition

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

+     * @return  com.gic.cloud.entity.TabSysTempStoreCondition

+    
*/
     TabSysTempStoreCondition getTempStoreCondition(Integer enterpriseId);
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/TestService.java

 package com.gic.cloud.service;
-
+/**
+ * test
+ * @ClassName: TestService

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 10:31 AM

+ */
 public class TestService {
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/UpdateTipService.java

@@ -12,17 +12,59 @@ import java.util.Map;
  */
 public interface UpdateTipService {
 
+    /**
+     * 新增小红点提示
+     * @Title: insertBySaveUser

+     * @Description:
+    
* @author zhiwj
+     * @param userId

+     * @return  void

+    
*/
     void insertBySaveUser(Integer userId);
 
+    /**
+     * 新增小红点提示
+     * @Title: insertBySaveBusiness

+     * @Description:
+    
* @author zhiwj
+     * @param businessId
+     * @param type

+     * @return  void

+    
*/
     void insertBySaveBusiness(Integer businessId, Integer type);
 
     /**
-     * 发布 要更新小红点
-     */
+     * 小红点提示发布
+     * @Title: publish

+     * @Description:
+    
* @author zhiwj
+     * @param businessId 指标ID
+     * @param type
指标/数据解读
+     * @return  void

+    
*/
     void publish(Integer businessId, Integer type);
 
-
+    /**
+     * 置灰小红点
+     * @Title: erase

+     * @Description:
+    
* @author zhiwj
+     * @param userId
+     * @param updateTipsId
+     * @param type

+     * @return  void

+    
*/
     void erase(Integer userId, Integer updateTipsId, Integer type);
 
+    /**
+     * 指标字典和用户的map
+     * @Title: mapByIndexIdAndUser

+     * @Description:
+    
* @author zhiwj
+     * @param indexIdList
+     * @param type
+     * @param userId

+     * @return  java.util.Map<java.lang.Integer,com.gic.cloud.entity.TabUpdateTips>

+    
*/
     Map<Integer, TabUpdateTips> mapByIndexIdAndUser(List<Integer> indexIdList, int type, Integer userId);
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/UserService.java

@@ -2,21 +2,75 @@ package com.gic.cloud.service;
 
 import com.gic.cloud.dto.UserDTO;
 import com.gic.cloud.entity.TabSysUser;
-import com.gic.cloud.qo.UserQO;
+import com.gic.cloud.qo.UserQo;
 import com.github.pagehelper.Page;
 
 import java.util.List;
-
+/**
+ * 用户
+ * @ClassName: UserService

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 10:32 AM

+ */
 public interface UserService {
 
+
+    /**
+     * 新增用户
+     * @Title: saveUser

+     * @Description:
+    
* @author guojuxing
+     * @param dto

+     * @return  java.lang.Integer

+    
*/
     Integer saveUser(UserDTO dto);
 
+
+    /**
+     * 编辑用户信息
+     * @Title: editUser

+     * @Description:
+    
* @author guojuxing
+     * @param dto

+     * @return  void

+    
*/
     void editUser(UserDTO dto);
 
+
+    /**
+     * 查询用户信息根据主键
+     * @Title: getUser

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

+     * @return  com.gic.cloud.entity.TabSysUser

+    
*/
     TabSysUser getUser(Integer userId);
 
+
+    /**
+     * 手机号是否重复
+     * @Title: isRepeatPhone

+     * @Description:
+    
* @author guojuxing
+     * @param enterpriseId
+     * @param userId
+     * @param nationCode
+     * @param phone

+     * @return  boolean

+    
*/
     boolean isRepeatPhone(Integer enterpriseId, Integer userId, String nationCode, String phone);
 
+
+    /**
+     * 删除用户根据主键
+     * @Title: deleteUser

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

+     * @return  void

+    
*/
     void deleteUser(Integer userId);
 
     /**
@@ -29,17 +83,84 @@ public interface UserService {
     
*/
     void deleteUserByAccountGroupId(Integer accountGroupId);
 
-    Page<TabSysUser> pageUser(UserQO userQO);
 
-    List<TabSysUser> listUser(UserQO userQO);
+    /**
+     * 分页查询用户列表
+     * @Title: pageUser

+     * @Description:
+    
* @author guojuxing
+     * @param userQo

+     * @return  com.github.pagehelper.Page<com.gic.cloud.entity.TabSysUser>

+    
*/
+    Page<TabSysUser> pageUser(UserQo userQo);
+
 
+    /**
+     * 查询用户列表
+     * @Title: listUser

+     * @Description:
+    
* @author guojuxing
+     * @param userQo

+     * @return  java.util.List<com.gic.cloud.entity.TabSysUser>

+    
*/
+    List<TabSysUser> listUser(UserQo userQo);
+
+
+    /**
+     * 批量转移账号分组
+     * @Title: bulkTransferAccountGroup

+     * @Description:
+    
* @author guojuxing
+     * @param userIdList
+     * @param targetAccountGroupId

+     * @return  void

+    
*/
     void bulkTransferAccountGroup(List<Integer> userIdList, Integer targetAccountGroupId);
 
+
+    /**
+     * 账号列表（每个账号下用户个数）
+     * @Title: countGroupByAccountGroupId

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

+     * @return  java.util.List<com.gic.cloud.dto.UserDTO>

+    
*/
     List<UserDTO> countGroupByAccountGroupId(Integer enterpriseId);
 
+
+    /**
+     * 手机号查询用户
+     * @Title: listUserByPhone

+     * @Description:
+    
* @author guojuxing
+     * @param nationCode
+     * @param phone

+     * @return  java.util.List<com.gic.cloud.entity.TabSysUser>

+    
*/
     List<TabSysUser> listUserByPhone(String nationCode, String phone);
 
+
+    /**
+     * 用户列表（功能权限授权个数）
+     * @Title: countGroupByFunctionAuthId

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

+     * @return  java.util.List<com.gic.cloud.dto.UserDTO>

+    
*/
     List<UserDTO> countGroupByFunctionAuthId(Integer enterpriseId, List<Integer> functionIdList);
 
+
+    /**
+     * 用户列（数据权限授权个数）
+     * @Title: countGroupByDataAuthId

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

+     * @return  java.util.List<com.gic.cloud.dto.UserDTO>

+    
*/
     List<UserDTO> countGroupByDataAuthId(Integer enterpriseId, List<Integer> dataAuthIdList);
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/AccountGroupServiceImpl.java

@@ -11,7 +11,13 @@ import com.gic.cloud.dto.AccountGroupDTO;
 import com.gic.cloud.entity.TabSysAccountGroup;
 import com.gic.cloud.service.AccountGroupService;
 import com.gic.commons.util.EntityUtil;
-
+/**
+ * 账号分组
+ * @ClassName: AccountGroupServiceImpl

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 10:31 AM

+ */
 @Service("accountGroupService")
 public class AccountGroupServiceImpl implements AccountGroupService{
     @Autowired

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/DataAuthServiceImpl.java

@@ -12,7 +12,13 @@ import org.springframework.stereotype.Service;
 
 import java.util.Date;
 import java.util.List;
-
+/**
+ * 数据权限
+ * @ClassName: DataAuthServiceImpl

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 10:34 AM

+ */
 @Service("dataAuthService")
 public class DataAuthServiceImpl implements DataAuthService{
     @Autowired

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/DataExplainServiceImpl.java

@@ -3,7 +3,7 @@ package com.gic.cloud.service.impl;
 import com.gic.cloud.dao.mapper.TabDataExplainMapper;
 import com.gic.cloud.dto.DataExplainDTO;
 import com.gic.cloud.entity.TabDataExplain;
-import com.gic.cloud.qo.DataExplainQO;
+import com.gic.cloud.qo.DataExplainQo;
 import com.gic.cloud.service.DataExplainService;
 import com.gic.commons.util.EntityUtil;
 import com.github.pagehelper.Page;
@@ -54,14 +54,14 @@ public class DataExplainServiceImpl implements DataExplainService {
     }
 
     @Override
-    public Page<TabDataExplain> listDataExplain(DataExplainQO dataExplainQO) {
-        PageHelper.startPage(dataExplainQO.getCurrentPage(), dataExplainQO.getPageSize());
-        return tabDataExplainMapper.listDataExplain(dataExplainQO);
+    public Page<TabDataExplain> listDataExplain(DataExplainQo dataExplainQo) {
+        PageHelper.startPage(dataExplainQo.getCurrentPage(), dataExplainQo.getPageSize());
+        return tabDataExplainMapper.listDataExplain(dataExplainQo);
     }
 
     @Override
-    public List<TabDataExplain> listAllDataExplain(DataExplainQO dataExplainQO) {
-        return tabDataExplainMapper.listDataExplain(dataExplainQO);
+    public List<TabDataExplain> listAllDataExplain(DataExplainQo dataExplainQo) {
+        return tabDataExplainMapper.listDataExplain(dataExplainQo);
     }
 
     @Override

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/FunctionModuleServiceImpl.java

@@ -11,7 +11,13 @@ import com.gic.cloud.dto.FunctionModuleDTO;
 import com.gic.cloud.entity.TabSysFunctionModule;
 import com.gic.cloud.service.FunctionModuleService;
 import com.gic.commons.util.EntityUtil;
-
+/**
+ * 功能模块
+ * @ClassName: FunctionModuleServiceImpl

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 10:33 AM

+ */
 @Service("functionModuleService")
 public class FunctionModuleServiceImpl implements FunctionModuleService{
     @Autowired

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/FunctionServiceImpl.java

@@ -12,7 +12,13 @@ import org.springframework.stereotype.Service;
 
 import java.util.Date;
 import java.util.List;
-
+/**
+ * 功能权限
+ * @ClassName: FunctionServiceImpl

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 10:33 AM

+ */
 @Service("functionService")
 public class FunctionServiceImpl implements FunctionService{
     @Autowired

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/IndexServiceImpl.java

@@ -3,7 +3,7 @@ package com.gic.cloud.service.impl;
 import com.gic.cloud.dao.mapper.TabIndexMapper;
 import com.gic.cloud.dto.IndexDTO;
 import com.gic.cloud.entity.TabIndex;
-import com.gic.cloud.qo.IndexQO;
+import com.gic.cloud.qo.IndexQo;
 import com.gic.cloud.service.IndexGroupService;
 import com.gic.cloud.service.IndexModuleRelService;
 import com.gic.cloud.service.IndexService;
@@ -73,22 +73,22 @@ public class IndexServiceImpl implements IndexService {
     }
 
     @Override
-    public Page<TabIndex> listIndex(IndexQO indexQO) {
-        PageHelper.startPage(indexQO.getCurrentPage(), indexQO.getPageSize());
-        if (StringUtils.isNotBlank(indexQO.getModuleId())) {
-            List<Integer> indexIdList = indexModuleRelService.listBusinessIdByModuleIds(Arrays.asList(indexQO.getModuleId().split(",")));
-            indexQO.setIndexIdList(indexIdList);
+    public Page<TabIndex> listIndex(IndexQo indexQo) {
+        PageHelper.startPage(indexQo.getCurrentPage(), indexQo.getPageSize());
+        if (StringUtils.isNotBlank(indexQo.getModuleId())) {
+            List<Integer> indexIdList = indexModuleRelService.listBusinessIdByModuleIds(Arrays.asList(indexQo.getModuleId().split(",")));
+            indexQo.setIndexIdList(indexIdList);
         }
-        if (indexQO.getIndexGroupId() != null) {
-            List<Integer> indexGroupIdList = indexGroupService.listChildIndexGroup(indexQO.getIndexGroupId());
-            indexQO.setIndexGroupIdList(indexGroupIdList);
+        if (indexQo.getIndexGroupId() != null) {
+            List<Integer> indexGroupIdList = indexGroupService.listChildIndexGroup(indexQo.getIndexGroupId());
+            indexQo.setIndexGroupIdList(indexGroupIdList);
         }
-        return tabIndexMapper.listIndex(indexQO);
+        return tabIndexMapper.listIndex(indexQo);
     }
 
     @Override
-    public List<TabIndex> listAllIndex(IndexQO indexQO) {
-        return tabIndexMapper.listIndex(indexQO);
+    public List<TabIndex> listAllIndex(IndexQo indexQo) {
+        return tabIndexMapper.listIndex(indexQo);
     }
 
     @Override
@@ -101,15 +101,15 @@ public class IndexServiceImpl implements IndexService {
 
     @Override
     public TabIndex getByIndexCode(String moduleId, String indexCode) {
-        IndexQO indexQO = new IndexQO();
+        IndexQo indexQo = new IndexQo();
         PageHelper.startPage(1, 1);
         List<Integer> indexIdList = indexModuleRelService.listBusinessIdByModuleIds(Collections.singletonList(moduleId));
         if (CollectionUtils.isEmpty(indexIdList)) {
             return null;
         }
-        indexQO.setIndexIdList(indexIdList);
-        indexQO.setCode(indexCode);
-        Page<TabIndex> page = tabIndexMapper.listIndex(indexQO);
+        indexQo.setIndexIdList(indexIdList);
+        indexQo.setCode(indexCode);
+        Page<TabIndex> page = tabIndexMapper.listIndex(indexQo);
         if (CollectionUtils.isEmpty(page)) {
             return null;
         } else {

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/StoreAttentionServiceImpl.java

@@ -10,7 +10,13 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-
+/**
+ * 关注门店
+ * @ClassName: StoreAttentionServiceImpl

+ * @Description: 

+ * @author boom

+ * @date 2020/9/7 10:44 AM

+ */
 @Service("storeAttenttionService")
 public class StoreAttentionServiceImpl implements StoreAttenttionService {
     @Autowired

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/TempStoreConditionServiceImpl.java

@@ -9,7 +9,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
-
+/**
+ * 门店暂存区
+ * @ClassName: TempStoreConditionServiceImpl

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 10:35 AM

+ */
 @Service("tempStoreConditionService")
 public class TempStoreConditionServiceImpl implements TempStoreConditionService{
     @Autowired

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/TestServiceImpl.java

 package com.gic.cloud.service.impl;
-
+/**
+ * test
+ * @ClassName: TestServiceImpl

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 10:30 AM

+ */
 public class TestServiceImpl {
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/UpdateTipServiceImpl.java

@@ -6,9 +6,9 @@ import com.gic.cloud.entity.TabDataExplain;
 import com.gic.cloud.entity.TabIndex;
 import com.gic.cloud.entity.TabSysUser;
 import com.gic.cloud.entity.TabUpdateTips;
-import com.gic.cloud.qo.DataExplainQO;
-import com.gic.cloud.qo.IndexQO;
-import com.gic.cloud.qo.UserQO;
+import com.gic.cloud.qo.DataExplainQo;
+import com.gic.cloud.qo.IndexQo;
+import com.gic.cloud.qo.UserQo;
 import com.gic.cloud.service.DataExplainService;
 import com.gic.cloud.service.IndexService;
 import com.gic.cloud.service.UpdateTipService;
@@ -41,7 +41,7 @@ public class UpdateTipServiceImpl implements UpdateTipService {
 
     @Override
     public void insertBySaveUser(Integer userId) {
-        List<TabIndex> indexList = indexService.listAllIndex(new IndexQO());
+        List<TabIndex> indexList = indexService.listAllIndex(new IndexQo());
         for (TabIndex index : indexList) {
             TabUpdateTips tabUpdateTips = new TabUpdateTips();
             tabUpdateTips.setUserId(userId);
@@ -50,7 +50,7 @@ public class UpdateTipServiceImpl implements UpdateTipService {
             tabUpdateTips.setType(LogAndUpdateTipsTypeEnum.INDEX.getCode());
             tabUpdateTipsMapper.insertSelective(tabUpdateTips);
         }
-        List<TabDataExplain> dataExplainList = dataExplainService.listAllDataExplain(new DataExplainQO());
+        List<TabDataExplain> dataExplainList = dataExplainService.listAllDataExplain(new DataExplainQo());
         for (TabDataExplain dataExplain : dataExplainList) {
             TabUpdateTips tabUpdateTips = new TabUpdateTips();
             tabUpdateTips.setUserId(userId);
@@ -63,7 +63,7 @@ public class UpdateTipServiceImpl implements UpdateTipService {
 
     @Override
     public void insertBySaveBusiness(Integer businessId, Integer type) {
-        List<TabSysUser> users = userService.listUser(new UserQO());
+        List<TabSysUser> users = userService.listUser(new UserQo());
         for (TabSysUser user : users) {
             TabUpdateTips tabUpdateTips = new TabUpdateTips();
             tabUpdateTips.setUserId(user.getUserId());

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/UserServiceImpl.java

@@ -3,7 +3,7 @@ package com.gic.cloud.service.impl;
 import com.gic.cloud.dao.mapper.TabSysUserMapper;
 import com.gic.cloud.dto.UserDTO;
 import com.gic.cloud.entity.TabSysUser;
-import com.gic.cloud.qo.UserQO;
+import com.gic.cloud.qo.UserQo;
 import com.gic.cloud.service.UserService;
 import com.gic.commons.util.EntityUtil;
 import com.github.pagehelper.Page;
@@ -14,7 +14,13 @@ import org.springframework.stereotype.Service;
 
 import java.util.Date;
 import java.util.List;
-
+/**
+ * 用户
+ * @ClassName: UserServiceImpl

+ * @Description: 

+ * @author guojuxing

+ * @date 2020/9/7 10:32 AM

+ */
 @Service("userService")
 public class UserServiceImpl implements UserService{
     @Autowired
@@ -62,14 +68,14 @@ public class UserServiceImpl implements UserService{
     }
 
     @Override
-    public Page<TabSysUser> pageUser(UserQO userQO) {
-        PageHelper.startPage(userQO.getCurrentPage(), userQO.getPageSize());
-        return (Page<TabSysUser>) tabSysUserMapper.pageUser(userQO);
+    public Page<TabSysUser> pageUser(UserQo userQo) {
+        PageHelper.startPage(userQo.getCurrentPage(), userQo.getPageSize());
+        return (Page<TabSysUser>) tabSysUserMapper.pageUser(userQo);
     }
 
     @Override
-    public List<TabSysUser> listUser(UserQO userQO) {
-        return tabSysUserMapper.pageUser(userQO);
+    public List<TabSysUser> listUser(UserQo userQo) {
+        return tabSysUserMapper.pageUser(userQo);
     }
 
     @Override