From a67e3e42ba14b71d94f662f306549d841cf865da Mon Sep 17 00:00:00 2001
From: MHW <wei2309328087@163.com>
Date: Wed, 15 Apr 2026 13:54:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A7=84=E5=88=99=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=EF=BC=8C=E8=A1=8C=E4=B8=BA=E6=A0=91=E7=9A=84pagelist?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=B7=BB=E5=8A=A0=E5=9C=BA=E6=99=AFid?=
 =?UTF-8?q?=E4=B8=8E=E5=B9=B3=E5=8F=B0id=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/solution/web/controller/rule/RuleController.java    | 4 ++--
 .../src/main/resources/application-druid.yml                | 2 +-
 .../src/main/resources/mapper/system/BehaviortreeMapper.xml | 6 +++++-
 auto-solution-rule/src/main/resources/rules/rule.drl        | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/auto-solution-admin/src/main/java/com/solution/web/controller/rule/RuleController.java b/auto-solution-admin/src/main/java/com/solution/web/controller/rule/RuleController.java
index f55335a..65b8224 100644
--- a/auto-solution-admin/src/main/java/com/solution/web/controller/rule/RuleController.java
+++ b/auto-solution-admin/src/main/java/com/solution/web/controller/rule/RuleController.java
@@ -28,7 +28,7 @@ public class RuleController extends BaseController {
     @Autowired
     private IRuleConfigService ruleConfigService;
 
-    @PreAuthorize("@ss.hasPermi('system:rule:list')")
+    /*@PreAuthorize("@ss.hasPermi('system:rule:list')")
     @GetMapping("/list")
     @ApiOperation("查询规则列表")
     public TableDataInfo list(Rule rule) {
@@ -66,7 +66,7 @@ public class RuleController extends BaseController {
     @ApiOperation("删除规则")
     public AjaxResult remove(@PathVariable Integer[] ids) {
         return toAjax(ruleService.deleteRuleByIds(ids));
-    }
+    }*/
 
     @PreAuthorize("@ss.hasPermi('system:rule:list')")
     @GetMapping("/config/list")
diff --git a/auto-solution-admin/src/main/resources/application-druid.yml b/auto-solution-admin/src/main/resources/application-druid.yml
index 3cfb6ea..6afff3b 100644
--- a/auto-solution-admin/src/main/resources/application-druid.yml
+++ b/auto-solution-admin/src/main/resources/application-druid.yml
@@ -8,7 +8,7 @@ spring:
             master:
                 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
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
diff --git a/auto-solution-behaviour/src/main/resources/mapper/system/BehaviortreeMapper.xml b/auto-solution-behaviour/src/main/resources/mapper/system/BehaviortreeMapper.xml
index be73fe6..67d0872 100644
--- a/auto-solution-behaviour/src/main/resources/mapper/system/BehaviortreeMapper.xml
+++ b/auto-solution-behaviour/src/main/resources/mapper/system/BehaviortreeMapper.xml
@@ -23,9 +23,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <sql id="selectBehaviortreeVo">
-        select id, name, description, created_at, updated_at, english_name, xml_content from behaviortree
+        select id, name, description, created_at, updated_at, english_name, xml_content, platform_id, scenario_id from behaviortree
     </sql>
 
+
     <select id="selectBehaviortreeList" parameterType="Behaviortree" resultMap="BehaviortreeResult">
         <include refid="selectBehaviortreeVo"/>
         <where>  
@@ -35,6 +36,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedAt != null "> and updated_at = #{updatedAt}</if>
             <if test="englishName != null  and englishName != ''"> and english_name like concat('%', #{englishName}, '%')</if>
             <if test="xmlContent != null  and xmlContent != ''"> and xml_content = #{xmlContent}</if>
+            <if test="xmlContent != null  and xmlContent != ''"> and xml_content = #{xmlContent}</if>
+            <if test="platformId != null">platform_id = #{platformId}</if>
+            <if test="scenarioId != null">scenario_id = #{scenarioId}</if>
         </where>
     </select>
     
diff --git a/auto-solution-rule/src/main/resources/rules/rule.drl b/auto-solution-rule/src/main/resources/rules/rule.drl
index f30613c..96f983f 100644
--- a/auto-solution-rule/src/main/resources/rules/rule.drl
+++ b/auto-solution-rule/src/main/resources/rules/rule.drl
@@ -79,7 +79,7 @@ function Map buildParam(){
     param.put("missileScore", 1);
 
     // ===================== 目标分配参数（写入 Tasks.task.execute） =====================
-    // executeTypeDefault：生成 execute[0] 的类型字段
+    // executeTypeDefault：生成 execute[0] 的类型字段 取值：strike_test/assault
     param.put("executeTypeDefault", "assault");
     // targetPickMode：roundRobin(稳定轮询) / random(伪随机但同输入稳定)
     param.put("targetPickMode", "roundRobin");