修改调用规则参数

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

@@ -94,7 +94,7 @@ public class BaseController {
 // 
 //    }
 
-      private String buildKey(String token) {
+      protected String buildKey(String token) {
     	//由于用户id 不是接口携带参数，为了避免，公共字段填充时频繁访问平台，缓存用户信息时， 
     	       return "region_" + token;
     	

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/MetaHandler.java

@@ -49,7 +49,7 @@ public class MetaHandler  implements MetaObjectHandler {
 		//获取用户信息 以及当前用户登录公司部门，角色
 		ReginParams reginParams =
 				JSONObject.parseObject(null != redisUtils.get(buildKey(getToken())) ?
-						redisUtils.get(buildKey(getToken())).toString() : "", ReginParams.class);
+						redisUtils.get(buildKey(getToken())).toString() : null, ReginParams.class);
 		if (ObjectUtils.isEmpty(reginParams)) {
 			return;
 		}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java

@@ -28,9 +28,11 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
@@ -83,7 +85,12 @@ public class AlertCalledController extends BaseController {
     	 if (ValidationUtil.isEmpty(alertCalledVo)
                  || ValidationUtil.isEmpty(alertCalledVo.getAlertCalled()))
              throw new BadRequest("参数校验失败.");
-
+    	 ReginParams reginParams =
+ 				JSONObject.parseObject(null != redisUtils.get(buildKey(getToken())) ?
+ 						redisUtils.get(buildKey(getToken())).toString() : null, ReginParams.class);
+    		//获取当前登录人公司
+     	   alertCalledVo.getAlertCalled().setCompanyName(reginParams.getCompany().getCompanyName());
+     	   
     	 return ResponseHelper.buildResponse(iAlertCalledService.createAlertCalled(alertCalledVo));
     }
 

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

@@ -66,6 +66,15 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
              alertCalled.setAlarmType(AlertStageEnums.JQGB.getValue());
              alertCalled.setAlarmTypeCode(AlertStageEnums.JQGB.getCode());
              this.save(alertCalled);
+             // 动态表单
+             List<AlertFormValue> alertFormValuelist = alertCalledVo.getAlertFormValue();
+             // 填充警情主键
+                 alertFormValuelist.stream().forEach(alertFormValue -> {
+                 alertFormValue.setAlertCalledId(alertCalled.getSequenceNbr());
+                 alertFormValue.setAlertTypeCode(alertCalled.getAlertTypeCode());
+             });
+             // 保存动态表单数据
+             iAlertFormValueService.saveBatch(alertFormValuelist);
          } else {
              // 警情报送
              // ****************************************************待确认开发
@@ -73,19 +82,22 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
         	  alertCalled.setAlarmType(AlertStageEnums.JQCB.getValue());
               alertCalled.setAlarmTypeCode(AlertStageEnums.JQCB.getCode());
               this.save(alertCalled);
-              //调用规则
-              ruleAlertCalledService.fireAlertCalledRule(new AlertCalledVo(alertCalled,null));
+
+              // 动态表单
+              List<AlertFormValue> alertFormValuelist = alertCalledVo.getAlertFormValue();
+              // 填充警情主键
+                  alertFormValuelist.stream().forEach(alertFormValue -> {
+                  alertFormValue.setAlertCalledId(alertCalled.getSequenceNbr());
+                  alertFormValue.setAlertTypeCode(alertCalled.getAlertTypeCode());
+              });
+              // 保存动态表单数据
+              iAlertFormValueService.saveBatch(alertFormValuelist);
+              alertCalledVo.setAlertCalled(alertCalled);
+              alertCalledVo.setAlertFormValue(alertFormValuelist);
+              //调用规则          
+              ruleAlertCalledService.fireAlertCalledRule(alertCalledVo);
          }
         
-         // 动态表单
-         List<AlertFormValue> alertFormValuelist = alertCalledVo.getAlertFormValue();
-         // 填充警情主键
-             alertFormValuelist.stream().forEach(alertFormValue -> {
-             alertFormValue.setAlertCalledId(alertCalled.getSequenceNbr());
-             alertFormValue.setAlertTypeCode(alertCalled.getAlertTypeCode());
-         });
-         // 保存动态表单数据
-         iAlertFormValueService.saveBatch(alertFormValuelist);
          
          /**
           * 同步保存ES