From 7d1c6986cea2bb8dd3203d047c5f544a87f03385 Mon Sep 17 00:00:00 2001 From: tiny Date: Thu, 5 Mar 2020 10:45:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A2=BC=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=99=A8=E6=A8=A1=E6=9D=BF=EF=BC=8C=E7=9B=A1=E9=87=8F?= =?UTF-8?q?=E5=B0=91=E5=A0=B1=E9=8C=AF=EF=BC=9B=E5=8F=A6=E5=A4=96=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0version=E3=80=81actype=E3=80=81aircraft=E7=9A=84?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=9B=AE=E9=8C=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../arj21/actype_manage/actype_manage.html | 132 ++++++++++++++ .../templates/arj21/actype_manage/add.html | 105 +++++++++++ .../templates/arj21/actype_manage/edit.html | 100 +++++++++++ .../templates/arj21/aircraft_manage/add.html | 102 +++++++++++ .../aircraft_manage/aircraft_manage.html | 127 ++++++++++++++ .../templates/arj21/aircraft_manage/edit.html | 97 ++++++++++ .../templates/arj21/version_manage/add.html | 102 +++++++++++ .../templates/arj21/version_manage/edit.html | 97 ++++++++++ .../arj21/version_manage/version_manage.html | 121 +++++++++++++ .../actypemanage/InfoAcTypeController.java | 126 +++++++++++++ .../InfoAircraftController.java | 126 +++++++++++++ .../versionmanage/InfoVersionController.java | 126 +++++++++++++ .../infosouth/arj21/domain/InfoAcType.java | 165 ++++++++++++++++++ .../infosouth/arj21/domain/InfoAircraft.java | 151 ++++++++++++++++ .../infosouth/arj21/domain/InfoVersion.java | 165 ++++++++++++++++++ .../arj21/mapper/InfoAcTypeMapper.java | 61 +++++++ .../arj21/mapper/InfoAircraftMapper.java | 61 +++++++ .../arj21/mapper/InfoVersionMapper.java | 61 +++++++ .../arj21/service/IInfoAcTypeService.java | 61 +++++++ .../arj21/service/IInfoAircraftService.java | 61 +++++++ .../arj21/service/IInfoVersionService.java | 61 +++++++ .../service/impl/InfoAcTypeServiceImpl.java | 94 ++++++++++ .../service/impl/InfoAircraftServiceImpl.java | 94 ++++++++++ .../service/impl/InfoVersionServiceImpl.java | 94 ++++++++++ .../resources/mapper/InfoAcTypeMapper.xml | 102 +++++++++++ .../resources/mapper/InfoAircraftMapper.xml | 97 ++++++++++ .../resources/mapper/InfoVersionMapper.xml | 98 +++++++++++ .../main/resources/vm/java/controller.java.vm | 16 +- .../src/main/resources/vm/java/domain.java.vm | 6 +- .../main/resources/vm/java/service.java.vm | 2 +- .../resources/vm/java/serviceImpl.java.vm | 6 +- 31 files changed, 2802 insertions(+), 15 deletions(-) create mode 100644 infosouth-admin/src/main/resources/templates/arj21/actype_manage/actype_manage.html create mode 100644 infosouth-admin/src/main/resources/templates/arj21/actype_manage/add.html create mode 100644 infosouth-admin/src/main/resources/templates/arj21/actype_manage/edit.html create mode 100644 infosouth-admin/src/main/resources/templates/arj21/aircraft_manage/add.html create mode 100644 infosouth-admin/src/main/resources/templates/arj21/aircraft_manage/aircraft_manage.html create mode 100644 infosouth-admin/src/main/resources/templates/arj21/aircraft_manage/edit.html create mode 100644 infosouth-admin/src/main/resources/templates/arj21/version_manage/add.html create mode 100644 infosouth-admin/src/main/resources/templates/arj21/version_manage/edit.html create mode 100644 infosouth-admin/src/main/resources/templates/arj21/version_manage/version_manage.html create mode 100644 infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/actypemanage/InfoAcTypeController.java create mode 100644 infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/aircraftmanage/InfoAircraftController.java create mode 100644 infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/versionmanage/InfoVersionController.java create mode 100644 infosouth-arj21/src/main/java/cn/com/infosouth/arj21/domain/InfoAcType.java create mode 100644 infosouth-arj21/src/main/java/cn/com/infosouth/arj21/domain/InfoAircraft.java create mode 100644 infosouth-arj21/src/main/java/cn/com/infosouth/arj21/domain/InfoVersion.java create mode 100644 infosouth-arj21/src/main/java/cn/com/infosouth/arj21/mapper/InfoAcTypeMapper.java create mode 100644 infosouth-arj21/src/main/java/cn/com/infosouth/arj21/mapper/InfoAircraftMapper.java create mode 100644 infosouth-arj21/src/main/java/cn/com/infosouth/arj21/mapper/InfoVersionMapper.java create mode 100644 infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoAcTypeService.java create mode 100644 infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoAircraftService.java create mode 100644 infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoVersionService.java create mode 100644 infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/InfoAcTypeServiceImpl.java create mode 100644 infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/InfoAircraftServiceImpl.java create mode 100644 infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/InfoVersionServiceImpl.java create mode 100644 infosouth-arj21/src/main/resources/mapper/InfoAcTypeMapper.xml create mode 100644 infosouth-arj21/src/main/resources/mapper/InfoAircraftMapper.xml create mode 100644 infosouth-arj21/src/main/resources/mapper/InfoVersionMapper.xml diff --git a/infosouth-admin/src/main/resources/templates/arj21/actype_manage/actype_manage.html b/infosouth-admin/src/main/resources/templates/arj21/actype_manage/actype_manage.html new file mode 100644 index 000000000..f7e778916 --- /dev/null +++ b/infosouth-admin/src/main/resources/templates/arj21/actype_manage/actype_manage.html @@ -0,0 +1,132 @@ + + + + + + +
+
+
+
+
+
    +
  • +

    机型：

    + +
    • +
  • +

    参数版本id：

    + +
    • +
  • +

    备注：

    + +
    • +
  • +

    机型的编号，自定义。用于查询后方便识记机型：

    + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/infosouth-admin/src/main/resources/templates/arj21/actype_manage/add.html b/infosouth-admin/src/main/resources/templates/arj21/actype_manage/add.html new file mode 100644 index 000000000..68c5e5e35 --- /dev/null +++ b/infosouth-admin/src/main/resources/templates/arj21/actype_manage/add.html @@ -0,0 +1,105 @@ + + + + + + + +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+
