对接应用接口修改

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/ConfigRuleApiService.java

@@ -36,6 +36,7 @@ public interface ConfigRuleApiService {
      * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.enterprise.dto.rule.RuleDTO>>

     
*/
     ServiceResponse<List<RuleDTO>> listRule(String search);
+
     /**
      * 分页查询分类列表
      * @Title: listRuleClassify

@@ -47,7 +48,9 @@ public interface ConfigRuleApiService {
      * @param pageSize

      * @return  com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<com.gic.enterprise.dto.rule.RuleClassifyDTO>>

     
*/
-    ServiceResponse<Page<RuleClassifyDTO>> listRuleClassify(String search, Integer ruleId, Integer pageNum, Integer pageSize);
+    ServiceResponse<Page<RuleClassifyDTO>> listRuleClassify(String search, Integer ruleId, Integer pageNum,
+            Integer pageSize);
+
     /**
      * 分页查询场景列表
      * @Title: listRuleClassifyScene

@@ -59,7 +62,9 @@ public interface ConfigRuleApiService {
      * @param pageSize

      * @return  com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<com.gic.enterprise.dto.rule.RuleClassifySceneDTO>>

     
*/
-    ServiceResponse<Page<RuleClassifySceneDTO>> listRuleClassifyScene(String search, Integer ruleId, Integer pageNum, Integer pageSize);
+    ServiceResponse<Page<RuleClassifySceneDTO>> listRuleClassifyScene(String search, Integer ruleId, Integer pageNum,
+            Integer pageSize);
+
     /**
      * 新增分类
      * @Title: saveRuleClassify

@@ -69,7 +74,9 @@ public interface ConfigRuleApiService {
      * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Integer>

     
*/
     ServiceResponse<Integer> saveRuleClassify(RuleClassifyDTO dto);
+
     ServiceResponse<String> editRuleClassify(RuleClassifyDTO dto);
+
     /**
      * 新增场景
      * @Title: saveRuleClassifyScene

@@ -79,10 +86,13 @@ public interface ConfigRuleApiService {
      * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Integer>

     
*/
     ServiceResponse<Integer> saveRuleClassifyScene(RuleClassifySceneDTO dto);
+
     ServiceResponse<String> editRuleClassifyScene(RuleClassifySceneDTO dto);
 
     ServiceResponse<String> deleteRule(Integer ruleId);
+
     ServiceResponse<String> deleteRuleClassify(Integer ruleId);
+
     ServiceResponse<String> deleteRuleClassifyScene(Integer ruleId);
 
     /**
@@ -146,14 +156,18 @@ public interface ConfigRuleApiService {
      * @param appCode
应用code
      * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.enterprise.dto.rule.RuleClassifyListDTO>>

     
*/
-    ServiceResponse<List<RuleClassifyListDTO>> listRuleClassifyByAppCode(String appCode);
+    ServiceResponse<List<RuleClassifyListDTO>> listRuleClassifyByAppCode(String appCode, Integer enterpriseId);
+
     /**
      * 根据分类ID查询场景列表
      * @Title: listRuleSceneByRuleClassifyId

      * @Description:
     
* @author guojuxing
      * @param ruleClassifyId
分类ID
+     * @param enterpriseId
+     * @param appCode 应用code
      * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.enterprise.dto.rule.RuleClassifyListDTO>>

     
*/
-    ServiceResponse<List<RuleClassifySceneListDTO>> listRuleSceneByRuleClassifyId(Integer ruleClassifyId);
+    ServiceResponse<List<RuleClassifySceneListDTO>> listRuleSceneByRuleClassifyId(Integer ruleClassifyId,
+            String appCode, Integer enterpriseId);
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabConfigRuleEnterpriseRelMapper.java

@@ -61,4 +61,6 @@ public interface TabConfigRuleEnterpriseRelMapper {
     void deleteByEnterpriseIdList(@Param("list") List<Integer> enterpriseIdList);
 
     List<TabConfigRuleEnterpriseRel> listEnterprise();
+
+    TabConfigRuleEnterpriseRel getByEnterpriseId(Integer enterpriseId);
 }
\ No newline at end of file

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/ConfigRuleEnterpriseService.java

@@ -136,4 +136,14 @@ public interface ConfigRuleEnterpriseService {
      * @return  java.util.List<com.gic.enterprise.dto.rule.RuleEnterpriseDTO>

     
*/
     List<TabConfigRuleEnterprise> listEnterpriseRule();
+
+    /**
+     * 查询商户配置的规则
+     * @Title: getByEnterpriseId

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

+     * @return  com.gic.enterprise.entity.TabConfigRuleEnterpriseRel

+    
*/
+    TabConfigRuleEnterpriseRel getByEnterpriseId(Integer enterpriseId);
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/ConfigRuleEnterpriseServiceImpl.java

@@ -125,4 +125,9 @@ public class ConfigRuleEnterpriseServiceImpl implements ConfigRuleEnterpriseServ
     public List<TabConfigRuleEnterprise> listEnterpriseRule() {
         return tabConfigRuleEnterpriseMapper.listEnterpriseRuleAll();
     }
+
+    @Override
+    public TabConfigRuleEnterpriseRel getByEnterpriseId(Integer enterpriseId) {
+        return tabConfigRuleEnterpriseRelMapper.getByEnterpriseId(enterpriseId);
+    }
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/ConfigRuleApiServiceImpl.java

@@ -390,23 +390,78 @@ public class ConfigRuleApiServiceImpl implements ConfigRuleApiService {
     }
 
     @Override
-    public ServiceResponse<List<RuleClassifyListDTO>> listRuleClassifyByAppCode(String appCode) {
+    public ServiceResponse<List<RuleClassifyListDTO>> listRuleClassifyByAppCode(String appCode, Integer enterpriseId) {
         TabConfigRule record = configRuleService.getByAppCode(appCode);
         if (record == null) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "该应用未配置");
         }
-        return ServiceResponse.success(EntityUtil.changeEntityListNew(RuleClassifyListDTO.class,
-                configRuleService.listAll(record.getRuleId())));
+        //先查询商户规则
+        TabConfigRuleEnterpriseRel ruleRel = configRuleEnterpriseService.getByEnterpriseId(enterpriseId);
+        Integer enterpriseRuleId = null;
+        if (ruleRel != null) {
+            enterpriseRuleId = ruleRel.getEnterpriseRuleId();
+        }
+        if (enterpriseRuleId == null) {
+            return ServiceResponse.success(EntityUtil.changeEntityListNew(RuleClassifyListDTO.class,
+                    configRuleService.listAll(record.getRuleId())));
+        } else {
+            ServiceResponse<List<RuleListDTO>> ruleListResult = getRuleTree(null, enterpriseRuleId);
+            if (ruleListResult.isSuccess()) {
+                List<RuleListDTO> ruleList = ruleListResult.getResult();
+                if (CollectionUtils.isNotEmpty(ruleList)) {
+                    for (RuleListDTO ruleListDTO : ruleList) {
+                        if (ruleListDTO.getAppCode().equals(appCode)) {
+                            return ServiceResponse.success(ruleListDTO.getRuleClassifyList());
+                        }
+                    }
+                }
+            }
+        }
+        return ServiceResponse.success(Collections.emptyList());
     }
 
     @Override
-    public ServiceResponse<List<RuleClassifySceneListDTO>> listRuleSceneByRuleClassifyId(Integer ruleClassifyId) {
+    public ServiceResponse<List<RuleClassifySceneListDTO>> listRuleSceneByRuleClassifyId(Integer ruleClassifyId,
+            String appCode, Integer enterpriseId) {
         TabConfigRule record = configRuleService.getByRuleId(ruleClassifyId);
         if (record == null) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "分类ID错误，无此分类");
         }
-        return ServiceResponse.success(EntityUtil.changeEntityListNew(RuleClassifySceneListDTO.class,
-                configRuleService.listAll(ruleClassifyId)));
+        //先查询商户规则
+        TabConfigRuleEnterpriseRel ruleRel = configRuleEnterpriseService.getByEnterpriseId(enterpriseId);
+        Integer enterpriseRuleId = null;
+        if (ruleRel != null) {
+            enterpriseRuleId = ruleRel.getEnterpriseRuleId();
+        }
+        if (enterpriseRuleId == null) {
+            return ServiceResponse.success(EntityUtil.changeEntityListNew(RuleClassifySceneListDTO.class,
+                    configRuleService.listAll(ruleClassifyId)));
+        } else {
+            //查询分类下的商户配置的场景，如果没有勾选，则没有数据
+            ServiceResponse<List<RuleListDTO>> ruleListResult = getRuleTree(null, enterpriseRuleId);
+            if (ruleListResult.isSuccess()) {
+                List<RuleListDTO> ruleList = ruleListResult.getResult();
+                if (CollectionUtils.isNotEmpty(ruleList)) {
+                    for (RuleListDTO ruleListDTO : ruleList) {
+                        //有的规则是复制建立的，没有应用code
+                        if (StringUtils.isBlank(ruleListDTO.getAppCode())) {
+                            continue;
+                        }
+                        if (ruleListDTO.getAppCode().equals(appCode)) {
+                            List<RuleClassifyListDTO> classifyList = ruleListDTO.getRuleClassifyList();
+                            if (CollectionUtils.isNotEmpty(classifyList)) {
+                                for (RuleClassifyListDTO classifyListDTO : classifyList) {
+                                    if (classifyListDTO.getRuleId().intValue() == ruleClassifyId.intValue()) {
+                                        return ServiceResponse.success(classifyListDTO.getRuleClassifySceneList());
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return ServiceResponse.success(Collections.emptyList());
     }
 
     @Override

gic-platform-enterprise-service/src/main/resources/mapper/TabConfigRuleEnterpriseRelMapper.xml

@@ -142,4 +142,12 @@
     where status = 1
     group by enterprise_id
   </select>
+
+  <select id="getByEnterpriseId" resultMap="BaseResultMap">
+    select <include refid="Base_Column_List"></include>
+    from tab_config_rule_enterprise_rel
+    where status = 1
+    and enterprise_id = #{enterpriseId}
+    limit 1
+  </select>
 </mapper>
\ No newline at end of file