syh преди 5 години
родител
ревизия
8d5b469757

+ 5 - 16
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/DateUtils.java

@@ -20,10 +20,10 @@ public class DateUtils extends PropertyEditorSupport {
     /**
      * 以毫秒表示的时间
      */
-    private static final long DAY_IN_MILLIS = 24 * 3600 * 1000;
-    private static final long HOUR_IN_MILLIS = 3600 * 1000;
-    private static final long MINUTE_IN_MILLIS = 60 * 1000;
-    private static final long SECOND_IN_MILLIS = 1000;
+    private static final long DAY_IN_MILLIS = 24 * 3600 * 1000L;
+    private static final long HOUR_IN_MILLIS = 3600 * 1000L;
+    private static final long MINUTE_IN_MILLIS = 60 * 1000L;
+    private static final long SECOND_IN_MILLIS = 1000L;
 
 
     public static boolean compare(String beginDate, String nowDate) throws ParseException {
@@ -140,11 +140,7 @@ public class DateUtils extends PropertyEditorSupport {
      */
     public static String date2Str() {
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-        Date date = getDate();
-        if (null == date) {
-            return null;
-        }
-        return format.format(date);
+        return format.format(new Date());
     }
 
     /**
@@ -173,9 +169,6 @@ public class DateUtils extends PropertyEditorSupport {
      */
     public static String getDate(String format) {
         Date date = new Date();
-        if (null == date) {
-            return null;
-        }
         SimpleDateFormat sdf = new SimpleDateFormat(format);
         return sdf.format(date);
     }
@@ -1208,7 +1201,6 @@ public class DateUtils extends PropertyEditorSupport {
     public static long getDiscrepantDays(String dateStart, String dateEnd){
         //设置转换的日期格式
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-
         //结束时间
         Date startDate = null;
         Date endDate = null;
@@ -1222,9 +1214,6 @@ public class DateUtils extends PropertyEditorSupport {
 
         //得到相差的天数 betweenDate
         long betweenDate = (endDate.getTime() - startDate.getTime())/(60*60*24*1000);
-
-        //打印控制台相差的天数
-        System.out.println(betweenDate);
         return betweenDate;
     }
 

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

@@ -1,5 +1,7 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.toutiao.modules.report.entity.ByteDanceCleanMaterialReport;
+import cn.com.ctop.toutiao.modules.report.service.IByteDanceCleanMaterialReportService;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,8 +13,6 @@ 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.ByteDanceCleanMaterialReport;
-import org.jeecg.modules.ctop.service.IByteDanceCleanMaterialReportService;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;

+ 6 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialInfoController.java

@@ -7,6 +7,8 @@ import cn.com.ctop.common.module.service.*;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.JsonUtil;
 import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
+import cn.com.ctop.toutiao.modules.report.entity.ByteDanceCleanMaterialReport;
+import cn.com.ctop.toutiao.modules.report.service.IByteDanceCleanMaterialReportService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -23,9 +25,7 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.ByteDanceCleanMaterialReport;
 import org.jeecg.modules.ctop.entity.KuaiShouCleanMaterialReport;
-import org.jeecg.modules.ctop.service.IByteDanceCleanMaterialReportService;
 import org.jeecg.modules.ctop.service.IKuaiShouCleanMaterialReportService;
 import org.jeecg.modules.ctop.service.IProjectMemberService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -45,7 +45,10 @@ import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.text.ParseException;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 素材信息

+ 4 - 3
module-crawler/src/main/java/cn/com/ctop/crawler/modules/core/util/FateadmHttpUtil.java

@@ -26,7 +26,8 @@ public class FateadmHttpUtil {
             this.json       = json;
             this.next_idx   = 0;
         }
-        public void Skip(){
+
+        public void skip() {
             while( next_idx < json.length()){
                 char c = json.charAt( next_idx);
                 if( (c<=32) || (c=='\\')){
@@ -100,7 +101,7 @@ public class FateadmHttpUtil {
             String key = "";
             String sval = "";
             for( next_idx = 0; next_idx < json.length(); ){
-                Skip();
+                skip();
                 char c = json.charAt(next_idx);
                 switch( c){
                     case ':':
@@ -115,7 +116,7 @@ public class FateadmHttpUtil {
                     case '\"':
                         next_idx++;
                         sval = NextSToken();
-                        Skip();
+                        skip();
                         if (next_idx >= json.length()) {
                             break;
                         }

+ 3 - 3
module-crawler/src/main/java/cn/com/ctop/crawler/modules/core/util/FateadmUtil.java

@@ -18,10 +18,10 @@ public class FateadmUtil {
         String app_key = "EFlubJ1X+vFUpyNBTHAjoCHYLsrySdd4";
         String pd_id = "113821";
         String pd_key = "XAZWyy3WsCBzb66isPwa4qBNb/uMZXFN";
-        Init(app_id, app_key, pd_id, pd_key);
+        init(app_id, app_key, pd_id, pd_key);
     }
 
-    public void Init(String app_id, String app_key, String pd_id, String pd_key) {
+    public void init(String app_id, String app_key, String pd_id, String pd_key) {
         this.app_id = app_id;
         this.app_key = app_key;
         this.pd_id = pd_id;
@@ -195,7 +195,7 @@ public class FateadmUtil {
             String pd_id = "113821";
             String pd_key = "XAZWyy3WsCBzb66isPwa4qBNb/uMZXFN";
             // 对象生成之后,在任何操作之前,需要先调用初始化接口
-            api.Init(app_id, app_key, pd_id, pd_key);
+            api.init(app_id, app_key, pd_id, pd_key);
             // 查询余额
             FateadmHttpUtil.HttpResp resp;
             // resp = api.QueryBalc();   // 查询余额返回详细信息

+ 0 - 16
module-ctop/src/main/java/cn/com/ctop/manage/modules/material/service/impl/MaterialUploadImageServiceImpl.java

@@ -44,20 +44,16 @@ public class MaterialUploadImageServiceImpl implements IMaterialUploadImageServi
     @Value("${oss.replace.download}")
     private String downloadUrl;
 
-
     @Autowired
     private IMaterialImageInfoService materialImageInfoService;
     @Autowired
     private IKuaiShouImageGetService imageGetService;
 
-
     /**
      * 同步素材到账号下
      */
     @Override
     public void uploadImage(String videoId, Long accountId, String accessToken) {
-
-
         try {
             QueryWrapper<MaterialImageInfo> imageInfoQueryWrapper = new QueryWrapper<>();
             imageInfoQueryWrapper.eq("video_id", videoId);
@@ -65,7 +61,6 @@ public class MaterialUploadImageServiceImpl implements IMaterialUploadImageServi
             List<MaterialImageInfo> imageList = materialImageInfoService.list(imageInfoQueryWrapper);
             if (!Check.isNull(imageList)) {
                 for (MaterialImageInfo imageInfo : imageList) {
-
                     QueryWrapper<KuaiShouImageGet> imageQueryWrapper = new QueryWrapper<>();
                     imageQueryWrapper.eq("account_id", accountId);
                     imageQueryWrapper.eq("signature", imageInfo.getCode());
@@ -74,7 +69,6 @@ public class MaterialUploadImageServiceImpl implements IMaterialUploadImageServi
                         log.info("此封面已上传");
                         continue;
                     }
-
                     String url = String.valueOf(imageInfo.getUrl());
                     String localUrl = LoadFileUtil.downLoadFromUrl(url, downloadUrl);
                     FileSystemResource resource = new FileSystemResource(new File(localUrl));
@@ -113,24 +107,16 @@ public class MaterialUploadImageServiceImpl implements IMaterialUploadImageServi
                                 imageGet.setImageToken(image_token);
                                 imageGetService.saveOrUpdate(imageGet);
                             }
-
-
                             log.info("快手封面素材素材同步完成,accountId:{},code:{},返回信息:{}", accountId, imageInfo.getCode(), resultJson);
                         } else {
                             log.error("快手同步封面素材失败,返回信息:{},请求参数:{}", resultJson, requestJson);
                         }
                     }
-
-
                 }
-
-
             }
         } catch (Exception e) {
             e.printStackTrace();
-
         }
-
     }
 
 
@@ -159,6 +145,4 @@ public class MaterialUploadImageServiceImpl implements IMaterialUploadImageServi
         }
         return null;
     }
-
-
 }