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

src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java

@@ -6,11 +6,8 @@ import io.swagger.annotations.ApiOperation;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.UUID;
 import java.util.stream.Collectors;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -25,6 +22,7 @@ import com.gzzn.omms.adminapi.dto.ResponseDto;
 import com.gzzn.omms.adminapi.dto.settings.UisettingsDto;
 import com.gzzn.omms.adminapi.dto.settings.convert.UisettingsConvert;
 import com.gzzn.omms.adminapi.service.IUserService;
+import com.gzzn.omms.adminapi.utils.CommonUtils;
 
 @RestController
 public class UISettingsController {
@@ -57,24 +55,19 @@ public class UISettingsController {
 		   @RequestParam(required=false) String envCode,
 		   @RequestParam(required=false) String groupCode)
 	{
-		String uid = iUserService.getCurrentUserId();
-		System.out.println(uid);
-		
-		String uname= iUserService.getCurrentUserName();
-		System.out.println(uname);
-		
 		List<Uisettings> uisettingsList = new ArrayList<Uisettings>();
-		if (envCode!=null && envCode!="") {
+		if(!StringUtils.isEmpty(envCode) && !StringUtils.isEmpty(groupCode)){
-			//envCode条件
-			uisettingsList = uisettingsDao.findByEnvCode(envCode);
-		}
-		if (groupCode!=null && groupCode!="") {
-			//groupCode条件
-			uisettingsList = uisettingsDao.findByGroupCode(groupCode);
-		}
-		if((envCode!=null && envCode!="") && (groupCode!=null && groupCode!="")){
 			//包括envCode、groupCode条件
 			uisettingsList = uisettingsDao.findByEnvCodeAndGroupCode(envCode,groupCode);
+		}else{
+			if (!StringUtils.isEmpty(envCode) && StringUtils.isEmpty(groupCode)) {
+				//envCode条件
+				uisettingsList = uisettingsDao.findByEnvCode(envCode);
+			}
+			if (StringUtils.isEmpty(envCode) && !StringUtils.isEmpty(groupCode)) {
+				//groupCode条件
+				uisettingsList = uisettingsDao.findByGroupCode(groupCode);
+			}
 		}
 		
 		//转换dto
@@ -101,7 +94,7 @@ public class UISettingsController {
 		
 		if(StringUtils.isEmpty(uisettings.getId()))
 		{
-			uisettings.setId(UUID.randomUUID().toString()); //uuid自动生成
+			uisettings.setId(CommonUtils.getUUID32()); //uuid自动生成
 		}
 					
 		uisettings = uisettingsDao.save(uisettings);

src/main/java/com/gzzn/omms/adminapi/utils/CommonUtils.java

@@ -0,0 +1,23 @@
+package com.gzzn.omms.adminapi.utils;
+
+import java.util.UUID;
+/**
+ * @author gln
+ * @Description: 数据中心实例
+ * @date 2018年5月15日
+ */
+public class CommonUtils {
+	//获取uuid
+	public static String getUUID32(){
+	    String uuid = UUID.randomUUID().toString().replace("-", "").toLowerCase();
+	    return uuid;
+	}
+	
+	//字符串转整数
+	public static Integer strToInt(String tempStr) {
+		if(tempStr!=""&&tempStr!=null) {
+			return Integer.parseInt(tempStr);
+		}
+		return 0;
+	}
+}