From 74533b9f215b570203d9c7fcd7fdede3d423747d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=99=8E?= Date: Fri, 6 Mar 2020 20:12:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E8=99=8E=EF=BC=9A=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=B0=8F=E7=BB=86=E8=8A=82=E5=A4=84=E7=90=86=EF=BC=88=E6=9C=AA?= =?UTF-8?q?=E5=A4=84=E7=90=86=E5=AE=8C=E5=BE=85=E7=BB=AD=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org.eclipse.core.resources.prefs | 2 +- .../arj21/csvmanager/imexportLog.html | 18 ++-- .../{flight.html => qarDataExport.html} | 96 ++++++------------- .../arj21/csvmanager/qarDataImport.html | 6 +- .../csvmanager/InfoFlightController.java | 13 ++- .../csvmanager/InfoImexportLogController.java | 10 +- .../arj21/mapper/InfoAcTypeMapper.java | 2 + .../arj21/service/IInfoAcTypeService.java | 6 ++ .../service/impl/InfoAcTypeServiceImpl.java | 5 + .../resources/mapper/InfoAcTypeMapper.xml | 10 ++ .../resources/mapper/InfoFlightMapper.xml | 26 +++-- 11 files changed, 99 insertions(+), 95 deletions(-) rename infosouth-admin/src/main/resources/templates/arj21/csvmanager/{flight.html => qarDataExport.html} (66%) diff --git a/infosouth-admin/.settings/org.eclipse.core.resources.prefs b/infosouth-admin/.settings/org.eclipse.core.resources.prefs index cbda80525..37fca55da 100644 --- a/infosouth-admin/.settings/org.eclipse.core.resources.prefs +++ b/infosouth-admin/.settings/org.eclipse.core.resources.prefs @@ -5,5 +5,5 @@ encoding//src/main/resources/static/css/login.css=UTF-8 encoding//src/main/resources/static/ruoyi/css/ry-ui.css=UTF-8 encoding//src/main/resources/templates/arj21/csvmanager/add.html=UTF-8 encoding//src/main/resources/templates/arj21/csvmanager/edit.html=UTF-8 -encoding//src/main/resources/templates/arj21/csvmanager/flight.html=UTF-8 +encoding//src/main/resources/templates/arj21/csvmanager/qarDataExport.html=UTF-8 encoding/=UTF-8 diff --git a/infosouth-admin/src/main/resources/templates/arj21/csvmanager/imexportLog.html b/infosouth-admin/src/main/resources/templates/arj21/csvmanager/imexportLog.html index 0f6d3abb3..c55a148f5 100644 --- a/infosouth-admin/src/main/resources/templates/arj21/csvmanager/imexportLog.html +++ b/infosouth-admin/src/main/resources/templates/arj21/csvmanager/imexportLog.html @@ -26,9 +26,9 @@

  • 机型：

    - - +
  • @@ -62,10 +62,11 @@
  • -

    操作类型--导入，导出：

    - - + +
  • @@ -74,10 +75,7 @@

  • 失败原因：

    - +
  •  搜索 @@ -178,7 +176,7 @@ }, { field : 'operateType', - title : '操作类型--导入，导出' + title : '操作类型' }, { field : 'isSucce', diff --git a/infosouth-admin/src/main/resources/templates/arj21/csvmanager/flight.html b/infosouth-admin/src/main/resources/templates/arj21/csvmanager/qarDataExport.html similarity index 66% rename from infosouth-admin/src/main/resources/templates/arj21/csvmanager/flight.html rename to infosouth-admin/src/main/resources/templates/arj21/csvmanager/qarDataExport.html index 7f89a04dc..0e4a35ecc 100644 --- a/infosouth-admin/src/main/resources/templates/arj21/csvmanager/flight.html +++ b/infosouth-admin/src/main/resources/templates/arj21/csvmanager/qarDataExport.html @@ -17,56 +17,38 @@
  • -

    航班号：

    - +

    机型：

    +

  • 飞机号：

    • -
  • -

    机型：

    - -

  • 起飞机场：

  • -

    到达机场：

    +

    落地机场：

    • -
  • -

    所属公司：

    - -
    • -
  • -

    资源目录ID：

    - -
    • -
  • -

    创建时间：

    - - - - -
    • -
  • -

    更新时间：

    - - - - -
    • -
  • -

    备注：

    - -
    • +
  •  搜索  重置
    • + @@ -114,12 +96,8 @@ visible: false }, { - field : 'flDate', - title : '航班日期' - }, - { - field : 'flNo', - title : '航班号' + field : 'csvName', + title : 'csv文件名' }, { field : 'arn', @@ -129,6 +107,10 @@ field : 'acType', title : '机型' }, + { + field : 'flDate', + title : '航班日期' + }, { field : 'pod', title : '起飞机场' @@ -137,35 +119,12 @@ field : 'poa', title : '到达机场' }, - { - field : 'airline', - title : '所属公司' - }, - { - field : 'csvPath', - title : 'csv存储路径' - }, - { - field : 'csvName', - title : 'csv文件名' - }, - { - field : 'infoResourceId', - title : '资源目录ID' - }, { field : 'createDate', - title : '创建时间' - }, - { - field : 'updateDate', - title : '更新时间' - }, - { - field : 'remarks', - title : '备注' - }, - { + title : '导入时间' + } + + /* { title: '操作', align: 'center', formatter: function(value, row, index) { @@ -174,7 +133,8 @@ actions.push('删除'); return actions.join(''); } - }] + } */ + ] }; $.table.init(options); }); diff --git a/infosouth-admin/src/main/resources/templates/arj21/csvmanager/qarDataImport.html b/infosouth-admin/src/main/resources/templates/arj21/csvmanager/qarDataImport.html index 7058a74ea..600b3d5b3 100644 --- a/infosouth-admin/src/main/resources/templates/arj21/csvmanager/qarDataImport.html +++ b/infosouth-admin/src/main/resources/templates/arj21/csvmanager/qarDataImport.html @@ -101,7 +101,8 @@ $("#progressBar").append("
  • "+efileName+"
    • "); } */ //填充table - tbody_html = ""; + tbody_html = "" + var loginName = "";//上传用户名 for(var m=0;m"; //上传时间 diff --git a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/csvmanager/InfoFlightController.java b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/csvmanager/InfoFlightController.java index 7549cd5ce..c77e410ce 100644 --- a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/csvmanager/InfoFlightController.java +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/csvmanager/InfoFlightController.java @@ -7,6 +7,7 @@ import java.util.Map; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import cn.com.infosouth.arj21.domain.InfoFlight; +import cn.com.infosouth.arj21.service.IInfoAcTypeService; import cn.com.infosouth.arj21.service.IInfoFlightService; import cn.com.infosouth.common.annotation.Log; import cn.com.infosouth.common.core.controller.BaseController; @@ -22,6 +24,7 @@ import cn.com.infosouth.common.core.domain.AjaxResult; import cn.com.infosouth.common.core.page.TableDataInfo; import cn.com.infosouth.common.enums.BusinessType; import cn.com.infosouth.common.utils.poi.ExcelUtil; +import cn.com.infosouth.framework.util.ShiroUtils; /** * 航班信息Controller @@ -36,11 +39,16 @@ public class InfoFlightController extends BaseController { @Autowired private IInfoFlightService infoFlightService; + @Autowired + private IInfoAcTypeService infoAcTypeService; @RequiresPermissions("arj21:flight:view") @GetMapping() - public String flight() { - return prefix + "/flight"; + public String flight(Model model) { + + List acTypeList = infoAcTypeService.findacTpyeList(); + model.addAttribute("acTypeList", acTypeList); + return prefix + "/qarDataExport"; } /** @@ -57,6 +65,7 @@ public class InfoFlightController extends BaseController { Map map = new HashMap(); map.put("status", "1001"); map.put("data", ""); + map.put("loginName", ShiroUtils.getLoginName()); //String info_ac_type_id = ""; String acType = ""; try { diff --git a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/csvmanager/InfoImexportLogController.java b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/csvmanager/InfoImexportLogController.java index 5f12a2d90..db5757603 100644 --- a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/csvmanager/InfoImexportLogController.java +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/csvmanager/InfoImexportLogController.java @@ -7,6 +7,7 @@ import java.util.List; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import cn.com.infosouth.arj21.domain.InfoImexportLog; +import cn.com.infosouth.arj21.service.IInfoAcTypeService; import cn.com.infosouth.arj21.service.IInfoImexportLogService; import cn.com.infosouth.common.annotation.Log; import cn.com.infosouth.common.core.controller.BaseController; @@ -37,11 +39,15 @@ public class InfoImexportLogController extends BaseController @Autowired private IInfoImexportLogService infoImexportLogService; - + @Autowired + private IInfoAcTypeService infoAcTypeService; + @RequiresPermissions("arj21:csvexport:view") @GetMapping() - public String csvexport() + public String csvexport(Model model) { + List acTypeList = infoAcTypeService.findacTpyeList(); + model.addAttribute("acTypeList", acTypeList); return prefix + "/csvexport"; } diff --git a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/mapper/InfoAcTypeMapper.java b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/mapper/InfoAcTypeMapper.java index fb6d9a5de..0a1aa1264 100644 --- a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/mapper/InfoAcTypeMapper.java +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/mapper/InfoAcTypeMapper.java @@ -62,4 +62,6 @@ public interface InfoAcTypeMapper public int deleteInfoAcTypeByIds(String[] ids); public List> findacTpyeMapList(); + + public List findacTpyeList(); } diff --git a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoAcTypeService.java b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoAcTypeService.java index 90c3f6ff6..78a3cb337 100644 --- a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoAcTypeService.java +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoAcTypeService.java @@ -66,4 +66,10 @@ public interface IInfoAcTypeService * @return */ public List> findacTpyeMapList(); + + /** + * 查找机型列表 + * @return + */ + public List findacTpyeList(); } diff --git a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/InfoAcTypeServiceImpl.java b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/InfoAcTypeServiceImpl.java index 1ac53d17e..f8ca80ca9 100644 --- a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/InfoAcTypeServiceImpl.java +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/InfoAcTypeServiceImpl.java @@ -98,4 +98,9 @@ public class InfoAcTypeServiceImpl implements IInfoAcTypeService public List> findacTpyeMapList() { return infoAcTypeMapper.findacTpyeMapList(); } + + @Override + public List findacTpyeList() { + return infoAcTypeMapper.findacTpyeList(); + } } diff --git a/infosouth-arj21/src/main/resources/mapper/InfoAcTypeMapper.xml b/infosouth-arj21/src/main/resources/mapper/InfoAcTypeMapper.xml index 8d1e62122..9147f2b6d 100644 --- a/infosouth-arj21/src/main/resources/mapper/InfoAcTypeMapper.xml +++ b/infosouth-arj21/src/main/resources/mapper/InfoAcTypeMapper.xml @@ -99,4 +99,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + \ No newline at end of file diff --git a/infosouth-arj21/src/main/resources/mapper/InfoFlightMapper.xml b/infosouth-arj21/src/main/resources/mapper/InfoFlightMapper.xml index 72670b579..7a701b0a9 100644 --- a/infosouth-arj21/src/main/resources/mapper/InfoFlightMapper.xml +++ b/infosouth-arj21/src/main/resources/mapper/InfoFlightMapper.xml @@ -27,24 +27,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.id AS "id", - a.fl_date AS "flDate", - a.fl_no AS "flNo", + a.fl_date AS "fl_date", + a.fl_no AS "fl_no", c.ac_reg AS "arn", - d.ac_tpye AS "acType", + d.ac_tpye AS "ac_type", a.pod AS "pod", a.poa AS "poa", a.airline AS "airline", - a.csv_path AS "csvPath", - a.csv_name AS "csvName", + a.csv_path AS "csv_path", + a.csv_name AS "csv_name", a.create_by AS "createBy.id", - a.info_resource_id AS "infoResourceId", - a.create_date AS "createDate", + a.info_resource_id AS "info_resource_id", + a.create_date AS "create_date", a.update_by AS "updateBy.id", - a.update_date AS "updateDate", + a.update_date AS "update_date", a.remarks AS "remarks", - a.del_flag AS "delFlag" + a.del_flag AS "del_flag" left join info_resource b @@ -60,7 +60,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"