Merge remote-tracking branch 'origin/master'

# Conflicts:
#	auto-solution-rule/src/main/java/com/solution/rule/service/FireRuleService.java
#	modeler/src/style.less

auto-solution-rule/pom.xml

@@ -71,10 +71,6 @@
             <artifactId>solution-common</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>io.springfox</groupId>

auto-solution-rule/src/main/java/com/solution/rule/domain/BasicPlatform.java

@@ -0,0 +1,47 @@
+package com.solution.rule.domain;
+/*
+ * This file is part of the kernelstudio package.
+ *
+ * (c) 2014-2026 zlin <admin@kernelstudio.com>
+ *
+ * For the full copyright and license information, please view the LICENSE file
+ * that was distributed with this source code.
+ */
+
+import java.io.Serializable;
+import java.util.List;
+
+public class BasicPlatform implements Serializable {
+
+
+    private Integer id;
+
+    private String name;
+
+    private String description;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+}

auto-solution-rule/src/main/java/com/solution/rule/domain/Platform.java

@@ -8,43 +8,12 @@ package com.solution.rule.domain;
  * that was distributed with this source code.
  */
 
-import java.io.Serializable;
 import java.util.List;
 
-public class Platform implements Serializable {
-
-    private Integer id;
-
-    private String name;
-
-    private String description;
+public class Platform extends BasicPlatform {
 
     private List<PlatformComponent> components;
 
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
     public List<PlatformComponent> getComponents() {
         return components;
     }
@@ -52,5 +21,4 @@ public class Platform implements Serializable {
     public void setComponents(List<PlatformComponent> components) {
         this.components = components;
     }
-
 }

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.BasicPlatform;
 import com.solution.rule.domain.Platform;
 import com.solution.rule.domain.PlatformComponent;
 import com.solution.rule.domain.vo.ComponentCountVO;
@@ -42,4 +43,8 @@ public interface FireRuleMapper {
     List<PlatformComponent> getComponents(Integer platformId);
 
     List<Platform> findPlatformComponents(Integer scenarioId);
+
+    List<Platform> findAllPlatformComponents();
+
+    List<BasicPlatform> findAllBasicPlatformComponents();
 }

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

@@ -1,6 +1,8 @@
 package com.solution.rule.service;
 
+import com.solution.rule.domain.BasicPlatform;
 import com.solution.rule.domain.FireRuleExecuteDTO;
+import com.solution.rule.domain.Platform;
 import com.solution.rule.domain.PlatformComponent;
 import com.solution.rule.domain.vo.PlatformComponentNamesVO;
 import com.solution.rule.domain.vo.PlatformWeaponAggregateVO;
@@ -45,6 +47,10 @@ public interface FireRuleService {
      */
     List<Platform> findPlatformComponents(Integer scenarioId);
 
+    List<Platform> findAllPlatformComponents();
+
+    List<BasicPlatform> findAllBasicPlatformComponents();
+
     /**
      * 开始执行规则匹配
      * @param task

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

@@ -3,10 +3,7 @@ package com.solution.rule.service.impl;
 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.Platform;
-import com.solution.rule.domain.PlatformComponent;
-import com.solution.rule.domain.RuleParam;
+import com.solution.rule.domain.*;
 import com.solution.rule.domain.dto.WeaponModelDTO;
 import com.solution.rule.domain.simplerulepojo.Task;
 import com.solution.rule.domain.simplerulepojo.Weapon;
@@ -210,4 +207,14 @@ public class FireRuleServiceImpl implements FireRuleService {
         return new ArrayList<>();
     }
 
+    @Override
+    public List<Platform> findAllPlatformComponents() {
+        return ruleMapper.findAllPlatformComponents();
+    }
+
+    @Override
+    public List<BasicPlatform> findAllBasicPlatformComponents() {
+        return ruleMapper.findAllBasicPlatformComponents();
+    }
+
 }

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

@@ -85,6 +85,16 @@
         WHERE platform_id=#{platformId}
     </select>
 
+    <resultMap id="VPBasicPlatformMap" type="com.solution.rule.domain.BasicPlatform">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="description" column="description"/>
+    </resultMap>
+    <select id="findAllBasicPlatformComponents" resultMap="VPBasicPlatformMap">
+        SELECT *
+        FROM platform
+    </select>
+
     <resultMap id="VPlatformMap" type="com.solution.rule.domain.Platform">
         <result property="id" column="id"/>
         <result property="name" column="name"/>
@@ -106,4 +116,9 @@
         ORDER BY p.name,pc.name
     </select>
 
+    <select id="findAllPlatformComponents" resultMap="VPlatformMap">
+        SELECT *
+        FROM platform
+    </select>
+
 </mapper>