1

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

@@ -7,7 +7,7 @@ import java.lang.annotation.*;
 @Target({ElementType.TYPE, ElementType.METHOD})
 public @interface PushJm {
     String method() default "event";
-    String event_type() default "";
+    String event_type() default "case";
     String event_content() default "";
 
 }

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

@@ -9,9 +9,13 @@ import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.config.FusionConfig;
 import com.fdkankan.fusion.down.CaseDownService;
+import com.fdkankan.fusion.entity.CaseEntity;
+import com.fdkankan.fusion.entity.JyUser;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.httpClient.client.OtherClient;
 import com.fdkankan.fusion.mq.vo.JmGaEventVo;
+import com.fdkankan.fusion.service.ICaseService;
+import com.fdkankan.fusion.service.IJyUserService;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -49,7 +53,10 @@ public class PushJmAspect {
 	OtherClient otherClient;
 	@Autowired
 	CaseDownService caseDownService;
-
+	@Autowired
+	ICaseService caseService;
+	@Autowired
+	IJyUserService jyUserService;
 
 	@Pointcut("@annotation(com.fdkankan.fusion.aop.PushJm)")
 	public void servicePush() {
@@ -71,6 +78,13 @@ public class PushJmAspect {
 				return result;
 			}
 
+
+			CaseEntity caseEntity = caseService.getById(caseIdStr);
+			if(caseEntity == null){
+				return result;
+			}
+			JyUser jyUser = jyUserService.getBySysId(caseEntity.getSysUserId());
+
 			MethodSignature signature = (MethodSignature)joinPoint.getSignature();
 			Method method = signature.getMethod();
 			PushJm methodAnnotation = method.getAnnotation(PushJm.class);
@@ -86,6 +100,12 @@ public class PushJmAspect {
 				event_content = event_type;
 			}
 			vo.setEvent_content(event_content);
+			vo.setCase_title(caseEntity.getCaseTitle());
+			if(jyUser != null){
+				vo.setCase_create_ryid(jyUser.getRyId());
+				vo.setCase_create_ryno(jyUser.getRyNo());
+				vo.setCase_create_name(jyUser.getRyNickName());
+			}
 
 			String ryid = (String) StpUtil.getExtra("ryId");
 			String userName = (String) StpUtil.getExtra("userName");

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

@@ -36,14 +36,14 @@ public class CaseAnimationController {
     }
 
     @PostMapping("/addOrUpdate")
-    @PushJm(event_type = "添加动画模型")
+    @PushJm(event_content = "添加动画模型")
     public ResultData addOrUpdate(@RequestBody CaseAnimation caseAnimation){
         caseAnimationService.saveOrUpdate(caseAnimation);
         return ResultData.ok(caseAnimation);
     }
 
     @PostMapping("/delete")
-    @PushJm(event_type = "删除动画模型")
+    @PushJm(event_content = "删除动画模型")
     public ResultData delete(@RequestBody CaseAnimation caseAnimation){
         if(caseAnimation.getId() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);

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

@@ -56,14 +56,14 @@ public class CaseController extends BaseController{
         return ResultData.ok(caseService.sceneList(param));
     }
     @PostMapping("/addOrUpdate")
-    @PushJm(event_type = "添加案件")
+    @PushJm(event_content = "添加案件")
     public ResultData addOrUpdate(@RequestBody CaseEntity param){
         caseService.addOrUpdate(param);
         return ResultData.ok();
     }
 
     @PostMapping("/delete")
-    @PushJm(event_type = "删除案件")
+    @PushJm(event_content = "删除案件")
     public ResultData delete(@RequestBody CaseParam param){
         caseService.delete(param.getCaseId());
         return ResultData.ok();
@@ -71,7 +71,7 @@ public class CaseController extends BaseController{
 
 
     @PostMapping("/addScene")
-    @PushJm(event_type = "添加场景")
+    @PushJm(event_content = "添加场景")
     public ResultData addScene(@RequestBody CaseParam param){
         caseService.addScene(param);
         return ResultData.ok();

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

@@ -51,7 +51,7 @@ public class CaseExtractDetailController {
     }
 
     @PostMapping("/saveOrUpdate")
-    @PushJm(event_type = "添加案件勘验笔录")
+    @PushJm(event_content = "添加案件勘验笔录")
     public ResultData saveOrUpdate(@RequestBody CaseExtractDetail caseExtractDetail){
         caseExtractDetailService.saveByParam(caseExtractDetail);
         return ResultData.ok();

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_content = "关联媒体库文件")
     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_content = "关联媒体库文件")
     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/CaseFusionController.java

@@ -47,7 +47,7 @@ public class CaseFusionController extends BaseController{
     }
 
     @PostMapping("/add")
-    @PushJm(event_type = "添加模型")
+    @PushJm(event_content = "添加模型")
     public ResultData add(@RequestBody FusionParam param){
         return ResultData.ok(fusionNumService.add(param));
     }
@@ -56,14 +56,14 @@ public class CaseFusionController extends BaseController{
      * 修改模型相关信息
      */
     @PostMapping("/update")
-    @PushJm(event_type = "修改模型")
+    @PushJm(event_content = "修改模型")
     public ResultData update(@RequestBody FusionParam param){
         fusionNumService.updateModel(param);
         return ResultData.ok();
     }
 
     @PostMapping("/delete")
-    @PushJm(event_type = "删除模型")
+    @PushJm(event_content = "删除模型")
     public ResultData delete(@RequestBody FusionParam param){
         if(param.getFusionNumId() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);

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

@@ -42,7 +42,7 @@ public class CaseImgController {
     }
 
     @PostMapping("/saveOrUpdate")
-    @PushJm(event_type = "添加或修改案件图片")
+    @PushJm(event_content = "添加或修改案件图片")
     public ResultData saveOrUpdate(@RequestBody CaseImg caseImg){
         if(caseImg.getCaseId() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
@@ -51,7 +51,7 @@ public class CaseImgController {
     }
 
     @PostMapping("/addBatch")
-    @PushJm(event_type = "添加或修改案件图片")
+    @PushJm(event_content = "添加或修改案件图片")
     public ResultData saveBatch(@RequestBody CaseImgParam param){
 
         if(param.getImgUrls() == null || param.getImgUrls().isEmpty()){
@@ -67,7 +67,7 @@ public class CaseImgController {
     }
 
     @PostMapping("/delete")
-    @PushJm(event_type = "删除案件图片")
+    @PushJm(event_content = "删除案件图片")
     public ResultData delete(@RequestBody CaseImg caseImg){
         if(caseImg.getId() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
@@ -87,7 +87,7 @@ public class CaseImgController {
     private String environment;
 
     @PostMapping("/uploadImagesAndSave")
-    @PushJm(event_type = "添加或修改案件图片")
+    @PushJm(event_content = "添加或修改案件图片")
     public ResultData uploadImagesAndSave(@RequestParam(required = false)MultipartFile[] files,
                                           @RequestParam(required = false)Integer caseId) {
         if(caseId == null || files.length==0){

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

@@ -32,7 +32,7 @@ public class CaseImgTagController {
     }
 
     @PostMapping("/saveOrUpdate")
-    @PushJm(event_type = "删除案件图片")
+    @PushJm(event_content = "删除案件图片")
     public ResultData saveOrUpdate(@RequestBody CaseImgTag caseImgTag){
         caseImgTagService.saveByParam(caseImgTag);
         return ResultData.ok();

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

@@ -41,7 +41,7 @@ public class CaseInquestCriminalController {
     }
 
     @PostMapping("/saveOrUpdate")
-    @PushJm(event_type = "添加案件勘验笔录")
+    @PushJm(event_content = "添加案件勘验笔录")
     public ResultData saveOrUpdate(@RequestBody CaseInquestCriminal caseInquestCriminal){
         return ResultData.ok(caseInquestCriminalService.saveByParam(caseInquestCriminal));
     }

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

@@ -32,7 +32,7 @@ public class CaseInquestInfoController {
     }
 
     @PostMapping("/saveOrUpdate")
-    @PushJm(event_type = "添加案件详情")
+    @PushJm(event_content = "添加案件详情")
     public ResultData saveOrUpdate(@RequestBody CaseInquestInfo caseInquestInfo){
         caseInquestInfoService.saveByParam(caseInquestInfo);
         return ResultData.ok();

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

@@ -53,7 +53,7 @@ public class CaseOverviewController {
     }
 
     @PostMapping("/addOrUpdate")
-    @PushJm(event_type = "添加绘图")
+    @PushJm(event_content = "添加绘图")
     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_content = "新增修改案件路线")
     public ResultData saveOrUpdate(@RequestBody CasePath casePath){
         casePathService.saveOrUpdate(casePath);
         return ResultData.ok(casePath);
     }
 
     @PostMapping("/del")
-    @PushJm(event_type = "删除案件路线")
+    @PushJm(event_content = "删除案件路线")
     public ResultData del(@RequestBody CasePath casePath){
         casePathService.removeById(casePath.getId());
         return ResultData.ok();

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

@@ -39,7 +39,7 @@ public class CaseSettingsController {
 
 
     @PostMapping("/saveOrUpdate")
-    @PushJm(event_type = "新增修改案件设置")
+    @PushJm(event_content = "新增修改案件设置")
     public ResultData saveOrUpdate(@RequestBody CaseSettings caseSettings){
         if(caseSettings.getCaseId() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);

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

@@ -39,7 +39,7 @@ public class CaseSettingsResourceController {
 
 
     @PostMapping("/saveOrUpdate")
-    @PushJm(event_type = "新增修改案件设置")
+    @PushJm(event_content = "新增修改案件设置")
     public ResultData saveOrUpdate(@RequestBody CaseSettingsResource settingsResource){
         if(settingsResource.getCaseId() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
@@ -49,7 +49,7 @@ public class CaseSettingsResourceController {
     }
 
     @PostMapping("/delete")
-    @PushJm(event_type = "删除案件设置")
+    @PushJm(event_content = "删除案件设置")
     public ResultData delete(@RequestBody CaseSettingsResource settingsResource){
         if(settingsResource.getId() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);

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

@@ -45,7 +45,7 @@ public class CaseTabulationController {
     }
 
     @PostMapping("/addOrUpdate")
-    @PushJm(event_type = "添加制表")
+    @PushJm(event_content = "添加制表")
     public ResultData addOrUpdate (@RequestBody CaseTabulation caseTabulation){
         caseTabulationService.addOrUpdate(caseTabulation);
         return ResultData.ok(caseTabulation);

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

@@ -34,7 +34,7 @@ public class CaseTagController {
 
 
     @PostMapping("/add")
-    @PushJm(event_type = "新增案件标注")
+    @PushJm(event_content = "新增案件标注")
     public ResultData add(@RequestBody CaseTag caseTag){
         if(caseTag.getHotIconId()==null ||  StringUtils.isEmpty(caseTag.getHotIconUrl())
               ||caseTag.getCaseId() == null  || StringUtils.isEmpty(caseTag.getTagTitle())){
@@ -55,7 +55,7 @@ public class CaseTagController {
     }
 
     @PostMapping("/delete")
-    @PushJm(event_type = "删除案件标注")
+    @PushJm(event_content = "删除案件标注")
     public ResultData delete(@RequestBody CaseTag caseTag){
         if(caseTag.getTagId() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);

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

@@ -31,7 +31,7 @@ public class CaseTagPointController {
 
 
     @PostMapping("/place")
-    @PushJm(event_type = "放置案件标注")
+    @PushJm(event_content = "放置案件标注")
     public ResultData place(@RequestBody CaseTagPoint caseTagPoint){
         return ResultData.ok(caseTagPointService.place(caseTagPoint));
     }
@@ -53,7 +53,7 @@ public class CaseTagPointController {
     }
 
     @PostMapping("/delete")
-    @PushJm(event_type = "删除案件标注")
+    @PushJm(event_content = "删除案件标注")
     public ResultData delete(@RequestBody CaseTagPoint caseTagPoint){
         if(caseTagPoint.getTagPointId() == null ){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
@@ -63,7 +63,7 @@ public class CaseTagPointController {
     }
 
     @PostMapping("/update")
-    @PushJm(event_type = "修改案件标注")
+    @PushJm(event_content = "修改案件标注")
     public ResultData update(@RequestBody CaseTagPoint caseTagPoint){
         if(caseTagPoint.getTagPointId() == null ){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);

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

@@ -45,7 +45,7 @@ public class CaseVideoController {
      * 批量添加文件至文件夹
      */
     @PostMapping("/uploadAddVideo")
-    @PushJm(event_type = "添加视频")
+    @PushJm(event_content = "添加视频")
     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

@@ -36,7 +36,7 @@ public class CaseViewController {
     }
 
     @PostMapping("/add")
-    @PushJm(event_type = "添加视图")
+    @PushJm(event_content = "添加视图")
     public ResultData add(@RequestBody CaseView caseView){
         return ResultData.ok(caseViewService.add(caseView));
     }
@@ -48,7 +48,7 @@ public class CaseViewController {
     }
 
     @PostMapping("/delete")
-    @PushJm(event_type = "删除视图")
+    @PushJm(event_content = "删除视图")
     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

@@ -36,12 +36,12 @@ public class FusionGuideController {
     }
 
     @PostMapping("/add")
-    @PushJm(event_type = "添加导览")
+    @PushJm(event_content = "添加导览")
     public ResultData add(@RequestBody FusionGuide fusionGuide){
         return ResultData.ok(fusionGuideService.add(fusionGuide));
     }
     @PostMapping("/update")
-    @PushJm(event_type = "修改导览")
+    @PushJm(event_content = "修改导览")
     public ResultData update(@RequestBody FusionGuide fusionGuide){
         if(fusionGuide.getFusionGuideId() == null ||
                 (fusionGuide.getSort() == null && StringUtils.isEmpty(fusionGuide.getTitle()) && StringUtils.isEmpty(fusionGuide.getCover())  )){
@@ -53,7 +53,7 @@ public class FusionGuideController {
     }
 
     @PostMapping("/delete")
-    @PushJm(event_type = "删除导览")
+    @PushJm(event_content = "删除导览")
     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

@@ -37,13 +37,13 @@ public class FusionMeterController {
     }
 
     @PostMapping("/add")
-    @PushJm(event_type = "添加测量")
+    @PushJm(event_content = "添加测量")
     public ResultData add(@RequestBody FusionMeter fusionMeter){
         return ResultData.ok( fusionMeterService.add(fusionMeter));
     }
 
     @PostMapping("/updateMeter")
-    @PushJm(event_type = "修改测量")
+    @PushJm(event_content = "修改测量")
     public ResultData updateMeter(@RequestBody FusionMeter fusionMeter){
         if(fusionMeter.getFusionMeterId() == null ){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
@@ -63,7 +63,7 @@ public class FusionMeterController {
         return ResultData.ok();
     }
     @PostMapping("/hide")
-    @PushJm(event_type = "修改测量")
+    @PushJm(event_content = "修改测量")
     public ResultData hide( @RequestBody FusionMeter fusionMeter){
         if((fusionMeter.getFusionMeterId() == null&& fusionMeter.getFusionId()== null) || fusionMeter.getHide()== null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
@@ -81,7 +81,7 @@ public class FusionMeterController {
     }
 
     @PostMapping("/delete")
-    @PushJm(event_type = "删除测量")
+    @PushJm(event_content = "删除测量")
     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

@@ -49,7 +49,7 @@ public class HotIconController extends BaseController{
     }
 
     @PostMapping("/add")
-    @PushJm(event_type = "添加标注图片")
+    @PushJm(event_content = "添加标注图片")
     public ResultData add(@RequestParam(required = false) MultipartFile file,
                           @RequestParam(required = false) String iconTitle,
                           @RequestParam(required = false) Integer caseId) throws IOException {
@@ -80,7 +80,7 @@ public class HotIconController extends BaseController{
     }
 
     @PostMapping("/delete")
-    @PushJm(event_type = "删除标注图片")
+    @PushJm(event_content = "删除标注图片")
     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

@@ -65,7 +65,7 @@ public class ModelController extends BaseController{
     }
 
     @PostMapping("/addByMediaLibrary")
-    @PushJm(event_type = "关联媒体库模型")
+    @PushJm(event_content = "关联媒体库模型")
     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/TestController.java

@@ -115,7 +115,7 @@ public class TestController {
 
 
     @PostMapping("/testPost")
-    @PushJm(event_type = "11111111")
+    @PushJm(event_content = "11111111")
     public ResultData testPost(@RequestBody JSONObject jsonObject){
         return ResultData.ok();
     }

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

@@ -23,6 +23,11 @@ public class JmGaEventVo {
     private String platform_name;
     private String ajbh;
     private String caseid;
+    private String case_title;
+    private String case_create_ryid;
+    private String case_create_ryno;
+    private String case_create_name;
+
 
     public String getEvent_time() {
         if(StringUtils.isBlank(event_time)){

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

@@ -16,4 +16,6 @@ public interface IJyUserService extends IService<JyUser> {
     JyUser getByUserId(Long userId);
 
     JyUser getByRyId(String ryid);
+
+    JyUser getBySysId(Long sysUserId);
 }

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

@@ -42,6 +42,16 @@ public class JyUserServiceImpl extends ServiceImpl<IJyUserMapper, JyUser> implem
             return list.get(0);
         }
         return null;
+    }
 
+    @Override
+    public JyUser getBySysId(Long sysUserId) {
+        LambdaQueryWrapper<JyUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(JyUser::getSysUserId,sysUserId);
+        List<JyUser> list = this.list(wrapper);
+        if(list != null && !list.isEmpty()){
+            return list.get(0);
+        }
+        return null;
     }
 }