fixed bugs

tfis-admin/src/main/java/com/tfis/system/controller/AircraftSubsystemController.java

@@ -106,12 +106,10 @@ public class AircraftSubsystemController extends BaseController
         return toAjax(aircraftSubsystemService.deleteAircraftSubsystemByIds(ids));
     }
 
-    @PreAuthorize("@ss.hasPermi('system:subsystem:getsubsystemoption')")
+//    @PreAuthorize("@ss.hasPermi('system:subsystem:getsubsystemoption')")
     @GetMapping(value = "/airsubsystem/{aircraftSystemId}")
     public AjaxResult getSystemOption(@PathVariable("aircraftSystemId") Long aircraftsystemid)
     {
-//        System.out.println("系统搜索");
-        System.out.println(aircraftsystemid);
         return success(aircraftSubsystemService.getSubSystemOption(aircraftsystemid));
     }
 

tfis-admin/src/main/java/com/tfis/system/controller/AircraftSystemController.java

@@ -97,12 +97,12 @@ public class AircraftSystemController extends BaseController
         return toAjax(aircraftSystemService.deleteAircraftSystemByIds(ids));
     }
 
-    @PreAuthorize("@ss.hasPermi('system:system:getsystemoption')")
+//    @PreAuthorize("@ss.hasPermi('system:system:getsystemoption')")
     @GetMapping(value = "/airsystem/{aircraftTypeId}")
     public AjaxResult getSystemOption(@PathVariable("aircraftTypeId") Long aircraftTypeId)
     {
-//        System.out.println("系统搜索");
         System.out.println(aircraftTypeId);
+        logger.info(String.valueOf(aircraftTypeId));
         return success(aircraftSystemService.getSystemOption(aircraftTypeId));
     }
 

tfis-admin/src/main/resources/application-druid.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/tfis?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://47.108.150.237:3306/tfis?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: 123456
+                password: w.cf123321
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

tfis-admin/src/main/resources/mapper/system/AircraftSubsystemMapper.xml

@@ -37,7 +37,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="getSubSystemOption" parameterType="Long" resultMap="AircraftSubsystemResult">
-        <include refid="selectAircraftSubsystemVo"/>
+        select
+            basub.id, basub.aircraft_type_name aircraft_subsystem_name
+        from
+            biz_aircraft_subsystem basub
         where basub.aircraft_system_id = #{aircraftSystemId}
     </select>
 

tfis-admin/src/main/resources/mapper/system/AircraftSystemMapper.xml

@@ -46,7 +46,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getSystemOption" parameterType="Long" resultMap="AircraftSystemResult">
-        <include refid="selectAircraftSystemVo"/>
+        select
+            bas.id, bas.aircraft_type_name aircraft_system_name
+        from
+            biz_aircraft_system bas
         where bas.aircraft_type_id = #{aircraftTypeId}
     </select>
         

tfis-ui/src/views/login.vue

@@ -72,8 +72,8 @@ export default {
     return {
       codeUrl: "",
       loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: "",
+        password: "",
         rememberMe: false,
         code: "",
         uuid: ""