Browse Source

修改视频查询bug

syh 4 years ago
parent
commit
1e1601ab2c

+ 12 - 112
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/controller/AiKuaishouProgramCreativeLevelOperationRecordController.java

@@ -1,39 +1,19 @@
 package cn.com.ctop.kuaishou.modules.ai.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.modules.query.QueryGenerator;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.util.oConvertUtils;
-import cn.com.ctop.ctop.entity.AiKuaishouProgramCreativeLevelOperationRecord;
-import cn.com.ctop.ctop.service.IAiKuaishouProgramCreativeLevelOperationRecordService;
-import java.util.Date;
+import cn.com.ctop.common.module.utils.QueryGenerator;
+import cn.com.ctop.kuaishou.modules.ai.entity.AiKuaishouProgramCreativeLevelOperationRecord;
+import cn.com.ctop.kuaishou.modules.ai.service.IAiKuaishouProgramCreativeLevelOperationRecordService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
+import org.jeecg.common.api.vo.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-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 java.util.Arrays;
 
  /**
  * 程序换创意创建记录
@@ -57,13 +37,11 @@ public class AiKuaishouProgramCreativeLevelOperationRecordController {
 	 * @param req
 	 * @return
 	 */
-	@AutoLog(value = "程序换创意创建记录-分页列表查询")
-	@ApiOperation(value="程序换创意创建记录-分页列表查询", notes="程序换创意创建记录-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<AiKuaishouProgramCreativeLevelOperationRecord>> queryPageList(AiKuaishouProgramCreativeLevelOperationRecord aiKuaishouProgramCreativeLevelOperationRecord,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
+																					  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+																					  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+																					  HttpServletRequest req) {
 		Result<IPage<AiKuaishouProgramCreativeLevelOperationRecord>> result = new Result<>();
 		QueryWrapper<AiKuaishouProgramCreativeLevelOperationRecord> queryWrapper = QueryGenerator.initQueryWrapper(aiKuaishouProgramCreativeLevelOperationRecord, req.getParameterMap());
 		Page<AiKuaishouProgramCreativeLevelOperationRecord> page = new Page<AiKuaishouProgramCreativeLevelOperationRecord>(pageNo, pageSize);
@@ -78,8 +56,6 @@ public class AiKuaishouProgramCreativeLevelOperationRecordController {
 	 * @param aiKuaishouProgramCreativeLevelOperationRecord
 	 * @return
 	 */
-	@AutoLog(value = "程序换创意创建记录-添加")
-	@ApiOperation(value="程序换创意创建记录-添加", notes="程序换创意创建记录-添加")
 	@PostMapping(value = "/add")
 	public Result<AiKuaishouProgramCreativeLevelOperationRecord> add(@RequestBody AiKuaishouProgramCreativeLevelOperationRecord aiKuaishouProgramCreativeLevelOperationRecord) {
 		Result<AiKuaishouProgramCreativeLevelOperationRecord> result = new Result<>();
@@ -98,12 +74,10 @@ public class AiKuaishouProgramCreativeLevelOperationRecordController {
 	 * @param aiKuaishouProgramCreativeLevelOperationRecord
 	 * @return
 	 */
-	@AutoLog(value = "程序换创意创建记录-编辑")
-	@ApiOperation(value="程序换创意创建记录-编辑", notes="程序换创意创建记录-编辑")
 	@PutMapping(value = "/edit")
 	public Result<AiKuaishouProgramCreativeLevelOperationRecord> edit(@RequestBody AiKuaishouProgramCreativeLevelOperationRecord aiKuaishouProgramCreativeLevelOperationRecord) {
 		Result<AiKuaishouProgramCreativeLevelOperationRecord> result = new Result<AiKuaishouProgramCreativeLevelOperationRecord>();
-		AiKuaishouProgramCreativeLevelOperationRecord aiKuaishouProgramCreativeLevelOperationRecordEntity = aiKuaishouProgramCreativeLevelOperationRecordService.getById(aiKuaishouProgramCreativeLevelOperationRecord.getId());
+		AiKuaishouProgramCreativeLevelOperationRecord aiKuaishouProgramCreativeLevelOperationRecordEntity = aiKuaishouProgramCreativeLevelOperationRecordService.getById(aiKuaishouProgramCreativeLevelOperationRecord.getCreativeUuid());
 		if(aiKuaishouProgramCreativeLevelOperationRecordEntity==null) {
 			result.error500("未找到对应实体");
 		}else {
@@ -121,8 +95,6 @@ public class AiKuaishouProgramCreativeLevelOperationRecordController {
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "程序换创意创建记录-通过id删除")
-	@ApiOperation(value="程序换创意创建记录-通过id删除", notes="程序换创意创建记录-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		try {
@@ -139,8 +111,6 @@ public class AiKuaishouProgramCreativeLevelOperationRecordController {
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "程序换创意创建记录-批量删除")
-	@ApiOperation(value="程序换创意创建记录-批量删除", notes="程序换创意创建记录-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<AiKuaishouProgramCreativeLevelOperationRecord> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		Result<AiKuaishouProgramCreativeLevelOperationRecord> result = new Result<>();
@@ -158,8 +128,6 @@ public class AiKuaishouProgramCreativeLevelOperationRecordController {
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "程序换创意创建记录-通过id查询")
-	@ApiOperation(value="程序换创意创建记录-通过id查询", notes="程序换创意创建记录-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<AiKuaishouProgramCreativeLevelOperationRecord> queryById(@RequestParam(name="id",required=true) String id) {
 		Result<AiKuaishouProgramCreativeLevelOperationRecord> result = new Result<>();
@@ -172,72 +140,4 @@ public class AiKuaishouProgramCreativeLevelOperationRecordController {
 		}
 		return result;
 	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<AiKuaishouProgramCreativeLevelOperationRecord> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              AiKuaishouProgramCreativeLevelOperationRecord aiKuaishouProgramCreativeLevelOperationRecord = JSON.parseObject(deString, AiKuaishouProgramCreativeLevelOperationRecord.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(aiKuaishouProgramCreativeLevelOperationRecord, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<AiKuaishouProgramCreativeLevelOperationRecord> pageList = aiKuaishouProgramCreativeLevelOperationRecordService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "程序换创意创建记录列表");
-      mv.addObject(NormalExcelConstants.CLASS, AiKuaishouProgramCreativeLevelOperationRecord.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("程序换创意创建记录列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
-
-  /**
-      * 通过excel导入数据
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-          MultipartFile file = entity.getValue();
-          ImportParams params = new ImportParams();
-          params.setTitleRows(2);
-          params.setHeadRows(1);
-          params.setNeedSave(true);
-          try {
-              List<AiKuaishouProgramCreativeLevelOperationRecord> listAiKuaishouProgramCreativeLevelOperationRecords = ExcelImportUtil.importExcel(file.getInputStream(), AiKuaishouProgramCreativeLevelOperationRecord.class, params);
-              aiKuaishouProgramCreativeLevelOperationRecordService.saveBatch(listAiKuaishouProgramCreativeLevelOperationRecords);
-              return Result.ok("文件导入成功!数据行数:" + listAiKuaishouProgramCreativeLevelOperationRecords.size());
-          } catch (Exception e) {
-              log.error(e.getMessage(),e);
-              return Result.error("文件导入失败:"+e.getMessage());
-          } finally {
-              try {
-                  file.getInputStream().close();
-              } catch (IOException e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-      return Result.ok("文件导入失败!");
-  }
-
 }

+ 12 - 112
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/controller/AiKuaishouUnitLevelOperationRecordController.java

@@ -1,39 +1,19 @@
 package cn.com.ctop.kuaishou.modules.ai.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.modules.query.QueryGenerator;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.util.oConvertUtils;
-import cn.com.ctop.ctop.entity.AiKuaishouUnitLevelOperationRecord;
-import cn.com.ctop.ctop.service.IAiKuaishouUnitLevelOperationRecordService;
-import java.util.Date;
+import cn.com.ctop.common.module.utils.QueryGenerator;
+import cn.com.ctop.kuaishou.modules.ai.entity.AiKuaishouUnitLevelOperationRecord;
+import cn.com.ctop.kuaishou.modules.ai.service.IAiKuaishouUnitLevelOperationRecordService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
+import org.jeecg.common.api.vo.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-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 java.util.Arrays;
 
  /**
  * 组创建记录
@@ -57,13 +37,11 @@ public class AiKuaishouUnitLevelOperationRecordController {
 	 * @param req
 	 * @return
 	 */
-	@AutoLog(value = "组创建记录-分页列表查询")
-	@ApiOperation(value="组创建记录-分页列表查询", notes="组创建记录-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<AiKuaishouUnitLevelOperationRecord>> queryPageList(AiKuaishouUnitLevelOperationRecord aiKuaishouUnitLevelOperationRecord,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
+																		   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+																		   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+																		   HttpServletRequest req) {
 		Result<IPage<AiKuaishouUnitLevelOperationRecord>> result = new Result<>();
 		QueryWrapper<AiKuaishouUnitLevelOperationRecord> queryWrapper = QueryGenerator.initQueryWrapper(aiKuaishouUnitLevelOperationRecord, req.getParameterMap());
 		Page<AiKuaishouUnitLevelOperationRecord> page = new Page<AiKuaishouUnitLevelOperationRecord>(pageNo, pageSize);
@@ -78,8 +56,6 @@ public class AiKuaishouUnitLevelOperationRecordController {
 	 * @param aiKuaishouUnitLevelOperationRecord
 	 * @return
 	 */
-	@AutoLog(value = "组创建记录-添加")
-	@ApiOperation(value="组创建记录-添加", notes="组创建记录-添加")
 	@PostMapping(value = "/add")
 	public Result<AiKuaishouUnitLevelOperationRecord> add(@RequestBody AiKuaishouUnitLevelOperationRecord aiKuaishouUnitLevelOperationRecord) {
 		Result<AiKuaishouUnitLevelOperationRecord> result = new Result<>();
@@ -98,12 +74,10 @@ public class AiKuaishouUnitLevelOperationRecordController {
 	 * @param aiKuaishouUnitLevelOperationRecord
 	 * @return
 	 */
-	@AutoLog(value = "组创建记录-编辑")
-	@ApiOperation(value="组创建记录-编辑", notes="组创建记录-编辑")
 	@PutMapping(value = "/edit")
 	public Result<AiKuaishouUnitLevelOperationRecord> edit(@RequestBody AiKuaishouUnitLevelOperationRecord aiKuaishouUnitLevelOperationRecord) {
 		Result<AiKuaishouUnitLevelOperationRecord> result = new Result<AiKuaishouUnitLevelOperationRecord>();
-		AiKuaishouUnitLevelOperationRecord aiKuaishouUnitLevelOperationRecordEntity = aiKuaishouUnitLevelOperationRecordService.getById(aiKuaishouUnitLevelOperationRecord.getId());
+		AiKuaishouUnitLevelOperationRecord aiKuaishouUnitLevelOperationRecordEntity = aiKuaishouUnitLevelOperationRecordService.getById(aiKuaishouUnitLevelOperationRecord.getGroupUuid());
 		if(aiKuaishouUnitLevelOperationRecordEntity==null) {
 			result.error500("未找到对应实体");
 		}else {
@@ -121,8 +95,6 @@ public class AiKuaishouUnitLevelOperationRecordController {
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "组创建记录-通过id删除")
-	@ApiOperation(value="组创建记录-通过id删除", notes="组创建记录-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		try {
@@ -139,8 +111,6 @@ public class AiKuaishouUnitLevelOperationRecordController {
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "组创建记录-批量删除")
-	@ApiOperation(value="组创建记录-批量删除", notes="组创建记录-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<AiKuaishouUnitLevelOperationRecord> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		Result<AiKuaishouUnitLevelOperationRecord> result = new Result<>();
@@ -158,8 +128,6 @@ public class AiKuaishouUnitLevelOperationRecordController {
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "组创建记录-通过id查询")
-	@ApiOperation(value="组创建记录-通过id查询", notes="组创建记录-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<AiKuaishouUnitLevelOperationRecord> queryById(@RequestParam(name="id",required=true) String id) {
 		Result<AiKuaishouUnitLevelOperationRecord> result = new Result<>();
@@ -172,72 +140,4 @@ public class AiKuaishouUnitLevelOperationRecordController {
 		}
 		return result;
 	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<AiKuaishouUnitLevelOperationRecord> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              AiKuaishouUnitLevelOperationRecord aiKuaishouUnitLevelOperationRecord = JSON.parseObject(deString, AiKuaishouUnitLevelOperationRecord.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(aiKuaishouUnitLevelOperationRecord, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<AiKuaishouUnitLevelOperationRecord> pageList = aiKuaishouUnitLevelOperationRecordService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "组创建记录列表");
-      mv.addObject(NormalExcelConstants.CLASS, AiKuaishouUnitLevelOperationRecord.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("组创建记录列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
-
-  /**
-      * 通过excel导入数据
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-          MultipartFile file = entity.getValue();
-          ImportParams params = new ImportParams();
-          params.setTitleRows(2);
-          params.setHeadRows(1);
-          params.setNeedSave(true);
-          try {
-              List<AiKuaishouUnitLevelOperationRecord> listAiKuaishouUnitLevelOperationRecords = ExcelImportUtil.importExcel(file.getInputStream(), AiKuaishouUnitLevelOperationRecord.class, params);
-              aiKuaishouUnitLevelOperationRecordService.saveBatch(listAiKuaishouUnitLevelOperationRecords);
-              return Result.ok("文件导入成功!数据行数:" + listAiKuaishouUnitLevelOperationRecords.size());
-          } catch (Exception e) {
-              log.error(e.getMessage(),e);
-              return Result.error("文件导入失败:"+e.getMessage());
-          } finally {
-              try {
-                  file.getInputStream().close();
-              } catch (IOException e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-      return Result.ok("文件导入失败!");
-  }
-
 }