|
@@ -12,7 +12,6 @@ import cn.com.ctop.toutiao.modules.material.service.IBytedanceVideoSlogenInfoSer
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
@@ -124,30 +123,31 @@ public class MaterialInfoController {
|
|
|
|
|
|
/**
|
|
/**
|
|
* 修改名称
|
|
* 修改名称
|
|
|
|
+ *
|
|
* @param data
|
|
* @param data
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@PostMapping("/editName")
|
|
@PostMapping("/editName")
|
|
public Map<String, Object> editName(@RequestBody JSONObject data) {
|
|
public Map<String, Object> editName(@RequestBody JSONObject data) {
|
|
- Map<String,Object>result = new HashMap<>();
|
|
|
|
|
|
+ Map<String, Object> result = new HashMap<>();
|
|
String id = data.getString("id");
|
|
String id = data.getString("id");
|
|
String name = data.getString("name");
|
|
String name = data.getString("name");
|
|
- if(null == id||"".equals(id.trim())||null == name||"".equals(name.trim())){
|
|
|
|
- ResultMapUtils.setResultMap(result,StatusCode.COMMON_PARAM_ERROR);
|
|
|
|
|
|
+ if (null == id || "".equals(id.trim()) || null == name || "".equals(name.trim())) {
|
|
|
|
+ ResultMapUtils.setResultMap(result, StatusCode.COMMON_PARAM_ERROR);
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
MaterialInfo info = materialInfoService.getById(id);
|
|
MaterialInfo info = materialInfoService.getById(id);
|
|
- if(null == info){
|
|
|
|
- ResultMapUtils.setResultMap(result,StatusCode.COMMON_DATA_NOT_EXIST);
|
|
|
|
|
|
+ if (null == info) {
|
|
|
|
+ ResultMapUtils.setResultMap(result, StatusCode.COMMON_DATA_NOT_EXIST);
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
- if(info.getStatus() == 1){
|
|
|
|
- ResultMapUtils.setResultMap(result,StatusCode.COMMON_DATA_NO_PERMMISSION);
|
|
|
|
|
|
+ if (info.getStatus() == 1) {
|
|
|
|
+ ResultMapUtils.setResultMap(result, StatusCode.COMMON_DATA_NO_PERMMISSION);
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
info.setMaterialName(name);
|
|
info.setMaterialName(name);
|
|
materialInfoService.updateById(info);
|
|
materialInfoService.updateById(info);
|
|
- ResultMapUtils.setResultMap(result,StatusCode.COMMON_SUCCESS);
|
|
|
|
|
|
+ ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -323,8 +323,10 @@ public class MaterialInfoController {
|
|
@GetMapping(value = "/listV2")
|
|
@GetMapping(value = "/listV2")
|
|
public Map<String, Object> queryPageList(String type, Integer status, Long productId, String materialName, String code,
|
|
public Map<String, Object> queryPageList(String type, Integer status, Long productId, String materialName, String code,
|
|
String startDate, String endDate, String tagCode,
|
|
String startDate, String endDate, String tagCode,
|
|
- Long projectId, String clipId, String shotId, String planId,String leaderName,
|
|
|
|
|
|
+ Long projectId, String clipId, String shotId, String planId, String leaderName,
|
|
|
|
+ Integer syncKuaishou, Integer syncBytedance,
|
|
@RequestParam(name = "offlineFlag", required = false) Integer offlineFlag,
|
|
@RequestParam(name = "offlineFlag", required = false) Integer offlineFlag,
|
|
|
|
+
|
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
|
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
@@ -342,7 +344,7 @@ public class MaterialInfoController {
|
|
List<Long> projectIdsByProductId = projectService.getProjectIdsByProductId(productId);
|
|
List<Long> projectIdsByProductId = projectService.getProjectIdsByProductId(productId);
|
|
projectIds.addAll(projectIdsByProductId);
|
|
projectIds.addAll(projectIdsByProductId);
|
|
}
|
|
}
|
|
- return materialInfoService.getListByParams(tagCode, type, status, materialName, projectIds, code, startDate, endDate, null, clipId, shotId, planId,leaderName, offlineFlag, pageNo, pageSize);
|
|
|
|
|
|
+ return materialInfoService.getListByParams(tagCode, type, status, materialName, projectIds, code, startDate, endDate, null, clipId, shotId, planId, leaderName, offlineFlag, pageNo, pageSize, syncKuaishou, syncBytedance);
|
|
//运营经理、运营、运营助理
|
|
//运营经理、运营、运营助理
|
|
} else if ("operator".equals(roleCode) || "kuaishouOperationManager".equals(roleCode) || "operationAssistant".equals(roleCode) || "touTiaoOperationManager".equals(roleCode)) {
|
|
} else if ("operator".equals(roleCode) || "kuaishouOperationManager".equals(roleCode) || "operationAssistant".equals(roleCode) || "touTiaoOperationManager".equals(roleCode)) {
|
|
if (!Check.isNull(projectId)) {
|
|
if (!Check.isNull(projectId)) {
|
|
@@ -358,9 +360,9 @@ public class MaterialInfoController {
|
|
projectIds.addAll(partakeProjectIds);
|
|
projectIds.addAll(partakeProjectIds);
|
|
projectIds.addAll(productProjectIds);
|
|
projectIds.addAll(productProjectIds);
|
|
}
|
|
}
|
|
- return materialInfoService.getListByParams(tagCode, type, status, materialName, projectIds, code, startDate, endDate, null, clipId, shotId, planId, leaderName,offlineFlag, pageNo, pageSize);
|
|
|
|
|
|
+ return materialInfoService.getListByParams(tagCode, type, status, materialName, projectIds, code, startDate, endDate, null, clipId, shotId, planId, leaderName, offlineFlag, pageNo, pageSize, syncKuaishou, syncBytedance);
|
|
|
|
|
|
- } else if ("designTeamLeader".equals(roleCode) || "planeLeader".equals(roleCode) || "plane".equals(roleCode) || "plan".equals(roleCode) || "shot".equals(roleCode)||"clip".equals(roleCode)) {
|
|
|
|
|
|
+ } else if ("designTeamLeader".equals(roleCode) || "planeLeader".equals(roleCode) || "plane".equals(roleCode) || "plan".equals(roleCode) || "shot".equals(roleCode) || "clip".equals(roleCode)) {
|
|
//查询自己所在项目下的数据
|
|
//查询自己所在项目下的数据
|
|
if (!Check.isNull(projectId)) {
|
|
if (!Check.isNull(projectId)) {
|
|
projectIds.add(projectId);
|
|
projectIds.add(projectId);
|
|
@@ -369,7 +371,7 @@ public class MaterialInfoController {
|
|
} else {
|
|
} else {
|
|
projectIds = projectMemberService.getProjectIdsByProductId(null, userId);
|
|
projectIds = projectMemberService.getProjectIdsByProductId(null, userId);
|
|
}
|
|
}
|
|
- return materialInfoService.getListByParams(tagCode, type, status, materialName, projectIds, code, startDate, endDate, null, clipId, shotId, planId, leaderName,offlineFlag, pageNo, pageSize);
|
|
|
|
|
|
+ return materialInfoService.getListByParams(tagCode, type, status, materialName, projectIds, code, startDate, endDate, null, clipId, shotId, planId, leaderName, offlineFlag, pageNo, pageSize, syncKuaishou, syncBytedance);
|
|
} else {
|
|
} else {
|
|
//查询自己上传的视频
|
|
//查询自己上传的视频
|
|
if (!Check.isNull(projectId)) {
|
|
if (!Check.isNull(projectId)) {
|
|
@@ -377,7 +379,7 @@ public class MaterialInfoController {
|
|
} else if (!Check.isNull(productId)) {
|
|
} else if (!Check.isNull(productId)) {
|
|
projectIds = projectMemberService.getProjectIdsByProductId(productId, userId);
|
|
projectIds = projectMemberService.getProjectIdsByProductId(productId, userId);
|
|
}
|
|
}
|
|
- return materialInfoService.getListByParams(tagCode, type, status, materialName, projectIds, code, startDate, endDate, userId, clipId, shotId, planId,leaderName, offlineFlag, pageNo, pageSize);
|
|
|
|
|
|
+ return materialInfoService.getListByParams(tagCode, type, status, materialName, projectIds, code, startDate, endDate, userId, clipId, shotId, planId, leaderName, offlineFlag, pageNo, pageSize, syncKuaishou, syncBytedance);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|