+ + + + + \ No newline at end of file diff --git a/infosouth-admin/src/main/resources/templates/arj21/actype_manage/edit.html b/infosouth-admin/src/main/resources/templates/arj21/actype_manage/edit.html new file mode 100644 index 000000000..ae2753d51 --- /dev/null +++ b/infosouth-admin/src/main/resources/templates/arj21/actype_manage/edit.html @@ -0,0 +1,100 @@ + + + + + + + +
+
+ +
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+
+ + + + + \ No newline at end of file diff --git a/infosouth-admin/src/main/resources/templates/arj21/aircraft_manage/add.html b/infosouth-admin/src/main/resources/templates/arj21/aircraft_manage/add.html new file mode 100644 index 000000000..5872292e6 --- /dev/null +++ b/infosouth-admin/src/main/resources/templates/arj21/aircraft_manage/add.html @@ -0,0 +1,102 @@ + + + + + + + +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+
+ + + + + \ No newline at end of file diff --git a/infosouth-admin/src/main/resources/templates/arj21/aircraft_manage/aircraft_manage.html b/infosouth-admin/src/main/resources/templates/arj21/aircraft_manage/aircraft_manage.html new file mode 100644 index 000000000..92e4bc426 --- /dev/null +++ b/infosouth-admin/src/main/resources/templates/arj21/aircraft_manage/aircraft_manage.html @@ -0,0 +1,127 @@ + + + + + + +
+
+
+
+
+
    +
  • +

    飞机号：

    + +
    • +
  • +

    机型编号,info_ac_type.id：

    + +
    • +
  • +

    null：

    + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/infosouth-admin/src/main/resources/templates/arj21/aircraft_manage/edit.html b/infosouth-admin/src/main/resources/templates/arj21/aircraft_manage/edit.html new file mode 100644 index 000000000..2e65e3f89 --- /dev/null +++ b/infosouth-admin/src/main/resources/templates/arj21/aircraft_manage/edit.html @@ -0,0 +1,97 @@ + + + + + + + +
