浏览代码

修改回调日志信息

syh 5 年之前
父节点
当前提交
5056bef51c

+ 6 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/controller/WpsFileController.java

@@ -16,8 +16,9 @@ import org.springframework.web.bind.annotation.*;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
 import java.util.Arrays;
+import java.util.Map;
 
 
- /**
+/**
  * wps文件
  * wps文件
  * @author jeecg-boot
  * @author jeecg-boot
  * @date   2020-06-01
  * @date   2020-06-01
@@ -31,6 +32,10 @@ public class WpsFileController {
 	@Autowired
 	@Autowired
 	private IWpsFileService wpsFileService;
 	private IWpsFileService wpsFileService;
 
 
+	@PostMapping("bindProject")
+	public Map<String,Object> bindProject(String fileId,Long projectId){
+		return wpsFileService.bindProject(fileId,projectId);
+	}
 	/**
 	/**
 	  * 分页列表查询
 	  * 分页列表查询
 	 * @param wpsFile
 	 * @param wpsFile

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

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 
 /**
 /**
@@ -42,6 +43,7 @@ public class WpsFile {
 	/**creator*/
 	/**creator*/
 	@Excel(name = "creator", width = 15)
 	@Excel(name = "creator", width = 15)
     @ApiModelProperty(value = "creator")
     @ApiModelProperty(value = "creator")
+	@Dict(dicCode = "id", dictTable = "sys_user", dicText = "real_name")
 	private String creator;
 	private String creator;
 	/**createTime*/
 	/**createTime*/
 	@Excel(name = "createTime", width = 15)
 	@Excel(name = "createTime", width = 15)
@@ -67,6 +69,10 @@ public class WpsFile {
 	@Excel(name = "canDelete", width = 15)
 	@Excel(name = "canDelete", width = 15)
     @ApiModelProperty(value = "canDelete")
     @ApiModelProperty(value = "canDelete")
 	private String canDelete;
 	private String canDelete;
+	@Dict(dicCode = "id", dictTable = "ctop_project", dicText = "project_name")
+	private Long projectId;
+
+	private String code;
 
 
 	public WpsFile(){super();}
 	public WpsFile(){super();}
 
 

+ 2 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/service/IWpsFileService.java

@@ -43,4 +43,6 @@ public interface IWpsFileService extends IService<WpsFile> {
     void uploadFile(MultipartFile file);
     void uploadFile(MultipartFile file);
 
 
     String createTemplateFile(String template);
     String createTemplateFile(String template);
+
+    Map<String, Object> bindProject(String fileId, Long projectId);
 }
 }

+ 22 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/service/impl/WpsFileServiceImpl.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
+import org.jeecg.modules.ctop.entity.Project;
+import org.jeecg.modules.ctop.service.IProjectService;
 import org.jeecg.modules.wps.config.Context;
 import org.jeecg.modules.wps.config.Context;
 import org.jeecg.modules.wps.dto.*;
 import org.jeecg.modules.wps.dto.*;
 import org.jeecg.modules.wps.entity.*;
 import org.jeecg.modules.wps.entity.*;
@@ -375,4 +377,24 @@ public class WpsFileServiceImpl extends ServiceImpl<WpsFileMapper, WpsFile> impl
         }
         }
         return "";
         return "";
     }
     }
+    @Autowired
+    private IProjectService projectService;
+    @Override
+    public Map<String, Object> bindProject(String fileId, Long projectId) {
+        Map<String,Object> result = new HashMap<>();
+        WpsFile wpsFile = this.getById(fileId);
+        if(null == wpsFile){
+            ResultMapUtils.setResultMap(result,StatusCode.CTOP_SCRIPT_FILE_NOT_EXIST);
+            return result;
+        }
+        Project project = projectService.getById(projectId);
+        if(null == project){
+            ResultMapUtils.setResultMap(result,StatusCode.CTOP_PROJECT_NOT_EXIST);
+            return result;
+        }
+        wpsFile.setProjectId(projectId);
+        this.updateById(wpsFile);
+        ResultMapUtils.setResultMap(result,StatusCode.COMMON_SUCCESS);
+        return result;
+    }
 }
 }

