|
@@ -8,6 +8,7 @@ import cn.com.ctop.common.module.mapper.CtopOauthTokenMapper;
|
|
import cn.com.ctop.common.module.mapper.MaterialInfoMapper;
|
|
import cn.com.ctop.common.module.mapper.MaterialInfoMapper;
|
|
import cn.com.ctop.common.module.mapper.MaterialParameterMapper;
|
|
import cn.com.ctop.common.module.mapper.MaterialParameterMapper;
|
|
import cn.com.ctop.common.module.service.IFileInfoService;
|
|
import cn.com.ctop.common.module.service.IFileInfoService;
|
|
|
|
+import cn.com.ctop.common.module.service.IMaterialParameterService;
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
|
|
import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
|
|
import cn.com.ctop.common.module.utils.LoadFileUtil;
|
|
import cn.com.ctop.common.module.utils.LoadFileUtil;
|
|
@@ -64,6 +65,12 @@ public class MaterialUploadServiceImpl implements IMaterialUploadService {
|
|
private IFileInfoService fileInfoService;
|
|
private IFileInfoService fileInfoService;
|
|
@Autowired
|
|
@Autowired
|
|
private IKuaiShouImageGetService iKuaiShouImageGetService;
|
|
private IKuaiShouImageGetService iKuaiShouImageGetService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private IMaterialParameterService materialParameterService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private MaterialParameterMapper parameterMapper;
|
|
|
|
+ @Autowired
|
|
|
|
+ private IKuaiShouVideoGetService kuaiShouVideoGetService;
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -139,10 +146,6 @@ public class MaterialUploadServiceImpl implements IMaterialUploadService {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- @Autowired
|
|
|
|
- private MaterialParameterMapper parameterMapper;
|
|
|
|
- @Autowired
|
|
|
|
- private IKuaiShouVideoGetService kuaiShouVideoGetService;
|
|
|
|
|
|
|
|
private void kuaiShouUpload(String mediaId, JSONArray materialArray, JSONArray accountArray) {
|
|
private void kuaiShouUpload(String mediaId, JSONArray materialArray, JSONArray accountArray) {
|
|
for (int j = 0; j < materialArray.size(); j++) {
|
|
for (int j = 0; j < materialArray.size(); j++) {
|
|
@@ -164,6 +167,16 @@ public class MaterialUploadServiceImpl implements IMaterialUploadService {
|
|
JSONObject requestJson = new JSONObject();
|
|
JSONObject requestJson = new JSONObject();
|
|
requestJson.put("file", resource);
|
|
requestJson.put("file", resource);
|
|
requestJson.put("signature", materialInfo.getCode());
|
|
requestJson.put("signature", materialInfo.getCode());
|
|
|
|
+ QueryWrapper<MaterialParameter> parameterQueryWrapper = new QueryWrapper<>();
|
|
|
|
+ parameterQueryWrapper.eq("material_id", materialInfo.getId());
|
|
|
|
+ parameterQueryWrapper.orderByDesc("create_time").last("limit 1");
|
|
|
|
+ MaterialParameter materialParameter = materialParameterService.getOne(parameterQueryWrapper);
|
|
|
|
+ if (!Check.isNull(materialParameter)) {
|
|
|
|
+ Integer type = MaterialEnum.getTypeBySize(Integer.valueOf(materialParameter.getWidth()), Integer.valueOf(materialParameter.getHeight()));
|
|
|
|
+ if (!Check.isNull(type) && type != 0) {
|
|
|
|
+ requestJson.put("type", type);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
for (int i = 0; i < accountArray.size(); i++) {
|
|
for (int i = 0; i < accountArray.size(); i++) {
|
|
Long accountId = accountArray.getLong(i);
|
|
Long accountId = accountArray.getLong(i);
|
|
QueryWrapper<CtopOauthToken> tokenQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<CtopOauthToken> tokenQueryWrapper = new QueryWrapper<>();
|