根据主题id查询数据规则

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

@@ -28,8 +28,7 @@ import java.util.List;
 @Slf4j
 @RestController
 @RequestMapping(value = Constants.BASE_API_PATH + "/dataSubject", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-public class DataSubjectController extends BaseController
-{
+public class DataSubjectController extends BaseController {
     @Autowired
     private DataSubjectService dataSubjectService;
 
@@ -44,9 +43,14 @@ public class DataSubjectController extends BaseController
     @ApiOperation(value = "get dataSubject")
     @GetMapping(value = "/getDataSubject")
     public ResponseEntity getDataSubject(@ApiIgnore @CurrentUser User user,
-                                        HttpServletRequest request) {
-
-        List<DataSubject> dataSubjects = dataSubjectService.getDataSubject();
+                                         @RequestParam(value = "pId", required = false) Long pId,
+                                         HttpServletRequest request) {
+        List<DataSubject> dataSubjects = null;
+        if (null == pId) {
+            dataSubjects = dataSubjectService.getDataSubject();
+        } else {
+            dataSubjects = dataSubjectService.getDataSubjectByPId(pId);
+        }
         return ResponseEntity.ok(new ResultMap(tokenUtils).successAndRefreshToken(request).payloads(dataSubjects));
     }
 
@@ -60,11 +64,11 @@ public class DataSubjectController extends BaseController
      * @return
      */
     @ApiOperation(value = "create dataSubject")
-    @PostMapping(value = "/createDataSubject",consumes = MediaType.APPLICATION_JSON_VALUE)
+    @PostMapping(value = "/createDataSubject", consumes = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity createDataSubject(@Valid @RequestBody DataSubject dataSubject,
-                                          @ApiIgnore BindingResult bindingResult,
-                                          @ApiIgnore @CurrentUser User user,
-                                          HttpServletRequest request) {
+                                            @ApiIgnore BindingResult bindingResult,
+                                            @ApiIgnore @CurrentUser User user,
+                                            HttpServletRequest request) {
 
         if (bindingResult.hasErrors()) {
             ResultMap resultMap = new ResultMap(tokenUtils).failAndRefreshToken(request).message(bindingResult.getFieldErrors().get(0).getDefaultMessage());
@@ -90,10 +94,10 @@ public class DataSubjectController extends BaseController
     @ApiOperation(value = "update dataSubject")
     @PutMapping(value = "/updateDataSubject/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity updateDataSubject(@PathVariable Long id,
-                                          @Valid @RequestBody DataSubject dataSubject,
-                                          @ApiIgnore BindingResult bindingResult,
-                                          @ApiIgnore @CurrentUser User user,
-                                          HttpServletRequest request) {
+                                            @Valid @RequestBody DataSubject dataSubject,
+                                            @ApiIgnore BindingResult bindingResult,
+                                            @ApiIgnore @CurrentUser User user,
+                                            HttpServletRequest request) {
 
 
         if (invalidId(id) || !id.equals(dataSubject.getId())) {
@@ -122,8 +126,8 @@ public class DataSubjectController extends BaseController
     @ApiOperation(value = "delete dataSubject")
     @DeleteMapping("/deleteDataSubject/{id}")
     public ResponseEntity deleteDataSubject(@PathVariable Long id,
-                                          @ApiIgnore @CurrentUser User user,
-                                          HttpServletRequest request) {
+                                            @ApiIgnore @CurrentUser User user,
+                                            HttpServletRequest request) {
         if (invalidId(id)) {
             ResultMap resultMap = new ResultMap(tokenUtils).failAndRefreshToken(request).message("Invalid dataSubject id");
             return ResponseEntity.status(resultMap.getCode()).body(resultMap);

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

@@ -25,4 +25,7 @@ public interface DataSubjectMapper
 
     @Select({"select * from `data_subject` where id = #{id}"})
     DataSubject getDataSubject(@Param("id") Long id);
+
+    @Select({"select * from `data_subject` where p_id = #{pId}"})
+    List<DataSubject> getDataSubjectListByPid(@Param("pId") Long pId);
 }

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

@@ -15,6 +15,8 @@ public interface DataSubjectService
 
     List<DataSubject> getDataSubject();
 
+    List<DataSubject> getDataSubjectByPId(Long pId);
+
     void deleteDataSubject(Long id);
 
     DataSubject  getOneDataSubject(Long id);

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

@@ -49,6 +49,11 @@ public class DataSubjectServiceImpl implements DataSubjectService
     }
 
     @Override
+    public List<DataSubject> getDataSubjectByPId(Long pId) {
+        return dataSubjectMapper.getDataSubjectListByPid(pId);
+    }
+
+    @Override
     public void deleteDataSubject(Long id)
     {
         dataSubjectMapper.deleteById(id);