浏览代码

Merge branch 'batch' into V1.1.3

# Conflicts:
#	jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java
zhaoxian 4 年之前
父节点
当前提交
2b81a608cd

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java

@@ -186,6 +186,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/template/**", "anon");
         filterChainDefinitionMap.put("/batch/kuaiShouGroupTemplate/*", "anon");
         filterChainDefinitionMap.put("/kuaishouBatchCampaignPreview/*", "anon");
+        filterChainDefinitionMap.put("/kuaishouBatch/**", "anon");
 
         // 添加自己的过滤器并且取名为jwt
         Map<String, Filter> filterMap = new HashMap<>(1);

+ 2 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaishouBatchCampaignPreviewController.java

@@ -53,7 +53,7 @@ import java.util.Map;
 @Slf4j
 @Api(tags = "快手-广告计划预览信息")
 @RestController
-@RequestMapping("/kuaishouBatchCampaignPreview")
+@RequestMapping("/kuaishouBatch/campaignPreview")
 public class KuaishouBatchCampaignPreviewController {
     @Autowired
     private IKuaishouBatchCampaignPreviewService kuaishouBatchCampaignPreviewService;
@@ -152,7 +152,7 @@ public class KuaishouBatchCampaignPreviewController {
      */
     @AutoLog(value = "快手-广告计划预览信息-编辑")
     @ApiOperation(value = "快手-广告计划预览信息-编辑", notes = "快手-广告计划预览信息-编辑")
-    @PutMapping(value = "/edit")
+    @PostMapping(value = "/edit")
     public Result<KuaishouBatchCampaignPreview> edit(@RequestBody KuaishouBatchCampaignPreview kuaishouBatchCampaignPreview) {
         Result<KuaishouBatchCampaignPreview> result = new Result<KuaishouBatchCampaignPreview>();
         KuaishouBatchCampaignPreview kuaishouBatchCampaignPreviewEntity = kuaishouBatchCampaignPreviewService.getById(kuaishouBatchCampaignPreview.getId());

+ 23 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaishouBatchCreativePreviewController.java

@@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
 import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaishouBatchCreativePreview;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouBatchCreativePreviewService;
+import com.alibaba.fastjson.JSONObject;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
@@ -48,7 +49,7 @@ import io.swagger.annotations.ApiOperation;
 @Slf4j
 @Api(tags = "快手-广告创意预览信息")
 @RestController
-@RequestMapping("/kuai/kuaishouBatchCreativePreview")
+@RequestMapping("/kuaishouBatch/creativePreview")
 public class KuaishouBatchCreativePreviewController {
     @Autowired
     private IKuaishouBatchCreativePreviewService kuaishouBatchCreativePreviewService;
@@ -98,6 +99,26 @@ public class KuaishouBatchCreativePreviewController {
         }
         return result;
     }
+    /**
+     * 添加
+     *
+     * @param kuaishouBatchCreativePreview
+     * @return
+     */
+    @AutoLog(value = "根据预览信息创建广告计划、组、创意")
+    @ApiOperation(value = "根据预览信息创建广告计划、组、创意", notes = "根据预览信息创建广告计划、组、创意")
+    @PostMapping(value = "/createAdcampaignAndGroups")
+    public Result<KuaishouBatchCreativePreview> createAdcampaignAndGroups(@RequestBody JSONObject data) {
+        Result<KuaishouBatchCreativePreview> result = new Result<>();
+        try {
+            kuaishouBatchCreativePreviewService.createAdcampaignAndGroups(data);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
 
     /**
      * 编辑
@@ -107,7 +128,7 @@ public class KuaishouBatchCreativePreviewController {
      */
     @AutoLog(value = "快手-广告创意预览信息-编辑")
     @ApiOperation(value = "快手-广告创意预览信息-编辑", notes = "快手-广告创意预览信息-编辑")
-    @PutMapping(value = "/edit")
+    @PostMapping(value = "/edit")
     public Result<KuaishouBatchCreativePreview> edit(@RequestBody KuaishouBatchCreativePreview kuaishouBatchCreativePreview) {
         Result<KuaishouBatchCreativePreview> result = new Result<KuaishouBatchCreativePreview>();
         KuaishouBatchCreativePreview kuaishouBatchCreativePreviewEntity = kuaishouBatchCreativePreviewService.getById(kuaishouBatchCreativePreview.getId());

+ 2 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaishouBatchGroupPreviewController.java

@@ -22,7 +22,6 @@ 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.RequestMethod;
@@ -51,7 +50,7 @@ import java.util.Map;
 @Slf4j
 @Api(tags = "快手-广告组预览信息")
 @RestController
-@RequestMapping("/kuai/kuaishouBatchGroupPreview")
+@RequestMapping("/kuaishouBatch/groupPreview")
 public class KuaishouBatchGroupPreviewController {
     @Autowired
     private IKuaishouBatchGroupPreviewService kuaishouBatchGroupPreviewService;
@@ -110,7 +109,7 @@ public class KuaishouBatchGroupPreviewController {
      */
     @AutoLog(value = "快手-广告组预览信息-编辑")
     @ApiOperation(value = "快手-广告组预览信息-编辑", notes = "快手-广告组预览信息-编辑")
-    @PutMapping(value = "/edit")
+    @PostMapping(value = "/edit")
     public Result<KuaishouBatchGroupPreview> edit(@RequestBody KuaishouBatchGroupPreview kuaishouBatchGroupPreview) {
         Result<KuaishouBatchGroupPreview> result = new Result<KuaishouBatchGroupPreview>();
         KuaishouBatchGroupPreview kuaishouBatchGroupPreviewEntity = kuaishouBatchGroupPreviewService.getById(kuaishouBatchGroupPreview.getId());

+ 2 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaishouBatchCreativePreviewService.java

@@ -1,6 +1,7 @@
 package cn.com.ctop.kuaishou.modules.batch.service;
 
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaishouBatchCreativePreview;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -11,4 +12,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IKuaishouBatchCreativePreviewService extends IService<KuaishouBatchCreativePreview> {
 
+    void createAdcampaignAndGroups(JSONObject data);
 }