1.增加管控级别

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/common/enums/ManageLevelEum.java

@@ -32,6 +32,17 @@ public enum  ManageLevelEum {
         return eumList;
     }
 
+    public static String getNameByManageLevel(int level){
+        String name = "";
+        for(ManageLevelEum eum : ManageLevelEum.values()){
+            if(level == eum.getManageLevel()){
+                name = eum.getName();
+                break;
+            }
+        }
+        return name;
+    }
+
     public String getName() {
         return name;
     }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskLevelServiceImpl.java

@@ -7,7 +7,11 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
 
+import com.yeejoin.amos.fas.business.util.StringUtil;
+import com.yeejoin.amos.fas.common.enums.ManageLevelEum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -54,13 +58,16 @@ public class RiskLevelServiceImpl implements IRiskLevelService {
             	userMap.put(users.get(i).getUserId(), users.get(i).getUserName());
     		}
 		}
+
         content.forEach(e -> {
             e.put("userName",userMap.get(String.valueOf(e.get("createBy"))));
+            e.put("manageLevelName",
+					StringUtil.isNotEmpty(e.get("manageLevel"))  ? ManageLevelEum.getNameByManageLevel(Integer.parseInt(e.get("manageLevel").toString())) : "");
         });
-		Page<HashMap<String, Object>> result = new PageImpl<>(content, param, total);
-		return result;
+		return new PageImpl<>(content, param, total);
 	}
 
+
 	@Override
 	public void editRiskLevel(HashMap<String, Object>  map) {
 		RiskLevel param =  (RiskLevel) map.get("param");
@@ -80,7 +87,6 @@ public class RiskLevelServiceImpl implements IRiskLevelService {
 		}
 		//2.删除
 		iRiskLevelDao.deleteAllByIds(param);
-
 	}
 
 	/**

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_risk_level.xml

@@ -25,7 +25,8 @@
 		a.color,
 		a.create_by as createBy,
 		a.create_date as createDate,
-		a.remark
+		a.remark,
+		a.manage_level as manageLevel
 		FROM
 		f_risk_level a
 		<trim prefix="WHERE" prefixOverrides="AND ">