发布的单操，场景实训 基本信息接口合并

src/main/java/club/joylink/rtss/controller/training2/TrainingV2PublishController.java

@@ -49,21 +49,32 @@ public class TrainingV2PublishController {
         return this.publishService.deletePublishedTrainings(req);
     }
 
+    /**
+     * 根据mapId查所有的已发布单操或场景实训的基础信息
+     * @param mapId
+     * @param typeEnum {@link Training2TypeEnum}
+     * @return
+     */
+    @GetMapping("/info/{mapId}/{type}")
+    public List<PublishedTraining2InfoRspVo> findTrainingBasicInfo(@PathVariable("mapId") Long mapId,@PathVariable("type") Training2TypeEnum typeEnum){
+        return this.publishService.findAllTrainingBasicInfoByMapIdAndType(mapId,typeEnum);
+    }
+
     /**
      * 根据mapId查所有的已发布单操实训的基础信息
      */
-    @GetMapping("/{mapId}/singles")
+/*    @GetMapping("/{mapId}/singles")
     public List<PublishedTraining2InfoRspVo> findSingleTrainingBasicInfo(@PathVariable("mapId") Long mapId){
         return this.publishService.findAllSingleTrainingBasicInfoByMapId(mapId);
-    }
+    }*/
 
     /**
      * 根据mapId查所有的已发布场景实训的基础信息
      */
-    @GetMapping("/{mapId}/scenes")
+/*    @GetMapping("/{mapId}/scenes")
     public List<PublishedTraining2InfoRspVo> findSceneTrainingBasicInfo(@PathVariable("mapId") Long mapId){
        return this.publishService.findAllSceneTrainingBasicInfoByMapId(mapId);
-    }
+    }*/
 
     /**
      * 查所有的已发布场景实训的基础信息

src/main/java/club/joylink/rtss/services/training2/Training2PublishService.java

@@ -159,6 +159,16 @@ public class Training2PublishService {
         return rsp;
     }
 
+    /**
+     * 根据mapId查所有的已发布单操或场景实训的基础信息
+     * @param mapId
+     * @param typeEnum
+     * @return
+     */
+    public List<PublishedTraining2InfoRspVo> findAllTrainingBasicInfoByMapIdAndType(Long mapId,Training2TypeEnum typeEnum){
+        return findTrainingInfo(mapId, typeEnum);
+    }
+
     /**
      * 根据mapId查找所有的单操实训的基础信息
      */