Commit Graph

61 Commits

Author SHA1 Message Date
bd62efca3f Merge branch 'master' of http://101.43.238.71:3000/zouju/auto-solution 2026-04-13 15:07:15 +08:00
MHW
5276a6b16f 复制行为树 2026-04-13 14:19:18 +08:00
MHW
1061020791 复制行为树 2026-04-13 10:39:37 +08:00
ee019d3c0f Merge branch 'master' of http://101.43.238.71:3000/zouju/auto-solution 2026-04-09 16:19:08 +08:00
MHW
78e5833514 docker 2026-04-09 15:13:10 +08:00
MHW
72f4caf555 火力规则:装备匹配规则实现 2026-04-07 14:41:46 +08:00
MHW
50a369c722 火力规则:最终版json实体解析定义 2026-04-04 07:07:20 +08:00
4e28782d59 Merge branch 'master' of http://101.43.238.71:3000/zouju/auto-solution 2026-03-31 14:33:13 +08:00
libertyspy
150966824e UPDATE: VERSION-20260331 2026-03-31 14:33:09 +08:00
e24920acf1 Merge branch 'master' of http://101.43.238.71:3000/zouju/auto-solution 2026-03-31 11:11:50 +08:00
libertyspy
889cc02631 UPDATE: VERSION-20260331 2026-03-31 11:11:02 +08:00
MHW
e9503358d3 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	auto-solution-rule/src/main/java/com/solution/rule/service/FireRuleService.java
#	modeler/src/style.less
2026-03-27 17:58:40 +08:00
MHW
3b3370c440 Merge branch 'refs/heads/develop'
# Conflicts:
#	auto-solution-rule/src/main/java/com/solution/rule/service/FireRuleService.java
#	modeler/src/style.less
2026-03-27 17:56:55 +08:00
MHW
18827cfbe7 火力规则打击规则实现 2026-03-27 10:27:04 +08:00
MHW
3fe32e4ac3 develop: 临时保存修改 2026-03-27 10:20:45 +08:00
c6c38332d9 Merge branches 'master' and 'master' of http://101.43.238.71:3000/zouju/auto-solution 2026-03-27 10:06:41 +08:00
libertyspy
27c8fc13c6 UPDATE: VERSION-20260327 2026-03-27 10:03:07 +08:00
a6c6cf2427 Merge branch 'master' of http://101.43.238.71:3000/zouju/auto-solution 2026-03-27 09:23:04 +08:00
libertyspy
02e9ca26a1 UPDATE: VERSION-20260326 2026-03-26 23:59:15 +08:00
373dc390fa Merge branch 'master' of http://101.43.238.71:3000/zouju/auto-solution 2026-03-26 23:37:03 +08:00
libertyspy
8958ecd6dc UPDATE: VERSION-20260326 2026-03-26 23:36:47 +08:00
2ed1129fe4 Merge branch 'master' of http://101.43.238.71:3000/zouju/auto-solution 2026-03-20 16:06:00 +08:00
MHW
b63ad360d0 新增通信关系 2026-03-17 10:49:21 +08:00
ce4c23eff8 save 2026-03-17 09:19:00 +08:00
9f4ef1ab94 save 2026-03-17 09:18:50 +08:00
libertyspy
65ea1cfd6b UPDATE: VERSION-20260317 2026-03-17 00:36:46 +08:00
MHW
7847dbc89f 26-03-15-09:53 火力规则模块:获取通信组件的所有平台和组件 增加返回平台description字段 2026-03-15 09:54:20 +08:00
MHW
cc01c9ece8 Merge remote-tracking branch 'origin/master' 2026-03-15 09:33:09 +08:00
MHW
8f29e230d0 Merge branch 'refs/heads/develop' 2026-03-15 09:32:14 +08:00
MHW
711d7bf3da 26-03-15-09:31 场景模块:分页查询所有场景,保存场景 2026-03-15 09:31:45 +08:00
libertyspy
29e17773af UPDATE: VERSION-20260314 2026-03-14 22:35:40 +08:00
MHW
26a89a66d1 Merge branch 'refs/heads/develop' 2026-03-14 20:47:07 +08:00
MHW
f72105134f 26-03-14-20:46 通过平台id获取平台下所有组件 2026-03-14 20:46:49 +08:00
MHW
af3a97175a Merge branch 'refs/heads/develop' 2026-03-14 14:31:12 +08:00
MHW
c1c67e826b 26-03-14-14:30 规则CRUD 2026-03-14 14:30:52 +08:00
MHW
8a946c4c84 Merge branch 'refs/heads/develop' 2026-03-14 11:18:23 +08:00
MHW
d9a55d0c95 26-03-14-11:17:行为树-保存场景配置 2026-03-14 11:17:55 +08:00
MHW
91adb9517e Merge remote-tracking branch 'origin/master'
# Conflicts:
#	auto-solution-admin/src/main/java/com/solution/web/controller/rule/RuleController.java
#	auto-solution-common/src/main/java/com/solution/common/constant/PlatformAndModuleConstants.java
#	pom.xml
2026-03-13 14:41:41 +08:00
MHW
99c100f2ac 26-03-13-14:36:火力规则简单实现 2026-03-13 14:36:31 +08:00
libertyspy
5a7b57d603 UPDATE: VERSION-20260313 2026-03-13 10:42:39 +08:00
MHW
956d3f69ea 火力规则:返回平台以及组件 2026-03-12 16:01:04 +08:00
libertyspy
538a43f597 Merge remote-tracking branch 'origin/master' 2026-02-09 14:53:43 +08:00
libertyspy
46bead08a0 UPDATE: fk 2026-02-09 14:52:46 +08:00
zouju
e07b11ef95 修改部分规则代码 2026-02-09 11:15:26 +08:00
libertyspy
af697e9304 UPDATE: fk 2026-02-08 21:50:33 +08:00
libertyspy
e12c3c0302 UPDATE: fk 2026-02-08 20:14:46 +08:00
libertyspy
7909ea8acb UPDATE: fk 2026-02-08 18:51:18 +08:00
libertyspy
444c31612d Merge remote-tracking branch 'origin/master' 2026-02-08 18:50:38 +08:00
libertyspy
a3e34424d8 UPDATE: fk 2026-02-08 18:48:21 +08:00
e3be036bd3 fix(behaviour): 修复行为树实例节点保存方法返回值类型
- 将返回类型从 Integer 改为 Long 以匹配实际数据类型
- 调整新增逻辑中的返回值,直接返回节点实例ID而不是插入操作的结果
- 统一更新逻辑的返回值处理方式
- 移动服务层调用顺序以确保正确的业务逻辑执行
2026-02-08 11:23:57 +08:00