1

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

@@ -62,7 +62,7 @@ public class CaseFilesController extends BaseController{
     }
 
     @PostMapping("/addByMediaLibrary")
-    @PushJm(event_type = "添加案件文件")
+    @PushJm(event_type = "关联媒体库文件")
     public ResultData addByMediaLibrary(@RequestBody AddByMediaLibraryParam param)  {
         if(param.getCaseId() == null || param.getUploadId() == null || param.getFilesTypeId() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
@@ -88,7 +88,7 @@ public class CaseFilesController extends BaseController{
         return ResultData.ok(caseFiles);
     }
     @PostMapping("/addByMediaLibrarys")
-    @PushJm(event_type = "添加案件文件")
+    @PushJm(event_type = "关联媒体库文件")
     public ResultData addByMediaLibrarys(@RequestBody AddByMediaLibraryParam param)  {
         if(param.getCaseId() == null  || param.getFilesTypeId() == null || param.getUploadIds().isEmpty()){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);

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

@@ -1,6 +1,7 @@
 package com.fdkankan.fusion.controller;
 
 
+import com.fdkankan.fusion.aop.PushJm;
 import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.common.util.FileMd5Util;
 import com.fdkankan.fusion.common.util.MD5Checksum;
@@ -52,6 +53,7 @@ public class CaseOverviewController {
     }
 
     @PostMapping("/addOrUpdate")
+    @PushJm(event_type = "添加绘图")
     public ResultData addOrUpdate (@RequestBody CaseOverview caseOverview){
         caseOverviewService.saveOrUpdate(caseOverview);
         return ResultData.ok(caseOverview);

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

@@ -36,14 +36,14 @@ public class CasePathController {
     }
 
     @PostMapping("/saveOrUpdate")
-    @PushJm(event_type = "新增修改案件导览")
+    @PushJm(event_type = "新增修改案件路线")
     public ResultData saveOrUpdate(@RequestBody CasePath casePath){
         casePathService.saveOrUpdate(casePath);
         return ResultData.ok(casePath);
     }
 
     @PostMapping("/del")
-    @PushJm(event_type = "删除案件导览")
+    @PushJm(event_type = "删除案件路线")
     public ResultData del(@RequestBody CasePath casePath){
         casePathService.removeById(casePath.getId());
         return ResultData.ok();

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

@@ -1,6 +1,7 @@
 package com.fdkankan.fusion.controller;
 
 
+import com.fdkankan.fusion.aop.PushJm;
 import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.entity.CaseFiles;
 import com.fdkankan.fusion.entity.CaseTabulation;
@@ -44,6 +45,7 @@ public class CaseTabulationController {
     }
 
     @PostMapping("/addOrUpdate")
+    @PushJm(event_type = "添加制表")
     public ResultData addOrUpdate (@RequestBody CaseTabulation caseTabulation){
         caseTabulationService.addOrUpdate(caseTabulation);
         return ResultData.ok(caseTabulation);

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

@@ -2,6 +2,7 @@ package com.fdkankan.fusion.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.fusion.aop.PushJm;
 import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.entity.CaseVideo;
@@ -44,6 +45,7 @@ public class CaseVideoController {
      * 批量添加文件至文件夹
      */
     @PostMapping("/uploadAddVideo")
+    @PushJm(event_type = "添加视频")
     public ResultData uploadAddVideo(@RequestParam(required = false) MultipartFile[] files,
                                      @RequestParam(required = false) Integer folderId,
                                      @RequestParam(required = false) Integer caseId) throws Exception {

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

@@ -1,6 +1,7 @@
 package com.fdkankan.fusion.controller;
 
 
+import com.fdkankan.fusion.aop.PushJm;
 import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.common.ResultData;
@@ -35,6 +36,7 @@ public class CaseViewController {
     }
 
     @PostMapping("/add")
+    @PushJm(event_type = "添加视图")
     public ResultData add(@RequestBody CaseView caseView){
         return ResultData.ok(caseViewService.add(caseView));
     }
@@ -46,6 +48,7 @@ public class CaseViewController {
     }
 
     @PostMapping("/delete")
+    @PushJm(event_type = "删除视图")
     public ResultData delete(@RequestBody CaseView caseView){
         if(caseView.getViewId() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);

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

@@ -2,6 +2,7 @@ package com.fdkankan.fusion.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.fdkankan.fusion.aop.PushJm;
 import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.entity.FusionGuide;
@@ -35,10 +36,12 @@ public class FusionGuideController {
     }
 
     @PostMapping("/add")
+    @PushJm(event_type = "添加导览")
     public ResultData add(@RequestBody FusionGuide fusionGuide){
         return ResultData.ok(fusionGuideService.add(fusionGuide));
     }
     @PostMapping("/update")
+    @PushJm(event_type = "修改导览")
     public ResultData update(@RequestBody FusionGuide fusionGuide){
         if(fusionGuide.getFusionGuideId() == null ||
                 (fusionGuide.getSort() == null && StringUtils.isEmpty(fusionGuide.getTitle()) && StringUtils.isEmpty(fusionGuide.getCover())  )){
@@ -50,6 +53,7 @@ public class FusionGuideController {
     }
 
     @PostMapping("/delete")
+    @PushJm(event_type = "删除导览")
     public ResultData delete(@RequestBody FusionGuide fusionGuide){
         if(fusionGuide.getFusionGuideId() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);

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

@@ -2,6 +2,7 @@ package com.fdkankan.fusion.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.fdkankan.fusion.aop.PushJm;
 import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.entity.FusionMeter;
@@ -36,11 +37,13 @@ public class FusionMeterController {
     }
 
     @PostMapping("/add")
+    @PushJm(event_type = "添加测量")
     public ResultData add(@RequestBody FusionMeter fusionMeter){
         return ResultData.ok( fusionMeterService.add(fusionMeter));
     }
 
     @PostMapping("/updateMeter")
+    @PushJm(event_type = "修改测量")
     public ResultData updateMeter(@RequestBody FusionMeter fusionMeter){
         if(fusionMeter.getFusionMeterId() == null ){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
@@ -60,6 +63,7 @@ public class FusionMeterController {
         return ResultData.ok();
     }
     @PostMapping("/hide")
+    @PushJm(event_type = "修改测量")
     public ResultData hide( @RequestBody FusionMeter fusionMeter){
         if((fusionMeter.getFusionMeterId() == null&& fusionMeter.getFusionId()== null) || fusionMeter.getHide()== null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
@@ -77,6 +81,7 @@ public class FusionMeterController {
     }
 
     @PostMapping("/delete")
+    @PushJm(event_type = "删除测量")
     public ResultData delete(@RequestBody FusionMeter fusionMeter){
         if(fusionMeter.getFusionMeterId() == null ){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);

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

@@ -1,6 +1,7 @@
 package com.fdkankan.fusion.controller;
 
 
+import com.fdkankan.fusion.aop.PushJm;
 import com.fdkankan.fusion.common.FilePath;
 import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.exception.BusinessException;
@@ -48,6 +49,7 @@ public class HotIconController extends BaseController{
     }
 
     @PostMapping("/add")
+    @PushJm(event_type = "添加标注图片")
     public ResultData add(@RequestParam(required = false) MultipartFile file,
                           @RequestParam(required = false) String iconTitle,
                           @RequestParam(required = false) Integer caseId) throws IOException {
@@ -78,6 +80,7 @@ public class HotIconController extends BaseController{
     }
 
     @PostMapping("/delete")
+    @PushJm(event_type = "删除标注图片")
     public ResultData delete(@RequestBody HotIcon hotIcon){
         if(hotIcon.getIconId() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);

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

@@ -4,6 +4,7 @@ package com.fdkankan.fusion.controller;
 import cn.hutool.core.io.FileUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.fdkankan.fusion.aop.PushJm;
 import com.fdkankan.fusion.common.FilePath;
 import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.ResultData;
@@ -64,6 +65,7 @@ public class ModelController extends BaseController{
     }
 
     @PostMapping("/addByMediaLibrary")
+    @PushJm(event_type = "关联媒体库模型")
     public ResultData addByMediaLibrary(@RequestBody AddByMediaLibraryParam param)  {
         if(param.getCaseId() == null || param.getUploadId() == null ){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);

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

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

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

@@ -4,8 +4,10 @@ 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.JyUser;
 import com.fdkankan.fusion.httpClient.client.OtherClient;
 import com.fdkankan.fusion.mq.vo.JmGaEventVo;
+import com.fdkankan.fusion.service.IJyUserService;
 import com.rabbitmq.client.Channel;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -30,6 +32,8 @@ public class PushJMConsumer {
     FusionConfig fusionConfig;
     @Autowired
     OtherClient otherClient;
+    @Autowired
+    IJyUserService jyUserService;
 
     @RabbitListener(
             queuesToDeclare = @Queue("${queue.manage.push-jm:jmga-event-notice}")
@@ -45,6 +49,12 @@ public class PushJMConsumer {
             }
 
             JmGaEventVo jmGaEventVo = JSONObject.parseObject(msg, JmGaEventVo.class);
+            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()));
+                }
+            }
             Map<String, Object> stringObjectMap = BeanUtil.beanToMap(jmGaEventVo);
 
             String s = otherClient.postJson(fusionConfig.getPushJmUrl(), stringObjectMap);

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

@@ -14,4 +14,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface IJyUserService extends IService<JyUser> {
 
     JyUser getByUserId(Long userId);
+
+    JyUser getByRyId(String ryid);
 }

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

@@ -32,4 +32,16 @@ public class JyUserServiceImpl extends ServiceImpl<IJyUserMapper, JyUser> implem
         }
         return null;
     }
+
+    @Override
+    public JyUser getByRyId(String ryid) {
+        LambdaQueryWrapper<JyUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(JyUser::getRyId,ryid);
+        List<JyUser> list = this.list(wrapper);
+        if(list != null && !list.isEmpty()){
+            return list.get(0);
+        }
+        return null;
+
+    }
 }