Merge branch 'refs/heads/develop'

auto-solution-common/pom.xml

@@ -113,6 +113,12 @@
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.34</version>
+        </dependency>
+
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>

auto-solution-rule/pom.xml

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

auto-solution-scene/pom.xml

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

auto-solution-scene/src/main/java/com/solution/scene/service/impl/SceneServiceImpl.java

@@ -34,7 +34,6 @@ public class SceneServiceImpl implements SceneService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public int saveOrUpdate(AfsimScenario afsimScenario) {
-        //TODO 报错待修改
         if (null != afsimScenario.getId() && afsimScenario.getId() > 0) {
             // 更新场景
             int updated = sceneMapper.update(afsimScenario);

auto-solution-scene/src/main/resources/mapper/scene/PlatFormCommunicationMapper.xml

@@ -9,12 +9,11 @@
         INSERT INTO platform_communication (scenary_id, command_platform, subordinate_platform, command_comm, subordinate_comm)
         VALUES
         <foreach collection="afsimScenarios" item="item" separator=",">
-            (#{scenaryId}, #{item.sourcePlatform}, #{item.targetPlatform}, #{item.sourceComponent}, #{item.targetComponent})
+            (#{scenaryId}, #{item.sourcePlatform.name}, #{item.targetPlatform.name}, #{item.sourceComponent.name}, #{item.targetComponent.name})
-        </foreach>
+         </foreach>
-    </insert>
+     </insert>
-
+     <delete id="delete" parameterType="java.lang.Integer">
-    <delete id="delete" parameterType="java.lang.Integer">
+         DELETE FROM platform_communication
-        DELETE FROM platform_communication
+         WHERE scenary_id = #{scenaryId}
-        WHERE scenary_id = #{scenaryId}
+     </delete>
-    </delete>
+ </mapper>
-</mapper>

pom.xml

@@ -274,6 +274,29 @@
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.11.0</version>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                    <annotationProcessorPaths>
+                        <!-- 顺序无关，但每个都需要指定版本 -->
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>1.18.34</version>
+                        </path>
+                        <path>
+                            <groupId>org.mapstruct</groupId>
+                            <artifactId>mapstruct-processor</artifactId>
+                            <version>1.5.5.Final</version>
+                        </path>
+                        <!-- 如果有其他 processor 也加在这里 -->
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
         </plugins>
     </build>