Explorar el Código

规范代码--修改逻辑

syh hace 5 años
padre
commit
4445729d29
Se han modificado 27 ficheros con 125 adiciones y 133 borrados
  1. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BindAccountLoginController.java
  2. 5 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CallbackController.java
  3. 4 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ReportController.java
  4. 6 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BindAccountLogin.java
  5. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCampaign.java
  6. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCustomAudience.java
  7. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceImageInfo.java
  8. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceVideoInfo.java
  9. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/FileInfo.java
  10. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IBindAccountLoginService.java
  11. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IByteDanceAdvertisePlanService.java
  12. 0 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IByteDanceAdvertiserDataService.java
  13. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IByteDanceCampaignTemplateService.java
  14. 0 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/AuthTaskServiceImpl.java
  15. 2 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/BindAccountLoginServiceImpl.java
  16. 9 8
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceAdvertisePlanServiceImpl.java
  17. 15 15
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceAdvertiserDataServiceImpl.java
  18. 8 8
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceCampaignTemplateServiceImpl.java
  19. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceCreativeServiceImpl.java
  20. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/BytedanceAdvertisePlanTemplateServiceImpl.java
  21. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/CtopOauthTokenServiceImpl.java
  22. 14 22
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/FileInfoServiceImpl.java
  23. 7 7
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/RefreshTokenServiceImpl.java
  24. 15 15
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ReportServiceImpl.java
  25. 6 8
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouController.java
  26. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouConversionTypesController.java
  27. 7 8
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouCreateServiceImpl.java

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

@@ -72,17 +72,17 @@ public class BindAccountLoginController {
             result.setSuccess(false);
             return result;
         }
+        String userId = json.getString("userId"); //创建人
         String password = json.getString("password");
         String loginType = json.getString("loginType");
         String accountName = json.getString("accountName"); //账号
