|
|
@@ -5,6 +5,7 @@ import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.http.ContentType;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
+import com.fdkankan.fusion.common.ResultCode;
|
|
|
import com.fdkankan.fusion.common.ResultData;
|
|
|
import com.fdkankan.fusion.config.FusionConfig;
|
|
|
import com.fdkankan.fusion.down.CaseDownService;
|
|
|
@@ -13,6 +14,7 @@ import com.fdkankan.fusion.httpClient.client.OtherClient;
|
|
|
import com.fdkankan.fusion.mq.vo.JmGaEventVo;
|
|
|
import com.fdkankan.rabbitmq.util.RabbitMqProducer;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.aspectj.lang.JoinPoint;
|
|
|
import org.aspectj.lang.ProceedingJoinPoint;
|
|
|
import org.aspectj.lang.annotation.After;
|
|
|
@@ -22,11 +24,11 @@ import org.aspectj.lang.annotation.Pointcut;
|
|
|
import org.aspectj.lang.reflect.MethodSignature;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
-import org.springframework.util.StringUtils;
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
|
import org.springframework.web.context.request.RequestContextHolder;
|
|
|
import org.springframework.web.context.request.ServletRequestAttributes;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
+import scala.Int;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import java.lang.annotation.Annotation;
|
|
|
@@ -83,12 +85,14 @@ public class PushJmAspect {
|
|
|
vo.setEvent_content(event_content);
|
|
|
|
|
|
String ryid = (String) StpUtil.getExtra("ryId");
|
|
|
- String platform_id = (String) StpUtil.getExtra("platformId");
|
|
|
+ Integer platform_id = (Integer) StpUtil.getExtra("platformId");
|
|
|
vo.setRyid(ryid);
|
|
|
- vo.setPlatform_id(platform_id);
|
|
|
+ vo.setPlatform_id(String.valueOf(platform_id));
|
|
|
vo.setCaseid(caseIdStr);
|
|
|
rabbitMqProducer.sendByWorkQueue("jmga-event-notice",BeanUtil.beanToMap(vo));
|
|
|
- caseDownService.cleckDownUrl(Integer.valueOf(caseIdStr));
|
|
|
+ if(StringUtils.isNotBlank(caseIdStr)){
|
|
|
+ caseDownService.cleckDownUrl(Integer.valueOf(caseIdStr));
|
|
|
+ }
|
|
|
|
|
|
return result;
|
|
|
}catch (BusinessException e){
|
|
|
@@ -99,7 +103,7 @@ public class PushJmAspect {
|
|
|
}catch (Throwable throwable){
|
|
|
log.info("servicePush-throwable-error:{}",throwable);
|
|
|
}
|
|
|
- return null;
|
|
|
+ return ResultData.error(ResultCode.SYSTEM_ERROR);
|
|
|
}
|
|
|
|
|
|
|
lyhzzz