Переглянути джерело

添加关联用户权限关系

syh 5 роки тому
батько
коміт
45f2e781c3
14 змінених файлів з 143 додано та 51 видалено
  1. 2 0
      jeecg-boot-base-common/src/main/java/org/jeecg/common/util/StatusCode.java
  2. 5 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceBudgetTemplateController.java
  3. 4 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceCampaignTemplateController.java
  4. 19 20
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceTemplateController.java
  5. 4 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceDeliveryTargetTemplateController.java
  6. 10 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceBudgetTemplate.java
  7. 6 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCampaignTemplate.java
  8. 7 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceUserOrientationTemplate.java
  9. 1 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceAdvertisePlanTemplate.java
  10. 14 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceDeliveryTargetTemplate.java
  11. 19 7
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceBudgetTemplateServiceImpl.java
  12. 26 16
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceCampaignTemplateServiceImpl.java
  13. 4 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceUserOrientationTemplateServiceImpl.java
  14. 22 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/BytedanceDeliveryTargetTemplateServiceImpl.java

+ 2 - 0
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/StatusCode.java

@@ -19,6 +19,8 @@ public enum StatusCode {
     BYTEDANCE_VIDEO_UPLOAD_FAIL("今日头条视频文件上传失败", -201, false),
     IMAGE_NUMBER_SHORTAGE("今日头条图片文件上传失败", -202, false),
     BYTEDANCE_IMAGE_UPLOAD_FAIL("今日头条图片文件上传失败", -203, false),
+    TEMPLATE_NAME_HAS_EXIST("模板名称已存在", -204, false),
+    TEMPLATE_NAME_IS_NULL("模板名称为空", -205, false),
     COMMON_SERVER_ERROR("server error", -102, false),
     COMMON_DATA_HAS_EXIST_ERROR("data has exist", -103, false),
     COMMON_CHANNEL_NOT_EXIST_ERROR("channel not exist", -104, false),

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

@@ -8,9 +8,12 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.ByteDanceBudgetTemplate;
 import org.jeecg.modules.ctop.service.IByteDanceBudgetTemplateService;
@@ -66,6 +69,8 @@ public class ByteDanceBudgetTemplateController {
                                                                 HttpServletRequest req) {
         Result<IPage<ByteDanceBudgetTemplate>> result = new Result<IPage<ByteDanceBudgetTemplate>>();
         QueryWrapper<ByteDanceBudgetTemplate> queryWrapper = QueryGenerator.initQueryWrapper(byteDanceBudgetTemplate, req.getParameterMap());
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        queryWrapper.eq("advertiser_id", user.getId());
         Page<ByteDanceBudgetTemplate> page = new Page<ByteDanceBudgetTemplate>(pageNo, pageSize);
         IPage<ByteDanceBudgetTemplate> pageList = byteDanceBudgetTemplateService.page(page, queryWrapper);
 		result.setSuccess(true);

+ 4 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceCampaignTemplateController.java

@@ -9,9 +9,11 @@ import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.ByteDanceCampaignTemplate;
 import org.jeecg.modules.ctop.service.IByteDanceCampaignTemplateService;
@@ -70,6 +72,8 @@ public class ByteDanceCampaignTemplateController {
                                                                   HttpServletRequest req) {
         Result<IPage<ByteDanceCampaignTemplate>> result = new Result<IPage<ByteDanceCampaignTemplate>>();
         QueryWrapper<ByteDanceCampaignTemplate> queryWrapper = QueryGenerator.initQueryWrapper(byteDanceCampaignTemplate, req.getParameterMap());
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        queryWrapper.eq("advertiser_id", user.getId());
         Page<ByteDanceCampaignTemplate> page = new Page<ByteDanceCampaignTemplate>(pageNo, pageSize);
         IPage<ByteDanceCampaignTemplate> pageList = byteDanceCampaignTemplateService.page(page, queryWrapper);
         result.setSuccess(true);

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

@@ -20,6 +20,18 @@ import java.util.Map;
 @RequestMapping("template")
 public class ByteDanceTemplateController {
     /**
+     * 广告组模板
+     *
+     * @param template
+     * @param req
+     * @return
+     */
+    @PostMapping("campaign/insert")
+    public Map<String, Object> campaignTemplateInsert(@RequestBody ByteDanceCampaignTemplate template, HttpServletRequest req) {
+        return campaignTemplateService.insertTemplate(template);
+    }
+
+    /**
      * 预算与出价模板
      *
      * @param template
@@ -33,20 +45,19 @@ public class ByteDanceTemplateController {
     }
 
     /**
-     * 广告组模板
-     * 完成
+     * 投放目标
+     *
      * @param template
      * @param req
      * @return
      */
-    @PostMapping("campaign/insert")
-    public Map<String, Object> campaignTemplateInsert(@RequestBody ByteDanceCampaignTemplate template, HttpServletRequest req) {
-        return campaignTemplateService.insertTemplate(template);
+    @PostMapping("deliverytarget/insert")
+    public Map<String, Object> diliverytargetTemplateInsert(@RequestBody BytedanceDeliveryTargetTemplate template, HttpServletRequest req) {
+        return deliveryTargetTemplateService.insertTemplate(template);
     }
 
     /**
-     * 广告组模板
-     * 完成
+     * 广告创意创建
      *
      * @param template
      * @return
@@ -59,18 +70,6 @@ public class ByteDanceTemplateController {
     @Autowired
     private IByteDanceCreativeService creativeService;
 
-    /**
-     * 投放目标
-     *
-     * @param template
-     * @param req
-     * @return
-     */
-    @PostMapping("deliverytarget/insert")
-    public Map<String, Object> diliverytargetTemplateInsert(@RequestBody BytedanceDeliveryTargetTemplate template, HttpServletRequest req) {
-        return deliveryTargetTemplateService.insertTemplate(template);
-    }
-
     @PostMapping(value = "allocation/list")
     public Result<IPage<UserAllocation>> queryPageList(@RequestBody UserAllocation userAllocation,
                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@@ -102,7 +101,7 @@ public class ByteDanceTemplateController {
 
     /**
      * 广告计划模板
-     *
+     *  方法废弃
      * @param template
      * @param req
      * @return

+ 4 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceDeliveryTargetTemplateController.java

@@ -9,9 +9,11 @@ import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.BytedanceDeliveryTargetTemplate;
 import org.jeecg.modules.ctop.service.IBytedanceDeliveryTargetTemplateService;
@@ -70,6 +72,8 @@ public class BytedanceDeliveryTargetTemplateController {
                                                                         HttpServletRequest req) {
         Result<IPage<BytedanceDeliveryTargetTemplate>> result = new Result<IPage<BytedanceDeliveryTargetTemplate>>();
         QueryWrapper<BytedanceDeliveryTargetTemplate> queryWrapper = QueryGenerator.initQueryWrapper(bytedanceDeliveryTargetTemplate, req.getParameterMap());
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        queryWrapper.eq("advertiser_id", user.getId());
         Page<BytedanceDeliveryTargetTemplate> page = new Page<BytedanceDeliveryTargetTemplate>(pageNo, pageSize);
         IPage<BytedanceDeliveryTargetTemplate> pageList = bytedanceDeliveryTargetTemplateService.page(page, queryWrapper);
         result.setSuccess(true);

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

@@ -36,6 +36,13 @@ public class ByteDanceBudgetTemplate {
     @ApiModelProperty(value = "id")
     private Long id;
     /**
+     * 平台广告主id
+     * advertiserId
+     */
+    @Excel(name = "平台广告主id", width = 15)
+    @ApiModelProperty(value = "advertiser_id")
+    private String advertiserId;
+    /**
      * 模板名称
      */
     @Excel(name = "模板名称", width = 15)
@@ -74,13 +81,13 @@ public class ByteDanceBudgetTemplate {
     /**
      * startDate
      */
-    @Excel(name = "startDate", width = 15)
+    @Excel(name = "开始日期", width = 15)
     @ApiModelProperty(value = "startDate")
     private String startDate;
     /**
      * endDate
      */
-    @Excel(name = "endDate", width = 15)
+    @Excel(name = "结束日子", width = 15)
     @ApiModelProperty(value = "endDate")
     private String endDate;
     /**
@@ -104,7 +111,7 @@ public class ByteDanceBudgetTemplate {
     /**
      * convertPrice
      */
-    @Excel(name = "convertPrice", width = 15)
+    @Excel(name = "转化出价", width = 15)
     @ApiModelProperty(value = "convertPrice")
     private String convertPrice;
     /**

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

@@ -37,6 +37,12 @@ public class ByteDanceCampaignTemplate {
     @ApiModelProperty(value = "id")
     private Long id;
     /**
+     * 平台广告主id
+     * advertiserId
+     */
+    @ApiModelProperty(value = "advertiser_id")
+    private String advertiserId;
+    /**
      * 推广目的
      */
     @Excel(name = "推广目的", width = 15)

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

@@ -36,6 +36,13 @@ public class ByteDanceUserOrientationTemplate {
     @ApiModelProperty(value = "id")
     private Long id;
     /**
+     * 平台广告主id
+     * advertiserId
+     */
+    @Excel(name = "平台广告主id")
+    @ApiModelProperty(value = "advertiser_id")
+    private String advertiserId;
+    /**
      * 模板名称
      */
     @Excel(name = "模板名称", width = 15)

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

@@ -42,6 +42,7 @@ public class BytedanceAdvertisePlanTemplate {
     @Excel(name = "广告组模板id", width = 15)
     @ApiModelProperty(value = "广告组模板id")
     private Long campaignTemplateId;
+
     /**
      * 投放范围
      */

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

@@ -37,6 +37,20 @@ public class BytedanceDeliveryTargetTemplate {
     @ApiModelProperty(value = "id")
     private Long id;
     /**
+     * 平台广告主id
+     * advertiserId
+     */
+    @Excel(name = "平台广告主id", width = 15)
+    @ApiModelProperty(value = "advertiser_id")
+    private String advertiserId;
+    /**
+     * 投放范围
+     */
+    @Excel(name = "投放范围", width = 15)
+    @ApiModelProperty(value = "delivery_range")
+    private String deliveryRange;
+
+    /**
      * 模板名称
      */
     @Excel(name = "模板名称", width = 15)

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

@@ -8,6 +8,8 @@ import org.apache.shiro.subject.Subject;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.ResultMapUtils;
+import org.jeecg.common.util.StatusCode;
 import org.jeecg.modules.ctop.entity.*;
 import org.jeecg.modules.ctop.mapper.ByteDanceAdvertiserMapper;
 import org.jeecg.modules.ctop.mapper.ByteDanceBudgetTemplateMapper;
@@ -38,13 +40,20 @@ public class ByteDanceBudgetTemplateServiceImpl extends ServiceImpl<ByteDanceBud
     @Override
     public Map<String, Object> insertTemplate(ByteDanceBudgetTemplate template) {
         Map<String, Object> resultMap = new HashMap<>();
-        QueryWrapper<ByteDanceBudgetTemplate> queryWrapper = new QueryWrapper<ByteDanceBudgetTemplate>();
+        String name = template.getName();
+        Long id = template.getId();
+        if (null == name || "".equals(name.trim())) {
+            ResultMapUtils.setResultMap(resultMap, StatusCode.TEMPLATE_NAME_IS_NULL.getCode());
+            return resultMap;
+        }
+        QueryWrapper<ByteDanceBudgetTemplate> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("name", template.getName());
-        queryWrapper.ne("id", template.getId());
+        if (null != id && id != 0) {
+            queryWrapper.ne("id", template.getId());
+        }
         List<ByteDanceBudgetTemplate> templateExistList = this.list(queryWrapper);
         if (templateExistList != null && templateExistList.size() > 0) {
-            resultMap.put("success", false);
-            resultMap.put("message", "模板名称已存在,请修改后重试");
+            ResultMapUtils.setResultMap(resultMap, StatusCode.TEMPLATE_NAME_HAS_EXIST.getCode());
             return resultMap;
         }
         template.setStatus(1);
@@ -54,9 +63,10 @@ public class ByteDanceBudgetTemplateServiceImpl extends ServiceImpl<ByteDanceBud
         if (template.getEndDate() != null) {
             template.setEndDate(template.getEndDate().substring(0, 10));
         }
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        template.setAdvertiserId(user.getId());
         this.saveOrUpdate(template);
-        resultMap.put("success", true);
-        resultMap.put("message", "模板保存成功");
+        ResultMapUtils.setResultMap(resultMap, StatusCode.COMMON_SUCCESS.getCode());
         return resultMap;
     }
 
@@ -64,7 +74,9 @@ public class ByteDanceBudgetTemplateServiceImpl extends ServiceImpl<ByteDanceBud
     public Result<IPage<ByteDanceBudgetTemplate>> getList(ByteDanceBudgetTemplate template, Integer pageNo, Integer pageSize, HttpServletRequest req) {
         Result<IPage<ByteDanceBudgetTemplate>> result = new Result<>();
         QueryWrapper<ByteDanceBudgetTemplate> queryWrapper = QueryGenerator.initQueryWrapper(template, req.getParameterMap());
-        queryWrapper.orderByDesc("create_time");
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String advertiserId = user.getId();
+        queryWrapper.eq("advertiser_id", advertiserId).orderByDesc("create_time");
         Page<ByteDanceBudgetTemplate> page = new Page<>(pageNo, pageSize);
         IPage<ByteDanceBudgetTemplate> pageList = this.page(page, queryWrapper);
         result.setSuccess(true);

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
@@ -16,12 +17,13 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.ResultMapUtils;
+import org.jeecg.common.util.StatusCode;
 import org.jeecg.modules.ctop.entity.ByteDanceCampaign;
 import org.jeecg.modules.ctop.entity.ByteDanceCampaignTemplate;
 import org.jeecg.modules.ctop.entity.CTopOauthToken;
 import org.jeecg.modules.ctop.mapper.ByteDanceCampaignMapper;
 import org.jeecg.modules.ctop.mapper.ByteDanceCampaignTemplateMapper;
-import org.jeecg.modules.ctop.service.IByteDanceAdvertiserDataService;
 import org.jeecg.modules.ctop.service.IByteDanceCampaignTemplateService;
 import org.jeecg.modules.ctop.service.ICTopOauthTokenService;
 import org.slf4j.Logger;
@@ -29,8 +31,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
 import javax.servlet.http.HttpServletRequest;
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -39,7 +39,6 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.logging.SimpleFormatter;
 
 /**
  * @Description: 今日头条广告组模板信息
@@ -53,24 +52,36 @@ public class ByteDanceCampaignTemplateServiceImpl extends ServiceImpl<ByteDanceC
     @Override
     public Map<String, Object> insertTemplate(ByteDanceCampaignTemplate template) {
         Map<String, Object> resultMap = new HashMap<>();
+        String name = template.getCampaignName();
+        Long id = template.getId();
+        if (null == name || "".equals(name)) {
+            ResultMapUtils.setResultMap(resultMap, StatusCode.TEMPLATE_NAME_IS_NULL.getCode());
+            return resultMap;
+        }
+        QueryWrapper<ByteDanceCampaignTemplate> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("campaign_name", template.getCampaignName());
+        if (null != template.getId() && template.getId() != 0) {
+            queryWrapper.ne("id", template.getId());
+        }
+        ByteDanceCampaignTemplate templateExist = getOne(queryWrapper);
+        if (null != templateExist) {
+            ResultMapUtils.setResultMap(resultMap, StatusCode.TEMPLATE_NAME_HAS_EXIST.getCode());
+            return resultMap;
+        }
+        template.setStatus(1);
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        CTopOauthToken token = tokenService.getOAuthTokenByAccountId(user.getId());
-        campaignTemplateMapper.insert(template);
-        //新增数据
-        //        return advertiserDataService.campaignCreate(token, template);
-        resultMap.put("success", true);
-        resultMap.put("message", "广告组模板创建成功");
-        resultMap.put("code", 0);
+        template.setAdvertiserId(user.getId());
+        this.saveOrUpdate(template);
+        ResultMapUtils.setResultMap(resultMap, StatusCode.COMMON_SUCCESS.getCode());
         return resultMap;
     }
-
-    @Autowired
-    private IByteDanceAdvertiserDataService advertiserDataService;
     @Override
     public Result<IPage<ByteDanceCampaignTemplate>> getList(ByteDanceCampaignTemplate template, Integer pageNo, Integer pageSize, HttpServletRequest req) {
         Result<IPage<ByteDanceCampaignTemplate>> result = new Result<>();
         QueryWrapper<ByteDanceCampaignTemplate> queryWrapper = QueryGenerator.initQueryWrapper(template, req.getParameterMap());
-        queryWrapper.orderByDesc("create_time");
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String advertiserId = user.getId();
+        queryWrapper.eq("advertiser_id", advertiserId).orderByDesc("create_time");
         Page<ByteDanceCampaignTemplate> page = new Page<>(pageNo, pageSize);
         IPage<ByteDanceCampaignTemplate> pageList = this.page(page, queryWrapper);
         result.setSuccess(true);
@@ -107,7 +118,6 @@ public class ByteDanceCampaignTemplateServiceImpl extends ServiceImpl<ByteDanceC
         }
         Long id = data.getLong("campaign_id");
         ByteDanceCampaign campaign = new ByteDanceCampaign(id, token, campaignName, budgetMode, budget, landingType);
-        //清除清数据,插入新数据
         campaignMapper.insert(campaign);
         resultMap.put("code", 0);
         resultMap.put("message", "广告组创建成功");

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

@@ -37,7 +37,7 @@ public class ByteDanceUserOrientationTemplateServiceImpl extends ServiceImpl<Byt
     public Map<String, Object> insertTemplate(ByteDanceUserOrientationTemplate template) {
         Map<String, Object> resultMap = new HashMap<>();
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        CTopOauthToken token = tokenService.getOAuthTokenByAccountId(user.getId());
+        template.setAdvertiserId(user.getId());
         template.setStatus(1);
         templateMapper.insert(template);
         resultMap.put("success", true);
@@ -48,8 +48,10 @@ public class ByteDanceUserOrientationTemplateServiceImpl extends ServiceImpl<Byt
     @Override
     public Result<IPage<ByteDanceUserOrientationTemplate>> getList(ByteDanceUserOrientationTemplate template, Integer pageNo, Integer pageSize, HttpServletRequest req) {
         Result<IPage<ByteDanceUserOrientationTemplate>> result = new Result<>();
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String advertiserId = user.getId();
         QueryWrapper<ByteDanceUserOrientationTemplate> queryWrapper = QueryGenerator.initQueryWrapper(template, req.getParameterMap());
-        queryWrapper.orderByDesc("create_time");
+        queryWrapper.eq("advertiser_id", advertiserId).orderByDesc("create_time");
         Page<ByteDanceUserOrientationTemplate> page = new Page<>(pageNo, pageSize);
         IPage<ByteDanceUserOrientationTemplate> pageList = this.page(page, queryWrapper);
         result.setSuccess(true);

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

@@ -7,6 +7,8 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.ResultMapUtils;
+import org.jeecg.common.util.StatusCode;
 import org.jeecg.modules.ctop.entity.ByteDanceCampaignTemplate;
 import org.jeecg.modules.ctop.entity.BytedanceDeliveryTargetTemplate;
 import org.jeecg.modules.ctop.entity.CTopOauthToken;
@@ -35,10 +37,27 @@ public class BytedanceDeliveryTargetTemplateServiceImpl extends ServiceImpl<Byte
     @Override
     public Map<String, Object> insertTemplate(BytedanceDeliveryTargetTemplate template) {
         Map<String, Object> resultMap = new HashMap<>();
+        Long id = template.getId();
+        String name = template.getName();
+        if (null == name || "".equals(name.trim())) {
+            ResultMapUtils.setResultMap(resultMap, StatusCode.TEMPLATE_NAME_IS_NULL.getCode());
+            return resultMap;
+        }
+        QueryWrapper<BytedanceDeliveryTargetTemplate> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("name", template.getName());
+        if (null != id && id != 0) {
+            queryWrapper.ne("id", id);
+        }
+        BytedanceDeliveryTargetTemplate templateExist = getOne(queryWrapper);
+        if (null != templateExist) {
+            ResultMapUtils.setResultMap(resultMap, StatusCode.TEMPLATE_NAME_HAS_EXIST.getCode());
+            return resultMap;
+        }
+        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        template.setAdvertiserId(user.getId());
         template.setStatus(1);
-        deliveryTargetTemplateMapper.insert(template);
-        resultMap.put("success", true);
-        resultMap.put("message", "投放目标模板保存成功");
+        this.saveOrUpdate(template);
+        ResultMapUtils.setResultMap(resultMap, StatusCode.COMMON_SUCCESS.getCode());
         return resultMap;
     }