yumeng 5 yıl önce
ebeveyn
işleme
e2dab80585

+ 247 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialImageInfoController.java

@@ -0,0 +1,247 @@
+package org.jeecg.modules.ctop.controller;
+
+import cn.com.ctop.common.module.entity.MaterialImageInfo;
+import com.alibaba.fastjson.JSON;
+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 io.swagger.annotations.ApiOperation;
+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.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.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 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;
+
+/**
+ * 素材
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2020-03-16
+ */
+@Slf4j
+@Api(tags = "素材")
+@RestController
+@RequestMapping("/ctop/MaterialImageInfo")
+public class MaterialImageInfoController {
+    @Autowired
+    private IMaterialImageInfoService MaterialImageInfoService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param MaterialImageInfo
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "素材-分页列表查询")
+    @ApiOperation(value = "素材-分页列表查询", notes = "素材-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<MaterialImageInfo>> queryPageList(MaterialImageInfo MaterialImageInfo,
+                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                          HttpServletRequest req) {
+        Result<IPage<MaterialImageInfo>> result = new Result<IPage<MaterialImageInfo>>();
+        QueryWrapper<MaterialImageInfo> queryWrapper = QueryGenerator.initQueryWrapper(MaterialImageInfo, req.getParameterMap());
+        Page<MaterialImageInfo> page = new Page<MaterialImageInfo>(pageNo, pageSize);
+        IPage<MaterialImageInfo> pageList = MaterialImageInfoService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param MaterialImageInfo
+     * @return
+     */
+    @AutoLog(value = "素材-添加")
+    @ApiOperation(value = "素材-添加", notes = "素材-添加")
+    @PostMapping(value = "/add")
+    public Result<MaterialImageInfo> add(@RequestBody MaterialImageInfo MaterialImageInfo) {
+        Result<MaterialImageInfo> result = new Result<MaterialImageInfo>();
+        try {
+            MaterialImageInfoService.save(MaterialImageInfo);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param MaterialImageInfo
+     * @return
+     */
+    @AutoLog(value = "素材-编辑")
+    @ApiOperation(value = "素材-编辑", notes = "素材-编辑")
+    @PutMapping(value = "/edit")
+    public Result<MaterialImageInfo> edit(@RequestBody MaterialImageInfo MaterialImageInfo) {
+        Result<MaterialImageInfo> result = new Result<MaterialImageInfo>();
+        MaterialImageInfo MaterialImageInfoEntity = MaterialImageInfoService.getById(MaterialImageInfo.getId());
+        if (MaterialImageInfoEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = MaterialImageInfoService.updateById(MaterialImageInfo);
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @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 {
+            MaterialImageInfoService.removeById(id);
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "素材-批量删除")
+    @ApiOperation(value = "素材-批量删除", notes = "素材-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<MaterialImageInfo> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<MaterialImageInfo> result = new Result<MaterialImageInfo>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.MaterialImageInfoService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "素材-通过id查询")
+    @ApiOperation(value = "素材-通过id查询", notes = "素材-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<MaterialImageInfo> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<MaterialImageInfo> result = new Result<MaterialImageInfo>();
+        MaterialImageInfo MaterialImageInfo = MaterialImageInfoService.getById(id);
+        if (MaterialImageInfo == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(MaterialImageInfo);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<MaterialImageInfo> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                MaterialImageInfo MaterialImageInfo = JSON.parseObject(deString, MaterialImageInfo.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(MaterialImageInfo, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<MaterialImageInfo> pageList = MaterialImageInfoService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "素材列表");
+        mv.addObject(NormalExcelConstants.CLASS, MaterialImageInfo.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<MaterialImageInfo> listMaterialImageInfos = ExcelImportUtil.importExcel(file.getInputStream(), MaterialImageInfo.class, params);
+                MaterialImageInfoService.saveBatch(listMaterialImageInfos);
+                return Result.ok("文件导入成功!数据行数:" + listMaterialImageInfos.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("文件导入失败!");
+    }
+
+}

+ 135 - 0
module-common/src/main/java/cn/com/ctop/common/module/entity/MaterialImageInfo.java

@@ -0,0 +1,135 @@
+package cn.com.ctop.common.module.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.util.Date;
+
+/**
+ * 素材
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2020-03-16
+ */
+@Data
+@TableName("ctop_material_image_info")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ctop_material_image_info对象", description = "素材")
+public class MaterialImageInfo {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "id")
+    private String id;
+    /**
+     * code
+     */
+    @Excel(name = "code", width = 15)
+    @ApiModelProperty(value = "code")
+    private String code;
+    /**
+     * url
+     */
+    @Excel(name = "url", width = 15)
+    @ApiModelProperty(value = "url")
+    private Object url;
+    /**
+     * 素材名称
+     */
+    @Excel(name = "素材名称", width = 15)
+    @ApiModelProperty(value = "素材名称")
+    private String videoId;
+    /**
+     * 素材名称
+     */
+    @Excel(name = "素材名称", width = 15)
+    @ApiModelProperty(value = "素材名称")
+    private String materialName;
+    /**
+     * 创建人id
+     */
+    @Excel(name = "创建人id", width = 15)
+    @ApiModelProperty(value = "创建人id")
+    private String userId;
+    /**
+     * 审核人
+     */
+    @Excel(name = "审核人", width = 15)
+    @ApiModelProperty(value = "审核人")
+    private String auditorId;
+    /**
+     * 0-待审核 1-审核通过 2-审核拒绝
+     */
+    @Excel(name = "0-待审核 1-审核通过 2-审核拒绝", width = 15)
+    @ApiModelProperty(value = "0-待审核 1-审核通过 2-审核拒绝")
+    private Integer status;
+    /**
+     * 素材描述
+     */
+    @Excel(name = "素材描述", width = 15)
+    @ApiModelProperty(value = "素材描述")
+    private Object materialDescribe;
+    /**
+     * 项目id
+     */
+    @Excel(name = "项目id", width = 15)
+    @ApiModelProperty(value = "项目id")
+    private Long projectId;
+    /**
+     * 拒绝原因
+     */
+    @Excel(name = "拒绝原因", width = 15)
+    @ApiModelProperty(value = "拒绝原因")
+    private Object refuseReason;
+    /**
+     * 拒绝截图
+     */
+    @Excel(name = "拒绝截图", width = 15)
+    @ApiModelProperty(value = "拒绝截图")
+    private Object refuseFile;
+    /**
+     * width
+     */
+    @Excel(name = "width", width = 15)
+    @ApiModelProperty(value = "width")
+    private String width;
+    /**
+     * 素材类型
+     */
+    @Excel(name = "素材类型", width = 15)
+    @ApiModelProperty(value = "素材类型")
+    private String type;
+    /**
+     * height
+     */
+    @Excel(name = "height", width = 15)
+    @ApiModelProperty(value = "height")
+    private String height;
+    /**
+     * size
+     */
+    @Excel(name = "size", width = 15)
+    @ApiModelProperty(value = "size")
+    private String size;
+    /**
+     * createTime
+     */
+    @ApiModelProperty(value = "createTime")
+    private Date createTime;
+    /**
+     * updateTime
+     */
+    @ApiModelProperty(value = "updateTime")
+    private Date updateTime;
+}

+ 15 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/MaterialImageInfoMapper.java

@@ -0,0 +1,15 @@
+package cn.com.ctop.common.module.mapper;
+
+import cn.com.ctop.common.module.entity.MaterialImageInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 素材
+ *
+ * @author: jeecg-boot
+ * @date: 2020-03-16
+ * @cersion: V1.0
+ */
+public interface MaterialImageInfoMapper extends BaseMapper<MaterialImageInfo> {
+
+}

+ 5 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/MaterialImageInfoMapper.xml

@@ -0,0 +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.common.module.mapper.MaterialImageInfoMapper">
+
+</mapper>

+ 23 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/IMaterialImageInfoService.java

@@ -0,0 +1,23 @@
+package cn.com.ctop.common.module.service;
+
+import cn.com.ctop.common.module.entity.MaterialImageInfo;
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 素材
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2020-03-16
+ */
+public interface IMaterialImageInfoService extends IService<MaterialImageInfo> {
+
+    /**
+     * 根据视频id  关联封面
+     *
+     * @param videoId
+     * @param imageArr
+     */
+    void insertImage(String videoId, JSONArray imageArr);
+}

+ 61 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialImageInfoServiceImpl.java

@@ -0,0 +1,61 @@
+package cn.com.ctop.common.module.service.impl;
+
+import cn.com.ctop.common.module.entity.MaterialImageInfo;
+import cn.com.ctop.common.module.mapper.MaterialImageInfoMapper;
+import cn.com.ctop.common.module.service.IMaterialImageInfoService;
+import cn.com.ctop.common.module.utils.Check;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * 素材
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2020-03-16
+ */
+@Slf4j
+@Service
+public class MaterialImageInfoServiceImpl extends ServiceImpl<MaterialImageInfoMapper, MaterialImageInfo> implements IMaterialImageInfoService {
+
+    @Override
+    public void insertImage(JSONObject imageJson) {
+        String videoId = imageJson.getString("videoId");
+        if (Check.isNull(videoId)) {
+            log.error("视频id不能为空");
+
+        }
+
+        String userId = imageJson.getString("userId");
+        Long projectId = imageJson.getLong("projectId");
+
+        JSONArray imageArr = imageJson.getJSONArray("imageArr");
+        for (int i = 0; i < imageArr.size(); i++) {
+            JSONObject json = imageArr.getJSONObject(i);
+            if (!Check.isNull(json)) {
+                MaterialImageInfo materialImageInfo = new MaterialImageInfo();
+                materialImageInfo.setVideoId(videoId);
+                materialImageInfo.setCode(json.getString("code"));
+                materialImageInfo.setMaterialDescribe(json.getString("materialDescribe"));
+                materialImageInfo.setType("IMAGE");
+                materialImageInfo.setHeight(json.getString("height"));
+                materialImageInfo.setWidth(json.getString("width"));
+                materialImageInfo.setSize(json.getString("size"));
+                materialImageInfo.setUrl(json.getString("url"));
+                materialImageInfo.setMaterialName(json.getString("materialName"));
+                materialImageInfo.setStatus(0);
+                materialImageInfo.setProjectId(projectId);
+                materialImageInfo.setUserId(userId);
+
+
+            }
+
+
+        }
+
+
+    }
+}

+ 15 - 22
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java

@@ -5,10 +5,7 @@ import cn.com.ctop.common.module.mapper.MaterialAscriptionMapper;
 import cn.com.ctop.common.module.mapper.MaterialInfoMapper;
 import cn.com.ctop.common.module.mapper.MaterialParameterMapper;
 import cn.com.ctop.common.module.mapper.MaterialTagMapper;
-import cn.com.ctop.common.module.service.IMaterialCutFrameService;
-import cn.com.ctop.common.module.service.IMaterialInfoService;
-import cn.com.ctop.common.module.service.IVideoWatermarkTaskService;
-import cn.com.ctop.common.module.service.IVideoWatermarkTemplateService;
+import cn.com.ctop.common.module.service.*;
 import cn.com.ctop.common.module.utils.*;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -436,6 +433,9 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
     }
 
 
+    @Autowired
+    private IMaterialImageInfoService materialImageInfoService;
+
     /**
      * 素材库关联上传素材
      *
@@ -449,15 +449,10 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
         try {
             String type = json.getString("type");
 
-                String url = "";
-                if (!Check.isNull(json.getString("url"))) {
-                    url = "https:" + json.getString("url");
-                }
-              //  insertMaterialInfo(url, type, json);
-
-
-
-
+            String url = "";
+            if (!Check.isNull(json.getString("url"))) {
+                url = "https:" + json.getString("url");
+            }
 
             MaterialInfo info = new MaterialInfo();
             Long projectId = json.getLong("projectId");
@@ -479,6 +474,13 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
             info.setUpdateTime(new Date());
             info.setType(type);
             this.save(info);
+
+            JSONArray imageArr = json.getJSONArray("imageArr");
+            if (!Check.isNull(imageArr) && imageArr.size() > 0) {
+                materialImageInfoService.insertImage(info.getId(), imageArr);
+            }
+
+
             Map<String, Object> deleteMap = new HashMap<>();
             deleteMap.put("material_id", info.getId());
             JSONObject ascription = json.getJSONObject("ascription");
@@ -518,11 +520,6 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
             getFile(info);
 
 
-
-
-
-
-
             ResultMapUtils.setResultMap(resultMap, StatusCode.COMMON_SUCCESS.getCode());
         } catch (Exception e) {
             ResultMapUtils.setResultMap(resultMap, StatusCode.MATERIAL_UPLOAD_FAIL.getCode());
@@ -534,9 +531,5 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
         return resultMap;
 
 
-
-
-
-
     }
 }

+ 6 - 0
module-common/src/main/java/cn/com/ctop/common/module/utils/Check.java

@@ -1,5 +1,6 @@
 package cn.com.ctop.common.module.utils;
 
+import com.alibaba.fastjson.JSONArray;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.Collection;
@@ -20,6 +21,11 @@ public class Check {
         return collection == null || collection.size() == 0 ? true : false;
     }
 
+    public static boolean isNull(JSONArray jsonArray) {
+        return jsonArray == null || jsonArray.size() == 0 ? true : false;
+    }
+
+
     public static boolean isNull(String str) {
         return str == null || str.length() <= 0;
     }