liyuyi@c-top.com.cn 4 rokov pred
rodič
commit
42639d9ee9

+ 12 - 112
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialImageVideoInfoController.java

@@ -1,41 +1,21 @@
 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.com.cn.entity.MaterialImageVideoInfo;
-import cn.com.ctop.com.cn.service.IMaterialImageVideoInfoService;
-import java.util.Date;
+import cn.com.ctop.common.module.entity.MaterialImageVideoInfo;
+import cn.com.ctop.common.module.service.IMaterialImageVideoInfoService;
 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.jeecg.common.system.query.QueryGenerator;
 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;
+
+/**
  * 视频封面关联表信息
  * @author jeecg-boot
  * @date   2020-12-17
@@ -57,13 +37,11 @@ public class MaterialImageVideoInfoController {
 	 * @param req
 	 * @return
 	 */
-	@AutoLog(value = "视频封面关联表信息-分页列表查询")
-	@ApiOperation(value="视频封面关联表信息-分页列表查询", notes="视频封面关联表信息-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<MaterialImageVideoInfo>> queryPageList(MaterialImageVideoInfo materialImageVideoInfo,
-									  @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<MaterialImageVideoInfo>> result = new Result<>();
 		QueryWrapper<MaterialImageVideoInfo> queryWrapper = QueryGenerator.initQueryWrapper(materialImageVideoInfo, req.getParameterMap());
 		Page<MaterialImageVideoInfo> page = new Page<MaterialImageVideoInfo>(pageNo, pageSize);
@@ -78,8 +56,6 @@ public class MaterialImageVideoInfoController {
 	 * @param materialImageVideoInfo
 	 * @return
 	 */
-	@AutoLog(value = "视频封面关联表信息-添加")
-	@ApiOperation(value="视频封面关联表信息-添加", notes="视频封面关联表信息-添加")
 	@PostMapping(value = "/add")
 	public Result<MaterialImageVideoInfo> add(@RequestBody MaterialImageVideoInfo materialImageVideoInfo) {
 		Result<MaterialImageVideoInfo> result = new Result<>();
@@ -98,8 +74,6 @@ public class MaterialImageVideoInfoController {
 	 * @param materialImageVideoInfo
 	 * @return
 	 */
-	@AutoLog(value = "视频封面关联表信息-编辑")
-	@ApiOperation(value="视频封面关联表信息-编辑", notes="视频封面关联表信息-编辑")
 	@PutMapping(value = "/edit")
 	public Result<MaterialImageVideoInfo> edit(@RequestBody MaterialImageVideoInfo materialImageVideoInfo) {
 		Result<MaterialImageVideoInfo> result = new Result<MaterialImageVideoInfo>();
@@ -121,8 +95,6 @@ public class MaterialImageVideoInfoController {
 	 * @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 MaterialImageVideoInfoController {
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "视频封面关联表信息-批量删除")
-	@ApiOperation(value="视频封面关联表信息-批量删除", notes="视频封面关联表信息-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<MaterialImageVideoInfo> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		Result<MaterialImageVideoInfo> result = new Result<>();
@@ -158,8 +128,6 @@ public class MaterialImageVideoInfoController {
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "视频封面关联表信息-通过id查询")
-	@ApiOperation(value="视频封面关联表信息-通过id查询", notes="视频封面关联表信息-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<MaterialImageVideoInfo> queryById(@RequestParam(name="id",required=true) String id) {
 		Result<MaterialImageVideoInfo> result = new Result<>();
@@ -172,72 +140,4 @@ public class MaterialImageVideoInfoController {
 		}
 		return result;
 	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<MaterialImageVideoInfo> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              MaterialImageVideoInfo materialImageVideoInfo = JSON.parseObject(deString, MaterialImageVideoInfo.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(materialImageVideoInfo, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<MaterialImageVideoInfo> pageList = materialImageVideoInfoService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "视频封面关联表信息列表");
-      mv.addObject(NormalExcelConstants.CLASS, MaterialImageVideoInfo.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<MaterialImageVideoInfo> listMaterialImageVideoInfos = ExcelImportUtil.importExcel(file.getInputStream(), MaterialImageVideoInfo.class, params);
-              materialImageVideoInfoService.saveBatch(listMaterialImageVideoInfos);
-              return Result.ok("文件导入成功!数据行数:" + listMaterialImageVideoInfos.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("文件导入失败!");
-  }
-
 }

+ 2 - 10
module-common/src/main/java/cn/com/ctop/common/module/entity/MaterialImageVideoInfo.java

@@ -23,27 +23,19 @@ import org.jeecgframework.poi.excel.annotation.Excel;
  */
 @Data
 @TableName("ctop_material_image_video_info")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="ctop_material_image_video_info对象", description="视频封面关联表信息")
 public class MaterialImageVideoInfo {
     
 	/**id*/
-	@TableId(type = IdType.UUID)
-    @ApiModelProperty(value = "id")
-	private java.lang.Integer id;
+	@TableId(type = IdType.AUTO)
+	private java.lang.Long id;
 	/**视频md5码*/
 	@Excel(name = "视频md5码", width = 15)
-    @ApiModelProperty(value = "视频md5码")
 	private java.lang.String videoCode;
 	/**封面md5码*/
 	@Excel(name = "封面md5码", width = 15)
-    @ApiModelProperty(value = "封面md5码")
 	private java.lang.String coverCode;
 	/**createTime*/
-    @ApiModelProperty(value = "createTime")
 	private java.util.Date createTime;
 	/**updateTime*/
-    @ApiModelProperty(value = "updateTime")
 	private java.util.Date updateTime;
 }

+ 2 - 5
module-common/src/main/java/cn/com/ctop/common/module/mapper/MaterialImageVideoInfoMapper.java

@@ -1,9 +1,6 @@
-package cn.com.ctop.com.cn.mapper;
+package cn.com.ctop.common.module.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import cn.com.ctop.com.cn.entity.MaterialImageVideoInfo;
+import cn.com.ctop.common.module.entity.MaterialImageVideoInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/MaterialImageVideoInfoMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.com.ctop.com.cn.mapper.MaterialImageVideoInfoMapper">
+<mapper namespace="cn.com.ctop.common.module.mapper.MaterialImageVideoInfoMapper">
 
 </mapper>

+ 4 - 5
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialImageVideoInfoServiceImpl.java

@@ -1,11 +1,10 @@
 package cn.com.ctop.common.module.service.impl;
 
-import cn.com.ctop.com.cn.entity.MaterialImageVideoInfo;
-import cn.com.ctop.com.cn.mapper.MaterialImageVideoInfoMapper;
-import cn.com.ctop.com.cn.service.IMaterialImageVideoInfoService;
-import org.springframework.stereotype.Service;
-
+import cn.com.ctop.common.module.entity.MaterialImageVideoInfo;
+import cn.com.ctop.common.module.mapper.MaterialImageVideoInfoMapper;
+import cn.com.ctop.common.module.service.IMaterialImageVideoInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
 
 /**
  * 视频封面关联表信息