+ 1 - 1
jeecg-boot-module-system/src/main/resources/application-prod.yml

@@ -97,7 +97,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
       datasource:
         master:
         master:
-          url: jdbc:mysql://39.97.120.42:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://139.186.27.96:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: hcst
           username: hcst
           password: test@20190531
           password: test@20190531
           driver-class-name: com.mysql.jdbc.Driver
           driver-class-name: com.mysql.jdbc.Driver

+ 10 - 50
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -2,10 +2,11 @@ package org.jeecg;
 
 
 import cn.com.ctop.common.module.entity.BindAccountLogin;
 import cn.com.ctop.common.module.entity.BindAccountLogin;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.service.IBindAccountLoginService;
 import cn.com.ctop.common.module.service.IBindAccountLoginService;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
+import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
-import cn.com.ctop.common.module.utils.HttpUtils;
 import cn.com.ctop.crawler.modules.pangolin.entity.PangolinApp;
 import cn.com.ctop.crawler.modules.pangolin.entity.PangolinApp;
 import cn.com.ctop.crawler.modules.pangolin.service.PangolinAppService;
 import cn.com.ctop.crawler.modules.pangolin.service.PangolinAppService;
 import cn.com.ctop.crawler.modules.pangolin.service.PangolinCrawlerService;
 import cn.com.ctop.crawler.modules.pangolin.service.PangolinCrawlerService;
@@ -15,8 +16,6 @@ import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouWebInterfaceService
 import cn.com.ctop.toutiao.modules.report.service.IByteDanceVideoReportDailyService;
 import cn.com.ctop.toutiao.modules.report.service.IByteDanceVideoReportDailyService;
 import cn.com.ctop.toutiao.modules.report.service.IBytedanceReportService;
 import cn.com.ctop.toutiao.modules.report.service.IBytedanceReportService;
 import cn.com.ctop.toutiao.modules.report.service.IReportService;
 import cn.com.ctop.toutiao.modules.report.service.IReportService;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.DateUtils;
@@ -29,7 +28,6 @@ import org.springframework.test.context.junit4.SpringRunner;
 import java.util.Date;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Executors;
