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/controller/settings/UISettingsController.java b/src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java index 81b9b8c..53b95ce 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 @@ -1,25 +1,46 @@ package com.gzzn.omms.adminapi.controller.settings; -import java.util.List; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; +import java.util.stream.Collectors; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import com.gzzn.omms.adminapi.domain.primary.dao.settings.UisettingsDao; +import com.gzzn.omms.adminapi.domain.primary.entity.settings.Uisettings; import com.gzzn.omms.adminapi.dto.ResponseDto; -import com.gzzn.omms.adminapi.dto.settings.FindByCurUserAndCondsDto; import com.gzzn.omms.adminapi.dto.settings.UisettingsDto; -import com.gzzn.omms.adminapi.enums.ResultCode; - -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; +import com.gzzn.omms.adminapi.dto.settings.convert.UisettingsConvert; +import com.gzzn.omms.adminapi.service.IUserService; @RestController public class UISettingsController { + /** + * UI设置接口 + */ + @Autowired + private UisettingsDao uisettingsDao; + /** + * UI设置Dto接口 + */ + @Autowired + private UisettingsConvert uisettingsConvert; + /** + * 获取当前用户ID + */ + private IUserService iUserService; /** * 根据条件查找当前用户所有UI设置 * @return @@ -30,10 +51,28 @@ public class UISettingsController { @ApiImplicitParam(name="groupCode",value="分组Code",dataType="string", paramType = "query",example="msgalert")}) @GetMapping(value="/settings/uisettings") public ResponseDto> findByCurUserAndConds( - @RequestParam(required=false) - FindByCurUserAndCondsDto conditionsDto) + @RequestParam(required=false) String envCode, + @RequestParam(required=false) String groupCode) { - return ResponseDto.failure(ResultCode.INTERFACE_NOT_IMPLEMENT); + List uisettingsList = new ArrayList(); + if (envCode!=null) { + //envCode条件 + uisettingsList = uisettingsDao.findByEnvCode(envCode); + }else if (groupCode!=null) { + //groupCode条件 + uisettingsList = uisettingsDao.findByGroupCode(groupCode); + }else { + //包括envCode、groupCode条件 + uisettingsList = uisettingsDao.findByEnvCodeAndGroupCode(envCode,groupCode); + } + + //转换dto + List uisettingsListDto = uisettingsList.stream().map(x -> { + UisettingsDto dto = uisettingsConvert.uisettingsToUisettingsDto(x); + return dto; + }).collect(Collectors.toList()); + + return ResponseDto.success(uisettingsListDto); } @@ -44,8 +83,18 @@ public class UISettingsController { */ @ApiOperation(value="保存当前用户的UI设置",tags="UI设置") @PostMapping(value="/settings/uisettings") - public ResponseDto saveUISettings(@RequestBody UisettingsDto uisettingsDto) + public ResponseDto saveUISettings(@RequestBody UisettingsDto uisettingsDto) { - return ResponseDto.failure(ResultCode.INTERFACE_NOT_IMPLEMENT); + //Dto转实体类 + Uisettings uisettings = uisettingsConvert.uisettingsDtoToUisettings(uisettingsDto); + + if(StringUtils.isEmpty(uisettings.getId())) + { + uisettings.setId(UUID.randomUUID().toString()); //uuid自动生成 + } + + uisettings = uisettingsDao.save(uisettings); + + return ResponseDto.success(uisettings.getId()); } } 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/dao/settings/UisettingsDao.java b/src/main/java/com/gzzn/omms/adminapi/domain/primary/dao/settings/UisettingsDao.java new file mode 100644 index 0000000..8f6700d --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/domain/primary/dao/settings/UisettingsDao.java @@ -0,0 +1,20 @@ +package com.gzzn.omms.adminapi.domain.primary.dao.settings; + +import java.util.List; +import org.springframework.data.repository.CrudRepository; +import com.gzzn.omms.adminapi.domain.primary.entity.settings.Uisettings; + +public interface UisettingsDao extends CrudRepository{ + + //根据条件envCode、goupCode查询 + List findByEnvCodeAndGroupCode(String envCode,String goupCode); + + //根据条件envCode查询 + List findByEnvCode(String envCode); + + //根据条件goupCode查询 + List findByGroupCode(String goupCode); + + //保存 + Uisettings save(Uisettings uisettings); +} \ No newline at end of file diff --git a/src/main/java/com/gzzn/omms/adminapi/domain/primary/entity/dictionary/DatadicGroup.java b/src/main/java/com/gzzn/omms/adminapi/domain/primary/entity/dictionary/DatadicGroup.java index d68b191..4769487 100644 --- a/src/main/java/com/gzzn/omms/adminapi/domain/primary/entity/dictionary/DatadicGroup.java +++ b/src/main/java/com/gzzn/omms/adminapi/domain/primary/entity/dictionary/DatadicGroup.java @@ -5,7 +5,7 @@ import javax.persistence.*; /** - * The persistent class for the datadic_groups database table. + * 字典分组 * */ @Entity @@ -16,10 +16,10 @@ public class DatadicGroup implements Serializable { @Id @Column(name="group_code") - private String groupCode; + private String groupCode; //分组代码,字典分组代码 @Column(name="group_name") - private String groupName; + private String groupName; //分组名称,字典分组名称 public DatadicGroup() { } 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/domain/primary/entity/settings/Uisettings.java b/src/main/java/com/gzzn/omms/adminapi/domain/primary/entity/settings/Uisettings.java index e379fdb..d89eb65 100644 --- a/src/main/java/com/gzzn/omms/adminapi/domain/primary/entity/settings/Uisettings.java +++ b/src/main/java/com/gzzn/omms/adminapi/domain/primary/entity/settings/Uisettings.java @@ -3,9 +3,8 @@ package com.gzzn.omms.adminapi.domain.primary.entity.settings; import java.io.Serializable; import javax.persistence.*; - /** - * The persistent class for the uisettings database table. + * UI设置 * */ @Entity @@ -18,15 +17,15 @@ public class Uisettings implements Serializable { private String id; @Column(name="env_code") - private String envCode; + private String envCode; //环境配置code , web - 大屏幕环境 mobile - 移动小屏幕 @Column(name="group_code") - private String groupCode; + private String groupCode; //设置分组,设置分组比如msgalert 消息提醒 @Column(name="setting_content") - private String settingContent; + private String settingContent; //具体的设置内容,json格式的设置内容。不超过60KB - private String userid; + private String userid; //用户id public Uisettings() { } diff --git a/src/main/java/com/gzzn/omms/adminapi/domain/primary/entity/settings/UisettingsDefault.java b/src/main/java/com/gzzn/omms/adminapi/domain/primary/entity/settings/UisettingsDefault.java index 464eecd..b9a01a1 100644 --- a/src/main/java/com/gzzn/omms/adminapi/domain/primary/entity/settings/UisettingsDefault.java +++ b/src/main/java/com/gzzn/omms/adminapi/domain/primary/entity/settings/UisettingsDefault.java @@ -1,12 +1,12 @@ package com.gzzn.omms.adminapi.domain.primary.entity.settings; import java.io.Serializable; + import javax.persistence.*; /** - * The persistent class for the uisettings_default database table. - * + * UI设置 */ @Entity @Table(name="adminapi_uisettings_default") @@ -18,13 +18,13 @@ public class UisettingsDefault implements Serializable { private String id; @Column(name="env_code") - private String envCode; + private String envCode; //环境配置code , web - 大屏幕环境 mobile - 移动小屏幕 @Column(name="group_code") - private String groupCode; + private String groupCode; //设置分组,设置分组比如msgalert 消息提醒 @Column(name="setting_content") - private String settingContent; + private String settingContent; //具体的设置内容,json格式的设置内容。不超过60KB public UisettingsDefault() { } 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 diff --git a/src/main/java/com/gzzn/omms/adminapi/dto/settings/convert/UisettingsConvert.java b/src/main/java/com/gzzn/omms/adminapi/dto/settings/convert/UisettingsConvert.java new file mode 100644 index 0000000..5d92123 --- /dev/null +++ b/src/main/java/com/gzzn/omms/adminapi/dto/settings/convert/UisettingsConvert.java @@ -0,0 +1,13 @@ +package com.gzzn.omms.adminapi.dto.settings.convert; + +import org.mapstruct.Mapper; +import com.gzzn.omms.adminapi.domain.primary.entity.settings.Uisettings; +import com.gzzn.omms.adminapi.dto.settings.UisettingsDto; + +@Mapper(componentModel="spring") +public interface UisettingsConvert { + //实体类转Dto + public UisettingsDto uisettingsToUisettingsDto(Uisettings uisettings); + //Dto转实体类 + public Uisettings uisettingsDtoToUisettings(UisettingsDto uisettingsDto); +}