修改接口

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/enums/AlertStageEnums.java

@@ -23,9 +23,12 @@ public  enum  AlertStageEnums {
 	TFSJ("235",	"突发事件救援"),
 	LYXC("237",	"漏油现场安全保障"),
 	ZJBZ("238",	"转机保障"),
-	QTJQ("242",	"其他");
-	
+	QTJQ("242",	"其他"),
 	
+	RG("226",  "人工上报"),
+	DJ("228",  "对讲呼入"),
+	JK("388",  "监控中心报警"),
+	DH("389",  "电话报警");
 
 	
 	

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

@@ -58,6 +58,13 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
    	    // 警情基本信息
          AlertCalled alertCalled = alertCalledVo.getAlertCalled();
          alertCalled.setCallTime(new Date());  
+ 		   if(AlertStageEnums.RG.getValue().equals(alertCalled.getAlertSourceCode())||
+			AlertStageEnums.RG.getValue().equals(alertCalled.getAlertSourceCode())){
+			   alertCalled.setType("0");
+		   }else {
+			   alertCalled.setType("1");
+		   }
+         
          // 判断是否归并警情
          if (alertCalled.getFatherAlert() != null) {
              // 警情归并，设置当前警情状态为结束。