Browse Source

测试效果

syh 5 năm trước cách đây
mục cha
commit
656ba2ee8c

+ 30 - 32
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/VideoWatermarkTaskController.java

@@ -1,39 +1,37 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.util.oConvertUtils;
 import cn.com.ctop.common.module.entity.VideoWatermarkTask;
 import cn.com.ctop.common.module.entity.VideoWatermarkTask;
 import cn.com.ctop.common.module.service.IVideoWatermarkTaskService;
 import cn.com.ctop.common.module.service.IVideoWatermarkTaskService;
-import java.util.Date;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
-
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 
  /**
  /**
  * 水印任务表
  * 水印任务表
@@ -48,7 +46,7 @@ import io.swagger.annotations.ApiOperation;
 public class VideoWatermarkTaskController {
 public class VideoWatermarkTaskController {
 	@Autowired
 	@Autowired
 	private IVideoWatermarkTaskService videoWatermarkTaskService;
 	private IVideoWatermarkTaskService videoWatermarkTaskService;
-	
+
 	/**
 	/**
 	  * 分页列表查询
 	  * 分页列表查询
 	 * @param videoWatermarkTask
 	 * @param videoWatermarkTask
@@ -70,9 +68,9 @@ public class VideoWatermarkTaskController {
 		IPage<VideoWatermarkTask> pageList = videoWatermarkTaskService.page(page, queryWrapper);
 		IPage<VideoWatermarkTask> pageList = videoWatermarkTaskService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setSuccess(true);
 		result.setResult(pageList);
 		result.setResult(pageList);
-		return result;
-	}
-	
+        return result;
+    }
+
 	/**
 	/**
 	  *   添加
 	  *   添加
 	 * @param videoWatermarkTask
 	 * @param videoWatermarkTask
@@ -92,8 +90,8 @@ public class VideoWatermarkTaskController {
 		}
 		}
 		return result;
 		return result;
 	}
 	}
-	
-	/**
+
+     /**
 	  *  编辑
 	  *  编辑
 	 * @param videoWatermarkTask
 	 * @param videoWatermarkTask
 	 * @return
 	 * @return
@@ -112,11 +110,11 @@ public class VideoWatermarkTaskController {
 				result.success("修改成功!");
 				result.success("修改成功!");
 			}
 			}
 		}
 		}
-		
-		return result;
+
+        return result;
 	}
 	}
-	
-	/**
+
+     /**
 	  *   通过id删除
 	  *   通过id删除
 	 * @param id
 	 * @param id
 	 * @return
 	 * @return
@@ -133,8 +131,8 @@ public class VideoWatermarkTaskController {
 		}
 		}
 		return Result.ok("删除成功!");
 		return Result.ok("删除成功!");
 	}
 	}
-	
-	/**
+
+     /**
 	  *  批量删除
 	  *  批量删除
 	 * @param ids
 	 * @param ids
 	 * @return
 	 * @return
@@ -152,8 +150,8 @@ public class VideoWatermarkTaskController {
 		}
 		}
 		return result;
 		return result;
 	}
 	}
-	
-	/**
+
+     /**
 	  * 通过id查询
 	  * 通过id查询
 	 * @param id
 	 * @param id
 	 * @return
 	 * @return