@@ -46,55 +44,17 @@ public class SampleTest {
     private ICtopOauthTokenService oauthTokenService;
     private ICtopOauthTokenService oauthTokenService;
     @Autowired
     @Autowired
     private IReportService reportService;
     private IReportService reportService;
+    @Autowired
+    private IUserAllocationService userAllocationService;
 
 
     @Test
     @Test
     public void testOceanEngineJob() {
     public void testOceanEngineJob() {
-        try {
-            String url = "https://ad.e.kuaishou.com/rest/openapi/v1/tool/key_frame";
-            JSONArray ptotoArr = new JSONArray();
-            ptotoArr.add("5188991225263567823");
-
-            Map<String, String> headers = new HashMap<>();
-            headers.put("Access-Token", "e251db4aa139eb36623818581003bcec");
-            headers.put("Content-Type", "application/json");
-            JSONObject requestJson = new JSONObject();
-            requestJson.put("advertiser_id", 161468);
-            requestJson.put("photo_ids", ptotoArr);
-            //  requestJson.put("type", type);
-            String result = HttpUtils.kuaiShouhttpPostRequest(url, requestJson.toJSONString(), headers);
-            System.err.println(result);
-            //     CtopOauthToken byId = oauthTokenService.getById(1654059015242756L);
-
-          /*  SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-            Date start = simpleDateFormat.parse("2020-01-01");
-            Date end = simpleDateFormat.parse("2020-06-03");*/
-
-
-            /*String nowDate = "2020-06-03";
-            String endDate = "2020-01-01";
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-            Date start = simpleDateFormat.parse(nowDate);
-            Date end = simpleDateFormat.parse(endDate);
-            List<Date> dates = DateUtils.findDates(end, start);
-            for (int i = 0; i < dates.size(); i++) {
-                String formatDate = simpleDateFormat.format(dates.get(i));
-                Date parse = simpleDateFormat.parse(formatDate);
-                reportService.getAdvertiserReport(byId, parse, parse, CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
-            }*/
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        String account = "3248395570@qq.com";
-       /* String password = "Ydxq-704127411";
-        oceanEngineService.login(account,password);
-        oceanEngineService.douyinHotHandler(1,1);
-        oceanEngineService.effectCaseHandler(1);
-        oceanEngineService.hotMaterialHandler(1,4,"抖音");
-        oceanEngineService.hotMaterialHandler(1,8,"头条");
-        oceanEngineService.hotMaterialHandler(1,1,"西瓜");
-        oceanEngineService.hotMaterialHandler(1,3,"火山");
-        oceanEngineService.hotMaterialHandler(1,9,"穿山甲");
-        log.info("巨量创意抓取完成");*/
+       List<UserAllocation>tokens = userAllocationService.getByProjectId(107L,null);
+       Date startDate = DateUtils.getDate();
+       tokens.forEach(token -> {
+           CtopOauthToken getToken  = oauthTokenService.getTokenByAccountId(token.getAccountId());
+           reportService.getAdvertiserReport(getToken,startDate,startDate,CtopAdConstant.BYTEDANCE_REPORT_TYPE_HOURLY);
+       });
     }
     }
 
 
     @Autowired
     @Autowired

+ 2 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/ICtopOauthTokenService.java

@@ -31,4 +31,6 @@ public interface ICtopOauthTokenService extends IService<CtopOauthToken> {
     CtopOauthToken getAccessTokenByAccountIdAndMediaId(Integer mediaId, Long accountId);
     CtopOauthToken getAccessTokenByAccountIdAndMediaId(Integer mediaId, Long accountId);
 
 
     List<CtopOauthToken> getToutiaoTokenByCreateTime(String createTime);
     List<CtopOauthToken> getToutiaoTokenByCreateTime(String createTime);
+
+    List<CtopOauthToken> getByProjectId(long projectId);
 }
 }

+ 7 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/impl/CtopOauthTokenServiceImpl.java

@@ -203,5 +203,12 @@ public class CtopOauthTokenServiceImpl extends ServiceImpl<CtopOauthTokenMapper,
         return cTopOauthTokenMapper.getToutiaoTokenByCreateTime(createTime);
         return cTopOauthTokenMapper.getToutiaoTokenByCreateTime(createTime);
     }
     }
 
 
+    @Override
+    public List<CtopOauthToken> getByProjectId(long projectId) {
+        QueryWrapper<CtopOauthToken>queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("project_id",projectId).eq("account_status",0);
+        return this.list(queryWrapper);
+    }
+
 
 
 }
 }

+ 2 - 0
module-common/src/main/java/cn/com/ctop/common/module/utils/StatusCode.java

@@ -35,6 +35,8 @@ public enum StatusCode {
     FILE_HAS_UPLOAD("文件已经上传过", 0, false),
     FILE_HAS_UPLOAD("文件已经上传过", 0, false),
     COMMON_SERVER_ERROR("服务器内部错误", -102, false),
     COMMON_SERVER_ERROR("服务器内部错误", -102, false),
     CTOP_HAS_NO_PERFORMANCE_STATISTIC_LOGIC("绩效统计逻辑尚未确定", -103, false),
     CTOP_HAS_NO_PERFORMANCE_STATISTIC_LOGIC("绩效统计逻辑尚未确定", -103, false),
+    CTOP_SCRIPT_FILE_NOT_EXIST("脚本文件不存在", -104, false),
+    CTOP_PROJECT_NOT_EXIST("项目不存在", -105, false),
     KUAISHOU_CRAWLER_APP_EXIT("快手app异常退出", -1001, false),
     KUAISHOU_CRAWLER_APP_EXIT("快手app异常退出", -1001, false),
     KUAISHOU_CRAWLER_APP_ELEMENT_ERROR("快手元素异常", -1002, false),
     KUAISHOU_CRAWLER_APP_ELEMENT_ERROR("快手元素异常", -1002, false),
     KUAISHOU_CRAWLER_APP_ELEMENT_IS_NULL("此快手元素获取不到", -1003, false),
     KUAISHOU_CRAWLER_APP_ELEMENT_IS_NULL("此快手元素获取不到", -1003, false),