修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/CommonResponseUtil.java

@@ -9,15 +9,15 @@ public class CommonResponseUtil
 	private CommonResponseUtil() {
 	}
 
-	public static ResponseModel<Object> success()
+	public static ResponseModel success()
 	{	
-		ResponseModel<Object> res = new ResponseModel<>();
+		ResponseModel res = new ResponseModel<>();
         res.setDevMessage(Constant.RESULT_SUCCESS);
         res.setStatus(HttpStatus.OK.value());
 		return res;
 	}
 
-	public static ResponseModel<Object> success(Object obj)
+	public static ResponseModel 天success(Object obj)
 	{	
 		ResponseModel<Object> res = new ResponseModel<>();
         res.setResult(obj);
@@ -26,35 +26,35 @@ public class CommonResponseUtil
 		return res;
 	}
 
-	public static ResponseModel<Object> success(Object obj, String message)
+	public static ResponseModel success(Object obj, String message)
 	{	
-		ResponseModel<Object> res = new ResponseModel<>();
+		ResponseModel res = new ResponseModel<>();
         res.setResult(obj);
         res.setDevMessage(message);
         res.setStatus(HttpStatus.OK.value());
 		return res;
 	}
 
-	public static ResponseModel<Object> failure()
+	public static ResponseModel failure()
 	{	
-		ResponseModel<Object> res = new ResponseModel<>();
+		ResponseModel res = new ResponseModel<>();
         res.setDevMessage(Constant.RESULT_FAILURE);
         res.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
 		return res;
 	}
 
-	public static ResponseModel<Object> failure(String message)
+	public static ResponseModel failure(String message)
 	{
-		ResponseModel<Object> res = new ResponseModel<>();
+		ResponseModel res = new ResponseModel<>();
         res.setDevMessage(Constant.RESULT_FAILURE);
         res.setMessage(message);
         res.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
 		return res;
 	}
 
-	public static ResponseModel<Object> failure(Object obj, String message)
+	public static ResponseModel failure(Object obj, String message)
 	{
-		ResponseModel<Object> res = new ResponseModel<>();
+		ResponseModel res = new ResponseModel<>();
         res.setResult(obj);
 		res.setMessage(message);
         res.setDevMessage(Constant.RESULT_FAILURE);

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/EnumsUtils.java

 package com.yeejoin.equipmanage.common.utils;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 
 import java.util.Arrays;
 import java.util.Map;
@@ -20,7 +19,9 @@ public class EnumsUtils {
     private EnumsUtils() {
     }
 
-    private static Map<Class<T>,Object> map = new ConcurrentHashMap<>();
+    private static Map<Class,Object> map = new ConcurrentHashMap<>();
+
+
 
     /**
      * 根据条件获取枚举对象
@@ -30,10 +31,10 @@ public class EnumsUtils {
      * @return
      */
     public static <T> Optional<T> getEnumObject(Class<T> className, Predicate<T> predicate) {
-        Optional<T> da=new Optional<>();
+
         if(!className.isEnum()){
             log.info("Class 不是枚举类");
-            return da;
+            return null;
         }
         Object obj = map.get(className);
         T[] ts = null;