1

src/main/java/com/fdkankan/fusion/aop/PushJmAspect.java

@@ -67,6 +67,9 @@ public class PushJmAspect {
 			if(resultData.getCode() != 0){
 				return result;
 			}
+			if(StringUtils.isBlank(caseIdStr)){
+				return result;
+			}
 
 			MethodSignature signature = (MethodSignature)joinPoint.getSignature();
 			Method method = signature.getMethod();
@@ -85,14 +88,16 @@ public class PushJmAspect {
 			vo.setEvent_content(event_content);
 
 			String ryid = (String) StpUtil.getExtra("ryId");
+			String userName = (String) StpUtil.getExtra("userName");
+			String nickName = (String) StpUtil.getExtra("nickName");
 			Integer platform_id = (Integer) StpUtil.getExtra("platformId");
 			vo.setRyid(ryid);
+			vo.setNick_name(nickName);
+			vo.setRyno(userName);
 			vo.setPlatform_id(String.valueOf(platform_id));
 			vo.setCaseid(caseIdStr);
 			rabbitMqProducer.sendByWorkQueue("jmga-event-notice",BeanUtil.beanToMap(vo));
-			if(StringUtils.isNotBlank(caseIdStr)){
-				caseDownService.cleckDownUrl(Integer.valueOf(caseIdStr));
-			}
+			caseDownService.cleckDownUrl(Integer.valueOf(caseIdStr));
 
 			return result;
 		}catch (BusinessException e){

src/main/java/com/fdkankan/fusion/controller/JyPlatformController.java

@@ -0,0 +1,21 @@
+package com.fdkankan.fusion.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2025-06-26
+ */
+@RestController
+@RequestMapping("/fusion/jyPlatform")
+public class JyPlatformController {
+
+}
+

src/main/java/com/fdkankan/fusion/entity/JyPlatform.java

@@ -0,0 +1,75 @@
+package com.fdkankan.fusion.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2025-06-26
+ */
+@Getter
+@Setter
+@TableName("jy_platform")
+public class JyPlatform implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 平台名称
+     */
+    @TableField("platform_name")
+    private String platformName;
+
+    /**
+     * 平台地址
+     */
+    @TableField("platform_address")
+    private String platformAddress;
+
+    /**
+     * 是否禁用，0否，1是
+     */
+    @TableField("status")
+    private Integer status;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * 平台管理员姓名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 平台管理手机号码
+     */
+    @TableField("phone")
+    private String phone;
+
+    /**
+     * 身份证号码
+     */
+    @TableField("id_card")
+    private String idCard;
+
+
+}

src/main/java/com/fdkankan/fusion/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir") ;
 
         generate(path,"fusion", getTables(new String[]{
-               "jy_user"
+               "jy_platform"
         }));
 
 //        generate(path,"goods", getTables(new String[]{
@@ -48,7 +48,7 @@ public class AutoGenerate {
     public static void  generate(String path,String moduleName,  List<String> tables){
 //        FastAutoGenerator.create("jdbc:mysql://192.168.0.25:3306/fd_fusion_xj",
 //                "root","mysql123!ROOT.")
-        FastAutoGenerator.create("jdbc:mysql://192.168.0.25:3306/4dkankan_v4",
+        FastAutoGenerator.create("jdbc:mysql://119.23.182.50:3306/4dkankan_v4",
                 "root","4dkk2023cuikuan%")
                 .globalConfig(builder -> {
                     builder.author("")               //作者

src/main/java/com/fdkankan/fusion/mapper/IJyPlatformMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.fusion.mapper;
+
+import com.fdkankan.fusion.entity.JyPlatform;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2025-06-26
+ */
+@Mapper
+public interface IJyPlatformMapper extends BaseMapper<JyPlatform> {
+
+}

src/main/java/com/fdkankan/fusion/mq/consumer/PushJMConsumer.java

@@ -4,9 +4,11 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.MapToBeanCopier;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.fusion.config.FusionConfig;
+import com.fdkankan.fusion.entity.JyPlatform;
 import com.fdkankan.fusion.entity.JyUser;
 import com.fdkankan.fusion.httpClient.client.OtherClient;
 import com.fdkankan.fusion.mq.vo.JmGaEventVo;
+import com.fdkankan.fusion.service.IJyPlatformService;
 import com.fdkankan.fusion.service.IJyUserService;
 import com.rabbitmq.client.Channel;
 import lombok.extern.slf4j.Slf4j;
@@ -34,6 +36,9 @@ public class PushJMConsumer {
     OtherClient otherClient;
     @Autowired
     IJyUserService jyUserService;
+    @Autowired
+    IJyPlatformService jyPlatformService;
+
 
     @RabbitListener(
             queuesToDeclare = @Queue("${queue.manage.push-jm:jmga-event-notice}")
@@ -52,7 +57,11 @@ public class PushJMConsumer {
             if(jmGaEventVo.getPlatform_id() == null && jmGaEventVo.getRyid() != null){
                 JyUser jyUser = jyUserService.getByRyId(jmGaEventVo.getRyid());
                 if(jyUser != null && jyUser.getPlatformId() != null){
-                    jmGaEventVo.setPlatform_id(String.valueOf(jyUser.getPlatformId()));
+                    JyPlatform jyPlatform = jyPlatformService.getById(jyUser.getPlatformId());
+                    if(jyPlatform !=null){
+                        jmGaEventVo.setPlatform_id(String.valueOf(jyPlatform.getId()));
+                        jmGaEventVo.setPlatform_name(jyPlatform.getPlatformName());
+                    }
                 }
             }
             Map<String, Object> stringObjectMap = BeanUtil.beanToMap(jmGaEventVo);

src/main/java/com/fdkankan/fusion/mq/vo/JmGaEventVo.java

@@ -15,8 +15,12 @@ public class JmGaEventVo {
     private String event_content;
     private String scene_num;
     private String scene_url;
+    private String scene_title;
     private String ryid;
+    private String ryno;
+    private String nick_name;
     private String platform_id;
+    private String platform_name;
     private String ajbh;
     private String caseid;
 

src/main/java/com/fdkankan/fusion/service/IJyPlatformService.java

@@ -0,0 +1,16 @@
+package com.fdkankan.fusion.service;
+
+import com.fdkankan.fusion.entity.JyPlatform;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2025-06-26
+ */
+public interface IJyPlatformService extends IService<JyPlatform> {
+
+}

src/main/java/com/fdkankan/fusion/service/impl/JyPlatformServiceImpl.java

@@ -0,0 +1,22 @@
+package com.fdkankan.fusion.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.fdkankan.fusion.entity.JyPlatform;
+import com.fdkankan.fusion.mapper.IJyPlatformMapper;
+import com.fdkankan.fusion.service.IJyPlatformService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2025-06-26
+ */
+@Service
+@DS("db2")
+public class JyPlatformServiceImpl extends ServiceImpl<IJyPlatformMapper, JyPlatform> implements IJyPlatformService {
+
+}

src/main/resources/mapper/fusion/JyPlatformMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.fusion.mapper.IJyPlatformMapper">
+
+</mapper>