|
@@ -1,37 +1,10 @@
|
|
|
package org.jeecg.modules.ctop.controller;
|
|
|
|
|
|
import cn.com.ctop.common.module.constant.CtopRoleCodeConstant;
|
|
|
-import cn.com.ctop.common.module.entity.ByteDanceCleanMaterialReport;
|
|
|
-import cn.com.ctop.common.module.entity.MaterialAscription;
|
|
|
-import cn.com.ctop.common.module.entity.MaterialCutFrame;
|
|
|
-import cn.com.ctop.common.module.entity.MaterialImageInfo;
|
|
|
-import cn.com.ctop.common.module.entity.MaterialInfo;
|
|
|
-import cn.com.ctop.common.module.entity.MaterialParameter;
|
|
|
-import cn.com.ctop.common.module.entity.MaterialTag;
|
|
|
-import cn.com.ctop.common.module.entity.Product;
|
|
|
-import cn.com.ctop.common.module.entity.Project;
|
|
|
-import cn.com.ctop.common.module.entity.UserCompany;
|
|
|
+import cn.com.ctop.common.module.entity.*;
|
|
|
import cn.com.ctop.common.module.enums.MaterialSupplierEnum;
|
|
|
-import cn.com.ctop.common.module.service.IByteDanceCleanMaterialReportService;
|
|
|
-import cn.com.ctop.common.module.service.IMaterialAscriptionService;
|
|
|
-import cn.com.ctop.common.module.service.IMaterialCutFrameService;
|
|
|
-import cn.com.ctop.common.module.service.IMaterialImageInfoService;
|
|
|
-import cn.com.ctop.common.module.service.IMaterialInfoService;
|
|
|
-import cn.com.ctop.common.module.service.IMaterialParameterService;
|
|
|
-import cn.com.ctop.common.module.service.IMaterialTagService;
|
|
|
-import cn.com.ctop.common.module.service.IMessageTemplate;
|
|
|
-import cn.com.ctop.common.module.service.IProductService;
|
|
|
-import cn.com.ctop.common.module.service.IProjectService;
|
|
|
-import cn.com.ctop.common.module.service.ISendMessageService;
|
|
|
-import cn.com.ctop.common.module.service.IUserCompanyService;
|
|
|
-import cn.com.ctop.common.module.service.IVideoWatermarkTaskService;
|
|
|
-import cn.com.ctop.common.module.utils.Check;
|
|
|
-import cn.com.ctop.common.module.utils.CloudVideoProcessUtil;
|
|
|
-import cn.com.ctop.common.module.utils.JsonUtil;
|
|
|
-import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
|
|
|
-import cn.com.ctop.common.module.utils.ResultMapUtils;
|
|
|
-import cn.com.ctop.common.module.utils.StatusCode;
|
|
|
-import cn.com.ctop.common.module.utils.StringUtils;
|
|
|
+import cn.com.ctop.common.module.service.*;
|
|
|
+import cn.com.ctop.common.module.utils.*;
|
|
|
import cn.com.ctop.toutiao.modules.material.entity.ByteDanceCreativeWordPackage;
|
|
|
import cn.com.ctop.toutiao.modules.material.entity.BytedanceVideoSlogenInfo;
|
|
|
import cn.com.ctop.toutiao.modules.material.service.IByteDanceCreativeWordPackageService;
|
|
@@ -52,25 +25,13 @@ import org.jeecg.common.util.DateUtils;
|
|
|
import org.jeecg.modules.ctop.service.IProjectMemberService;
|
|
|
import org.jeecg.modules.system.service.ISysRoleService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.web.bind.annotation.DeleteMapping;
|
|
|
-import org.springframework.web.bind.annotation.GetMapping;
|
|
|
-import org.springframework.web.bind.annotation.PostMapping;
|
|
|
-import org.springframework.web.bind.annotation.PutMapping;
|
|
|
-import org.springframework.web.bind.annotation.RequestBody;
|
|
|
-import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
-import org.springframework.web.bind.annotation.RequestParam;
|
|
|
-import org.springframework.web.bind.annotation.RestController;
|
|
|
+import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import java.net.URLDecoder;
|
|
|
import java.text.ParseException;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Arrays;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
import java.util.regex.Matcher;
|
|
|
import java.util.regex.Pattern;
|
|
|
|
|
@@ -807,6 +768,7 @@ public class MaterialInfoController {
|
|
|
public Result<MaterialInfo> batchEditStatus(@RequestBody JSONObject requestJson) {
|
|
|
Result<MaterialInfo> result = new Result<>();
|
|
|
Integer status = requestJson.getInteger("status");
|
|
|
+ String userId = requestJson.getString("userId");
|
|
|
JSONArray ids = requestJson.getJSONArray("ids");
|
|
|
if (Check.isNull(ids)) {
|
|
|
result.setCode(-1);
|
|
@@ -820,6 +782,7 @@ public class MaterialInfoController {
|
|
|
MaterialInfo materialInfo = new MaterialInfo();
|
|
|
materialInfo.setId(id);
|
|
|
materialInfo.setStatus(status);
|
|
|
+ materialInfo.setAuditorId(userId);
|
|
|
materialInfo.setConfirmTime(new Date());
|
|
|
boolean b = materialInfoService.updateById(materialInfo);
|
|
|
if (b) {
|