+
+ +
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+
+ + + + + \ No newline at end of file diff --git a/infosouth-admin/src/main/resources/templates/arj21/version_manage/add.html b/infosouth-admin/src/main/resources/templates/arj21/version_manage/add.html new file mode 100644 index 000000000..073c411ac --- /dev/null +++ b/infosouth-admin/src/main/resources/templates/arj21/version_manage/add.html @@ -0,0 +1,102 @@ + + + + + + + +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/infosouth-admin/src/main/resources/templates/arj21/version_manage/edit.html b/infosouth-admin/src/main/resources/templates/arj21/version_manage/edit.html new file mode 100644 index 000000000..e211f5d70 --- /dev/null +++ b/infosouth-admin/src/main/resources/templates/arj21/version_manage/edit.html @@ -0,0 +1,97 @@ + + + + + + + +
+
+ +
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/infosouth-admin/src/main/resources/templates/arj21/version_manage/version_manage.html b/infosouth-admin/src/main/resources/templates/arj21/version_manage/version_manage.html new file mode 100644 index 000000000..c79055e29 --- /dev/null +++ b/infosouth-admin/src/main/resources/templates/arj21/version_manage/version_manage.html @@ -0,0 +1,121 @@ + + + + + + +
+
+
+
+
+
    +
  • +

    版本名：

    + +
    • +
  • +

    版本描述：

    + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/actypemanage/InfoAcTypeController.java b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/actypemanage/InfoAcTypeController.java new file mode 100644 index 000000000..b2ecaee5d --- /dev/null +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/actypemanage/InfoAcTypeController.java @@ -0,0 +1,126 @@ +package cn.com.infosouth.arj21.controller.actypemanage; + +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.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import cn.com.infosouth.common.annotation.Log; +import cn.com.infosouth.common.enums.BusinessType; +import cn.com.infosouth.arj21.domain.InfoAcType; +import cn.com.infosouth.arj21.service.IInfoAcTypeService; +import cn.com.infosouth.common.core.controller.BaseController; +import cn.com.infosouth.common.core.domain.AjaxResult; +import cn.com.infosouth.common.utils.poi.ExcelUtil; +import cn.com.infosouth.common.core.page.TableDataInfo; + +/** + * 机型Controller + * + * @author kxnf + * @date 2020-03-05 + */ +@Controller +@RequestMapping("/arj21/actype_manage") +public class InfoAcTypeController extends BaseController +{ + private String prefix = "arj21/actype_manage"; + + @Autowired + private IInfoAcTypeService infoAcTypeService; + + @RequiresPermissions("arj21:actype_manage:view") + @GetMapping() + public String actype_manage() + { + return prefix + "/actype_manage"; + } + + /** + * 查询机型列表 + */ + @RequiresPermissions("arj21:actype_manage:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(InfoAcType infoAcType) + { + startPage(); + List list = infoAcTypeService.selectInfoAcTypeList(infoAcType); + return getDataTable(list); + } + + /** + * 导出机型列表 + */ + @RequiresPermissions("arj21:actype_manage:export") + @Log(title = "机型", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(InfoAcType infoAcType) + { + List list = infoAcTypeService.selectInfoAcTypeList(infoAcType); + ExcelUtil util = new ExcelUtil(InfoAcType.class); + return util.exportExcel(list, "actype_manage"); + } + + /** + * 新增机型 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存机型 + */ + @RequiresPermissions("arj21:actype_manage:add") + @Log(title = "机型", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(InfoAcType infoAcType) + { + return toAjax(infoAcTypeService.insertInfoAcType(infoAcType)); + } + + /** + * 修改机型 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") String id, ModelMap mmap) + { + InfoAcType infoAcType = infoAcTypeService.selectInfoAcTypeById(id); + mmap.put("infoAcType", infoAcType); + return prefix + "/edit"; + } + + /** + * 修改保存机型 + */ + @RequiresPermissions("arj21:actype_manage:edit") + @Log(title = "机型", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(InfoAcType infoAcType) + { + return toAjax(infoAcTypeService.updateInfoAcType(infoAcType)); + } + + /** + * 删除机型 + */ + @RequiresPermissions("arj21:actype_manage:remove") + @Log(title = "机型", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(infoAcTypeService.deleteInfoAcTypeByIds(ids)); + } +} diff --git a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/aircraftmanage/InfoAircraftController.java b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/aircraftmanage/InfoAircraftController.java new file mode 100644 index 000000000..88b0d0e3b --- /dev/null +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/aircraftmanage/InfoAircraftController.java @@ -0,0 +1,126 @@ +package cn.com.infosouth.arj21.controller.aircraftmanage; + +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.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import cn.com.infosouth.common.annotation.Log; +import cn.com.infosouth.common.enums.BusinessType; +import cn.com.infosouth.arj21.domain.InfoAircraft; +import cn.com.infosouth.arj21.service.IInfoAircraftService; +import cn.com.infosouth.common.core.controller.BaseController; +import cn.com.infosouth.common.core.domain.AjaxResult; +import cn.com.infosouth.common.utils.poi.ExcelUtil; +import cn.com.infosouth.common.core.page.TableDataInfo; + +/** + * 飞机Controller + * + * @author kxnf + * @date 2020-03-05 + */ +@Controller +@RequestMapping("/arj21/aircraft_manage") +public class InfoAircraftController extends BaseController +{ + private String prefix = "arj21/aircraft_manage"; + + @Autowired + private IInfoAircraftService infoAircraftService; + + @RequiresPermissions("arj21:aircraft_manage:view") + @GetMapping() + public String aircraft_manage() + { + return prefix + "/aircraft_manage"; + } + + /** + * 查询飞机列表 + */ + @RequiresPermissions("arj21:aircraft_manage:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(InfoAircraft infoAircraft) + { + startPage(); + List list = infoAircraftService.selectInfoAircraftList(infoAircraft); + return getDataTable(list); + } + + /** + * 导出飞机列表 + */ + @RequiresPermissions("arj21:aircraft_manage:export") + @Log(title = "飞机", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(InfoAircraft infoAircraft) + { + List list = infoAircraftService.selectInfoAircraftList(infoAircraft); + ExcelUtil util = new ExcelUtil(InfoAircraft.class); + return util.exportExcel(list, "aircraft_manage"); + } + + /** + * 新增飞机 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存飞机 + */ + @RequiresPermissions("arj21:aircraft_manage:add") + @Log(title = "飞机", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(InfoAircraft infoAircraft) + { + return toAjax(infoAircraftService.insertInfoAircraft(infoAircraft)); + } + + /** + * 修改飞机 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") String id, ModelMap mmap) + { + InfoAircraft infoAircraft = infoAircraftService.selectInfoAircraftById(id); + mmap.put("infoAircraft", infoAircraft); + return prefix + "/edit"; + } + + /** + * 修改保存飞机 + */ + @RequiresPermissions("arj21:aircraft_manage:edit") + @Log(title = "飞机", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(InfoAircraft infoAircraft) + { + return toAjax(infoAircraftService.updateInfoAircraft(infoAircraft)); + } + + /** + * 删除飞机 + */ + @RequiresPermissions("arj21:aircraft_manage:remove") + @Log(title = "飞机", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(infoAircraftService.deleteInfoAircraftByIds(ids)); + } +} diff --git a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/versionmanage/InfoVersionController.java b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/versionmanage/InfoVersionController.java new file mode 100644 index 000000000..0bdd3db18 --- /dev/null +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/versionmanage/InfoVersionController.java @@ -0,0 +1,126 @@ +package cn.com.infosouth.arj21.controller.versionmanage; + +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.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import cn.com.infosouth.common.annotation.Log; +import cn.com.infosouth.common.enums.BusinessType; +import cn.com.infosouth.arj21.domain.InfoVersion; +import cn.com.infosouth.arj21.service.IInfoVersionService; +import cn.com.infosouth.common.core.controller.BaseController; +import cn.com.infosouth.common.core.domain.AjaxResult; +import cn.com.infosouth.common.utils.poi.ExcelUtil; +import cn.com.infosouth.common.core.page.TableDataInfo; + +/** + * 参数版本Controller + * + * @author kxnf + * @date 2020-03-05 + */ +@Controller +@RequestMapping("/arj21/version_manage") +public class InfoVersionController extends BaseController +{ + private String prefix = "arj21/version_manage"; + + @Autowired + private IInfoVersionService infoVersionService; + + @RequiresPermissions("arj21:version_manage:view") + @GetMapping() + public String version_manage() + { + return prefix + "/version_manage"; + } + + /** + * 查询参数版本列表 + */ + @RequiresPermissions("arj21:version_manage:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(InfoVersion infoVersion) + { + startPage(); + List list = infoVersionService.selectInfoVersionList(infoVersion); + return getDataTable(list); + } + + /** + * 导出参数版本列表 + */ + @RequiresPermissions("arj21:version_manage:export") + @Log(title = "参数版本", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(InfoVersion infoVersion) + { + List list = infoVersionService.selectInfoVersionList(infoVersion); + ExcelUtil util = new ExcelUtil(InfoVersion.class); + return util.exportExcel(list, "version_manage"); + } + + /** + * 新增参数版本 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存参数版本 + */ + @RequiresPermissions("arj21:version_manage:add") + @Log(title = "参数版本", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(InfoVersion infoVersion) + { + return toAjax(infoVersionService.insertInfoVersion(infoVersion)); + } + + /** + * 修改参数版本 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + InfoVersion infoVersion = infoVersionService.selectInfoVersionById(id); + mmap.put("infoVersion", infoVersion); + return prefix + "/edit"; + } + + /** + * 修改保存参数版本 + */ + @RequiresPermissions("arj21:version_manage:edit") + @Log(title = "参数版本", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(InfoVersion infoVersion) + { + return toAjax(infoVersionService.updateInfoVersion(infoVersion)); + } + + /** + * 删除参数版本 + */ + @RequiresPermissions("arj21:version_manage:remove") + @Log(title = "参数版本", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(infoVersionService.deleteInfoVersionByIds(ids)); + } +} diff --git a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/domain/InfoAcType.java b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/domain/InfoAcType.java new file mode 100644 index 000000000..df1a5655f --- /dev/null +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/domain/InfoAcType.java @@ -0,0 +1,165 @@ +package cn.com.infosouth.arj21.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import cn.com.infosouth.common.annotation.Excel; +import cn.com.infosouth.common.core.domain.BaseEntity; +import java.util.Date; + +/** + * 机型对象 info_ac_type + * + * @author kxnf + * @date 2020-03-05 + */ +public class InfoAcType extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** null */ + private String id; + + /** 机型 */ + @Excel(name = "机型") + private String acTpye; + + /** csv列头对应index(弃用，改用info_version表中对应字段) */ + @Excel(name = "csv列头对应index(弃用，改用info_version表中对应字段)") + private Long csvHeaderIndex; + + /** csv内容开始行对应index(弃用，改用info_version表中对应字段) */ + @Excel(name = "csv内容开始行对应index(弃用，改用info_version表中对应字段)") + private Long csvContentIndex; + + /** 参数版本id */ + @Excel(name = "参数版本id") + private Long versionId; + + /** 创建时间 */ + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date createDate; + + /** 更新时间 */ + @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date updateDate; + + /** 备注 */ + @Excel(name = "备注") + private String remarks; + + /** 删除标志 */ + private String delFlag; + + /** 机型的编号，自定义。用于查询后方便识记机型 */ + @Excel(name = "机型的编号，自定义。用于查询后方便识记机型") + private String acTypeNo; + + public void setId(String id) + { + this.id = id; + } + + public String getId() + { + return id; + } + public void setAcTpye(String acTpye) + { + this.acTpye = acTpye; + } + + public String getAcTpye() + { + return acTpye; + } + public void setCsvHeaderIndex(Long csvHeaderIndex) + { + this.csvHeaderIndex = csvHeaderIndex; + } + + public Long getCsvHeaderIndex() + { + return csvHeaderIndex; + } + public void setCsvContentIndex(Long csvContentIndex) + { + this.csvContentIndex = csvContentIndex; + } + + public Long getCsvContentIndex() + { + return csvContentIndex; + } + public void setVersionId(Long versionId) + { + this.versionId = versionId; + } + + public Long getVersionId() + { + return versionId; + } + public void setCreateDate(Date createDate) + { + this.createDate = createDate; + } + + public Date getCreateDate() + { + return createDate; + } + public void setUpdateDate(Date updateDate) + { + this.updateDate = updateDate; + } + + public Date getUpdateDate() + { + return updateDate; + } + public void setRemarks(String remarks) + { + this.remarks = remarks; + } + + public String getRemarks() + { + return remarks; + } + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getDelFlag() + { + return delFlag; + } + public void setAcTypeNo(String acTypeNo) + { + this.acTypeNo = acTypeNo; + } + + public String getAcTypeNo() + { + return acTypeNo; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("acTpye", getAcTpye()) + .append("csvHeaderIndex", getCsvHeaderIndex()) + .append("csvContentIndex", getCsvContentIndex()) + .append("versionId", getVersionId()) + .append("createBy", getCreateBy()) + .append("createDate", getCreateDate()) + .append("updateBy", getUpdateBy()) + .append("updateDate", getUpdateDate()) + .append("remarks", getRemarks()) + .append("delFlag", getDelFlag()) + .append("acTypeNo", getAcTypeNo()) + .toString(); + } +} diff --git a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/domain/InfoAircraft.java b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/domain/InfoAircraft.java new file mode 100644 index 000000000..046604408 --- /dev/null +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/domain/InfoAircraft.java @@ -0,0 +1,151 @@ +package cn.com.infosouth.arj21.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import cn.com.infosouth.common.annotation.Excel; +import cn.com.infosouth.common.core.domain.BaseEntity; +import java.util.Date; + +/** + * 飞机对象 info_aircraft + * + * @author kxnf + * @date 2020-03-05 + */ +public class InfoAircraft extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** null */ + private String id; + + /** 创建时间 */ + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date createDate; + + /** 更新时间 */ + @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date updateDate; + + /** 备注 */ + @Excel(name = "备注") + private String remarks; + + /** 删除标志 */ + private String delFlag; + + /** 飞机号 */ + @Excel(name = "飞机号") + private String acReg; + + /** 机型编号,info_ac_type.id */ + @Excel(name = "机型编号,info_ac_type.id") + private String infoAcTypeId; + + /** 默认上传目录, info_resource.id */ + @Excel(name = "默认上传目录, info_resource.id") + private String uploadDirId; + + /** null */ + @Excel(name = "null") + private String aircompanyid; + + public void setId(String id) + { + this.id = id; + } + + public String getId() + { + return id; + } + public void setCreateDate(Date createDate) + { + this.createDate = createDate; + } + + public Date getCreateDate() + { + return createDate; + } + public void setUpdateDate(Date updateDate) + { + this.updateDate = updateDate; + } + + public Date getUpdateDate() + { + return updateDate; + } + public void setRemarks(String remarks) + { + this.remarks = remarks; + } + + public String getRemarks() + { + return remarks; + } + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getDelFlag() + { + return delFlag; + } + public void setAcReg(String acReg) + { + this.acReg = acReg; + } + + public String getAcReg() + { + return acReg; + } + public void setInfoAcTypeId(String infoAcTypeId) + { + this.infoAcTypeId = infoAcTypeId; + } + + public String getInfoAcTypeId() + { + return infoAcTypeId; + } + public void setUploadDirId(String uploadDirId) + { + this.uploadDirId = uploadDirId; + } + + public String getUploadDirId() + { + return uploadDirId; + } + public void setAircompanyid(String aircompanyid) + { + this.aircompanyid = aircompanyid; + } + + public String getAircompanyid() + { + return aircompanyid; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("createBy", getCreateBy()) + .append("createDate", getCreateDate()) + .append("updateBy", getUpdateBy()) + .append("updateDate", getUpdateDate()) + .append("remarks", getRemarks()) + .append("delFlag", getDelFlag()) + .append("acReg", getAcReg()) + .append("infoAcTypeId", getInfoAcTypeId()) + .append("uploadDirId", getUploadDirId()) + .append("aircompanyid", getAircompanyid()) + .toString(); + } +} diff --git a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/domain/InfoVersion.java b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/domain/InfoVersion.java new file mode 100644 index 000000000..0f0589557 --- /dev/null +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/domain/InfoVersion.java @@ -0,0 +1,165 @@ +package cn.com.infosouth.arj21.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import cn.com.infosouth.common.annotation.Excel; +import cn.com.infosouth.common.core.domain.BaseEntity; +import java.util.Date; + +/** + * 参数版本对象 info_version + * + * @author kxnf + * @date 2020-03-05 + */ +public class InfoVersion extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** null */ + private Long id; + + /** 版本名 */ + @Excel(name = "版本名") + private String verName; + + /** 版本描述 */ + @Excel(name = "版本描述") + private String verDesc; + + /** csv列头对应index */ + @Excel(name = "csv列头对应index") + private Long csvHeaderIndex; + + /** csv内容开始行对应index */ + @Excel(name = "csv内容开始行对应index") + private Long csvContentIndex; + + /** 脚本语言 */ + @Excel(name = "脚本语言") + private String scriptLanguage; + + /** 创建时间 */ + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date createDate; + + /** 更新时间 */ + @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date updateDate; + + /** 备注 */ + @Excel(name = "备注") + private String remarks; + + /** 删除标志 */ + private String delFlag; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setVerName(String verName) + { + this.verName = verName; + } + + public String getVerName() + { + return verName; + } + public void setVerDesc(String verDesc) + { + this.verDesc = verDesc; + } + + public String getVerDesc() + { + return verDesc; + } + public void setCsvHeaderIndex(Long csvHeaderIndex) + { + this.csvHeaderIndex = csvHeaderIndex; + } + + public Long getCsvHeaderIndex() + { + return csvHeaderIndex; + } + public void setCsvContentIndex(Long csvContentIndex) + { + this.csvContentIndex = csvContentIndex; + } + + public Long getCsvContentIndex() + { + return csvContentIndex; + } + public void setScriptLanguage(String scriptLanguage) + { + this.scriptLanguage = scriptLanguage; + } + + public String getScriptLanguage() + { + return scriptLanguage; + } + public void setCreateDate(Date createDate) + { + this.createDate = createDate; + } + + public Date getCreateDate() + { + return createDate; + } + public void setUpdateDate(Date updateDate) + { + this.updateDate = updateDate; + } + + public Date getUpdateDate() + { + return updateDate; + } + public void setRemarks(String remarks) + { + this.remarks = remarks; + } + + public String getRemarks() + { + return remarks; + } + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getDelFlag() + { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("verName", getVerName()) + .append("verDesc", getVerDesc()) + .append("csvHeaderIndex", getCsvHeaderIndex()) + .append("csvContentIndex", getCsvContentIndex()) + .append("scriptLanguage", getScriptLanguage()) + .append("createBy", getCreateBy()) + .append("createDate", getCreateDate()) + .append("updateBy", getUpdateBy()) + .append("updateDate", getUpdateDate()) + .append("remarks", getRemarks()) + .append("delFlag", getDelFlag()) + .toString(); + } +} 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 new file mode 100644 index 000000000..f78a370ef --- /dev/null +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/mapper/InfoAcTypeMapper.java @@ -0,0 +1,61 @@ +package cn.com.infosouth.arj21.mapper; + +import java.util.List; +import cn.com.infosouth.arj21.domain.InfoAcType; + +/** + * 机型Mapper接口 + * + * @author kxnf + * @date 2020-03-05 + */ +public interface InfoAcTypeMapper +{ + /** + * 查询机型 + * + * @param id 机型ID + * @return 机型 + */ + public InfoAcType selectInfoAcTypeById(String id); + + /** + * 查询机型列表 + * + * @param infoAcType 机型 + * @return 机型集合 + */ + public List selectInfoAcTypeList(InfoAcType infoAcType); + + /** + * 新增机型 + * + * @param infoAcType 机型 + * @return 结果 + */ + public int insertInfoAcType(InfoAcType infoAcType); + + /** + * 修改机型 + * + * @param infoAcType 机型 + * @return 结果 + */ + public int updateInfoAcType(InfoAcType infoAcType); + + /** + * 删除机型 + * + * @param id 机型ID + * @return 结果 + */ + public int deleteInfoAcTypeById(String id); + + /** + * 批量删除机型 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteInfoAcTypeByIds(String[] ids); +} diff --git a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/mapper/InfoAircraftMapper.java b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/mapper/InfoAircraftMapper.java new file mode 100644 index 000000000..3a7db94a1 --- /dev/null +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/mapper/InfoAircraftMapper.java @@ -0,0 +1,61 @@ +package cn.com.infosouth.arj21.mapper; + +import java.util.List; +import cn.com.infosouth.arj21.domain.InfoAircraft; + +/** + * 飞机Mapper接口 + * + * @author kxnf + * @date 2020-03-05 + */ +public interface InfoAircraftMapper +{ + /** + * 查询飞机 + * + * @param id 飞机ID + * @return 飞机 + */ + public InfoAircraft selectInfoAircraftById(String id); + + /** + * 查询飞机列表 + * + * @param infoAircraft 飞机 + * @return 飞机集合 + */ + public List selectInfoAircraftList(InfoAircraft infoAircraft); + + /** + * 新增飞机 + * + * @param infoAircraft 飞机 + * @return 结果 + */ + public int insertInfoAircraft(InfoAircraft infoAircraft); + + /** + * 修改飞机 + * + * @param infoAircraft 飞机 + * @return 结果 + */ + public int updateInfoAircraft(InfoAircraft infoAircraft); + + /** + * 删除飞机 + * + * @param id 飞机ID + * @return 结果 + */ + public int deleteInfoAircraftById(String id); + + /** + * 批量删除飞机 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteInfoAircraftByIds(String[] ids); +} diff --git a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/mapper/InfoVersionMapper.java b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/mapper/InfoVersionMapper.java new file mode 100644 index 000000000..7b02426a4 --- /dev/null +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/mapper/InfoVersionMapper.java @@ -0,0 +1,61 @@ +package cn.com.infosouth.arj21.mapper; + +import java.util.List; +import cn.com.infosouth.arj21.domain.InfoVersion; + +/** + * 参数版本Mapper接口 + * + * @author kxnf + * @date 2020-03-05 + */ +public interface InfoVersionMapper +{ + /** + * 查询参数版本 + * + * @param id 参数版本ID + * @return 参数版本 + */ + public InfoVersion selectInfoVersionById(Long id); + + /** + * 查询参数版本列表 + * + * @param infoVersion 参数版本 + * @return 参数版本集合 + */ + public List selectInfoVersionList(InfoVersion infoVersion); + + /** + * 新增参数版本 + * + * @param infoVersion 参数版本 + * @return 结果 + */ + public int insertInfoVersion(InfoVersion infoVersion); + + /** + * 修改参数版本 + * + * @param infoVersion 参数版本 + * @return 结果 + */ + public int updateInfoVersion(InfoVersion infoVersion); + + /** + * 删除参数版本 + * + * @param id 参数版本ID + * @return 结果 + */ + public int deleteInfoVersionById(Long id); + + /** + * 批量删除参数版本 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteInfoVersionByIds(String[] ids); +} 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 new file mode 100644 index 000000000..946b9961e --- /dev/null +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoAcTypeService.java @@ -0,0 +1,61 @@ +package cn.com.infosouth.arj21.service; + +import java.util.List; +import cn.com.infosouth.arj21.domain.InfoAcType; + +/** + * 机型Service接口 + * + * @author kxnf + * @date 2020-03-05 + */ +public interface IInfoAcTypeService +{ + /** + * 查询机型 + * + * @param id 机型ID + * @return 机型 + */ + public InfoAcType selectInfoAcTypeById(String id); + + /** + * 查询机型列表 + * + * @param infoAcType 机型 + * @return 机型集合 + */ + public List selectInfoAcTypeList(InfoAcType infoAcType); + + /** + * 新增机型 + * + * @param infoAcType 机型 + * @return 结果 + */ + public int insertInfoAcType(InfoAcType infoAcType); + + /** + * 修改机型 + * + * @param infoAcType 机型 + * @return 结果 + */ + public int updateInfoAcType(InfoAcType infoAcType); + + /** + * 批量删除机型 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteInfoAcTypeByIds(String ids); + + /** + * 删除机型信息 + * + * @param id 机型ID + * @return 结果 + */ + public int deleteInfoAcTypeById(String id); +} diff --git a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoAircraftService.java b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoAircraftService.java new file mode 100644 index 000000000..b20fb3343 --- /dev/null +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoAircraftService.java @@ -0,0 +1,61 @@ +package cn.com.infosouth.arj21.service; + +import java.util.List; +import cn.com.infosouth.arj21.domain.InfoAircraft; + +/** + * 飞机Service接口 + * + * @author kxnf + * @date 2020-03-05 + */ +public interface IInfoAircraftService +{ + /** + * 查询飞机 + * + * @param id 飞机ID + * @return 飞机 + */ + public InfoAircraft selectInfoAircraftById(String id); + + /** + * 查询飞机列表 + * + * @param infoAircraft 飞机 + * @return 飞机集合 + */ + public List selectInfoAircraftList(InfoAircraft infoAircraft); + + /** + * 新增飞机 + * + * @param infoAircraft 飞机 + * @return 结果 + */ + public int insertInfoAircraft(InfoAircraft infoAircraft); + + /** + * 修改飞机 + * + * @param infoAircraft 飞机 + * @return 结果 + */ + public int updateInfoAircraft(InfoAircraft infoAircraft); + + /** + * 批量删除飞机 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteInfoAircraftByIds(String ids); + + /** + * 删除飞机信息 + * + * @param id 飞机ID + * @return 结果 + */ + public int deleteInfoAircraftById(String id); +} diff --git a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoVersionService.java b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoVersionService.java new file mode 100644 index 000000000..aef635ee4 --- /dev/null +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoVersionService.java @@ -0,0 +1,61 @@ +package cn.com.infosouth.arj21.service; + +import java.util.List; +import cn.com.infosouth.arj21.domain.InfoVersion; + +/** + * 参数版本Service接口 + * + * @author kxnf + * @date 2020-03-05 + */ +public interface IInfoVersionService +{ + /** + * 查询参数版本 + * + * @param id 参数版本ID + * @return 参数版本 + */ + public InfoVersion selectInfoVersionById(Long id); + + /** + * 查询参数版本列表 + * + * @param infoVersion 参数版本 + * @return 参数版本集合 + */ + public List selectInfoVersionList(InfoVersion infoVersion); + + /** + * 新增参数版本 + * + * @param infoVersion 参数版本 + * @return 结果 + */ + public int insertInfoVersion(InfoVersion infoVersion); + + /** + * 修改参数版本 + * + * @param infoVersion 参数版本 + * @return 结果 + */ + public int updateInfoVersion(InfoVersion infoVersion); + + /** + * 批量删除参数版本 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteInfoVersionByIds(String ids); + + /** + * 删除参数版本信息 + * + * @param id 参数版本ID + * @return 结果 + */ + public int deleteInfoVersionById(Long id); +} 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 new file mode 100644 index 000000000..6977aab93 --- /dev/null +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/InfoAcTypeServiceImpl.java @@ -0,0 +1,94 @@ +package cn.com.infosouth.arj21.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import cn.com.infosouth.arj21.mapper.InfoAcTypeMapper; +import cn.com.infosouth.arj21.domain.InfoAcType; +import cn.com.infosouth.arj21.service.IInfoAcTypeService; +import cn.com.infosouth.common.core.text.Convert; + +/** + * 机型Service业务层处理 + * + * @author kxnf + * @date 2020-03-05 + */ +@Service +public class InfoAcTypeServiceImpl implements IInfoAcTypeService +{ + @Autowired + private InfoAcTypeMapper infoAcTypeMapper; + + /** + * 查询机型 + * + * @param id 机型ID + * @return 机型 + */ + @Override + public InfoAcType selectInfoAcTypeById(String id) + { + return infoAcTypeMapper.selectInfoAcTypeById(id); + } + + /** + * 查询机型列表 + * + * @param infoAcType 机型 + * @return 机型 + */ + @Override + public List selectInfoAcTypeList(InfoAcType infoAcType) + { + return infoAcTypeMapper.selectInfoAcTypeList(infoAcType); + } + + /** + * 新增机型 + * + * @param infoAcType 机型 + * @return 结果 + */ + @Override + public int insertInfoAcType(InfoAcType infoAcType) + { + return infoAcTypeMapper.insertInfoAcType(infoAcType); + } + + /** + * 修改机型 + * + * @param infoAcType 机型 + * @return 结果 + */ + @Override + public int updateInfoAcType(InfoAcType infoAcType) + { + return infoAcTypeMapper.updateInfoAcType(infoAcType); + } + + /** + * 删除机型对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteInfoAcTypeByIds(String ids) + { + return infoAcTypeMapper.deleteInfoAcTypeByIds(Convert.toStrArray(ids)); + } + + /** + * 删除机型信息 + * + * @param id 机型ID + * @return 结果 + */ + @Override + public int deleteInfoAcTypeById(String id) + { + return infoAcTypeMapper.deleteInfoAcTypeById(id); + } +} diff --git a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/InfoAircraftServiceImpl.java b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/InfoAircraftServiceImpl.java new file mode 100644 index 000000000..1da7cfaaa --- /dev/null +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/InfoAircraftServiceImpl.java @@ -0,0 +1,94 @@ +package cn.com.infosouth.arj21.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import cn.com.infosouth.arj21.mapper.InfoAircraftMapper; +import cn.com.infosouth.arj21.domain.InfoAircraft; +import cn.com.infosouth.arj21.service.IInfoAircraftService; +import cn.com.infosouth.common.core.text.Convert; + +/** + * 飞机Service业务层处理 + * + * @author kxnf + * @date 2020-03-05 + */ +@Service +public class InfoAircraftServiceImpl implements IInfoAircraftService +{ + @Autowired + private InfoAircraftMapper infoAircraftMapper; + + /** + * 查询飞机 + * + * @param id 飞机ID + * @return 飞机 + */ + @Override + public InfoAircraft selectInfoAircraftById(String id) + { + return infoAircraftMapper.selectInfoAircraftById(id); + } + + /** + * 查询飞机列表 + * + * @param infoAircraft 飞机 + * @return 飞机 + */ + @Override + public List selectInfoAircraftList(InfoAircraft infoAircraft) + { + return infoAircraftMapper.selectInfoAircraftList(infoAircraft); + } + + /** + * 新增飞机 + * + * @param infoAircraft 飞机 + * @return 结果 + */ + @Override + public int insertInfoAircraft(InfoAircraft infoAircraft) + { + return infoAircraftMapper.insertInfoAircraft(infoAircraft); + } + + /** + * 修改飞机 + * + * @param infoAircraft 飞机 + * @return 结果 + */ + @Override + public int updateInfoAircraft(InfoAircraft infoAircraft) + { + return infoAircraftMapper.updateInfoAircraft(infoAircraft); + } + + /** + * 删除飞机对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteInfoAircraftByIds(String ids) + { + return infoAircraftMapper.deleteInfoAircraftByIds(Convert.toStrArray(ids)); + } + + /** + * 删除飞机信息 + * + * @param id 飞机ID + * @return 结果 + */ + @Override + public int deleteInfoAircraftById(String id) + { + return infoAircraftMapper.deleteInfoAircraftById(id); + } +} diff --git a/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/InfoVersionServiceImpl.java b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/InfoVersionServiceImpl.java new file mode 100644 index 000000000..e67c9b9e7 --- /dev/null +++ b/infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/InfoVersionServiceImpl.java @@ -0,0 +1,94 @@ +package cn.com.infosouth.arj21.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import cn.com.infosouth.arj21.mapper.InfoVersionMapper; +import cn.com.infosouth.arj21.domain.InfoVersion; +import cn.com.infosouth.arj21.service.IInfoVersionService; +import cn.com.infosouth.common.core.text.Convert; + +/** + * 参数版本Service业务层处理 + * + * @author kxnf + * @date 2020-03-05 + */ +@Service +public class InfoVersionServiceImpl implements IInfoVersionService +{ + @Autowired + private InfoVersionMapper infoVersionMapper; + + /** + * 查询参数版本 + * + * @param id 参数版本ID + * @return 参数版本 + */ + @Override + public InfoVersion selectInfoVersionById(Long id) + { + return infoVersionMapper.selectInfoVersionById(id); + } + + /** + * 查询参数版本列表 + * + * @param infoVersion 参数版本 + * @return 参数版本 + */ + @Override + public List selectInfoVersionList(InfoVersion infoVersion) + { + return infoVersionMapper.selectInfoVersionList(infoVersion); + } + + /** + * 新增参数版本 + * + * @param infoVersion 参数版本 + * @return 结果 + */ + @Override + public int insertInfoVersion(InfoVersion infoVersion) + { + return infoVersionMapper.insertInfoVersion(infoVersion); + } + + /** + * 修改参数版本 + * + * @param infoVersion 参数版本 + * @return 结果 + */ + @Override + public int updateInfoVersion(InfoVersion infoVersion) + { + return infoVersionMapper.updateInfoVersion(infoVersion); + } + + /** + * 删除参数版本对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteInfoVersionByIds(String ids) + { + return infoVersionMapper.deleteInfoVersionByIds(Convert.toStrArray(ids)); + } + + /** + * 删除参数版本信息 + * + * @param id 参数版本ID + * @return 结果 + */ + @Override + public int deleteInfoVersionById(Long id) + { + return infoVersionMapper.deleteInfoVersionById(id); + } +} diff --git a/infosouth-arj21/src/main/resources/mapper/InfoAcTypeMapper.xml b/infosouth-arj21/src/main/resources/mapper/InfoAcTypeMapper.xml new file mode 100644 index 000000000..8d1e62122 --- /dev/null +++ b/infosouth-arj21/src/main/resources/mapper/InfoAcTypeMapper.xml @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + select id, ac_tpye, csv_header_index, csv_content_index, version_id, create_by, create_date, update_by, update_date, remarks, del_flag, ac_type_no from info_ac_type + + + + + + + + insert into info_ac_type + + id, + ac_tpye, + csv_header_index, + csv_content_index, + version_id, + create_by, + create_date, + update_by, + update_date, + remarks, + del_flag, + ac_type_no, + + + #{id}, + #{acTpye}, + #{csvHeaderIndex}, + #{csvContentIndex}, + #{versionId}, + #{createBy}, + #{createDate}, + #{updateBy}, + #{updateDate}, + #{remarks}, + #{delFlag}, + #{acTypeNo}, + + + + + update info_ac_type + + ac_tpye = #{acTpye}, + csv_header_index = #{csvHeaderIndex}, + csv_content_index = #{csvContentIndex}, + version_id = #{versionId}, + create_by = #{createBy}, + create_date = #{createDate}, + update_by = #{updateBy}, + update_date = #{updateDate}, + remarks = #{remarks}, + del_flag = #{delFlag}, + ac_type_no = #{acTypeNo}, + + where id = #{id} + + + + delete from info_ac_type where id = #{id} + + + + delete from info_ac_type where id in + + #{id} + + + + \ No newline at end of file diff --git a/infosouth-arj21/src/main/resources/mapper/InfoAircraftMapper.xml b/infosouth-arj21/src/main/resources/mapper/InfoAircraftMapper.xml new file mode 100644 index 000000000..b0f31352f --- /dev/null +++ b/infosouth-arj21/src/main/resources/mapper/InfoAircraftMapper.xml @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + select id, create_by, create_date, update_by, update_date, remarks, del_flag, ac_reg, info_ac_type_id, upload_dir_id, airCompanyId from info_aircraft + + + + + + + + insert into info_aircraft + + id, + create_by, + create_date, + update_by, + update_date, + remarks, + del_flag, + ac_reg, + info_ac_type_id, + upload_dir_id, + airCompanyId, + + + #{id}, + #{createBy}, + #{createDate}, + #{updateBy}, + #{updateDate}, + #{remarks}, + #{delFlag}, + #{acReg}, + #{infoAcTypeId}, + #{uploadDirId}, + #{aircompanyid}, + + + + + update info_aircraft + + create_by = #{createBy}, + create_date = #{createDate}, + update_by = #{updateBy}, + update_date = #{updateDate}, + remarks = #{remarks}, + del_flag = #{delFlag}, + ac_reg = #{acReg}, + info_ac_type_id = #{infoAcTypeId}, + upload_dir_id = #{uploadDirId}, + airCompanyId = #{aircompanyid}, + + where id = #{id} + + + + delete from info_aircraft where id = #{id} + + + + delete from info_aircraft where id in + + #{id} + + + + \ No newline at end of file diff --git a/infosouth-arj21/src/main/resources/mapper/InfoVersionMapper.xml b/infosouth-arj21/src/main/resources/mapper/InfoVersionMapper.xml new file mode 100644 index 000000000..ac2700d03 --- /dev/null +++ b/infosouth-arj21/src/main/resources/mapper/InfoVersionMapper.xml @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + select id, ver_name, ver_desc, csv_header_index, csv_content_index, script_language, create_by, create_date, update_by, update_date, remarks, del_flag from info_version + + + + + + + + insert into info_version + + ver_name, + ver_desc, + csv_header_index, + csv_content_index, + script_language, + create_by, + create_date, + update_by, + update_date, + remarks, + del_flag, + + + #{verName}, + #{verDesc}, + #{csvHeaderIndex}, + #{csvContentIndex}, + #{scriptLanguage}, + #{createBy}, + #{createDate}, + #{updateBy}, + #{updateDate}, + #{remarks}, + #{delFlag}, + + + + + update info_version + + ver_name = #{verName}, + ver_desc = #{verDesc}, + csv_header_index = #{csvHeaderIndex}, + csv_content_index = #{csvContentIndex}, + script_language = #{scriptLanguage}, + create_by = #{createBy}, + create_date = #{createDate}, + update_by = #{updateBy}, + update_date = #{updateDate}, + remarks = #{remarks}, + del_flag = #{delFlag}, + + where id = #{id} + + + + delete from info_version where id = #{id} + + + + delete from info_version where id in + + #{id} + + + + \ No newline at end of file diff --git a/infosouth-generator/src/main/resources/vm/java/controller.java.vm b/infosouth-generator/src/main/resources/vm/java/controller.java.vm index ed3ed0769..8d29228a5 100644 --- a/infosouth-generator/src/main/resources/vm/java/controller.java.vm +++ b/infosouth-generator/src/main/resources/vm/java/controller.java.vm @@ -10,18 +10,18 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import Log; -import BusinessType; +import cn.com.infosouth.common.annotation.Log; +import cn.com.infosouth.common.enums.BusinessType; import ${packageName}.domain.${ClassName}; import ${packageName}.service.I${ClassName}Service; -import BaseController; -import AjaxResult; -import ExcelUtil; +import cn.com.infosouth.common.core.controller.BaseController; +import cn.com.infosouth.common.core.domain.AjaxResult; +import cn.com.infosouth.common.utils.poi.ExcelUtil; #if($table.crud) -import TableDataInfo; +import cn.com.infosouth.common.core.page.TableDataInfo; #elseif($table.tree) -import StringUtils; -import Ztree; +import cn.com.infosouth.common.utils.StringUtils; +import cn.com.infosouth.common.core.domain.Ztree; #end /** diff --git a/infosouth-generator/src/main/resources/vm/java/domain.java.vm b/infosouth-generator/src/main/resources/vm/java/domain.java.vm index c9220897b..605c87cf8 100644 --- a/infosouth-generator/src/main/resources/vm/java/domain.java.vm +++ b/infosouth-generator/src/main/resources/vm/java/domain.java.vm @@ -2,11 +2,11 @@ package ${packageName}.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import Excel; +import cn.com.infosouth.common.annotation.Excel; #if($table.crud) -import BaseEntity; +import cn.com.infosouth.common.core.domain.BaseEntity; #elseif($table.tree) -import TreeEntity; +import cn.com.infosouth.common.core.domain.TreeEntity; #end #foreach ($import in $importList) import ${import}; diff --git a/infosouth-generator/src/main/resources/vm/java/service.java.vm b/infosouth-generator/src/main/resources/vm/java/service.java.vm index 613c519ff..62c926493 100644 --- a/infosouth-generator/src/main/resources/vm/java/service.java.vm +++ b/infosouth-generator/src/main/resources/vm/java/service.java.vm @@ -3,7 +3,7 @@ package ${packageName}.service; import java.util.List; import ${packageName}.domain.${ClassName}; #if($table.tree) -import Ztree; +import cn.com.infosouth.common.core.domain.Ztree; #end /** diff --git a/infosouth-generator/src/main/resources/vm/java/serviceImpl.java.vm b/infosouth-generator/src/main/resources/vm/java/serviceImpl.java.vm index ab2a94c28..4a0333cc3 100644 --- a/infosouth-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ b/infosouth-generator/src/main/resources/vm/java/serviceImpl.java.vm @@ -3,11 +3,11 @@ package ${packageName}.service.impl; import java.util.List; #if($table.tree) import java.util.ArrayList; -import Ztree; +import cn.com.infosouth.common.core.domain.Ztree; #end #foreach ($column in $columns) #if($column.javaField == 'createTime' || $column.javaField == 'updateTime') -import DateUtils; +import cn.com.infosouth.common.utils.DateUtils; #break #end #end @@ -16,7 +16,7 @@ import org.springframework.stereotype.Service; import ${packageName}.mapper.${ClassName}Mapper; import ${packageName}.domain.${ClassName}; import ${packageName}.service.I${ClassName}Service; -import Convert; +import cn.com.infosouth.common.core.text.Convert; /** * ${functionName}Service业务层处理