专机保障优化项

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/AircraftMapper.java

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftListTreeDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.Aircraft;
 
 import java.util.List;
+import java.util.Map;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -15,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface AircraftMapper extends BaseMapper<Aircraft> {
 	 List<AircraftListTreeDto> getAircraft();
+	List<Map<String, Object>> queryAircraftList();
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IAircraftService.java

@@ -35,4 +35,7 @@ public interface IAircraftService {
      * @return
      */
     Aircraft queryAircraftInfoByModel(String aircraftModel);
+
+
+    List< Map<String, Object>> queryAircraftList();
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AircraftMapper.xml

@@ -5,4 +5,9 @@
      select jc_aircraft.aircraft_model id,jc_aircraft.aircraft_model name
      from jc_aircraft  where is_delete=0
  </select>
+
+    <select id="queryAircraftList" resultType="Map">
+      select jc_aircraft.sequence_nbr id,jc_aircraft.aircraft_model name
+     from jc_aircraft  where is_delete=0
+ </select>
 </mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AircraftController.java

@@ -286,4 +286,19 @@ public class AircraftController extends BaseController {
            return false;
         }
     }
+
+    /**
+     *
+     *
+     * @param
+     * @return
+     */
+    @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/queryAircraftList")
+    @ApiOperation(httpMethod = "GET", value = "航空器下拉框", notes = "航空器下拉框")
+    public ResponseModel<Object> queryAircraftList() {
+
+        return ResponseHelper.buildResponse(aircraftServiceImpl.queryAircraftList());
+
+    }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AircraftServiceImpl.java

@@ -309,4 +309,9 @@ public class AircraftServiceImpl extends BaseService<AircraftDto, Aircraft, Airc
     public Aircraft queryAircraftInfoByModel(String aircraftModel) {
         return this.baseMapper.selectOne(new LambdaQueryWrapper<Aircraft>().eq(Aircraft::getAircraftModel, aircraftModel));
     }
+
+    @Override
+    public List<Map<String, Object>> queryAircraftList() {
+        return aircraftMapper.queryAircraftList();
+    }
 }

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -1118,4 +1118,21 @@
 
 		</sql>
 	</changeSet>
+
+
+
+
+	<changeSet author="tw" id="2021-09-22-0001">
+		<preConditions onFail="MARK_RAN">
+
+			<tableExists tableName="jc_alert_form" />
+			<primaryKeyExists primaryKeyName="sequence_nbr" tableName="jc_alert_form"/>
+		</preConditions>
+		<comment>add data jc_alert_form</comment>
+		<sql>
+			INSERT INTO `jc_alert_form`(`sequence_nbr`, `alert_type_code`, `field_value_code`, `field_name`, `field_code`, `field_type`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `block`, `sort_num`, `url`, `hide`) VALUES (140, '238', '', '航空器类型', 'aircraft', 'TextInputpo', NULL, NULL, NULL, b'0', b'0', 1, 'aircraft/queryAircraftList', b'0');
+			INSERT INTO `jc_alert_form`(`sequence_nbr`, `alert_type_code`, `field_value_code`, `field_name`, `field_code`, `field_type`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `block`, `sort_num`, `url`, `hide`) VALUES (141, '237', '', '航空器类型', 'aircraft', 'TextInputpo', NULL, NULL, NULL, b'0', b'0', 0, 'aircraft/queryAircraftList', b'0');
+			INSERT INTO `jc_alert_form`(`sequence_nbr`, `alert_type_code`, `field_value_code`, `field_name`, `field_code`, `field_type`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `block`, `sort_num`, `url`, `hide`) VALUES (142, '237', NULL, '航班号', 'flightNumber', 'selectDelay', NULL, NULL, NULL, b'0', b'0', -1, 'aircraft/getAircraftNum', b'0');
+		</sql>
+	</changeSet>
 </databaseChangeLog>