根据主题id查询数据规则

server/src/main/java/edp/davinci/controller/DataRulesController.java

@@ -43,9 +43,15 @@ public class DataRulesController extends BaseController
     @ApiOperation(value = "get dataRules")
     @GetMapping(value = "/getDataRules")
     public ResponseEntity getDataRules(@ApiIgnore @CurrentUser User user,
+                                         @RequestParam(value = "subjectId", required = false) Long subjectId,
                                          HttpServletRequest request) {
+        List<DataRules> dataRules = null;
+        if(null == subjectId){
+            dataRules = dataRulesService.getDataRules();
+        }else{
+            dataRules = dataRulesService.getDataRulesListBySubjectId(subjectId);
+        }
 
-        List<DataRules> dataRules = dataRulesService.getDataRules();
         return ResponseEntity.ok(new ResultMap(tokenUtils).successAndRefreshToken(request).payloads(dataRules));
     }
 

server/src/main/java/edp/davinci/controller/DataSubjectController.java

@@ -4,7 +4,6 @@ import edp.core.annotation.CurrentUser;
 import edp.davinci.common.controller.BaseController;
 import edp.davinci.core.common.Constants;
 import edp.davinci.core.common.ResultMap;
-import edp.davinci.model.Catalogue;
 import edp.davinci.model.DataSubject;
 import edp.davinci.model.User;
 import edp.davinci.service.DataSubjectService;

server/src/main/java/edp/davinci/dao/DataRulesMapper.java

@@ -20,6 +20,8 @@ public interface DataRulesMapper
 
     int update(DataRules dataRules);
 
+    @Select({"select * from `data_rules` where subject_id = #{subjectId}"})
+    List<DataRules> getDataRulesListBySubjectId(@Param("subjectId") Long subjectId);
 
     @Select({"select * from `data_rules`"})
     List<DataRules> getDataRulesList();

server/src/main/java/edp/davinci/service/DataRulesService.java

@@ -2,6 +2,7 @@ package edp.davinci.service;
 
 import edp.core.exception.ServerException;
 import edp.davinci.model.DataRules;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -13,6 +14,8 @@ public interface DataRulesService
 
     void updateDataRules(DataRules dataRules);
 
+    List<DataRules> getDataRulesListBySubjectId(Long subjectId);
+
     void deleteDataRules(Long id);
 
     DataRules getDataRule(Long id);

server/src/main/java/edp/davinci/service/impl/DataRulesServiceImpl.java

@@ -50,6 +50,11 @@ public class DataRulesServiceImpl implements DataRulesService
     }
 
     @Override
+    public List<DataRules> getDataRulesListBySubjectId(Long subjectId) {
+        return dataRulesMapper.getDataRulesListBySubjectId(subjectId);
+    }
+
+    @Override
     public void deleteDataRules(Long id)
     {
         dataRulesMapper.deleteById(id);