From a8b716120263caf3a91728b535264aced181a276 Mon Sep 17 00:00:00 2001 From: z Date: Wed, 20 Dec 2023 09:18:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/zcloud/aspect/DockingAspect.java | 2 +- .../controller/keyProjects/VideoManagerController.java | 8 ++++++++ .../controller/keyProjects/VideoResourcesController.java | 3 +++ .../mybatis/dsno2/keyProjects/VideoResourcesMapper.xml | 3 ++- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zcloud/aspect/DockingAspect.java b/src/main/java/com/zcloud/aspect/DockingAspect.java index 6f153798..7783a8b2 100644 --- a/src/main/java/com/zcloud/aspect/DockingAspect.java +++ b/src/main/java/com/zcloud/aspect/DockingAspect.java @@ -43,7 +43,7 @@ public class DockingAspect { public Object beforeApi(ProceedingJoinPoint joinPoint) throws Throwable { Map proceed = (HashMap)joinPoint.proceed(); MethodSignature signature = (MethodSignature) joinPoint.getSignature(); - Method method = joinPoint.getTarget().getClass().getDeclaredMethod(signature.getName(), signature.getParameterTypes()); + Method method = joinPoint.getTarget().getClass().getDeclaredMethod(signature.getName(), signature.getParameterTypes()); try { HttpServletRequest request = getRequest(); //获取资源映射路径：servlet路径 diff --git a/src/main/java/com/zcloud/controller/keyProjects/VideoManagerController.java b/src/main/java/com/zcloud/controller/keyProjects/VideoManagerController.java index 64a93959..68d30672 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/VideoManagerController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/VideoManagerController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.keyProjects; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -39,6 +41,7 @@ public class VideoManagerController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions("videomanager:add") @ResponseBody + @DockAnnotation(isAdd = true) public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -50,6 +53,7 @@ public class VideoManagerController extends BaseController { pd.put("OPUSER", Jurisdiction.getUsername()); //操作人 pd.put("ISDELETE", "0"); //是否删除 videomanagerService.save(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -61,6 +65,7 @@ public class VideoManagerController extends BaseController { @RequestMapping(value="/delete") @RequiresPermissions("videomanager:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -78,12 +83,14 @@ public class VideoManagerController extends BaseController { @RequestMapping(value="/edit") @RequiresPermissions("videomanager:edit") @ResponseBody + @DockAnnotation(isAdd = true) public Object edit() throws Exception{ Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); videomanagerService.edit(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -211,6 +218,7 @@ public class VideoManagerController extends BaseController { @RequestMapping(value="/deleteAll") @RequiresPermissions("videomanager:del") @ResponseBody + @DockAnnotation public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; diff --git a/src/main/java/com/zcloud/controller/keyProjects/VideoResourcesController.java b/src/main/java/com/zcloud/controller/keyProjects/VideoResourcesController.java index 2f5836c4..df55c9a5 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/VideoResourcesController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/VideoResourcesController.java @@ -69,6 +69,7 @@ public class VideoResourcesController extends BaseController { @RequestMapping(value = "/delete") @RequiresPermissions("videomanager:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -115,6 +116,7 @@ public class VideoResourcesController extends BaseController { @RequestMapping(value = "/edit") @RequiresPermissions("videomanager:edit") @ResponseBody + @DockAnnotation public Object edit() throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -177,6 +179,7 @@ public class VideoResourcesController extends BaseController { @RequestMapping(value = "/deleteAll") @RequiresPermissions("videomanager:del") @ResponseBody + @DockAnnotation public Object deleteAll() throws Exception { Map map = new HashMap(); String errInfo = "success"; diff --git a/src/main/resources/mybatis/dsno2/keyProjects/VideoResourcesMapper.xml b/src/main/resources/mybatis/dsno2/keyProjects/VideoResourcesMapper.xml index a70e443b..8fc13b2f 100644 --- a/src/main/resources/mybatis/dsno2/keyProjects/VideoResourcesMapper.xml +++ b/src/main/resources/mybatis/dsno2/keyProjects/VideoResourcesMapper.xml @@ -156,7 +156,8 @@ and f.UNIT_USE like CONCAT(CONCAT('%', #{pd.UNIT_USE}),'%') - GROUP BY f.OPERATTIME desc + group by f.VIDEO_RESOURCES_ID + order BY f.OPERATTIME desc