重点工程部分代码

src/main/java/com/zcloud/aspect/DockingAspect.java

@@ -43,7 +43,7 @@ public class DockingAspect {
     public Object beforeApi(ProceedingJoinPoint joinPoint) throws Throwable {
         Map<String,String> proceed = (HashMap<String,String>)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路径

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<String,Object> map = new HashMap<String,Object>();
 		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<String,String> map = new HashMap<String,String>();
 		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<String,Object> map = new HashMap<String,Object>();
 		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<String,Object> map = new HashMap<String,Object>();
 		String errInfo = "success";

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<String, String> map = new HashMap<String, String>();
         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<String, Object> map = new HashMap<String, Object>();
         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<String, Object> map = new HashMap<String, Object>();
         String errInfo = "success";

src/main/resources/mybatis/dsno2/keyProjects/VideoResourcesMapper.xml

@@ -156,7 +156,8 @@
 		<if test="pd.UNIT_USE != null and pd.UNIT_USE != ''">
 			and f.UNIT_USE like CONCAT(CONCAT('%', #{pd.UNIT_USE}),'%')
 		</if>
-		GROUP BY f.OPERATTIME desc
+		group by f.VIDEO_RESOURCES_ID
+		order BY f.OPERATTIME desc
 	</select>
 
 	<!-- 列表(全部) -->