修改安全等级计算接口，

修改应急保障成员页面及存储方式

spring-cloud/server-basic/src/main/java/com/jd/service/impl/SafetyInfoServiceImpl.java

@@ -289,7 +289,7 @@ public class SafetyInfoServiceImpl implements SafetyInfoService {
         if(Blank.isEmpty(safetyInfo.get("middle_risk_number")) || Blank.isEmpty(safetyInfo.get("high_risk_number"))){
             return SendUtil.send(false, "无数据");
         }
-        Integer safetyLevel = 0;
+        String safetyLevel = "";
         Integer highRiskNumber = Convert.toInt(safetyInfo.get("high_risk_number").toString());
         Integer middleRiskNumber = Convert.toInt(safetyInfo.get("middle_risk_number").toString());
         // 高危漏洞规则分割值1
@@ -315,15 +315,15 @@ public class SafetyInfoServiceImpl implements SafetyInfoService {
         }
         //安全等级 差
         if (highRiskNumber > safetyHighFlag_2 || middleRiskNumber > safetyMiddleFlag_2) {
-            safetyLevel = 3;
+            safetyLevel = "差";
         }else if ((safetyHighFlag_1 <= highRiskNumber && highRiskNumber <= safetyHighFlag_2)
                 || (middleRiskNumber > safetyMiddleFlag_1 && middleRiskNumber <= safetyMiddleFlag_2)) {
-            safetyLevel = 2;
+            safetyLevel = "良";
         }else {
-            safetyLevel = 1;
+            safetyLevel = "优";
         }
         //计算风险系数
-        Integer riskCoefficient = 0;
+        String riskCoefficient = "";
         //获取风险系数计算规则
         // 风险系数规则分割值1
         Integer riskFlag_1 = 0;
@@ -338,12 +338,19 @@ public class SafetyInfoServiceImpl implements SafetyInfoService {
                 riskFlag_2 = Convert.toInt(map.get("data_value").toString());
             }
         }
+        SimpleDateFormat sdf = new SimpleDateFormat("YYYY-MM-dd+hh:mm:ss");
+        Calendar calender = Calendar.getInstance();
+        //String startTime = "2022-05-25+00:00:00";
+        //String endTime = "2022-05-30+17:05:00";
+        String endTime = sdf.format(calender.getTime());
+        calender.add(Calendar.HOUR,-24 );
+        String startTime = sdf.format(calender.getTime());
         ApiUrl apiUrl = new ApiUrl();
         apiUrl.setUrlPrefix("https://23.37.0.200");
         apiUrl.setUrlApi("/api/security/incident/overview");
         apiUrl.setUrlMethod("GET");
         apiUrl.setUrlParamType(2);
-        String params = "{\"keyword\":\"\",\"startTime\":\"2022-05-25+00:00:00\",\"endTime\":\"2022-05-30+17:05:00\",\"threatSeverity\":\"\"}";
+        String params = "{\"keyword\":\"\",\"startTime\":\""+startTime+"\",\"endTime\":\""+endTime+"\",\"threatSeverity\":\"\"}";
         //通过threeAPI调用第三方接口
         //Map<String, Object> apiMap = threeApiClient.sendApiUrlAndParam(urlCode, params);
         String apiString = sendHttpRequest(apiUrl, params);
@@ -355,12 +362,13 @@ public class SafetyInfoServiceImpl implements SafetyInfoService {
         if(Blank.isNotEmpty(attackMap)){
             if(Blank.isNotEmpty(attackMap.get("High"))){
                 attackHighNum = Convert.toInt(attackMap.get("High").toString());
+
                 if(attackHighNum < riskFlag_1){
-                    riskCoefficient = 1;
+                    riskCoefficient = "低";
                 }else if (attackHighNum > riskFlag_1 && attackHighNum < riskFlag_2){
-                    riskCoefficient = 2;
+                    riskCoefficient = "中";
                 }else {
-                    riskCoefficient = 3;
+                    riskCoefficient = "高";
                 }
             }
         }

spring-cloud/server-basic/src/main/resources/mapper/GuaranteeGroupMapper.xml

@@ -103,6 +103,7 @@
         (#{officeId},
          #{name},
          #{gender},
+         #{phone},
          now())
     </insert>
 

spring-cloud/server-page/src/main/resources/static/page/guaranteeGroupManager.html

@@ -75,6 +75,8 @@
 						<label class="layui-form-label">电话号码：</label>
 						<div class="layui-input-inline">
 							<input type="text" name="phone" id="phone" required  lay-verify="required" 
+							onKeyPress="if(event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;"
+							onKeyUp="this.value=this.value.replace(/\D/g,'')" maxlength="12"
 							placeholder="请输入电话号码" autocomplete="off" class="layui-input">
 						</div>
 					</div>