syh 4 лет назад
Родитель
Сommit
cd7fcb7539

+ 3 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/entity/WpsFile.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.wps.entity;
 
+import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -40,8 +41,7 @@ public class WpsFile {
     @ApiModelProperty(value = "size")
 	private Integer size;
 	/**creator*/
-	@Excel(name = "creator", width = 15)
-    @ApiModelProperty(value = "creator")
+	@Dict(dicCode = "id",dictTable="sys_user",dicText="realname")
     private String creator;
 	/**createTime*/
 	@Excel(name = "createTime", width = 15)
@@ -60,13 +60,10 @@ public class WpsFile {
     @ApiModelProperty(value = "downloadUrl")
 	private String downloadUrl;
 	/**deleted*/
-	@Excel(name = "deleted", width = 15)
-    @ApiModelProperty(value = "deleted")
 	private String deleted;
 	/**canDelete*/
-	@Excel(name = "canDelete", width = 15)
-    @ApiModelProperty(value = "canDelete")
 	private String canDelete;
+	@Dict(dicCode = "id",dictTable="ctop_project",dicText="project_name")
 	private Long projectId;
 
 	private String code;

+ 10 - 4
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/ByteDanceCreativeServiceImpl.java

@@ -180,12 +180,12 @@ public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeM
             log.info("广告创意创建失败,accountId:{},message:{}", accountId, message);
             resultMap.put("success", false);
             resultMap.put("code", -1);
-            resultMap.put("message", message);
+            resultMap.put("message", "广告计划("+adId+"):"+message);
             return resultMap;
         }
         resultMap.put("success", true);
         resultMap.put("code", 0);
-        resultMap.put("message", "广告创意创建成功");
+        resultMap.put("message", "广告计划("+adId+"):"+"创意创建成功");
         return resultMap;
     }
 
@@ -295,6 +295,7 @@ public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeM
             array.add(getData);
         }
         result.put("data",array);
+        ResultMapUtils.setResultMap(result,StatusCode.COMMON_SUCCESS);
         return result;
     }
 
@@ -528,8 +529,13 @@ public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeM
                     }
                     JSONArray dpaDictIds = creativeObject.getJSONArray("dpaDictIds");
                     creativeObject.remove("dpaDictIds");
-                    if(null!=creativeWordIds&&!creativeWordIds.isEmpty()){
-                        creativeObject.put("creative_word_ids",creativeWordIds);
+                    if(null!=dpaDictIds&&!dpaDictIds.isEmpty()){
+                        creativeObject.put("dpa_dict_ids",dpaDictIds);
+                    }
+                    String text = creativeObject.getString("text");
+                    creativeObject.remove("text");
+                    if(null!=text&&!"".equals(text.trim())){
+                        creativeObject.put("title",text);
                     }
                     Integer derivePosterCid = creativeObject.getInteger("derivePosterCid");
                     creativeObject.remove("derivePosterCid");