|
@@ -15,6 +15,8 @@ import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouWebInterfaceService
|
|
import cn.com.ctop.kuaishou.modules.report.service.IKuaiShouDailyAgentService;
|
|
import cn.com.ctop.kuaishou.modules.report.service.IKuaiShouDailyAgentService;
|
|
import cn.com.ctop.kuaishou.modules.report.service.IKuaiShouProjectDataService;
|
|
import cn.com.ctop.kuaishou.modules.report.service.IKuaiShouProjectDataService;
|
|
import cn.com.ctop.manage.modules.material.service.IMaterialUploadService;
|
|
import cn.com.ctop.manage.modules.material.service.IMaterialUploadService;
|
|
|
|
+import cn.com.ctop.oa.modules.service.IWechatCheckinDataService;
|
|
|
|
+import cn.com.ctop.oa.modules.service.IWechatUserListService;
|
|
import cn.com.ctop.toutiao.modules.report.service.IBytedanceReportService;
|
|
import cn.com.ctop.toutiao.modules.report.service.IBytedanceReportService;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
@@ -30,10 +32,7 @@ import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
-import java.util.ArrayList;
|
|
|
|
-import java.util.Calendar;
|
|
|
|
-import java.util.Date;
|
|
|
|
-import java.util.List;
|
|
|
|
|
|
+import java.util.*;
|
|
import java.util.concurrent.ExecutorService;
|
|
import java.util.concurrent.ExecutorService;
|
|
import java.util.concurrent.Executors;
|
|
import java.util.concurrent.Executors;
|
|
|
|
|
|
@@ -124,26 +123,72 @@ public class TestController {
|
|
private IRefreshTokenService refreshTokenService;
|
|
private IRefreshTokenService refreshTokenService;
|
|
@Autowired
|
|
@Autowired
|
|
private IKuaishouSupplyChainService ikuaishouSupplyChainService;
|
|
private IKuaishouSupplyChainService ikuaishouSupplyChainService;
|
|
-
|
|
|
|
- @Value("${xxl-job.requestUrl}")
|
|
|
|
- private String jobUrl;
|
|
|
|
-
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private IWechatCheckinDataService wechatCheckinDataService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private IWechatUserListService wechatUserInfoService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private IKuaiShouActivityInfoService activityInfoService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private IKuaiShouActivityItemListService activityItemListService;
|
|
|
|
|
|
@GetMapping(value = "/getData")
|
|
@GetMapping(value = "/getData")
|
|
public void getDate() throws Exception {
|
|
public void getDate() throws Exception {
|
|
|
|
|
|
|
|
|
|
|
|
+// Map<Long, Long> itemMap = activityItemListService.getItemMap();
|
|
|
|
+// System.err.println(itemMap);
|
|
|
|
|
|
- /* String beforeDay = DateUtils.getLastDay(DateUtils.formatDate(new Date()), NoEn.NO1.valueInt());
|
|
|
|
|
|
|
|
- //更新员工打卡明细表
|
|
|
|
- wechatCheckinDataService.getCheckinData("2022-12-01" + " 00:00:00", "2022-12-31" + " 23:59:59");
|
|
|
|
- XxlJobHelper.log("--------考勤数据入库 end ");
|
|
|
|
- //更新人员信息表
|
|
|
|
- wechatUserInfoService.getUserList();*/
|
|
|
|
|
|
|
|
|
|
+ String cookie = ikuaishouSupplyChainService.getCookie();
|
|
|
|
+ if (Check.isNull(cookie)) {
|
|
|
|
+ log.error("cookie数据为空");
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
|
|
|
|
+ String date = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1);
|
|
|
|
+ JSONArray hourList = KuaishouHourEnum.getHourList();
|
|
|
|
+ JSONArray minSecList = KuaishouMinSecEnum.getMinSecList();
|
|
|
|
+ Map<Long, Long> itemMap = activityItemListService.getItemMap();
|
|
|
|
+ for (int i = 0; i < hourList.size(); i++) {
|
|
|
|
+ String hour = hourList.getString(i);
|
|
|
|
+ for (int j = 0; j < minSecList.size(); j++) {
|
|
|
|
+ JSONObject minSecJson = minSecList.getJSONObject(j);
|
|
|
|
+ String startTime = minSecJson.getString("startTime");
|
|
|
|
+ String endTime = minSecJson.getString("endTime");
|
|
|
|
+ String start = date + hour + startTime;
|
|
|
|
+ String end = date + hour + endTime;
|
|
|
|
+ System.err.println("开始时间:" + start);
|
|
|
|
+ System.err.println("结束时间:" + end);
|
|
|
|
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
|
+ Long orderCreateTimeStart = sdf.parse(start).getTime();
|
|
|
|
+ Long orderCreateTimeEnd = sdf.parse(end).getTime();
|
|
|
|
+ ikuaishouSupplyChainService.getOrderList(cookie, 0, orderCreateTimeStart, orderCreateTimeEnd,itemMap);
|
|
|
|
|
|
- log.info("-------------------------获取快分销订单昨日数据开始数据开始--------------------------");
|
|
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ // List<JSONObject> = activityItemListService.getItemMap();
|
|
|
|
+ // System.err.println(map);
|
|
|
|
+
|
|
|
|
+// String cookie = ikuaishouSupplyChainService.getCookie();
|
|
|
|
+// if (Check.isNull(cookie)) {
|
|
|
|
+// log.error("cookie数据为空");
|
|
|
|
+// return;
|
|
|
|
+// }
|
|
|
|
+//
|
|
|
|
+// List<Long> activityIdList = activityInfoService.getActivityIdList();
|
|
|
|
+// if (!Check.isNull(activityIdList)) {
|
|
|
|
+// for (int i = 0; i < activityIdList.size(); i++) {
|
|
|
|
+// Long activityId = activityIdList.get(i);
|
|
|
|
+// activityItemListService.getActivityItemList(cookie, 0, activityId);
|
|
|
|
+// }
|
|
|
|
+//
|
|
|
|
+// }
|
|
|
|
+
|
|
|
|
+ /*log.info("-------------------------获取快分销订单昨日数据开始数据开始--------------------------");
|
|
String cookie = ikuaishouSupplyChainService.getCookie();
|
|
String cookie = ikuaishouSupplyChainService.getCookie();
|
|
if (Check.isNull(cookie)) {
|
|
if (Check.isNull(cookie)) {
|
|
log.error("cookie数据为空");
|
|
log.error("cookie数据为空");
|
|
@@ -235,7 +280,7 @@ public class TestController {
|
|
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
|
|
|
|
|
|
|
|
}
|
|
}
|