|
@@ -6,8 +6,7 @@ import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
-import org.apache.shiro.SecurityUtils;
|
|
|
|
-import org.jeecg.common.system.vo.LoginUser;
|
|
|
|
|
|
+import org.jeecg.modules.ctop.service.IMaterialUploadTaskService;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
@@ -32,11 +31,13 @@ public class MaterialUploadController {
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private IMaterialUploadService materialUploadService;
|
|
private IMaterialUploadService materialUploadService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private IMaterialUploadTaskService materialUploadTaskService;
|
|
|
|
+
|
|
|
|
|
|
@PostMapping(value = "/uploadAccount")
|
|
@PostMapping(value = "/uploadAccount")
|
|
public Map<String, Object> uploadAccount(@RequestBody JSONObject json) {
|
|
public Map<String, Object> uploadAccount(@RequestBody JSONObject json) {
|
|
Map<String, Object> returnMap = new HashMap<>();
|
|
Map<String, Object> returnMap = new HashMap<>();
|
|
- log.info("头条视频素材推送信息=={}",json);
|
|
|
|
String mediaId = json.getString("mediaId");
|
|
String mediaId = json.getString("mediaId");
|
|
Boolean shieldBackwardSwitch = json.getBoolean("shieldBackwardSwitch");
|
|
Boolean shieldBackwardSwitch = json.getBoolean("shieldBackwardSwitch");
|
|
JSONArray materialArray = json.getJSONArray("materialArray");
|
|
JSONArray materialArray = json.getJSONArray("materialArray");
|
|
@@ -48,8 +49,11 @@ public class MaterialUploadController {
|
|
if (Check.isNull(materialArray) || Check.isNull(accountArray)) {
|
|
if (Check.isNull(materialArray) || Check.isNull(accountArray)) {
|
|
throw new Exception("请选择账号或素材");
|
|
throw new Exception("请选择账号或素材");
|
|
}
|
|
}
|
|
- LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
|
- new Thread(() -> materialUploadService.uploadAccount(mediaId, materialArray, accountArray, sysUser.getId(), shieldBackwardSwitch)).start();
|
|
|
|
|
|
+
|
|
|
|
+ // new Thread(() -> materialUploadService.uploadAccount(mediaId, materialArray, accountArray, sysUser.getId(), shieldBackwardSwitch)).start();
|
|
|
|
+
|
|
|
|
+ JSONArray returnArr = materialUploadTaskService.submitTask(json);
|
|
|
|
+
|
|
returnMap.put("success", true);
|
|
returnMap.put("success", true);
|
|
returnMap.put("message", "开始上传文件");
|
|
returnMap.put("message", "开始上传文件");
|
|
returnMap.put("code", 0);
|
|
returnMap.put("code", 0);
|