zouju/auto-solution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
MHW
2026-04-14 16:46:10 +08:00
parent 6969fe5744 d43effe612
commit 178bceabbb
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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