Преглед изворни кода

Merge remote-tracking branch 'origin/master'

yumeng пре 5 година
родитељ
комит
51571cc2dd
14 измењених фајлова са 12 додато и 87 уклоњено
  1. 2 1
      .gitignore
  2. 0 1
      jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java
  3. 5 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceTemplateController.java
  4. 0 12
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceBudgetTemplate.java
  5. 0 9
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCampaignTemplate.java
  6. 2 14
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCreativeTemplate.java
  7. 0 12
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceUserOrientationTemplate.java
  8. 1 13
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceAdvertisePlanTemplate.java
  9. 0 12
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceDeliveryTargetTemplate.java
  10. 1 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceBudgetTemplateServiceImpl.java
  11. 0 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceCampaignTemplateServiceImpl.java
  12. 0 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceUserOrientationTemplateServiceImpl.java
  13. 0 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/BytedanceAdvertisePlanTemplateServiceImpl.java
  14. 1 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/BytedanceDeliveryTargetTemplateServiceImpl.java

+ 2 - 1
.gitignore

@@ -31,4 +31,5 @@ gen
 
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 hs_err_pid*
-**/target/
+**/target/
+application-dev.yml

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

@@ -92,7 +92,6 @@ public class ShiroConfig {
 		filterChainDefinitionMap.put("/toutiao/dictitem/list", "anon");
 		filterChainDefinitionMap.put("/toutiao/dictitem/list", "anon");
 		filterChainDefinitionMap.put("/toutiao/advertiser/**", "anon");
 		filterChainDefinitionMap.put("/toutiao/advertiser/**", "anon");
         filterChainDefinitionMap.put("/toutiao/industry/list", "anon");
         filterChainDefinitionMap.put("/toutiao/industry/list", "anon");
-        filterChainDefinitionMap.put("/template/**", "user");
 		//文件上传接口
 		//文件上传接口
 		filterChainDefinitionMap.put("/upload/**", "anon");
 		filterChainDefinitionMap.put("/upload/**", "anon");
 
 

+ 5 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceTemplateController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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 org.apache.shiro.SecurityUtils;
 import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.subject.Subject;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
@@ -13,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 import java.util.Map;
 
 
 @RestController
 @RestController
@@ -22,11 +24,12 @@ public class ByteDanceTemplateController {
      * 预算与出价模板
      * 预算与出价模板
      *
      *
      * @param template
      * @param template
-     * @param req
+     * @param request
+     * @param response
      * @return
      * @return
      */
      */
     @PostMapping("budget/insert")
     @PostMapping("budget/insert")
-    public Map<String, Object> budgetTemplateInsert(@RequestBody ByteDanceBudgetTemplate template, HttpServletRequest req) {
+    public Map<String, Object> budgetTemplateInsert(@RequestBody ByteDanceBudgetTemplate template, HttpServletRequest request, HttpServletResponse response) {
         return budgetTemplateService.insertTemplate(template);
         return budgetTemplateService.insertTemplate(template);
     }
     }
 
 

+ 0 - 12
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceBudgetTemplate.java

@@ -36,18 +36,6 @@ public class ByteDanceBudgetTemplate {
     @ApiModelProperty(value = "id")
     @ApiModelProperty(value = "id")
     private Long id;
     private Long id;
     /**
     /**
-     * 广告主id
-     */
-    @Excel(name = "广告主id", width = 15)
-    @ApiModelProperty(value = "广告主id")
-    private String advertiserId;
-    /**
-     * 头条账号id
-     */
-    @Excel(name = "头条账号id", width = 15)
-    @ApiModelProperty(value = "头条账号id")
-    private Long toutiaoId;
-    /**
      * 模板名称
      * 模板名称
      */
      */
     @Excel(name = "模板名称", width = 15)
     @Excel(name = "模板名称", width = 15)

+ 0 - 9
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCampaignTemplate.java

@@ -37,15 +37,6 @@ public class ByteDanceCampaignTemplate {
     @ApiModelProperty(value = "id")
     @ApiModelProperty(value = "id")
     private Long id;
     private Long id;
     /**
     /**
-     * accountId
-     */
-    @Excel(name = "头条账号id")
-    @ApiModelProperty(value = "头条账号id")
-    private Long accountId;
-    @Excel(name = "平台广告主id")
-    @ApiModelProperty(value = "平台广告主id")
-    private String advertiserId;
-    /**
      * 投放目标
      * 投放目标
      */
      */
     @Excel(name = "投放目标", width = 15)
     @Excel(name = "投放目标", width = 15)

+ 2 - 14
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCreativeTemplate.java

@@ -32,21 +32,9 @@ public class ByteDanceCreativeTemplate {
     /**
     /**
      * id
      * id
      */
      */
-    @TableId(type = IdType.UUID)
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "id")
     @ApiModelProperty(value = "id")
-    private Integer id;
-    /**
-     * 用户头条id
-     */
-    @Excel(name = "用户头条id", width = 15)
-    @ApiModelProperty(value = "用户头条id")
-    private String accountId;
-    /**
-     * 广告主id
-     */
-    @Excel(name = "广告主id", width = 15)
-    @ApiModelProperty(value = "广告主id")
-    private Integer advertiserId;
+    private Long id;
     /**
     /**
      * 广告计划id
      * 广告计划id
      */
      */

+ 0 - 12
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceUserOrientationTemplate.java

@@ -36,18 +36,6 @@ public class ByteDanceUserOrientationTemplate {
     @ApiModelProperty(value = "id")
     @ApiModelProperty(value = "id")
     private Long id;
     private Long id;
     /**
     /**
-     * 头条账号id
-     */
-    @Excel(name = "头条账号id", width = 15)
-    @ApiModelProperty(value = "头条账号id")
-    private Long accountId;
-    /**
-     * 广告主id
-     */
-    @Excel(name = "广告主id", width = 15)
-    @ApiModelProperty(value = "广告主id")
-    private String advertiserId;
-    /**
      * 模板名称
      * 模板名称
      */
      */
     @Excel(name = "模板名称", width = 15)
     @Excel(name = "模板名称", width = 15)

+ 1 - 13
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceAdvertisePlanTemplate.java

@@ -34,19 +34,7 @@ public class BytedanceAdvertisePlanTemplate {
      */
      */
     @TableId(type = IdType.AUTO)
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "id")
     @ApiModelProperty(value = "id")
-    private Integer id;
-    /**
-     * 头条账号id
-     */
-    @Excel(name = "头条账号id", width = 15)
-    @ApiModelProperty(value = "头条账号id")
-    private Long accountId;
-    /**
-     * 广告主id
-     */
-    @Excel(name = "广告主id", width = 15)
-    @ApiModelProperty(value = "广告主id")
-    private String advertiserId;
+    private Long id;
     /**
     /**
      * 广告组模板id
      * 广告组模板id
      */
      */

+ 0 - 12
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceDeliveryTargetTemplate.java

@@ -36,18 +36,6 @@ public class BytedanceDeliveryTargetTemplate {
     @ApiModelProperty(value = "id")
     @ApiModelProperty(value = "id")
     private Long id;
     private Long id;
     /**
     /**
-     * 头条平台id
-     */
-    @Excel(name = "头条平台id", width = 15)
-    @ApiModelProperty(value = "头条平台id")
-    private Long accountId;
-    /**
-     * 平台账号id
-     */
-    @Excel(name = "平台账号id", width = 15)
-    @ApiModelProperty(value = "平台账号id")
-    private String advertiserId;
-    /**
      * 模板名称
      * 模板名称
      */
      */
     @Excel(name = "模板名称", width = 15)
     @Excel(name = "模板名称", width = 15)

+ 1 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceBudgetTemplateServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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 org.apache.shiro.SecurityUtils;
 import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.subject.Subject;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
@@ -38,8 +39,6 @@ public class ByteDanceBudgetTemplateServiceImpl extends ServiceImpl<ByteDanceBud
         Map<String, Object> resultMap = new HashMap<>();
         Map<String, Object> resultMap = new HashMap<>();
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         CTopOauthToken token = tokenService.getOAuthTokenByAccountId(user.getId());
         CTopOauthToken token = tokenService.getOAuthTokenByAccountId(user.getId());
-        template.setAdvertiserId(token.getAdvertiserId());
-        template.setToutiaoId(token.getAccountId());
         template.setStatus(1);
         template.setStatus(1);
         template.setStartDate(template.getStartDate().substring(0, 10));
         template.setStartDate(template.getStartDate().substring(0, 10));
         template.setEndDate(template.getEndDate().substring(0, 10));
         template.setEndDate(template.getEndDate().substring(0, 10));

+ 0 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceCampaignTemplateServiceImpl.java

@@ -37,8 +37,6 @@ public class ByteDanceCampaignTemplateServiceImpl extends ServiceImpl<ByteDanceC
         Map<String, Object> resultMap = new HashMap<>();
         Map<String, Object> resultMap = new HashMap<>();
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         CTopOauthToken token = tokenService.getOAuthTokenByAccountId(user.getId());
         CTopOauthToken token = tokenService.getOAuthTokenByAccountId(user.getId());
-        template.setAccountId(token.getAccountId());
-        template.setAdvertiserId(token.getAdvertiserId());
         campaignTemplateMapper.insert(template);
         campaignTemplateMapper.insert(template);
         return advertiserDataService.campaignCreate(token, template);
         return advertiserDataService.campaignCreate(token, template);
     }
     }

+ 0 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceUserOrientationTemplateServiceImpl.java

@@ -38,8 +38,6 @@ public class ByteDanceUserOrientationTemplateServiceImpl extends ServiceImpl<Byt
         Map<String, Object> resultMap = new HashMap<>();
         Map<String, Object> resultMap = new HashMap<>();
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         CTopOauthToken token = tokenService.getOAuthTokenByAccountId(user.getId());
         CTopOauthToken token = tokenService.getOAuthTokenByAccountId(user.getId());
-        template.setAccountId(token.getAccountId());
-        template.setAdvertiserId(token.getAdvertiserId());
         template.setStatus(1);
         template.setStatus(1);
         templateMapper.insert(template);
         templateMapper.insert(template);
         resultMap.put("success", true);
         resultMap.put("success", true);

+ 0 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/BytedanceAdvertisePlanTemplateServiceImpl.java

@@ -32,8 +32,6 @@ public class BytedanceAdvertisePlanTemplateServiceImpl extends ServiceImpl<Byted
         Map<String, Object> resultMap = new HashMap<>();
         Map<String, Object> resultMap = new HashMap<>();
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         CTopOauthToken token = tokenService.getOAuthTokenByAccountId(user.getId());
         CTopOauthToken token = tokenService.getOAuthTokenByAccountId(user.getId());
-        template.setAccountId(token.getAccountId());
-        template.setAdvertiserId(token.getAdvertiserId());
         template.setStatus(1);
         template.setStatus(1);
         templateMapper.insert(template);
         templateMapper.insert(template);
         //同步线上广告计划信息
         //同步线上广告计划信息

+ 1 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/BytedanceDeliveryTargetTemplateServiceImpl.java

@@ -35,9 +35,7 @@ public class BytedanceDeliveryTargetTemplateServiceImpl extends ServiceImpl<Byte
     public Map<String, Object> insertTemplate(BytedanceDeliveryTargetTemplate template) {
     public Map<String, Object> insertTemplate(BytedanceDeliveryTargetTemplate template) {
         Map<String, Object> resultMap = new HashMap<>();
         Map<String, Object> resultMap = new HashMap<>();
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        CTopOauthToken token = tokenService.getOAuthTokenByAccountId(user.getId());
-        template.setAccountId(token.getAccountId());
-        template.setAdvertiserId(token.getAdvertiserId());
+        CTopOauthToken token = tokenService.getOAuthTokenByAccountId("74099510334");
         template.setStatus(1);
         template.setStatus(1);
         deliveryTargetTemplateMapper.insert(template);
         deliveryTargetTemplateMapper.insert(template);
         resultMap.put("success", true);
         resultMap.put("success", true);