feat:1.bug修复

jeecg-module-system/pom.xml

@@ -65,6 +65,7 @@
             <properties>
                 <package.environment>dev</package.environment>
             </properties>
+
         </profile>
 
         <!-- 黄康林本地配置-->
@@ -73,6 +74,10 @@
             <properties>
                 <package.environment>hkl</package.environment>
             </properties>
+            <!-- 是否默认 true表示默认-->
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
         </profile>
 
         <!-- 测试环境 -->
@@ -81,10 +86,6 @@
             <properties>
                 <package.environment>test</package.environment>
             </properties>
-            <!-- 是否默认 true表示默认-->
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
         </profile>
 
         <!-- 压测环境-->

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/controller/RailManagementController.java

@@ -93,7 +93,6 @@ public class RailManagementController extends JeecgController<RailManagement, IR
             @ApiImplicitParam(name = "lineAliasId", value = "线别id")
     })
     public Result<String> intelligentGeneration(String lightRailId,String lineAliasId) {
-//        this.service.intelligentGeneration(lightRailId);
         this.service.intelligentGeneration(lightRailId,lineAliasId);
         return Result.OK("生成成功");
     }

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/mapper/xml/RailManagementMapper.xml

@@ -25,6 +25,7 @@
         <if test="dto.lineAliasId != null and dto.lineAliasId != ''">
             AND t1.line_alias_id = #{dto.lineAliasId}
         </if>
+        ORDER BY t1.light_rail_id ,t1.line_alias_id,t1.starting_mileage
     </select>
     <select id="getLineSpecialRail" resultType="java.util.Map">
         SELECT id,