-        boolean trueOrFalse = bindAccountLoginService.bindLogin(advertiserId, accountName, password, loginType);
+        boolean trueOrFalse = bindAccountLoginService.bindLogin(advertiserId, accountName, password, loginType, userId);
         if (trueOrFalse) {
             String realName = json.getString("realName");
             String departmentId = json.getString("departmentId"); //部门id
             String distributionName = json.getString("distributionName");//指定分配人姓名
             String advertiserName = json.getString("advertiser_name"); // 广告主名称
             String mediaId = json.getString("mediaId"); // 媒体类型: 1 头条 2 快手
-            String userId = json.getString("userId"); //创建人
             UserAllocation userAllocation = new UserAllocation();
             userAllocation.setDistributionName(distributionName);
             userAllocation.setUserId(userId);

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

@@ -10,9 +10,9 @@ import com.alibaba.fastjson.JSONObject;
 import constant.KuaishouInterfaceConstant;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.modules.ctop.entity.ByteDanceAdvertiser;
-import org.jeecg.modules.ctop.entity.CTopOauthToken;
+import org.jeecg.modules.ctop.entity.CtopOauthToken;
 import org.jeecg.modules.ctop.entity.UserAllocation;
-import org.jeecg.modules.ctop.mapper.CTopOauthTokenMapper;
+import org.jeecg.modules.ctop.mapper.CtopOauthTokenMapper;
 import org.jeecg.modules.ctop.mapper.UserAllocationMapper;
 import org.jeecg.modules.ctop.service.IBindAccountAuthService;
 import org.jeecg.modules.ctop.service.IByteDanceAdvertiserDataService;
@@ -40,7 +40,7 @@ public class CallbackController {
     private IKuaishouInterfaceService kuaishouInterfaceService;
 
     @Autowired
-    private CTopOauthTokenMapper cTopOauthTokenMapper;
+    private CtopOauthTokenMapper cTopOauthTokenMapper;
     @Autowired
     private IBindAccountAuthService bindAccountAuthService;
 
@@ -104,7 +104,7 @@ public class CallbackController {
                     if (i > 0) {
                         logger.info("同步分配用户表完成,task_id:{},accountId:{}", state, accountId);
                     }
-                    CTopOauthToken topOauthToken = new CTopOauthToken();
+                    CtopOauthToken topOauthToken = new CtopOauthToken();
                     Map<String, Object> deleteMap = new HashMap<>();
                     deleteMap.put("advertiser_id", advertiserId);
                     deleteMap.put("account_id", accountId);
@@ -184,7 +184,7 @@ public class CallbackController {
             String userId = json.getString("userId"); //创建人
 
             JSONObject data = resultObject.getJSONObject("data");
-            CTopOauthToken token = new CTopOauthToken(advertiserId, data);
+            CtopOauthToken token = new CtopOauthToken(advertiserId, data);
             Map<String, Object> deleteMap = new HashMap<>();
             deleteMap.put("advertiser_id", advertiserId);
             deleteMap.put("account_id", token.getAccountId());

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

@@ -4,14 +4,13 @@ import com.alibaba.fastjson.JSONObject;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.ResultMapUtils;
 import org.jeecg.common.util.StatusCode;
-import org.jeecg.modules.ctop.entity.CTopOauthToken;
-import org.jeecg.modules.ctop.service.ICTopOauthTokenService;
+import org.jeecg.modules.ctop.entity.CtopOauthToken;
+import org.jeecg.modules.ctop.service.ICtopOauthTokenService;
 import org.jeecg.modules.ctop.service.IReportService;
 import org.jeecg.modules.kuaishou.service.IKuaishouInterfaceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.util.Date;
@@ -56,7 +55,7 @@ public class ReportController {
     @GetMapping("jietiao/kuaishou/insert")
     public Map<String, Object> jietiaoKuaishouInsert(String accountId) {
         Map<String, Object> result = new HashMap<>();
-        CTopOauthToken token = tokenService.getOauthTokenByAccountId(accountId);
+        CtopOauthToken token = tokenService.getOauthTokenByAccountId(accountId);
         Date now = new Date();
         String startDate = DateUtils.formatDate(now, "yyyy-MM-dd");
         kuaishouInterfaceService.getCampaignDailyReport(token.getAccessToken(), token.getAccountId(), startDate, startDate, 1000, 1);
@@ -64,7 +63,7 @@ public class ReportController {
     }
 
     @Autowired
-    private ICTopOauthTokenService tokenService;
+    private ICtopOauthTokenService tokenService;
     @Autowired
     private IKuaishouInterfaceService kuaishouInterfaceService;
 

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

@@ -40,6 +40,12 @@ public class BindAccountLogin {
     @ApiModelProperty(value = "广告id")
     private String advertiserId;
     /**
+     * 广告id
+     */
+    @Excel(name = "用户Id", width = 15)
+    @ApiModelProperty(value = "用户id")
+    private String userId;
+    /**
      * 账号
      */
     @Excel(name = "账号", width = 15)

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

@@ -157,7 +157,7 @@ public class ByteDanceCampaign {
 		this.updateTime = now;
     }
 
-	public ByteDanceCampaign(Long id, CTopOauthToken oauthToken, String campaignName, String budgetMode, Integer budget, String landingType) {
+    public ByteDanceCampaign(Long id, CtopOauthToken oauthToken, String campaignName, String budgetMode, Integer budget, String landingType) {
 		this.id = id;
 		this.advertiserId = oauthToken.getAdvertiserId();
 		this.name = campaignName;
@@ -170,7 +170,7 @@ public class ByteDanceCampaign {
 		this.updateTime = now;
 	}
 
-	public ByteDanceCampaign(Long id, CTopOauthToken token, ByteDanceCampaignTemplate template) {
+    public ByteDanceCampaign(Long id, CtopOauthToken token, ByteDanceCampaignTemplate template) {
 		this.id = id;
 		this.advertiserId = token.getAdvertiserId();
 		this.name = template.getCampaignName();

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

@@ -105,7 +105,7 @@ public class ByteDanceCustomAudience {
     public ByteDanceCustomAudience() {
     }
 
-    public ByteDanceCustomAudience(CTopOauthToken token, JSONObject dataObject) {
+    public ByteDanceCustomAudience(CtopOauthToken token, JSONObject dataObject) {
         this.id = dataObject.getLong("custom_audience_id");
         this.accountId = token.getAccountId();
         this.advertiserId = token.getAdvertiserId();

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

@@ -100,7 +100,7 @@ public class ByteDanceImageInfo {
     @ApiModelProperty(value = "updateTime")
     private Date updateTime;
 
-    public ByteDanceImageInfo(JSONObject data, CTopOauthToken token) {
+    public ByteDanceImageInfo(JSONObject data, CtopOauthToken token) {
         this.id = data.getString("id");
         this.fileId = id;
         this.accountId = token.getAccountId();

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

@@ -96,7 +96,7 @@ public class ByteDanceVideoInfo {
     @ApiModelProperty(value = "updateTime")
     private Date updateTime;
 
-    public ByteDanceVideoInfo(JSONObject data, CTopOauthToken token) {
+    public ByteDanceVideoInfo(JSONObject data, CtopOauthToken token) {
         this.id = data.getString("video_id");
         this.fileId = id;
         this.accountId = token.getAccountId();

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

@@ -96,7 +96,7 @@ public class FileInfo {
     @ApiModelProperty(value = "updateTime")
     private Date updateTime;
 
-    public FileInfo(String md5Hex, JSONObject data, String advertiserId, CTopOauthToken token, String imageUrl, String imagePath, String fileType, String platformType) {
+    public FileInfo(String md5Hex, JSONObject data, String advertiserId, CtopOauthToken token, String imageUrl, String imagePath, String fileType, String platformType) {
         this.type = fileType;
         if ("IMAGE".equals(type)) {
             this.fileId = data.getString("id");

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

@@ -12,7 +12,7 @@ import org.jeecg.modules.ctop.entity.BindAccountLogin;
 public interface IBindAccountLoginService extends IService<BindAccountLogin> {
 
 
-    boolean bindLogin(String advertiserId, String accountName, String password, String loginType);
+    boolean bindLogin(String advertiserId, String accountName, String password, String loginType, String userId);
 
 
 }

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

@@ -1,8 +1,8 @@
 package org.jeecg.modules.ctop.service;
 
-import org.jeecg.modules.ctop.entity.ByteDanceAdvertisePlan;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.ctop.entity.CTopOauthToken;
+import org.jeecg.modules.ctop.entity.ByteDanceAdvertisePlan;
+import org.jeecg.modules.ctop.entity.CtopOauthToken;
 
 import java.util.Map;
 
@@ -14,7 +14,7 @@ import java.util.Map;
  */
 public interface IByteDanceAdvertisePlanService extends IService<ByteDanceAdvertisePlan> {
 
-    Map<String, Object> advertiserPlanCreate(CTopOauthToken token, Long campaignId, String dataString);
+    Map<String, Object> advertiserPlanCreate(CtopOauthToken token, Long campaignId, String dataString);
 
     Map<String, Object> getAdConvertList(Long accountId, Long targetId);
 

+ 0 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IByteDanceAdvertiserDataService.java

@@ -1,8 +1,5 @@
 package org.jeecg.modules.ctop.service;
 
-import org.jeecg.modules.ctop.entity.ByteDanceCampaignTemplate;
-import org.jeecg.modules.ctop.entity.CTopOauthToken;
-
 import java.util.Map;
 
 public interface IByteDanceAdvertiserDataService {

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.ctop.entity.ByteDanceCampaignTemplate;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.ctop.entity.CTopOauthToken;
+import org.jeecg.modules.ctop.entity.CtopOauthToken;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
@@ -21,7 +21,7 @@ public interface IByteDanceCampaignTemplateService extends IService<ByteDanceCam
 
     Result<IPage<ByteDanceCampaignTemplate>> getList(ByteDanceCampaignTemplate template, Integer pageNo, Integer pageSize, HttpServletRequest req);
 
-    Map<String, Object> campaignCreate(CTopOauthToken token, ByteDanceCampaignTemplate template);
+    Map<String, Object> campaignCreate(CtopOauthToken token, ByteDanceCampaignTemplate template);
 
     Map<String, Object> campaignCreate(String getAccountId, Long campaignId, String getName);
 

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

@@ -2,7 +2,6 @@ package org.jeecg.modules.ctop.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.jeecg.modules.ctop.entity.AuthTask;
-import org.jeecg.modules.ctop.entity.CTopOauthToken;
 import org.jeecg.modules.ctop.mapper.AuthTaskMapper;
 import org.jeecg.modules.ctop.service.IAuthTaskService;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -28,7 +28,7 @@ public class BindAccountLoginServiceImpl extends ServiceImpl<BindAccountLoginMap
     private BindAccountLoginMapper bindAccountLoginMapper;
 
     @Override
-    public boolean bindLogin(String advertiserId, String accountName, String password, String loginType) {
+    public boolean bindLogin(String advertiserId, String accountName, String password, String loginType, String userId) {
         Map<String, Object> requestMap = new HashMap<>();
         requestMap.put("advertiser_id", advertiserId);
         requestMap.put("account_name", accountName);
@@ -42,6 +42,7 @@ public class BindAccountLoginServiceImpl extends ServiceImpl<BindAccountLoginMap
         bindAccountLogin.setAccountName(accountName);
         bindAccountLogin.setPassword(password);
         bindAccountLogin.setLoginType(loginType);
+        bindAccountLogin.setUserId(userId);
         int i = bindAccountLoginMapper.insert(bindAccountLogin);
         if (i > 0) {
             log.info("登录账号绑定成功,广告主id:{}", bindAccountLogin.getAdvertiserId());

+ 9 - 8
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceAdvertisePlanServiceImpl.java

@@ -15,12 +15,12 @@ import org.apache.http.impl.client.HttpClientBuilder;
 import org.jeecg.modules.ctop.entity.ByteDanceAdvertisePlan;
 import org.jeecg.modules.ctop.entity.BytedanceDeliveryTargetTemplate;
 import org.jeecg.modules.ctop.entity.BytedanceUrlInfo;
-import org.jeecg.modules.ctop.entity.CTopOauthToken;
+import org.jeecg.modules.ctop.entity.CtopOauthToken;
 import org.jeecg.modules.ctop.mapper.ByteDanceAdvertisePlanMapper;
 import org.jeecg.modules.ctop.mapper.BytedanceDeliveryTargetTemplateMapper;
 import org.jeecg.modules.ctop.mapper.BytedanceUrlInfoMapper;
 import org.jeecg.modules.ctop.service.IByteDanceAdvertisePlanService;
-import org.jeecg.modules.ctop.service.ICTopOauthTokenService;
+import org.jeecg.modules.ctop.service.ICtopOauthTokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -47,13 +47,13 @@ public class ByteDanceAdvertisePlanServiceImpl extends ServiceImpl<ByteDanceAdve
     private BytedanceDeliveryTargetTemplateMapper deliveryTargetTemplateMapper;
 
     @Autowired
-    private ICTopOauthTokenService tokenService;
+    private ICtopOauthTokenService tokenService;
 
     @Autowired
     private ByteDanceAdvertisePlanMapper planMapper;
 
     @Override
-    public Map<String, Object> advertiserPlanCreate(CTopOauthToken token, Long campaignId, String dataString) {
+    public Map<String, Object> advertiserPlanCreate(CtopOauthToken token, Long campaignId, String dataString) {
         Map<String, Object> resultMap = new HashMap<>();
         JSONObject data = JSONObject.parseObject(dataString);
         data.put("advertiser_id", token.getAccountId());
@@ -80,19 +80,19 @@ public class ByteDanceAdvertisePlanServiceImpl extends ServiceImpl<ByteDanceAdve
 
     @Override
     public Map<String, Object> getAdConvertList(Long accountId, Long targetId) {
-        CTopOauthToken token = tokenService.getOauthTokenByAccountId(accountId + "");
+        CtopOauthToken token = tokenService.getOauthTokenByAccountId(accountId + "");
         BytedanceDeliveryTargetTemplate targetTemplate = deliveryTargetTemplateMapper.selectById(targetId);
         return getAdConvert(token, targetTemplate);
     }
 
     @Override
     public Map<String, Object> getAdConvertListByUrlId(Long accountId, Long urlId) {
-        CTopOauthToken token = tokenService.getOauthTokenByAccountId(accountId + "");
+        CtopOauthToken token = tokenService.getOauthTokenByAccountId(accountId + "");
         BytedanceUrlInfo urlInfo = urlInfoMapper.selectById(urlId);
         return getAdConvertByUrlInfo(token, urlInfo);
     }
 
-    private Map<String, Object> getAdConvertByUrlInfo(CTopOauthToken token, BytedanceUrlInfo urlInfo) {
+    private Map<String, Object> getAdConvertByUrlInfo(CtopOauthToken token, BytedanceUrlInfo urlInfo) {
         String accessToken = token.getAccessToken();
         final Long advertiserId = token.getAccountId();
         // 请求地址
@@ -154,7 +154,8 @@ public class ByteDanceAdvertisePlanServiceImpl extends ServiceImpl<ByteDanceAdve
         }
         return null;
     }
-    public JSONObject getAdConvert(CTopOauthToken token, BytedanceDeliveryTargetTemplate targetTemplate) {
+
+    public JSONObject getAdConvert(CtopOauthToken token, BytedanceDeliveryTargetTemplate targetTemplate) {
         String accessToken = token.getAccessToken();
         final Long advertiserId = token.getAccountId();
         // 请求地址

+ 15 - 15
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceAdvertiserDataServiceImpl.java

@@ -8,7 +8,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.modules.ctop.entity.*;
 import org.jeecg.modules.ctop.mapper.*;
 import org.jeecg.modules.ctop.service.IByteDanceAdvertiserDataService;
-import org.jeecg.modules.ctop.service.ICTopOauthTokenService;
+import org.jeecg.modules.ctop.service.ICtopOauthTokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -24,7 +24,7 @@ import java.util.TreeMap;
 @Service
 public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserDataService {
     @Autowired
-    private ICTopOauthTokenService tokenService;
+    private ICtopOauthTokenService tokenService;
     @Autowired
     private ByteDanceAdvertisePlanMapper advertisePlanMapper;
     @Autowired
@@ -45,7 +45,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
     @Override
     public Map<String, Object> getAdvertiserInfo(String accountId) {
         Map<String, Object> resultMap = new HashMap<>();
-        CTopOauthToken cTopOauthToken = tokenService.getOauthTokenByAccountId(accountId);
+        CtopOauthToken cTopOauthToken = tokenService.getOauthTokenByAccountId(accountId);
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + PropertiesUtils.getValue("bytedance_config", "bytedance_v2_advertiser_info");
         Map<String, String> headers = new HashMap<>();
@@ -87,7 +87,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
     }
 
     private void getAdvertiserPlanByPageNumber(String accountId, Integer pageNumber, String ids) {
-        CTopOauthToken cTopOauthToken = tokenService.getOauthTokenByAccountId(accountId);
+        CtopOauthToken cTopOauthToken = tokenService.getOauthTokenByAccountId(accountId);
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + PropertiesUtils.getValue("bytedance_config", "bytedance_v2_ad_get");
         Map<String, String> headers = new HashMap<>();
@@ -153,7 +153,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
     @Override
     public Map<String, Object> getAdvertiserBudget(String accountId) {
         Map<String, Object> resultMap = new HashMap<>();
-        CTopOauthToken cTopOauthToken = tokenService.getOauthTokenByAccountId(accountId);
+        CtopOauthToken cTopOauthToken = tokenService.getOauthTokenByAccountId(accountId);
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + PropertiesUtils.getValue("bytedance_config", "bytedance_v2_campaign_get");
         Map<String, String> headers = new HashMap<>();
@@ -203,7 +203,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
     @Override
     public Map<String, Object> getAdvertiserCreativeMaterial(String accountId, String creativeIds) {
         Map<String, Object> resultMap = new HashMap<>();
-        CTopOauthToken cTopOauthToken = tokenService.getOauthTokenByAccountId(accountId);
+        CtopOauthToken cTopOauthToken = tokenService.getOauthTokenByAccountId(accountId);
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + PropertiesUtils.getValue("bytedance_config", "bytedance_v2_creative_material_get");
         Map<String, String> headers = new HashMap<>();
@@ -252,7 +252,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
                 ids.add(Long.parseLong(getIds[i]));
             }
         }
-        CTopOauthToken cTopOauthToken = tokenService.getOauthTokenByAccountId(accountId);
+        CtopOauthToken cTopOauthToken = tokenService.getOauthTokenByAccountId(accountId);
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + PropertiesUtils.getValue("bytedance_config", "bytedance_v2_campaign_update_status");
         Map<String, String> headers = new HashMap<>();
@@ -299,7 +299,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
     @Override
     public Map<String, Object> advertiserCampaignUpdate(String accountId, Long campaignId, String budgetMode, Integer budget, String campaignName) {
         Map<String, Object> resultMap = new HashMap<>();
-        CTopOauthToken cTopOauthToken = tokenService.getOauthTokenByAccountId(accountId);
+        CtopOauthToken cTopOauthToken = tokenService.getOauthTokenByAccountId(accountId);
         ByteDanceCampaign campaign = campaignMapper.selectById(campaignId);
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + PropertiesUtils.getValue("bytedance_config", "bytedance_v2_campaign_update");
@@ -365,7 +365,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
                 ids.add(Long.parseLong(getIds[i]));
             }
         }
-        CTopOauthToken cTopOauthToken = tokenService.getOauthTokenByAccountId(accountId);
+        CtopOauthToken cTopOauthToken = tokenService.getOauthTokenByAccountId(accountId);
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + PropertiesUtils.getValue("bytedance_config", "bytedance_v2_ad_update_status");
         Map<String, String> headers = new HashMap<>();
@@ -420,7 +420,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
                 data.add(object);
             }
         }
-        CTopOauthToken cTopOauthToken = tokenService.getOauthTokenByAccountId(accountId);
+        CtopOauthToken cTopOauthToken = tokenService.getOauthTokenByAccountId(accountId);
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + PropertiesUtils.getValue("bytedance_config", "bytedance_v2_ad_update_bid");
         Map<String, String> headers = new HashMap<>();
@@ -474,7 +474,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
                 data.add(object);
             }
         }
-        CTopOauthToken cTopOauthToken = tokenService.getOauthTokenByAccountId(accountId);
+        CtopOauthToken cTopOauthToken = tokenService.getOauthTokenByAccountId(accountId);
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + PropertiesUtils.getValue("bytedance_config", "bytedance_v2_ad_update_budget");
         Map<String, String> headers = new HashMap<>();
@@ -520,7 +520,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
                 ids.add(Long.parseLong(getCreativeIds[i]));
             }
         }
-        CTopOauthToken cTopOauthToken = tokenService.getOauthTokenByAccountId(accountId);
+        CtopOauthToken cTopOauthToken = tokenService.getOauthTokenByAccountId(accountId);
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + PropertiesUtils.getValue("bytedance_config", "bytedance_v2_creative_update_status");
         Map<String, String> headers = new HashMap<>();
@@ -566,7 +566,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
     @Override
     public Map<String, Object> advertiserCustomAudienceSelect(String accountId) {
         Map<String, Object> resultMap = new HashMap<>();
-        CTopOauthToken token = tokenService.getOauthTokenByAccountId(accountId);
+        CtopOauthToken token = tokenService.getOauthTokenByAccountId(accountId);
 
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + PropertiesUtils.getValue("bytedance_config", "bytedance_v2_dmp_custom_audience_select");
         Map<String, String> headers = new HashMap<>();
@@ -611,7 +611,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
     }
 
     private void getAdvertiserCreativeByPageNumber(String accountId, Integer pageNumber, String ids) {
-        CTopOauthToken cTopOauthToken = tokenService.getOauthTokenByAccountId(accountId);
+        CtopOauthToken cTopOauthToken = tokenService.getOauthTokenByAccountId(accountId);
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + PropertiesUtils.getValue("bytedance_config", "bytedance_v2_creative_get");
         Map<String, String> headers = new HashMap<>();
@@ -656,7 +656,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
     }
 
     private void getAdvertiserCampaignByPageNumber(String accountId, Integer pageNumber, String ids) {
-        CTopOauthToken cTopOauthToken = tokenService.getOauthTokenByAccountId(accountId);
+        CtopOauthToken cTopOauthToken = tokenService.getOauthTokenByAccountId(accountId);
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + PropertiesUtils.getValue("bytedance_config", "bytedance_v2_campaign_get");
         Map<String, String> headers = new HashMap<>();

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

@@ -23,11 +23,11 @@ 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.entity.CtopOauthToken;
 import org.jeecg.modules.ctop.mapper.ByteDanceCampaignMapper;
 import org.jeecg.modules.ctop.mapper.ByteDanceCampaignTemplateMapper;
 import org.jeecg.modules.ctop.service.IByteDanceCampaignTemplateService;
-import org.jeecg.modules.ctop.service.ICTopOauthTokenService;
+import org.jeecg.modules.ctop.service.ICtopOauthTokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -52,7 +52,7 @@ public class ByteDanceCampaignTemplateServiceImpl extends ServiceImpl<ByteDanceC
     @Autowired
     private ByteDanceCampaignTemplateMapper campaignTemplateMapper;
     @Autowired
-    private ICTopOauthTokenService tokenService;
+    private ICtopOauthTokenService tokenService;
     @Autowired
     private ByteDanceCampaignMapper campaignMapper;
     @Override
@@ -102,7 +102,7 @@ public class ByteDanceCampaignTemplateServiceImpl extends ServiceImpl<ByteDanceC
     @Override
     public Map<String, Object> campaignCreate(String accountId, String campaignName, String budgetMode, Integer budget, String landingType) {
         Map<String, Object> resultMap = new HashMap<>();
-        CTopOauthToken token = tokenService.getOauthTokenByAccountId(accountId);
+        CtopOauthToken token = tokenService.getOauthTokenByAccountId(accountId);
         //2: 根据token以及用户id获取用户信息数据
         JSONObject params = new JSONObject();
         params.put("advertiser_id", token.getAccountId());
@@ -136,12 +136,12 @@ public class ByteDanceCampaignTemplateServiceImpl extends ServiceImpl<ByteDanceC
 
     @Override
     public Map<String, Object> getSuggestCover(String accountId, String videoId) {
-        CTopOauthToken token = tokenService.getOauthTokenByAccountId(accountId);
+        CtopOauthToken token = tokenService.getOauthTokenByAccountId(accountId);
         JSONObject result = suggestVideo(token, videoId);
         return null;
     }
 
-    public JSONObject suggestVideo(CTopOauthToken token, String videoId) {
+    public JSONObject suggestVideo(CtopOauthToken token, String videoId) {
         // 请求地址
         String url = "https://ad.toutiao.com/open_api/2/tools/video_cover/suggest/";
         // 请求参数
@@ -155,7 +155,7 @@ public class ByteDanceCampaignTemplateServiceImpl extends ServiceImpl<ByteDanceC
     }
 
     @Override
-    public Map<String, Object> campaignCreate(CTopOauthToken token, ByteDanceCampaignTemplate template) {
+    public Map<String, Object> campaignCreate(CtopOauthToken token, ByteDanceCampaignTemplate template) {
         Map<String, Object> resultMap = new HashMap<>();
         //2: 根据token以及用户id获取用户信息数据
         JSONObject params = new JSONObject();
@@ -192,7 +192,7 @@ public class ByteDanceCampaignTemplateServiceImpl extends ServiceImpl<ByteDanceC
     @Override
     public Map<String, Object> campaignCreate(String getAccountId, Long campaignId, String name) {
         ByteDanceCampaignTemplate template = campaignTemplateMapper.selectById(campaignId);
-        CTopOauthToken token = tokenService.getOauthTokenByAccountId(getAccountId);
+        CtopOauthToken token = tokenService.getOauthTokenByAccountId(getAccountId);
         Map<String, Object> resultMap = new HashMap<>();
         //2: 根据token以及用户id获取用户信息数据
         JSONObject params = new JSONObject();

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

@@ -15,7 +15,7 @@ import org.apache.http.impl.client.HttpClientBuilder;
 import org.jeecg.common.util.ResultMapUtils;
 import org.jeecg.common.util.StatusCode;
 import org.jeecg.modules.ctop.entity.ByteDanceCreative;
-import org.jeecg.modules.ctop.entity.CTopOauthToken;
+import org.jeecg.modules.ctop.entity.CtopOauthToken;
 import org.jeecg.modules.ctop.mapper.ByteDanceCreativeMapper;
 import org.jeecg.modules.ctop.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,13 +45,13 @@ public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeM
     @Autowired
     private IByteDanceAdvertiserDataService advertiserDataService;
     @Autowired
-    private ICTopOauthTokenService tokenService;
+    private ICtopOauthTokenService tokenService;
 
     @Override
     public Map<String, Object> creativeCreate(String accountId, Long adId, String dataString) {
         Map<String, Object> resultMap = new HashMap<>();
         //1:获取token
-        CTopOauthToken token = tokenService.getOauthTokenByAccountId(accountId);
+        CtopOauthToken token = tokenService.getOauthTokenByAccountId(accountId);
         JSONObject data = JSONObject.parseObject(dataString);
         data.put("advertiser_id", token.getAccountId());
         data.put("ad_id", adId);

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

@@ -8,7 +8,7 @@ import org.jeecg.modules.ctop.entity.*;
 import org.jeecg.modules.ctop.mapper.*;
 import org.jeecg.modules.ctop.service.IByteDanceAdvertisePlanService;
 import org.jeecg.modules.ctop.service.IBytedanceAdvertisePlanTemplateService;
-import org.jeecg.modules.ctop.service.ICTopOauthTokenService;
+import org.jeecg.modules.ctop.service.ICtopOauthTokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -39,7 +39,7 @@ public class BytedanceAdvertisePlanTemplateServiceImpl extends ServiceImpl<Byted
     @Autowired
     private BytedanceAdvertisePlanTemplateMapper templateMapper;
     @Autowired
-    private ICTopOauthTokenService tokenService;
+    private ICtopOauthTokenService tokenService;
 
     @Override
     public Map<String, Object> insertTemplate(BytedanceAdvertisePlanTemplate template, String accountId) {
@@ -64,7 +64,7 @@ public class BytedanceAdvertisePlanTemplateServiceImpl extends ServiceImpl<Byted
      */
     @Override
     public Map<String, Object> planCreate(Long campaignId, String getAccountId, String deliveryRange, Long userorentationId, Long budgetId, Long deliverytargetId, String getName, String convertId) {
-        CTopOauthToken token = tokenService.getOauthTokenByAccountId(getAccountId);
+        CtopOauthToken token = tokenService.getOauthTokenByAccountId(getAccountId);
         ByteDanceBudgetTemplate budgetTemplate = budgetTemplateMapper.selectById(budgetId);
         BytedanceDeliveryTargetTemplate deliveryTargetTemplate = deliveryTargetTemplateMapper.selectById(deliverytargetId);
         ByteDanceUserOrientationTemplate userOrientationTemplate = userOrientationTemplateMapper.selectById(userorentationId);

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

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import constant.KuaishouInterfaceConstant;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.modules.ctop.entity.CtopOauthToken;
-import org.jeecg.modules.ctop.mapper.CTopOauthTokenMapper;
+import org.jeecg.modules.ctop.mapper.CtopOauthTokenMapper;
 import org.jeecg.modules.ctop.service.ICtopOauthTokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -27,9 +27,9 @@ import java.util.Map;
  */
 @Slf4j
 @Service
-public class CtopOauthTokenServiceImpl extends ServiceImpl<CTopOauthTokenMapper, CtopOauthToken> implements ICtopOauthTokenService {
+public class CtopOauthTokenServiceImpl extends ServiceImpl<CtopOauthTokenMapper, CtopOauthToken> implements ICtopOauthTokenService {
     @Autowired
-    private CTopOauthTokenMapper cTopOauthTokenMapper;
+    private CtopOauthTokenMapper cTopOauthTokenMapper;
 
     @Override
     public CtopOauthToken getOauthTokenByAccountId(String accountId) {

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

@@ -12,31 +12,23 @@ import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
 import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.StringEntity;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
 import org.apache.http.entity.mime.content.FileBody;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.jeecg.common.util.ResultMapUtils;
 import org.jeecg.common.util.StatusCode;
-import org.jeecg.modules.ctop.entity.CTopOauthToken;
+import org.jeecg.modules.ctop.entity.CtopOauthToken;
 import org.jeecg.modules.ctop.entity.FileInfo;
 import org.jeecg.modules.ctop.entity.SourceFile;
-import org.jeecg.modules.ctop.mapper.ByteDanceImageInfoMapper;
-import org.jeecg.modules.ctop.mapper.ByteDanceVideoInfoMapper;
 import org.jeecg.modules.ctop.mapper.FileInfoMapper;
-import org.jeecg.modules.ctop.service.IByteDanceImageInfoService;
-import org.jeecg.modules.ctop.service.ICTopOauthTokenService;
+import org.jeecg.modules.ctop.service.ICtopOauthTokenService;
 import org.jeecg.modules.ctop.service.IFileInfoService;
 import org.jeecg.modules.ctop.service.ISourceFileService;
 import org.jeecg.modules.system.entity.SysCategory;
 import org.jeecg.modules.system.mapper.SysCategoryMapper;
 import org.jeecg.modules.system.service.ISysCategoryService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -73,13 +65,13 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
     @Autowired
     private SysCategoryMapper sysCategoryMapper;
     @Autowired
-    private ICTopOauthTokenService tokenService;
+    private ICtopOauthTokenService tokenService;
 
     @Override
     public Map<String, Object> uploadVideoToBytedance(String accountId, String videoUrl) {
         Map<String, Object> resultMap = new HashMap<>();
         //TODO查询是否已经上传过头条平台
-        CTopOauthToken token = tokenService.getOauthTokenByAccountId(accountId);
+        CtopOauthToken token = tokenService.getOauthTokenByAccountId(accountId);
         JSONObject resultObject = uploadAdvideo(token, videoUrl, token.getAccountId() + "");
         System.out.println(resultObject);
         Integer code = resultObject.getInteger("code");
@@ -103,7 +95,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
             ResultMapUtils.setResultMap(resultMap, StatusCode.IMAGE_NUMBER_SHORTAGE.getCode());
             return resultMap;
         }
-        CTopOauthToken token = tokenService.getOauthTokenByAccountId(accountId);
+        CtopOauthToken token = tokenService.getOauthTokenByAccountId(accountId);
         JSONArray imageIds = new JSONArray();
         for (int i = 0; i < imageUrls.length; i++) {
             JSONObject resultObject = uploadAdImage(token, imageUrls[i], token.getAccountId() + "");
@@ -126,7 +118,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
     @Override
     public Map<String, Object> uploadImageToBytedance(String accountId, String imageUrl) {
         Map<String, Object> resultMap = new HashMap<>();
-        CTopOauthToken token = tokenService.getOauthTokenByAccountId(accountId);
+        CtopOauthToken token = tokenService.getOauthTokenByAccountId(accountId);
         JSONObject resultObject = uploadAdImage(token, imageUrl, token.getAccountId() + "");
         Integer code = resultObject.getInteger("code");
         String message = resultObject.getString("message");
@@ -146,7 +138,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
     @Override
     public Map<String, Object> getIndustryList(String accountId, Integer level) {
         Map<String, Object> resultMap = new HashMap<>();
-        CTopOauthToken token = tokenService.getOauthTokenByAccountId(accountId);
+        CtopOauthToken token = tokenService.getOauthTokenByAccountId(accountId);
         JSONObject result = searchIndustry(token, level);
         JSONArray list = result.getJSONObject("data").getJSONArray("list");
         for (int i = 0; i < list.size(); i++) {
@@ -232,7 +224,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
 
     @Override
     public Map<String, Object> getCreativeWords(Long accountId) {
-        CTopOauthToken token = tokenService.getOauthTokenByAccountId(accountId + "");
+        CtopOauthToken token = tokenService.getOauthTokenByAccountId(accountId + "");
         return getCreativeWord(token, accountId);
     }
 
@@ -241,7 +233,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
         return null;
     }
 
-    public JSONObject getCreativeWord(CTopOauthToken token, Long accountId) {
+    public JSONObject getCreativeWord(CtopOauthToken token, Long accountId) {
         // 请求地址
         String url = "https://ad.toutiao.com/open_api/2/tools/creative_word/select/";
         // 请求参数
@@ -254,7 +246,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
         return resultObject;
     }
 
-    public JSONObject searchIndustry(CTopOauthToken token, Integer level) {
+    public JSONObject searchIndustry(CtopOauthToken token, Integer level) {
         // 请求地址
         String url = "https://ad.toutiao.com/open_api/2/tools/industry/get/";
         if (null != level) {
@@ -264,7 +256,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
         return resultObject;
     }
 
-    public JSONObject uploadAdImage(CTopOauthToken token, String imageUrl, String advertiserId) {
+    public JSONObject uploadAdImage(CtopOauthToken token, String imageUrl, String advertiserId) {
         JSONObject result = new JSONObject();
         //1:下载文件到本地
         String imagePath = downLoadByURL(imageUrl);
@@ -306,7 +298,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
         return result;
     }
 
-    private JSONObject imageUpload(CTopOauthToken token, String advertiserId, String imageUrl) {
+    private JSONObject imageUpload(CtopOauthToken token, String advertiserId, String imageUrl) {
         JSONObject result = null;
         // 请求地址
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + PropertiesUtils.getValue("bytedance_config", "bytedance_v2_file_image_ad");
@@ -386,7 +378,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
         }
     }
 
-    public JSONObject uploadAdvideo(CTopOauthToken token, String videoUrl, String advertiserId) {
+    public JSONObject uploadAdvideo(CtopOauthToken token, String videoUrl, String advertiserId) {
         JSONObject result = new JSONObject();
         //1:下载文件到本地
         String videoPath = downLoadByURL(videoUrl);
@@ -429,7 +421,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
         return result;
     }
 
-    private JSONObject videoUpload(CTopOauthToken token, String advertiserId, String videoPath) {
+    private JSONObject videoUpload(CtopOauthToken token, String advertiserId, String videoPath) {
         CloseableHttpResponse response = null;
         CloseableHttpClient client = null;
         // 请求地址

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

@@ -3,9 +3,9 @@ package org.jeecg.modules.ctop.service.impl;
 import cn.com.ctop.common.utils.Check;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.constant.CtopAdConstant;
-import org.jeecg.modules.ctop.entity.CTopOauthToken;
-import org.jeecg.modules.ctop.mapper.CTopOauthTokenMapper;
-import org.jeecg.modules.ctop.service.ICTopOauthTokenService;
+import org.jeecg.modules.ctop.entity.CtopOauthToken;
+import org.jeecg.modules.ctop.mapper.CtopOauthTokenMapper;
+import org.jeecg.modules.ctop.service.ICtopOauthTokenService;
 import org.jeecg.modules.ctop.service.IRefreshTokenService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,9 +18,9 @@ import java.util.List;
 @Service
 public class RefreshTokenServiceImpl implements IRefreshTokenService {
     @Autowired
-    private CTopOauthTokenMapper oauthTokenMapper;
+    private CtopOauthTokenMapper oauthTokenMapper;
     @Autowired
-    private ICTopOauthTokenService oauthTokenService;
+    private ICtopOauthTokenService oauthTokenService;
 
     /**
      * 获取所有token
@@ -28,10 +28,10 @@ public class RefreshTokenServiceImpl implements IRefreshTokenService {
      */
     @Override
     public void getRefresh() {
-        List<CTopOauthToken> oauthTokens = oauthTokenMapper.selectAll();
+        List<CtopOauthToken> oauthTokens = oauthTokenMapper.selectAll();
         log.info("需要刷新token列表长度:{}", oauthTokens.size());
         if (!Check.isNull(oauthTokens)) {
-            for (CTopOauthToken oauthToken : oauthTokens) {
+            for (CtopOauthToken oauthToken : oauthTokens) {
                 //头条
                 if (CtopAdConstant.PLATFORM_TYPE_BYTEDANCE.equals(oauthToken.getMediaId().trim())) {
                     oauthTokenService.getByteDanceAccessToken(String.valueOf(oauthToken.getAccountId()));

+ 15 - 15
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ReportServiceImpl.java

@@ -20,12 +20,12 @@ import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.jeecg.common.util.ResultMapUtils;
 import org.jeecg.common.util.StatusCode;
-import org.jeecg.modules.ctop.entity.CTopOauthToken;
+import org.jeecg.modules.ctop.entity.CtopOauthToken;
 import org.jeecg.modules.ctop.entity.CustomerPlanStatisticInfo;
 import org.jeecg.modules.ctop.entity.PlatformCampaignStatisticInfo;
 import org.jeecg.modules.ctop.mapper.CustomerPlanStatisticInfoMapper;
 import org.jeecg.modules.ctop.mapper.PlatformCampaignStatisticInfoMapper;
-import org.jeecg.modules.ctop.service.ICTopOauthTokenService;
+import org.jeecg.modules.ctop.service.ICtopOauthTokenService;
 import org.jeecg.modules.ctop.service.ICustomerPlanStatisticInfoService;
 import org.jeecg.modules.ctop.service.IPlatformCampaignStatisticInfoService;
 import org.jeecg.modules.ctop.service.IReportService;
@@ -59,7 +59,7 @@ public class ReportServiceImpl implements IReportService {
     @Autowired
     private PlatformCampaignStatisticInfoMapper platformCampaignStatisticInfoMapper;
     @Autowired
-    private ICTopOauthTokenService tokenService;
+    private ICtopOauthTokenService tokenService;
 
     @Override
     public Map<String, Object> getAdvertiserReport(JSONObject conditions) {
@@ -71,7 +71,7 @@ public class ReportServiceImpl implements IReportService {
         conditions.put("page", 1);
         Long accountId = conditions.getLong("advertiser_id");
 //        Long accountId = 74099510334L;
-        CTopOauthToken token = tokenService.getOauthTokenByAccountId(accountId + "");
+        CtopOauthToken token = tokenService.getOauthTokenByAccountId(accountId + "");
         JSONObject getObject = getAdvertiserStat(token, conditions);
         return getObject;
     }
@@ -79,12 +79,12 @@ public class ReportServiceImpl implements IReportService {
     @Override
     public Map<String, Object> getCampaignReport(JSONObject conditions) {
         Long accountId = conditions.getLong("accountId");
-        CTopOauthToken token = tokenService.getOauthTokenByAccountId(accountId + "");
+        CtopOauthToken token = tokenService.getOauthTokenByAccountId(accountId + "");
         JSONObject getObject = getAdStat(token, conditions);
         return new HashMap<>();
     }
 
-    private JSONObject getAdStat(CTopOauthToken token, JSONObject conditions) {
+    private JSONObject getAdStat(CtopOauthToken token, JSONObject conditions) {
         final Long advertiserId = token.getAccountId();
         // 请求地址
         String url = "https://ad.toutiao.com/open_api/2/report/ad/get/";
@@ -153,7 +153,7 @@ public class ReportServiceImpl implements IReportService {
     @Override
     public Map<String, Object> getAdReport(JSONObject conditions) {
         Long accountId = conditions.getLong("accountId");
-        CTopOauthToken token = tokenService.getOauthTokenByAccountId(accountId + "");
+        CtopOauthToken token = tokenService.getOauthTokenByAccountId(accountId + "");
         JSONObject getObject = getAdStat(token, conditions);
         return getObject;
     }
@@ -161,7 +161,7 @@ public class ReportServiceImpl implements IReportService {
     @Override
     public Map<String, Object> getCreativeReport(JSONObject conditions) {
         Long accountId = conditions.getLong("accountId");
-        CTopOauthToken token = tokenService.getOauthTokenByAccountId(accountId + "");
+        CtopOauthToken token = tokenService.getOauthTokenByAccountId(accountId + "");
         JSONObject getObject = getCreativeStat(token, conditions);
         return getObject;
     }
@@ -169,7 +169,7 @@ public class ReportServiceImpl implements IReportService {
     @Override
     public Map<String, Object> getAgentReport(JSONObject conditions) {
         Long accountId = conditions.getLong("accountId");
-        CTopOauthToken token = tokenService.getOauthTokenByAccountId(accountId + "");
+        CtopOauthToken token = tokenService.getOauthTokenByAccountId(accountId + "");
         JSONObject getObject = getCreativeStat(token, conditions);
         return getObject;
     }
@@ -177,7 +177,7 @@ public class ReportServiceImpl implements IReportService {
     @Override
     public void insertCustomerInfo(String csvPath, String charset) {
         try {
-            List<String[]> data = CsvUtils.ReadCSV(csvPath, charset);
+            List<String[]> data = CsvUtils.readCSV(csvPath, charset);
             if (null != data && data.size() > 1) {
                 for (int i = 1; i < data.size(); i++) {
                     String[] record = data.get(i);
@@ -193,7 +193,7 @@ public class ReportServiceImpl implements IReportService {
     @Override
     public void insertPlatformInfo(String csvPath, String charset, Long accountId) {
         try {
-            List<String[]> data = CsvUtils.ReadCSV(csvPath, charset);
+            List<String[]> data = CsvUtils.readCSV(csvPath, charset);
             if (null != data && data.size() > 1) {
                 for (int i = 1; i < data.size(); i++) {
                     String[] record = data.get(i);
@@ -579,7 +579,7 @@ public class ReportServiceImpl implements IReportService {
         }
     }
 
-    public JSONObject getAgentStat(CTopOauthToken token, JSONObject conditions) {
+    public JSONObject getAgentStat(CtopOauthToken token, JSONObject conditions) {
         // 请求地址
         String url = "https://ad.toutiao.com/open_api/2/report/agent/get/";
         // 请求参数
@@ -633,7 +633,7 @@ public class ReportServiceImpl implements IReportService {
         return null;
     }
 
-    public JSONObject getCreativeStat(CTopOauthToken token, JSONObject conditions) {
+    public JSONObject getCreativeStat(CtopOauthToken token, JSONObject conditions) {
         // 请求地址
         String url = "https://ad.toutiao.com/open_api/2/report/creative/get/";
         final Map filtering = new HashMap() {
@@ -695,7 +695,7 @@ public class ReportServiceImpl implements IReportService {
         return null;
     }
 
-    public static JSONObject getCampaignStat(CTopOauthToken token, JSONObject conditions) {
+    public static JSONObject getCampaignStat(CtopOauthToken token, JSONObject conditions) {
         // 请求地址
         String url = "https://ad.toutiao.com/open_api/2/report/campaign/get/";
         final Map filtering = new HashMap() {
@@ -758,7 +758,7 @@ public class ReportServiceImpl implements IReportService {
         return null;
     }
 
-    public JSONObject getAdvertiserStat(CTopOauthToken token, JSONObject conditions) {
+    public JSONObject getAdvertiserStat(CtopOauthToken token, JSONObject conditions) {
         final Long advertiserId = token.getAccountId();
         // 请求地址
         String url = "https://ad.toutiao.com/open_api/2/report/advertiser/get/";

+ 6 - 8
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouController.java

@@ -4,8 +4,9 @@ import cn.com.ctop.kuaishou.modules.material.entity.KuaishouResult;
 import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyCampaign;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import org.jeecg.modules.ctop.entity.CTopOauthToken;
-import org.jeecg.modules.ctop.service.ICTopOauthTokenService;
+
+import org.jeecg.modules.ctop.entity.CtopOauthToken;
+import org.jeecg.modules.ctop.service.ICtopOauthTokenService;
 import org.jeecg.modules.ctop.service.IRefreshTokenService;
 import org.jeecg.modules.kuaishou.service.IKuaishouInterfaceService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -193,17 +194,17 @@ public class KuaiShouController {
     @Autowired
     private IRefreshTokenService refreshTokenService;
     @Autowired
-    private ICTopOauthTokenService oauthTokenService;
+    private ICtopOauthTokenService tokenService;
 
     @RequestMapping("/test")
     public void test() throws IOException {
-        oauthTokenService.getKuaiShouRefreshToken(23212L, "b51ce96a098299b04fa6cb70617e653d");
+        tokenService.getKuaiShouRefreshToken(23212L, "b51ce96a098299b04fa6cb70617e653d");
 
     }
 
     @RequestMapping("report")
     public Map<String, Object> getReport(String accountId) {
-        CTopOauthToken token = tokenService.getOauthTokenByAccountId(accountId);
+        CtopOauthToken token = tokenService.getOauthTokenByAccountId(accountId);
         String startDate = "2019-08-14";
         String endDate = "2019-08-14";
         KuaishouResult<KuaishouReportDailyCampaign> stringObjectMap = kuaishouInterfaceService.getCampaignDailyReport(token.getAccessToken(), token.getAccountId(), startDate, endDate, 1000, 1);
@@ -211,7 +212,4 @@ public class KuaiShouController {
         result.put("data", stringObjectMap);
         return result;
     }
-
-    @Autowired
-    private ICTopOauthTokenService tokenService;
 }

+ 4 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouConversionTypesController.java

@@ -12,8 +12,8 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.CTopOauthToken;
-import org.jeecg.modules.ctop.service.ICTopOauthTokenService;
+import org.jeecg.modules.ctop.entity.CtopOauthToken;
+import org.jeecg.modules.ctop.service.ICtopOauthTokenService;
 import org.jeecg.modules.kuaishou.entity.KuaiShouConversionTypes;
 import org.jeecg.modules.kuaishou.service.IKuaiShouConversionTypesService;
 import org.jeecg.modules.kuaishou.service.IKuaishouInterfaceService;
@@ -53,12 +53,12 @@ public class KuaiShouConversionTypesController {
     @Autowired
     private IKuaishouInterfaceService kuaishouInterfaceService;
     @Autowired
-    private ICTopOauthTokenService oauthTokenService;
+    private ICtopOauthTokenService oauthTokenService;
 
     @GetMapping(value = "/getIsActivate")
     public Result<IPage<KuaiShouConversionTypes>> queryPageList(Long accountId) {
         Result result = new Result<IPage<KuaiShouConversionTypes>>();
-        CTopOauthToken token = oauthTokenService.getOauthTokenByAccountId(String.valueOf(accountId));
+        CtopOauthToken token = oauthTokenService.getOauthTokenByAccountId(String.valueOf(accountId));
         if (Check.isNull(token)) {
             result.setSuccess(false);
             result.setMessage("未获取到授权信息");

+ 7 - 8
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouCreateServiceImpl.java

@@ -4,8 +4,8 @@ import cn.com.ctop.common.utils.Check;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.jeecg.modules.ctop.entity.CTopOauthToken;
-import org.jeecg.modules.ctop.service.ICTopOauthTokenService;
+import org.jeecg.modules.ctop.entity.CtopOauthToken;
+import org.jeecg.modules.ctop.service.ICtopOauthTokenService;
 import org.jeecg.modules.kuaishou.entity.KuaiShouCampaignCreate;
 import org.jeecg.modules.kuaishou.entity.KuaiShouCampaignTemplate;
 import org.jeecg.modules.kuaishou.entity.KuaiShouCreateAppTemplate;
@@ -40,7 +40,7 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
     @Autowired
     private KuaiShouGroupCreateLogMapper groupCreateLogMapper;
     @Autowired
-    private ICTopOauthTokenService oauthTokenService;
+    private ICtopOauthTokenService oauthTokenService;
     @Autowired
     private KuaiShouCampaignCreateMapper campaignCreateMapper;
 
@@ -63,13 +63,12 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                 return returnMap;
             }
 
-            CTopOauthToken cTopOauthToken = oauthTokenService.getOauthTokenByAccountId(String.valueOf(accountId));
-            if (Check.isNull(cTopOauthToken)) {
+            CtopOauthToken ctopOauthToken = oauthTokenService.getOauthTokenByAccountId(String.valueOf(accountId));
+            if (Check.isNull(ctopOauthToken)) {
                 logger.error("未获取到token信息,accountId:{}", accountId);
                 throw new Exception("未获取到token信息");
             }
-            String accessToken = cTopOauthToken.getAccessToken();
-
+            String accessToken = ctopOauthToken.getAccessToken();
             Long campaignTemplateId = groupCreateTemplate.getCampaignTemplateId(); // 广告计划模板id
             if (Check.isNull(campaignTemplateId)) {
                 returnMap.put("code", -1);
@@ -264,7 +263,7 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                 return returnMap;
             }
 
-            CTopOauthToken cTopOauthToken = oauthTokenService.getOauthTokenByAccountId(String.valueOf(accountId));
+            CtopOauthToken cTopOauthToken = oauthTokenService.getOauthTokenByAccountId(String.valueOf(accountId));
             if (Check.isNull(cTopOauthToken)) {
                 logger.error("未获取到token信息,accountId:{}", accountId);
                 throw new Exception("未获取到token信息");