Merge branch 'master' of git@git.int.it2000.com.cn:airport-chengdu/admin-api.git

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 com.gzzn.omms.adminapi.dto.dictionary.convert.DatadicItemsConvert;
-
-import io.swagger.annotations.ApiOperation;
 
 /**
  * 字典控制器
@@ -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}")
+	@GetMapping(value="/dictionary/datadicItems/{groupCode}")
-	public ResponseDto<List<DatadicItemsDto>> findAllByGroupCode(@PathVariable String code) {
+	public ResponseDto<List<DatadicItemsDto>> findAllByGroupCode(@PathVariable String groupCode) {
-		return ResponseDto.failure(ResultCode.INTERFACE_NOT_IMPLEMENT);
+		List<DatadicItem> datadicItemsList = datadicItemDao.findAllByGroupCode(groupCode);
+		
+		//转换dto
+		List<DatadicItemsDto> fimsFlightschdSeasonsListDto = datadicItemsList.stream().map(x -> {
+			DatadicItemsDto dto = datadicItemsConvert.datadicItemToDatadicItemsDto(x);
+			return dto;
+		}).collect(Collectors.toList());
+		
+		return ResponseDto.success(fimsFlightschdSeasonsListDto);
 	}
 }

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 com.gzzn.omms.adminapi.dto.settings.convert.UisettingsConvert;
-
+import com.gzzn.omms.adminapi.service.IUserService;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 
 @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<List<UisettingsDto>> findByCurUserAndConds(
-	                                                              @RequestParam(required=false) 
+		   @RequestParam(required=false) String envCode,
-	                                                              FindByCurUserAndCondsDto conditionsDto)
+		   @RequestParam(required=false) String groupCode)
 	{
-		return ResponseDto.failure(ResultCode.INTERFACE_NOT_IMPLEMENT);
+		List<Uisettings> uisettingsList = new ArrayList<Uisettings>();
+		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<UisettingsDto> 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<String> 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());
 	}
 }

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<DatadicItem,String>{
 
+	//根据字典groupCode查询
+	List<DatadicItem> findAllByGroupCode(String groupCode);
 }

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<Uisettings,String>{
+
+	//根据条件envCode、goupCode查询
+	List<Uisettings> findByEnvCodeAndGroupCode(String envCode,String goupCode);  
+	
+	//根据条件envCode查询
+	List<Uisettings> findByEnvCode(String envCode);
+	
+	//根据条件goupCode查询
+	List<Uisettings> findByGroupCode(String goupCode);
+	
+	//保存
+	Uisettings save(Uisettings uisettings);
+}

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() {
 	}

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() {
 	}

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() {
 	}

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() {
 	}

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);
+}

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);
+}