Merge branch 'master' of http://101.43.238.71:3000/zouju/auto-solution

auto-solution-admin/src/main/resources/application-druid.yml

@@ -6,11 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-#                url: jdbc:mysql://192.168.166.71:3306/behaviortreedb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                url: jdbc:mysql://localhost:3306/autosolution_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://127.0.0.1:3306/autosolution_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-#                password: 123456
-                password: 1234
+                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

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

@@ -82,7 +82,7 @@
     </resultMap>
     <select id="findComponentsByPlatformId" resultMap="VPlatformComponentMap">
         SELECT * FROM platform_component
-        WHERE platform_id=#{platformId}
+        WHERE platform_id=#{platformId} AND platform_component.type = "comm"
     </select>
 
     <resultMap id="VPBasicPlatformMap" type="com.solution.rule.domain.BasicPlatform">
@@ -106,9 +106,18 @@
     </resultMap>
     <select id="findPlatformComponents" resultMap="VPlatformMap"
             parameterType="java.lang.Integer">
-        SELECT DISTINCT
-            p.*,
-            pc.*
+<!--        SELECT DISTINCT-->
+<!--            p.*,-->
+<!--            pc.*-->
+<!--        FROM platform p-->
+<!--        LEFT JOIN platform_component pc ON p.id = pc.platform_id-->
+<!--        WHERE pc.type = 'comm'-->
+<!--          AND p.scenario_id = #{scenarioId}-->
+<!--        ORDER BY p.name,pc.name-->
+        SELECT
+        p.id,
+        p.name,
+        p.description
         FROM platform p
         LEFT JOIN platform_component pc ON p.id = pc.platform_id
         WHERE pc.type = 'comm'