修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/KeySiteController.java

@@ -7,6 +7,7 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.yeejoin.amos.boot.module.common.biz.enums.DynamicGroupCode;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -109,6 +110,13 @@ public class KeySiteController extends BaseController {
 		ids.add(model.getBuildingId().toString());
 		Map<String, String> map3 = keySiteService.getNodeAllParentIds(ids);
 		model.setParentBuildingId(map3.get(model.getBuildingId().toString()));
+		//由于前段防火等级
+		if(model.getFireEnduranceRateName()!=null){
+
+			model.setFireEnduranceRate(DynamicGroupCode.getEnum(model.getFireEnduranceRateName()).getCode());
+		}
+
+
 		KeySiteDto entity = keySiteService.save(model);
 		return ResponseHelper.buildResponse(entity);
 	}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/enums/DynamicGroupCode.java

@@ -2,7 +2,15 @@ package com.yeejoin.amos.boot.module.common.biz.enums;
 
 public enum DynamicGroupCode {
 
-    JCS_PERSON("机场人员", "246");
+    JCS_PERSON("机场人员", "246"),
+    JCS_YIJ("一级", "852"),
+    JCS_ERJ("二级", "853"),
+    JCS_SANJ("三级", "854"),
+    JCS_SIJ("四级", "855");
+
+
+
+
 
     private String name;
     private String code;
@@ -27,4 +35,13 @@ public enum DynamicGroupCode {
         this.name = name;
         this.code = code;
     }
+
+    public static DynamicGroupCode getEnum(String name) {
+        for (DynamicGroupCode bEnum : DynamicGroupCode.values()) {
+            if (bEnum.getName().equals(name)) {
+                return bEnum;
+            }
+        }
+        return null;
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java

@@ -2256,7 +2256,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
             pushMessageWebAndAppRo.setName("消息");
             pushMessageWebAndAppRo.setCompanyName(smsParams.get("alertType"));
             pushMessageWebAndAppRo.setAddress(smsParams.get("address"));
-            pushMessageWebAndAppRo.setSendTime(besidesMap.get("sendTime"));
+            pushMessageWebAndAppRo.setSendTime(simpleDateFormat.format(new Date()));
             pushMessageWebAndAppRo.setTransferLocation(smsParams.get("replaceContent"));
             pushMessageWebAndAppRo.setTrappedNum(smsParams.get("trappedNum"));//被困人数
             pushMessageWebAndAppRo.setCasualtiesNum(smsParams.get("casualtiesNum"));//伤亡人数
@@ -2267,7 +2267,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
             pushMessageWebAndAppRo.setName(AlertBusinessTypeEnum.力量调派.getName());
             pushMessageWebAndAppRo.setCompanyName(smsParams.get("resourcesNum"));
             pushMessageWebAndAppRo.setAddress(smsParams.get("address"));
-            pushMessageWebAndAppRo.setSendTime(smsParams.get("callTimeStr"));
+            pushMessageWebAndAppRo.setSendTime(simpleDateFormat.format(new Date()));
             if(StringUtils.isNotBlank(besidesMap.get("transferLocation"))) {
                 pushMessageWebAndAppRo.setTransferLocation(besidesMap.get("responseLevelString"));//响应级别
                 pushMessageWebAndAppRo.setRuleType("fullTime");

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java

@@ -199,8 +199,10 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
             }
         }
         if (fullTimeList.size() > 0) {
+
             ruleAlertCalledService.powerTransferCalledRule(fullTimeList, powerTransferDto.getAlertCalledId(),
                     FireBrigadeTypeEnum.专职消防队.getKey(), powerTransferDto.getCompanyName());
+//            Thread.sleep(1000);
         }
         if (medicalTeamList.size() > 0) {
             ruleAlertCalledService.powerTransferCalledRule(medicalTeamList, powerTransferDto.getAlertCalledId(),
@@ -210,6 +212,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
         if (monitorTeamList.size() > 0) {
             ruleAlertCalledService.powerTransferCalledRule(monitorTeamList, powerTransferDto.getAlertCalledId(),
                     FireBrigadeTypeEnum.监控大队.getKey(), powerTransferDto.getCompanyName());
+//            Thread.sleep(1000);
 
         }
     }