Merge branch 'refs/heads/develop'

auto-solution-admin/src/main/java/com/solution/web/controller/rule/FireRuleController.java

@@ -52,4 +52,15 @@ public class FireRuleController extends BaseController {
     public AjaxResult getCommPlatformComponentNames(Integer scenarioId){
         return success(ruleService.getCommPlatformComponentNames(scenarioId));
     }
+
+    /**
+     * 根据平台id获取平台下所有组件
+     * @param platformId
+     * @return
+     */
+    @GetMapping("/component/{platformId}")
+    @ApiOperation("根据平台id获取平台下所有组件")
+    public AjaxResult getComponents(@PathVariable Integer platformId){
+        return success(ruleService.getComponents(platformId));
+    }
 }

auto-solution-behaviour/src/main/java/com/solution/system/service/IBehaviortreeService.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.solution.system.domain.AfsimScenario;
 import com.solution.system.domain.Behaviortree;
+import sun.management.spi.PlatformMBeanProvider;
 
 /**
  * 行为树主Service接口

auto-solution-rule/src/main/java/com/solution/rule/mapper/FireRuleMapper.java

@@ -1,5 +1,6 @@
 package com.solution.rule.mapper;
 
+import com.solution.rule.domain.PlatformComponent;
 import com.solution.rule.domain.vo.ComponentCountVO;
 import com.solution.rule.domain.vo.PlatformComponentNamesVO;
 import com.solution.rule.domain.vo.WeaponModelVO;
@@ -32,4 +33,10 @@ public interface FireRuleMapper {
     List<PlatformComponentNamesVO> getCommPlatformComponentNames(Integer scenarioId);
 
 
+    /**
+     * 根据平台id获取平台下所有组件
+     * @param platformId
+     * @return
+     */
+    List<PlatformComponent> getComponents(Integer platformId);
 }

auto-solution-rule/src/main/java/com/solution/rule/service/FireRuleService.java

@@ -1,6 +1,7 @@
 package com.solution.rule.service;
 
 import com.solution.rule.domain.FireRuleExecuteDTO;
+import com.solution.rule.domain.PlatformComponent;
 import com.solution.rule.domain.vo.PlatformComponentNamesVO;
 import com.solution.rule.domain.vo.PlatformWeaponAggregateVO;
 
@@ -29,4 +30,11 @@ public interface FireRuleService {
      * @return
      */
     List<PlatformComponentNamesVO> getCommPlatformComponentNames(Integer scenarioId);
+
+    /**
+     * 根据平台id获取平台下所有组件
+     * @param platformId
+     * @return
+     */
+    List<PlatformComponent> getComponents(Integer platformId);
 }

auto-solution-rule/src/main/java/com/solution/rule/service/impl/FireRuleServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.solution.common.constant.ExceptionConstants;
 import com.solution.rule.domain.FireRuleExecuteDTO;
+import com.solution.rule.domain.PlatformComponent;
 import com.solution.rule.domain.RuleParam;
 import com.solution.rule.domain.dto.WeaponModelDTO;
 import com.solution.rule.domain.vo.ComponentCountVO;
@@ -142,6 +143,16 @@ public class FireRuleServiceImpl implements FireRuleService {
         return ruleMapper.getCommPlatformComponentNames(scenarioId);
     }
 
+    /**
+     * 根据平台id获取平台下所有组件
+     * @param platformId
+     * @return
+     */
+    @Override
+    public List<PlatformComponent> getComponents(Integer platformId) {
+        return ruleMapper.getComponents(platformId);
+    }
+
     /**
      * 获取所有组件以及数量
      * @return

auto-solution-rule/src/main/resources/mapper/rule/FireRuleService.xml

@@ -61,6 +61,12 @@
         WHERE pc.type = "comm"
         AND p.scenario_id = #{scenarioId}
     </select>
+    <select id="getComponents" resultType="com.solution.rule.domain.PlatformComponent"
+            parameterType="java.lang.Integer">
+        SELECT id,name,type,description,platform_id
+        FROM platform_component
+        WHERE platform_id = #{platformId}
+    </select>
 
 
 </mapper>