lyhzzz 2 月之前
父節點
當前提交
3b3cc36947

+ 7 - 12
src/main/java/com/fdkankan/fusion/aop/PushJmAspect.java

@@ -1,5 +1,6 @@
 package com.fdkankan.fusion.aop;
 package com.fdkankan.fusion.aop;
 
 
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.http.ContentType;
 import cn.hutool.http.ContentType;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
@@ -56,8 +57,8 @@ public class PushJmAspect {
 		try {
 		try {
 			HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
 			HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
 			//获取参数
 			//获取参数
-			JSONObject params = this.getParams(joinPoint, request);
-			log.info("请求参数:{}",params);
+			String caseIdStr = request.getHeader("caseId");
+			log.info("header:caseIdStr{}",caseIdStr);
 			//放行
 			//放行
 			Object result = joinPoint.proceed();
 			Object result = joinPoint.proceed();
 			ResultData resultData = (ResultData) result;
 			ResultData resultData = (ResultData) result;
@@ -81,19 +82,13 @@ public class PushJmAspect {
 			}
 			}
 			vo.setEvent_content(event_content);
 			vo.setEvent_content(event_content);
 
 
-
-			String ryid = "";
-			String platform_id = "";
-			String ajbh = params != null ? params.getString("caseId") : null;
+			String ryid = (String) StpUtil.getExtra("ryId");
+			String platform_id = (String) StpUtil.getExtra("platformId");
 			vo.setRyid(ryid);
 			vo.setRyid(ryid);
 			vo.setPlatform_id(platform_id);
 			vo.setPlatform_id(platform_id);
-			vo.setAjbh(ajbh);
-
+			vo.setCaseid(caseIdStr);
 			rabbitMqProducer.sendByWorkQueue("jmga-event-notice",BeanUtil.beanToMap(vo));
 			rabbitMqProducer.sendByWorkQueue("jmga-event-notice",BeanUtil.beanToMap(vo));
-
-			if(params != null && params.getInteger("caseId")!=null){
-				caseDownService.cleckDownUrl(params.getInteger("caseId"));
-			}
+			caseDownService.cleckDownUrl(Integer.valueOf(caseIdStr));
 
 
 			return result;
 			return result;
 		}catch (BusinessException e){
 		}catch (BusinessException e){

+ 2 - 1
src/main/java/com/fdkankan/fusion/mq/vo/JmGaEventVo.java

@@ -18,10 +18,11 @@ public class JmGaEventVo {
     private String ryid;
     private String ryid;
     private String platform_id;
     private String platform_id;
     private String ajbh;
     private String ajbh;
+    private String caseid;
 
 
     public String getEvent_time() {
     public String getEvent_time() {
         if(StringUtils.isBlank(event_time)){
         if(StringUtils.isBlank(event_time)){
-            return DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss");
+            return new Date().getTime()+"";
         }
         }
         return event_time;
         return event_time;
     }
     }