From 35a6e0eea4c55c5ed8607d7a7db340caa10904ea Mon Sep 17 00:00:00 2001 From: "714943302@qq.com" Date: Thu, 1 Nov 2018 18:02:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE=E5=AD=97?= =?UTF-8?q?=E5=85=B8=20=E5=AE=9E=E4=BD=93=E7=B1=BB=EF=BC=8CDAO=20=EF=BC=8C?= =?UTF-8?q?=20controller=20=E3=80=81Dto=E3=80=81Convert=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dictionary/DictionaryController.java | 35 ++++++++++++++----- .../dao/dictionary/DatadicItemDao.java | 5 +-- .../entity/dictionary/DatadicItem.java | 12 +++---- .../convert/DatadicItemsConvert.java | 11 ++++++ 4 files changed, 46 insertions(+), 17 deletions(-) create mode 100644 src/main/java/com/gzzn/omms/adminapi/dto/dictionary/convert/DatadicItemsConvert.java diff --git a/src/main/java/com/gzzn/omms/adminapi/controller/dictionary/DictionaryController.java b/src/main/java/com/gzzn/omms/adminapi/controller/dictionary/DictionaryController.java index 5c33d15..a6c18d1 100644 --- a/src/main/java/com/gzzn/omms/adminapi/controller/dictionary/DictionaryController.java +++ b/src/main/java/com/gzzn/omms/adminapi/controller/dictionary/DictionaryController.java @@ -1,16 +1,17 @@ package com.gzzn.omms.adminapi.controller.dictionary; +import io.swagger.annotations.ApiOperation; 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.PathVariable; import org.springframework.web.bind.annotation.RestController; - +import com.gzzn.omms.adminapi.domain.primary.dao.dictionary.DatadicItemDao; +import com.gzzn.omms.adminapi.domain.primary.entity.dictionary.DatadicItem; import com.gzzn.omms.adminapi.dto.ResponseDto; import com.gzzn.omms.adminapi.dto.dictionary.DatadicItemsDto; -import com.gzzn.omms.adminapi.enums.ResultCode; - -import io.swagger.annotations.ApiOperation; +import com.gzzn.omms.adminapi.dto.dictionary.convert.DatadicItemsConvert; /** * 字典控制器 @@ -19,10 +20,28 @@ import io.swagger.annotations.ApiOperation; */ @RestController public class DictionaryController { + /** + * 字典接口 + */ + @Autowired + private DatadicItemDao datadicItemDao; + /** + * 字典Dto接口 + */ + @Autowired + private DatadicItemsConvert datadicItemsConvert; @ApiOperation(value="获取字典列表",tags="字典管理") - @GetMapping(value="/dictionary/datadicItems/{code}") - public ResponseDto> findAllByGroupCode(@PathVariable String code) { - return ResponseDto.failure(ResultCode.INTERFACE_NOT_IMPLEMENT); + @GetMapping(value="/dictionary/datadicItems/{groupCode}") + public ResponseDto> findAllByGroupCode(@PathVariable String groupCode) { + List datadicItemsList = datadicItemDao.findAllByGroupCode(groupCode); + + //转换dto + List fimsFlightschdSeasonsListDto = datadicItemsList.stream().map(x -> { + DatadicItemsDto dto = datadicItemsConvert.datadicItemToDatadicItemsDto(x); + return dto; + }).collect(Collectors.toList()); + + return ResponseDto.success(fimsFlightschdSeasonsListDto); } } diff --git a/src/main/java/com/gzzn/omms/adminapi/domain/primary/dao/dictionary/DatadicItemDao.java b/src/main/java/com/gzzn/omms/adminapi/domain/primary/dao/dictionary/DatadicItemDao.java index b41fc72..df34d08 100644 --- a/src/main/java/com/gzzn/omms/adminapi/domain/primary/dao/dictionary/DatadicItemDao.java +++ b/src/main/java/com/gzzn/omms/adminapi/domain/primary/dao/dictionary/DatadicItemDao.java @@ -1,9 +1,10 @@ package com.gzzn.omms.adminapi.domain.primary.dao.dictionary; +import java.util.List; import org.springframework.data.repository.CrudRepository; - import com.gzzn.omms.adminapi.domain.primary.entity.dictionary.DatadicItem; - public interface DatadicItemDao extends CrudRepository{ + //根据字典groupCode查询 + List findAllByGroupCode(String groupCode); } \ No newline at end of file diff --git a/src/main/java/com/gzzn/omms/adminapi/domain/primary/entity/dictionary/DatadicItem.java b/src/main/java/com/gzzn/omms/adminapi/domain/primary/entity/dictionary/DatadicItem.java index 6c4364c..ad14fe8 100644 --- a/src/main/java/com/gzzn/omms/adminapi/domain/primary/entity/dictionary/DatadicItem.java +++ b/src/main/java/com/gzzn/omms/adminapi/domain/primary/entity/dictionary/DatadicItem.java @@ -3,10 +3,8 @@ package com.gzzn.omms.adminapi.domain.primary.entity.dictionary; import java.io.Serializable; import javax.persistence.*; - /** - * The persistent class for the datadic_items database table. - * + * 数据字典 */ @Entity @Table(name="adminapi_datadic_items") @@ -16,16 +14,16 @@ public class DatadicItem implements Serializable { @Id @Column(name="dataitem_code") - private String dataitemCode; + private String dataitemCode; //数据字典编码 @Column(name="dataitem_desc") - private String dataitemDesc; + private String dataitemDesc; //数据字典描述 @Column(name="dataitem_name") - private String dataitemName; + private String dataitemName; //数据字典名称 @Column(name="group_code") - private String groupCode; + private String groupCode; //字典分组Code public DatadicItem() { } diff --git a/src/main/java/com/gzzn/omms/adminapi/dto/dictionary/convert/DatadicItemsConvert.java b/src/main/java/com/gzzn/omms/adminapi/dto/dictionary/convert/DatadicItemsConvert.java new file mode 100644 index 0000000..31e0e19 --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/dto/dictionary/convert/DatadicItemsConvert.java @@ -0,0 +1,11 @@ +package com.gzzn.omms.adminapi.dto.dictionary.convert; + +import org.mapstruct.Mapper; +import com.gzzn.omms.adminapi.domain.primary.entity.dictionary.DatadicItem; +import com.gzzn.omms.adminapi.dto.dictionary.DatadicItemsDto; + +@Mapper(componentModel="spring") +public interface DatadicItemsConvert { + + public DatadicItemsDto datadicItemToDatadicItemsDto(DatadicItem datadicItem); +} \ No newline at end of file