From eb5cb09704e92fbc36de093532aeb38a3c284800 Mon Sep 17 00:00:00 2001 From: zhouxiunai <154707516@qq.com> Date: Wed, 21 Nov 2018 10:48:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=88=AA=E7=8F=AD=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=8E=A5=E5=8F=A3=E5=AE=9E=E7=8E=B0=E5=8F=8A=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/SysFlightStatusController.java | 48 ++++++++++++++ .../settings/UISettingsController.java | 5 ++ .../dao/basicdata/SysFlightStatusDao.java | 9 +++ .../entity/baiscdata/SysFlightStatus.java | 61 ++++++++++++++++++ .../dto/basicdata/SysFlightStatusDto.java | 64 +++++++++++++++++++ .../convert/SysFlightStatusConvert.java | 12 ++++ 6 files changed, 199 insertions(+) create mode 100644 src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysFlightStatusController.java create mode 100644 src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/SysFlightStatusDao.java create mode 100644 src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/baiscdata/SysFlightStatus.java create mode 100644 src/main/java/com/gzzn/omms/adminapi/dto/basicdata/SysFlightStatusDto.java create mode 100644 src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysFlightStatusConvert.java diff --git a/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysFlightStatusController.java b/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysFlightStatusController.java new file mode 100644 index 0000000..1cec24c --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/controller/basicdata/SysFlightStatusController.java @@ -0,0 +1,48 @@ +package com.gzzn.omms.adminapi.controller.basicdata; + +import java.util.List; +import java.util.stream.Collectors; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.gzzn.omms.adminapi.domain.secondary.dao.basicdata.SysFlightStatusDao; +import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.SysFlightStatus; +import com.gzzn.omms.adminapi.dto.ResponseDto; +import com.gzzn.omms.adminapi.dto.basicdata.SysFlightStatusDto; +import com.gzzn.omms.adminapi.dto.basicdata.convert.SysFlightStatusConvert; + +import io.swagger.annotations.ApiOperation; + +/** + * 航班外部状态代码 + * @author Administrator + * + */ +@RestController +public class SysFlightStatusController { + + @Autowired + private SysFlightStatusConvert sysFlightStatusConvert; + + @Autowired + private SysFlightStatusDao sysFlightStatusDao; + + /** + * 获取所有航班外部状态代码 + * @return + */ + @ApiOperation(value="获取航班外部状态代码列表",tags="基础数据") + @GetMapping(value="/basicdata/sysFlightStatus") + public ResponseDto> getSysFlightStatus() { + List sysFlightStatus = (List) sysFlightStatusDao.findAll(); + + //转换dto + List dtoList = sysFlightStatus.stream().map( + x -> sysFlightStatusConvert.SysFlightStatusToSysFlightStatusDto(x) + ).collect(Collectors.toList()); + + return ResponseDto.success(dtoList); + } +} diff --git a/src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java b/src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java index cdbf41d..049a4a1 100644 --- a/src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java +++ b/src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java @@ -58,6 +58,11 @@ public class UISettingsController { @RequestParam(required=false) String groupCode) { String uid = iUserService.getCurrentUserId(); + System.out.println(uid); + + String uname= iUserService.getCurrentUserName(); + System.out.println(uname); + List uisettingsList = new ArrayList(); if (envCode!=null && envCode!="") { //envCode条件 diff --git a/src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/SysFlightStatusDao.java b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/SysFlightStatusDao.java new file mode 100644 index 0000000..b754e48 --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/dao/basicdata/SysFlightStatusDao.java @@ -0,0 +1,9 @@ +package com.gzzn.omms.adminapi.domain.secondary.dao.basicdata; + +import org.springframework.data.repository.CrudRepository; + +import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.SysFlightStatus; + +public interface SysFlightStatusDao extends CrudRepository { + +} diff --git a/src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/baiscdata/SysFlightStatus.java b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/baiscdata/SysFlightStatus.java new file mode 100644 index 0000000..789481f --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/domain/secondary/entity/baiscdata/SysFlightStatus.java @@ -0,0 +1,61 @@ +package com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata; + +import java.io.Serializable; +import javax.persistence.*; + + +/** + * The persistent class for the SYS_FLIGHT_STATUS database table. + * 航班外部状态代码表 + */ +@Entity +@Table(name="SYS_FLIGHT_STATUS") +@NamedQuery(name="SysFlightStatus.findAll", query="SELECT s FROM SysFlightStatus s") +public class SysFlightStatus implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + private String sttc;//航班状态代码 + + private String abns;//航班状态描述 + + private String stdc;//航班状态中文描述 + + private String sttd;//这个状态是否为异常状态 Y-是一个异常状态 N-不是一个异常状态 + + public SysFlightStatus() { + } + + public String getSttc() { + return this.sttc; + } + + public void setSttc(String sttc) { + this.sttc = sttc; + } + + public String getAbns() { + return this.abns; + } + + public void setAbns(String abns) { + this.abns = abns; + } + + public String getStdc() { + return this.stdc; + } + + public void setStdc(String stdc) { + this.stdc = stdc; + } + + public String getSttd() { + return this.sttd; + } + + public void setSttd(String sttd) { + this.sttd = sttd; + } + +} \ No newline at end of file diff --git a/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/SysFlightStatusDto.java b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/SysFlightStatusDto.java new file mode 100644 index 0000000..6834731 --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/SysFlightStatusDto.java @@ -0,0 +1,64 @@ +package com.gzzn.omms.adminapi.dto.basicdata; + +import java.io.Serializable; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + + +/** + * + * 航班外部状态代码Dto + */ +@ApiModel(value="航班外部状态代码Dto",description="航班外部状态代码基础数据") +public class SysFlightStatusDto implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value="航班状态代码",example="EARR") + private String sttc;// + + @ApiModelProperty(value="航班状态描述",example="Estimated Arrive") + private String abns;// + + @ApiModelProperty(value="航班状态中文描述",example="预计到达") + private String stdc;// + + @ApiModelProperty(value="是否异常状态",example="N") + private String sttd;//这个状态是否为异常状态 Y-是一个异常状态 N-不是一个异常状态 + + public SysFlightStatusDto() { + } + + public String getSttc() { + return this.sttc; + } + + public void setSttc(String sttc) { + this.sttc = sttc; + } + + public String getAbns() { + return this.abns; + } + + public void setAbns(String abns) { + this.abns = abns; + } + + public String getStdc() { + return this.stdc; + } + + public void setStdc(String stdc) { + this.stdc = stdc; + } + + public String getSttd() { + return this.sttd; + } + + public void setSttd(String sttd) { + this.sttd = sttd; + } + +} \ No newline at end of file diff --git a/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysFlightStatusConvert.java b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysFlightStatusConvert.java new file mode 100644 index 0000000..40e76f0 --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/dto/basicdata/convert/SysFlightStatusConvert.java @@ -0,0 +1,12 @@ +package com.gzzn.omms.adminapi.dto.basicdata.convert; + +import org.mapstruct.Mapper; + +import com.gzzn.omms.adminapi.domain.secondary.entity.baiscdata.SysFlightStatus; +import com.gzzn.omms.adminapi.dto.basicdata.SysFlightStatusDto; + +@Mapper(componentModel="spring") +public interface SysFlightStatusConvert { +public SysFlightStatus SysFlightStatusDtoToSysFlightStatus(SysFlightStatusDto SysFlightStatusDto); +public SysFlightStatusDto SysFlightStatusToSysFlightStatusDto(SysFlightStatus SysFlightStatusDto); +}