*）修改规则对象属性

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertCalledRo.java

@@ -19,19 +19,24 @@ import lombok.Data;
 @RuleFact(value = "警情信息",project = "西咸机场119接处警规则")
 public class AlertCalledRo implements Serializable{
 
-    /**
+
+
+
+	/**
 	 * <pre>
 	 * 
 	 * </pre>
 	 */
-	private static final long serialVersionUID = -9034974124471572825L;
-
+	private static final long serialVersionUID = 7091835997817930383L;
 
 	/**
 	 * 通用属性
 	 */
 	@Label("警情id")
     private String sequenceNbr;
+	
+	@Label(value = "警情时间")
+    private String callTimeStr;
    
     @Label(value = "警情类型")
     private String alertType;
@@ -39,8 +44,8 @@ public class AlertCalledRo implements Serializable{
     @Label(value = "警情类型code")
     private String alertTypeCode;
     
-    @Label(value = "事发单位")
-    private String unitInvolved;
+    @Label(value = "发送单位")
+    private String companyName;
 
     @Label(value = "被困人数")
     private String trappedNum;

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/rule/action/AlertCalledAction.java

@@ -2,23 +2,16 @@ package com.yeejoin.amos.boot.module.jcs.biz.rule.action;
 
 
 import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertSubmittedServiceImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.typroject.tyboot.core.foundation.utils.StringUtil;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
-import com.alibaba.fastjson.JSON;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledRo;
-import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
-import com.yeejoin.amos.boot.module.jcs.biz.service.impl.OrgUsrServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertSubmittedServiceImpl;
 import com.yeejoin.amos.component.rule.RuleActionBean;
 import com.yeejoin.amos.component.rule.RuleMethod;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
@@ -38,9 +31,6 @@ public class AlertCalledAction {
     public static final Logger log = LoggerFactory.getLogger(AlertCalledAction.class);
 
     @Autowired
-    private OrgUsrServiceImpl orgUsrService;
-
-    @Autowired
     private AlertSubmittedServiceImpl alertSubmittedService;
 
     public void sendSysMessage(String msgType, AlertCalledRo contingency) {