瀏覽代碼

修改代码规范

syh 5 年之前
父節點
當前提交
e859dc85a3
共有 83 個文件被更改,包括 955 次插入1165 次删除
  1. 3 3
      jeecg-boot-base-common/src/main/java/org/jeecg/common/system/query/QueryGenerator.java
  2. 64 60
      jeecg-boot-base-common/src/main/java/org/jeecg/common/system/vo/SysUserCacheInfo.java
  3. 9 9
      jeecg-boot-base-common/src/main/java/org/jeecg/common/util/DateUtils.java
  4. 67 63
      jeecg-boot-base-common/src/main/java/org/jeecg/common/util/SpringContextUtils.java
  5. 24 21
      jeecg-boot-base-common/src/main/java/org/jeecg/common/util/jsonschema/validate/StringProperty.java
  6. 3 1
      jeecg-boot-module-system/src/main/java/org/jeecg/config/RabbitConfig.java
  7. 24 12
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CallbackController.java
  8. 4 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/SyncDataController.java
  9. 4 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TestMqController.java
  10. 3 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/KuaishouHourlyReportLoadJob.java
  11. 1 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/CreateInternalServiceImpl.java
  12. 4 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/fileupload/service/impl/UploadServiceImpl.java
  13. 18 13
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/handle/enums/SendMsgStatusEnum.java
  14. 46 41
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/handle/enums/SendMsgTypeEnum.java
  15. 4 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/handle/impl/SmsSendMsgHandle.java
  16. 4 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/handle/impl/WxSendMsgHandle.java
  17. 3 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/job/SendMsgJob.java
  18. 4 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/mq/Sender.java
  19. 0 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java
  20. 7 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/vo/UserBean.java
  21. 0 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/PermissionDataAspect.java
  22. 18 18
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDataLogController.java
  23. 0 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java
  24. 14 12
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java
  25. 26 21
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserDepart.java
  26. 5 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDataLogMapper.java
  27. 6 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java
  28. 12 7
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.java
  29. 21 16
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysUserDepartsVO.java
  30. 70 64
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/TreeSelectModel.java
  31. 4 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDataLogServiceImpl.java
  32. 9 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SysDepartUsersVO.java
  33. 4 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SysDictPage.java
  34. 6 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SysUserRoleVO.java
  35. 4 3
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/IpPoolServiceImpl.java
  36. 16 8
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java
  37. 10 9
      module-common/src/main/java/cn/com/ctop/common/module/utils/MpsUtils.java
  38. 4 0
      module-common/src/main/java/cn/com/ctop/common/module/utils/ResultMapUtils.java
  39. 4 0
      module-common/src/main/java/cn/com/ctop/common/module/utils/StatusCode.java
  40. 4 0
      module-common/src/main/java/cn/com/ctop/common/module/utils/StringUtils.java
  41. 0 1
      module-common/src/main/java/cn/com/ctop/common/module/utils/TransfMediaTool.java
  42. 4 2
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/appium/service/impl/AppiumJobServiceImpl.java
  43. 0 2
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/core/service/impl/KuaishouCrawlerServiceImpl.java
  44. 20 20
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/core/util/AppiumUtil.java
  45. 4 0
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/core/util/FateadmUtil.java
  46. 4 0
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/core/util/SignUtil.java
  47. 4 0
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/core/util/SortUtil.java
  48. 4 42
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/jiema/service/impl/WumaServiceImpl.java
  49. 4 0
      module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/entity/Actor.java
  50. 4 0
      module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/entity/ActorComment.java
  51. 4 0
      module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/entity/Yard.java
  52. 4 0
      module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/entity/YardComment.java
  53. 4 0
      module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/entity/YardPhoto.java
  54. 4 0
      module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/entity/YardScheduler.java
  55. 4 0
      module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/entity/YardVideo.java
  56. 4 0
      module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/mapper/ActorCommentMapper.java
  57. 4 1
      module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/mapper/YardCommentMapper.java
  58. 4 0
      module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/mapper/YardMapper.java
  59. 4 0
      module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/mapper/YardPhotoMapper.java
  60. 4 0
      module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/mapper/YardSchedulerMapper.java
  61. 4 0
      module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/mapper/YardVideoMapper.java
  62. 4 3
      module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/service/impl/YardCommentServiceImpl.java
  63. 4 1
      module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/service/impl/YardPhotoServiceImpl.java
  64. 4 1
      module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/service/impl/YardSchedulerServiceImpl.java
  65. 4 1
      module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/service/impl/YardServiceImpl.java
  66. 4 1
      module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/service/impl/YardVideoServiceImpl.java
  67. 4 4
      module-ctop/src/main/java/cn/com/ctop/manage/modules/material/service/impl/MaterialUploadServiceImpl.java
  68. 0 36
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouController.java
  69. 4 3
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java
  70. 2 86
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/graphql/service/impl/KuaishouWebInterfaceServiceImpl.java
  71. 4 0
      module-report/src/main/java/cn/com/ctop/bytedance/controller/AccountReportController.java
  72. 0 6
      module-report/src/main/java/cn/com/ctop/bytedance/controller/BytedanceReportController.java
  73. 99 107
      module-report/src/main/java/cn/com/ctop/bytedance/entity/BytedanceCreativeHourlyReport.java
  74. 75 75
      module-report/src/main/java/cn/com/ctop/bytedance/entity/BytedancePlanDailyReport.java
  75. 96 96
      module-report/src/main/java/cn/com/ctop/bytedance/entity/BytedancePlanHourlyReport.java
  76. 4 0
      module-report/src/main/java/cn/com/ctop/bytedance/mapper/AccountReportMapper.java
  77. 16 15
      module-report/src/main/java/cn/com/ctop/bytedance/service/impl/ReportServiceImpl.java
  78. 0 248
      module-toutiao/src/main/java/cn/com/ctop/toutiao/entity/ByteDanceAdvertisePlan.java
  79. 2 3
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceAdvertiserDataServiceImpl.java
  80. 0 2
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/BytedanceAdvertisePlanTemplateServiceImpl.java
  81. 0 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/BytedanceUrlInfoServiceImpl.java
  82. 0 3
      module-toutiao/src/main/java/cn/com/ctop/toutiao/test/Test.java
  83. 4 0
      mondule-jbpm/src/main/java/cn/com/ctop/jbpm/service/ActivitiTable.java

+ 3 - 3
jeecg-boot-base-common/src/main/java/org/jeecg/common/system/query/QueryGenerator.java

@@ -42,12 +42,12 @@ public class QueryGenerator {
 	private static final String ORDER_TYPE_ASC = "ASC";
 
 	/**时间格式化 */
-	private static final ThreadLocal<SimpleDateFormat> local = new ThreadLocal<SimpleDateFormat>();
+    private static final ThreadLocal<SimpleDateFormat> LOCAL = new ThreadLocal<SimpleDateFormat>();
 	private static SimpleDateFormat getTime(){
-		SimpleDateFormat time = local.get();
+        SimpleDateFormat time = LOCAL.get();
 		if(time == null){
 			time = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-			local.set(time);
+            LOCAL.set(time);
 		}
 		return time;
 	}

+ 64 - 60
jeecg-boot-base-common/src/main/java/org/jeecg/common/system/vo/SysUserCacheInfo.java

@@ -1,67 +1,71 @@
 package org.jeecg.common.system.vo;
 
-import java.util.List;
-
 import org.jeecg.common.util.DateUtils;
 
+import java.util.List;
+
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
+ */
 public class SysUserCacheInfo {
-	
-	private String sysUserCode;
-	
-	private String sysUserName;
-	
-	private String sysOrgCode;
-	
-	private List<String> sysMultiOrgCode;
-	
-	private boolean oneDepart;
-	
-	public boolean isOneDepart() {
-		return oneDepart;
-	}
-
-	public void setOneDepart(boolean oneDepart) {
-		this.oneDepart = oneDepart;
-	}
-
-	public String getSysDate() {
-		return DateUtils.formatDate();
-	}
-
-	public String getSysTime() {
-		return DateUtils.now();
-	}
-
-	public String getSysUserCode() {
-		return sysUserCode;
-	}
-
-	public void setSysUserCode(String sysUserCode) {
-		this.sysUserCode = sysUserCode;
-	}
-
-	public String getSysUserName() {
-		return sysUserName;
-	}
-
-	public void setSysUserName(String sysUserName) {
-		this.sysUserName = sysUserName;
-	}
-
-	public String getSysOrgCode() {
-		return sysOrgCode;
-	}
-
-	public void setSysOrgCode(String sysOrgCode) {
-		this.sysOrgCode = sysOrgCode;
-	}
-
-	public List<String> getSysMultiOrgCode() {
-		return sysMultiOrgCode;
-	}
-
-	public void setSysMultiOrgCode(List<String> sysMultiOrgCode) {
-		this.sysMultiOrgCode = sysMultiOrgCode;
-	}
+
+    private String sysUserCode;
+
+    private String sysUserName;
+
+    private String sysOrgCode;
+
+    private List<String> sysMultiOrgCode;
+
+    private boolean oneDepart;
+
+    public boolean isOneDepart() {
+        return oneDepart;
+    }
+
+    public void setOneDepart(boolean oneDepart) {
+        this.oneDepart = oneDepart;
+    }
+
+    public String getSysDate() {
+        return DateUtils.formatDate();
+    }
+
+    public String getSysTime() {
+        return DateUtils.now();
+    }
+
+    public String getSysUserCode() {
+        return sysUserCode;
+    }
+
+    public void setSysUserCode(String sysUserCode) {
+        this.sysUserCode = sysUserCode;
+    }
+
+    public String getSysUserName() {
+        return sysUserName;
+    }
+
+    public void setSysUserName(String sysUserName) {
+        this.sysUserName = sysUserName;
+    }
+
+    public String getSysOrgCode() {
+        return sysOrgCode;
+    }
+
+    public void setSysOrgCode(String sysOrgCode) {
+        this.sysOrgCode = sysOrgCode;
+    }
+
+    public List<String> getSysMultiOrgCode() {
+        return sysMultiOrgCode;
+    }
+
+    public void setSysMultiOrgCode(List<String> sysMultiOrgCode) {
+        this.sysMultiOrgCode = sysMultiOrgCode;
+    }
 
 }

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

@@ -783,9 +783,9 @@ public class DateUtils extends PropertyEditorSupport {
     public static String getAnotherDay(String format, String date, Integer num) throws ParseException {
 
         SimpleDateFormat sdf = new SimpleDateFormat(format);
-        Date date_ = sdf.parse(date);
+        Date getDate = sdf.parse(date);
         Calendar calendar = Calendar.getInstance();
-        calendar.setTime(date_);
+        calendar.setTime(getDate);
         calendar.add(Calendar.DAY_OF_MONTH, num);
         Date resultDate = calendar.getTime();
         return sdf.format(resultDate);
@@ -816,21 +816,21 @@ public class DateUtils extends PropertyEditorSupport {
         return dateFormat.format(date);
     }
 
-    public static Map<String, Object> compare_date(String format, String DATE1, String DATE2) {
+    public static Map<String, Object> compareDate(String format, String date1, String date2) {
 
 
         DateFormat df = new SimpleDateFormat(format);
         Map<String, Object> map = new HashMap<>();
         try {
-            Date dt1 = df.parse(DATE1);
-            Date dt2 = df.parse(DATE2);
+            Date dt1 = df.parse(date1);
+            Date dt2 = df.parse(date2);
             if (dt1.getTime() > dt2.getTime()) {
-                map.put("bigDate", DATE1);
-                map.put("smallDate", DATE2);
+                map.put("bigDate", date1);
+                map.put("smallDate", date2);
                 return map;
             } else if (dt1.getTime() < dt2.getTime()) {
-                map.put("bigDate", DATE2);
-                map.put("smallDate", DATE1);
+                map.put("bigDate", date2);
+                map.put("smallDate", date1);
                 return map;
             }
         } catch (Exception exception) {

+ 67 - 63
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/SpringContextUtils.java

@@ -1,7 +1,5 @@
 package org.jeecg.common.util;
 
-import javax.servlet.http.HttpServletRequest;
-
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -9,76 +7,82 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
+ */
 @Component
 public class SpringContextUtils implements ApplicationContextAware {
 
-	/**
-	 * 上下文对象实例
-	 */
-	private static ApplicationContext applicationContext;
+    /**
+     * 上下文对象实例
+     */
+    private static ApplicationContext applicationContext;
 
-	@Override
-	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
         SpringContextUtils.applicationContext = applicationContext;
-	}
+    }
+
+    /**
+     * 获取applicationContext
+     *
+     * @return
+     */
+    public static ApplicationContext getApplicationContext() {
+        return applicationContext;
+    }
 
-	/**
-	 * 获取applicationContext
-	 *
-	 * @return
-	 */
-	public static ApplicationContext getApplicationContext() {
-		return applicationContext;
-	}
+    /**
+     * 获取HttpServletRequest
+     */
+    public static HttpServletRequest getHttpServletRequest() {
+        return ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+    }
 
-	/**
-	  * 获取HttpServletRequest
-	 */
-	public static HttpServletRequest getHttpServletRequest() {
-		return ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-	}
+    public static String getDomain(){
+        HttpServletRequest request = getHttpServletRequest();
+        StringBuffer url = request.getRequestURL();
+        return url.delete(url.length() - request.getRequestURI().length(), url.length()).toString();
+    }
 
-	public static String getDomain(){
-		HttpServletRequest request = getHttpServletRequest();
-		StringBuffer url = request.getRequestURL();
-		return url.delete(url.length() - request.getRequestURI().length(), url.length()).toString();
-	}
+    public static String getOrigin(){
+        HttpServletRequest request = getHttpServletRequest();
+        return request.getHeader("Origin");
+    }
 
-	public static String getOrigin(){
-		HttpServletRequest request = getHttpServletRequest();
-		return request.getHeader("Origin");
-	}
-	
-	/**
-	 * 通过name获取 Bean.
-	 *
-	 * @param name
-	 * @return
-	 */
-	public static Object getBean(String name) {
-		return getApplicationContext().getBean(name);
-	}
+    /**
+     * 通过name获取 Bean.
+     *
+     * @param name
+     * @return
+     */
+    public static Object getBean(String name) {
+        return getApplicationContext().getBean(name);
+    }
 
-	/**
-	 * 通过class获取Bean.
-	 *
-	 * @param clazz
-	 * @param       <T>
-	 * @return
-	 */
-	public static <T> T getBean(Class<T> clazz) {
-		return getApplicationContext().getBean(clazz);
-	}
+    /**
+     * 通过class获取Bean.
+     *
+     * @param clazz
+     * @param       <T>
+     * @return
+     */
+    public static <T> T getBean(Class<T> clazz) {
+        return getApplicationContext().getBean(clazz);
+    }
 
-	/**
-	 * 通过name,以及Clazz返回指定的Bean
-	 *
-	 * @param name
-	 * @param clazz
-	 * @param       <T>
-	 * @return
-	 */
-	public static <T> T getBean(String name, Class<T> clazz) {
-		return getApplicationContext().getBean(name, clazz);
-	}
+    /**
+     * 通过name,以及Clazz返回指定的Bean
+     *
+     * @param name
+     * @param clazz
+     * @param       <T>
+     * @return
+     */
+    public static <T> T getBean(String name, Class<T> clazz) {
+        return getApplicationContext().getBean(name, clazz);
+    }
 }

+ 24 - 21
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/jsonschema/validate/StringProperty.java

@@ -1,29 +1,32 @@
 package org.jeecg.common.util.jsonschema.validate;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import com.alibaba.fastjson.JSONObject;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.util.jsonschema.CommonProperty;
 
-import com.alibaba.fastjson.JSONObject;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
+ */
 public class StringProperty extends CommonProperty {
-	
+
 	private static final long serialVersionUID = -3200493311633999539L;
-	
+
 	private Integer maxLength;
-	
-	private Integer minLength;
-	
-	/**
+
+    private Integer minLength;
+
+    /**
 	 * 根据ECMA 262正则表达式方言,该字符串应该是有效的正则表达式。
 	 */
 	private String pattern;
-	
 
-	/**
+
+    /**
 	 * 错误提示信息
 	 */
 	private String errorInfo;
@@ -53,8 +56,8 @@ public class StringProperty extends CommonProperty {
 		this.pattern = pattern;
 	}
 
-	
-	public String getErrorInfo() {
+
+    public String getErrorInfo() {
 		return errorInfo;
 	}
 
@@ -64,8 +67,8 @@ public class StringProperty extends CommonProperty {
 	}
 
 	public StringProperty() {}
-	
-	/**
+
+    /**
 	 *  一般字符串类型走这个构造器
 	 * @param key 字段名
 	 * @param title 字段备注
@@ -79,11 +82,11 @@ public class StringProperty extends CommonProperty {
 		this.title = title;
 		this.type = "string";
 	}
-	
-	/**
-         *  列表类型的走这个构造器  
+
+    /**
+     *  列表类型的走这个构造器
 	 * @param key 字段名
-	 * @param title 字段备注 
+     * @param title 字段备注
 	 * @param view 展示控件 list-checkbox-radio
 	 * @param maxLength 数据库字段最大长度
 	 * @param include 数据字典

+ 3 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/config/RabbitConfig.java

@@ -50,9 +50,11 @@ public class RabbitConfig {
         return connectionFactory;
     }
 
+    /**
+     * 必须是prototype类型
+     */
     @Bean
     @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-    //必须是prototype类型
     public RabbitTemplate rabbitTemplate() {
         RabbitTemplate template = new RabbitTemplate(connectionFactory());
         return template;

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

@@ -87,17 +87,22 @@ public class CallbackController {
                         return "授权失败,该账号已被:" + checkUserAllocation.getAuthName() + "绑定!";
                     }
                     String advertiserId = json.getString("advertiserId");
-                    String userName = json.getString("userName");//指定分配人姓名
-                    String advertiserName = json.getString("advertiser_name"); // 广告主名称
-                    String mediaId = json.getString("mediaId"); // 媒体类型: 1 头条 2 快手
-                    String userId = json.getString("userId"); //创建人
+                    //指定分配人姓名
+                    String userName = json.getString("userName");
+                    // 广告主名称
+                    String advertiserName = json.getString("advertiser_name");
+                    // 媒体类型: 1 头条 2 快手
+                    String mediaId = json.getString("mediaId");
+                    //创建人
+                    String userId = json.getString("userId");
                     Long projectId = json.getLong("projectId");
                     String projectName = json.getString("projectName");
                     UserAllocation userAllocation = new UserAllocation();
                     userAllocation.setUserName(userName);
                     userAllocation.setUserId(userId);
                     userAllocation.setAdvertiserId(advertiserId);
-                    Map<String, Object> advertiseBaseInfoMap = kuaishouInterfaceService.advertiserInfo(accountId, token.getAccessToken());// 获取快手昵称
+                    // 获取快手昵称
+                    Map<String, Object> advertiseBaseInfoMap = kuaishouInterfaceService.advertiserInfo(accountId, token.getAccessToken());
                     if ((Integer) advertiseBaseInfoMap.get("code") == 0) {
                         userAllocation.setAuthName((String) advertiseBaseInfoMap.get("userName"));
                     }
@@ -133,7 +138,8 @@ public class CallbackController {
                     topOauthToken.setRefreshTokenExpiresIn(refreshTokenExpireInDate);
                     topOauthToken.setUpdateTime(new Date());
                     ctopOauthTokenService.saveOrUpdate(topOauthToken);
-                    bindAccountAuthService.addBindAccount(accountId, KuaishouInterfaceConstant.LOGIN_TYPE_KUAISHOU, advertiserId); //账号绑定
+                    //账号绑定
+                    bindAccountAuthService.addBindAccount(accountId, KuaishouInterfaceConstant.LOGIN_TYPE_KUAISHOU, advertiserId);
                     Thread t = new Thread() {
                         @Override
                         public void run() {
@@ -191,12 +197,17 @@ public class CallbackController {
                 logger.error("获取token失败,state:{},message:{}", state, message);
                 throw new Exception("token返回码异常");
             }
-            String advertiserId = json.getString("advertiserId");//广告主id
-            String mediaId = json.getString("mediaId"); // 媒体类型: 1 头条 2 快手
+            //广告主id
+            String advertiserId = json.getString("advertiserId");
+            // 媒体类型: 1 头条 2 快手
+            String mediaId = json.getString("mediaId");
 
-            String advertiserName = json.getString("advertiser_name"); // 广告主名称
-            String userId = json.getString("userId"); //创建人
-            String userName = json.getString("userName"); //创建人
+            // 广告主名称
+            String advertiserName = json.getString("advertiser_name");
+            //创建人
+            String userId = json.getString("userId");
+            //创建人
+            String userName = json.getString("userName");
             Long projectId = json.getLong("projectId");
             String projectName = json.getString("projectName");
 
@@ -245,7 +256,8 @@ public class CallbackController {
                 logger.info("同步分配用户表完成,task_id:{},accountId:{}", state, token.getAccountId());
 
             }
-            bindAccountAuthService.addBindAccount(token.getAccountId(), KuaishouInterfaceConstant.LOGIN_TYPE_BYTEDANCE, advertiserId); //账号绑定
+            //账号绑定
+            bindAccountAuthService.addBindAccount(token.getAccountId(), KuaishouInterfaceConstant.LOGIN_TYPE_BYTEDANCE, advertiserId);
             returnMap.put("code", 0);
             returnMap.put("desc", "success");
         } catch (Exception e) {

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

@@ -12,6 +12,10 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
+ */
 @Slf4j
 @RestController
 @RequestMapping("/ctop/syncdata")

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

@@ -15,6 +15,10 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
+ */
 @RestController
 @RequestMapping("mq")
 public class TestMqController {

+ 3 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/KuaishouHourlyReportLoadJob.java

@@ -29,7 +29,9 @@ public class KuaishouHourlyReportLoadJob implements Job {
     private IKuaishouInterfaceService kuaishouInterfaceService;
 
     static ExecutorService executorService = null;
-    //线程计数器
+    /**
+     * 线程计数器
+     */
     static CountDownLatch countDownLatch = null;
 
     @Override

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

@@ -229,10 +229,6 @@ public class CreateInternalServiceImpl implements ICreateInternalService {
         System.getProperties().setProperty("webdriver.chrome.driver", chromeDriver);
         ChromeOptions chromeOptions = new ChromeOptions();
         chromeOptions.addArguments("--headless");
-        /**
-         * chromeOptions.addArguments("--incognito");
-         * chromeOptions.addArguments("--disable-gpu");
-         */
         chromeOptions.addArguments("--no-sandbox");
         chromeOptions.addArguments("--window-size=1920,1080");
         chromeOptions.addArguments("--user-agent=" + HttpUtils2.USER_AGENT);
@@ -396,8 +392,7 @@ public class CreateInternalServiceImpl implements ICreateInternalService {
                         planParam.put("classify", 5);
                         planParam.put("projectid", "");
                         planParam.put("localGeolocation", new ArrayList<String>());
-//                        planParam.put("external_action", 4);
-                        //  应用直达链接
+                        //应用直达链接
                         planParam.put("open_url", "");
                         planParam.put("style_type", 0);
                         //受众位置类型

+ 4 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/fileupload/service/impl/UploadServiceImpl.java

@@ -20,6 +20,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
+ */
 @Service
 public class UploadServiceImpl implements IUploadService {
     @Value("${jeecg.path.video-upload}")

+ 18 - 13
jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/handle/enums/SendMsgStatusEnum.java

@@ -3,23 +3,28 @@ package org.jeecg.modules.message.handle.enums;
 /**
  * 推送状态枚举
  */
+
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
+ */
 public enum SendMsgStatusEnum {
 
-//推送状态 0未推送 1推送成功 2推送失败
-	WAIT("0"), SUCCESS("1"), FAIL("2");
+    //推送状态 0未推送 1推送成功 2推送失败
+    WAIT("0"), SUCCESS("1"), FAIL("2");
 
-	private String code;
+    private String code;
 
-	private SendMsgStatusEnum(String code) {
-		this.code = code;
-	}
+    private SendMsgStatusEnum(String code) {
+        this.code = code;
+    }
 
-	public String getCode() {
-		return code;
-	}
+    public String getCode() {
+        return code;
+    }
 
-	public void setStatusCode(String code) {
-		this.code = code;
-	}
+    public void setStatusCode(String code) {
+        this.code = code;
+    }
 
-}
+}

+ 46 - 41
jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/handle/enums/SendMsgTypeEnum.java

@@ -5,47 +5,52 @@ import org.jeecg.common.util.oConvertUtils;
 /**
  * 发送消息类型枚举
  */
+
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
+ */
 public enum SendMsgTypeEnum {
 
-//推送方式:1短信 2邮件 3微信
-	SMS("1", "org.jeecg.modules.message.handle.impl.SmsSendMsgHandle"),
-	EMAIL("2", "org.jeecg.modules.message.handle.impl.EmailSendMsgHandle"),
-	WX("3","org.jeecg.modules.message.handle.impl.WxSendMsgHandle");
-
-	private String type;
-
-	private String implClass;
-
-	private SendMsgTypeEnum(String type, String implClass) {
-		this.type = type;
-		this.implClass = implClass;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public String getImplClass() {
-		return implClass;
-	}
-
-	public void setImplClass(String implClass) {
-		this.implClass = implClass;
-	}
-
-	public static SendMsgTypeEnum getByType(String type) {
-		if (oConvertUtils.isEmpty(type)) {
-			return null;
-		}
-		for (SendMsgTypeEnum val : values()) {
-			if (val.getType().equals(type)) {
-				return val;
-			}
-		}
-		return null;
-	}
+    //推送方式:1短信 2邮件 3微信
+    SMS("1", "org.jeecg.modules.message.handle.impl.SmsSendMsgHandle"),
+    EMAIL("2", "org.jeecg.modules.message.handle.impl.EmailSendMsgHandle"),
+    WX("3","org.jeecg.modules.message.handle.impl.WxSendMsgHandle");
+
+    private String type;
+
+    private String implClass;
+
+    private SendMsgTypeEnum(String type, String implClass) {
+        this.type = type;
+        this.implClass = implClass;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getImplClass() {
+        return implClass;
+    }
+
+    public void setImplClass(String implClass) {
+        this.implClass = implClass;
+    }
+
+    public static SendMsgTypeEnum getByType(String type) {
+        if (oConvertUtils.isEmpty(type)) {
+            return null;
+        }
+        for (SendMsgTypeEnum val : values()) {
+            if (val.getType().equals(type)) {
+                return val;
+            }
+        }
+        return null;
+    }
 }

+ 4 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/handle/impl/SmsSendMsgHandle.java

@@ -2,6 +2,10 @@ package org.jeecg.modules.message.handle.impl;
 
 import org.jeecg.modules.message.handle.ISendMsgHandle;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
+ */
 public class SmsSendMsgHandle implements ISendMsgHandle {
 
 	@Override

+ 4 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/handle/impl/WxSendMsgHandle.java

@@ -2,6 +2,10 @@ package org.jeecg.modules.message.handle.impl;
 
 import org.jeecg.modules.message.handle.ISendMsgHandle;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:55:14
+ */
 public class WxSendMsgHandle implements ISendMsgHandle {
 
 	@Override

+ 3 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/message/job/SendMsgJob.java

@@ -17,6 +17,9 @@ import java.util.List;
 
 /**
  * 发送消息任务
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
+ *
  */
 
 @Slf4j

+ 4 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/mq/Sender.java

@@ -4,6 +4,10 @@ import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
+ */
 @Component
 public class Sender {
 

+ 0 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java

@@ -205,7 +205,6 @@ public class QuartzJobController {
 			return Result.error("定时任务不存在!");
 		}
 		quartzJobService.resumeJob(job);
-		//scheduler.resumeJob(JobKey.jobKey(job.getJobClassName().trim()));
 		return Result.ok("恢复定时任务成功");
 	}
 

+ 7 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/shiro/vo/UserBean.java

@@ -1,9 +1,14 @@
 package org.jeecg.modules.shiro.vo;
 
+import lombok.Data;
+
 import java.util.HashSet;
 import java.util.Set;
-import lombok.Data;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
+ */
 @Data
 public class UserBean {
     private String username;
@@ -16,4 +21,4 @@ public class UserBean {
      * 用户所有权限值,用于shiro做资源权限的判断
      */
     private Set<String> perms = new HashSet<>();
-}
+}

+ 0 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/PermissionDataAspect.java

@@ -108,9 +108,6 @@ public class PermissionDataAspect {
 			if(url.indexOf("//")>=0){
 				url = filterUrl(url);
 			}
-			/*if(url.startsWith("/")){
-				url=url.substring(1);
-			}*/
 		}
 		return url;
 	}

+ 18 - 18
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDataLogController.java

@@ -1,13 +1,11 @@
 package org.jeecg.modules.system.controller;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.system.entity.SysDataLog;
 import org.jeecg.modules.system.service.ISysDataLogService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,20 +14,22 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import lombok.extern.slf4j.Slf4j;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
+ */
 @RestController
 @RequestMapping("/sys/dataLog")
 @Slf4j
 public class SysDataLogController {
 	@Autowired
 	private ISysDataLogService service;
-	
-	@RequestMapping(value = "/list", method = RequestMethod.GET)
+
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
 	public Result<IPage<SysDataLog>> queryPageList(SysDataLog dataLog,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) {
 		Result<IPage<SysDataLog>> result = new Result<IPage<SysDataLog>>();
@@ -44,8 +44,8 @@ public class SysDataLogController {
 		result.setResult(pageList);
 		return result;
 	}
-	
-	/**
+
+    /**
 	 * 查询对比数据
 	 * @param req
 	 * @return
@@ -67,8 +67,8 @@ public class SysDataLogController {
 		}
 		return result;
 	}
-	
-	/**
+
+    /**
 	 * 查询版本信息
 	 * @param req
 	 * @return
@@ -90,5 +90,5 @@ public class SysDataLogController {
 		}
 		return result;
 	}
-	
+
 }

+ 0 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java

@@ -311,7 +311,6 @@ public class SysRoleController {
 					.eq(SysRolePermission::getRoleId,roleId);
 			SysRolePermission sysRolePermission = sysRolePermissionService.getOne(query);
 			if(sysRolePermission==null) {
-				//return Result.error("未找到角色菜单配置信息");
 			}else {
 				String drChecked = sysRolePermission.getDataRuleIds();
 				if(oConvertUtils.isNotEmpty(drChecked)) {

+ 14 - 12
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysDataLog.java

@@ -1,28 +1,30 @@
 package org.jeecg.modules.system.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-
-import org.springframework.format.annotation.DateTimeFormat;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
+ */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 public class SysDataLog implements Serializable {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
     /**
      * id
      */
-	@TableId(type = IdType.UUID)
+    @TableId(type = IdType.UUID)
     private String id;
     /**
      * 创建人登录名称
@@ -30,8 +32,8 @@ public class SysDataLog implements Serializable {
     private String createBy;
     /**
      * 创建日期
-	 */
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+     */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date createTime;
     /**
@@ -40,8 +42,8 @@ public class SysDataLog implements Serializable {
     private String updateBy;
     /**
      * 更新日期
-	 */
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+     */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
     /**

+ 26 - 21
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserDepart.java

@@ -1,33 +1,38 @@
 package org.jeecg.modules.system.entity;
 
-import java.io.Serializable;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
+ */
 @Data
 @TableName("sys_user_depart")
 public class SysUserDepart implements Serializable {
-	private static final long serialVersionUID = 1L;
-	
-	/**主键id*/
+    private static final long serialVersionUID = 1L;
+
+    /**主键id*/
     @TableId(type = IdType.UUID)
-	private String id;
-	/**用户id*/
-	private String userId;
-	/**部门id*/
-	private String depId;
-	public SysUserDepart(String id, String userId, String depId) {
-		super();
-		this.id = id;
-		this.userId = userId;
-		this.depId = depId;
-	}
+    private String id;
+    /**用户id*/
+    private String userId;
+    /**部门id*/
+    private String depId;
+
+    public SysUserDepart(String id, String userId, String depId) {
+        super();
+        this.id = id;
+        this.userId = userId;
+        this.depId = depId;
+    }
 
-	public SysUserDepart(String id, String departId) {
-		this.userId = id;
-		this.depId = departId;
-	}
+    public SysUserDepart(String id, String departId) {
+        this.userId = id;
+        this.depId = departId;
+    }
 }

+ 5 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDataLogMapper.java

@@ -5,6 +5,10 @@ import org.jeecg.modules.system.entity.SysDataLog;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
+ */
 public interface SysDataLogMapper extends BaseMapper<SysDataLog>{
 	/**
 	 * 通过表名及数据Id获取最大版本
@@ -13,5 +17,5 @@ public interface SysDataLogMapper extends BaseMapper<SysDataLog>{
 	 * @return
 	 */
 	public String queryMaxDataVer(@Param("tableName") String tableName,@Param("dataId") String dataId);
-	
+
 }

+ 6 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java

@@ -6,9 +6,13 @@ import org.jeecg.modules.system.entity.SysUserDepart;
 
 import java.util.List;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
+ */
 public interface SysUserDepartMapper extends BaseMapper<SysUserDepart>{
-	
-	List<SysUserDepart> getUserDepartByUid(@Param("userId") String userId);
+
+    List<SysUserDepart> getUserDepartByUid(@Param("userId") String userId);
 
 	SysUserDepart getUserDepartByUserId(@Param("userId") String userId);
 }

+ 12 - 7
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.java

@@ -1,11 +1,16 @@
 package org.jeecg.modules.system.model;
 
+import org.jeecg.modules.system.entity.SysPermission;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import org.jeecg.modules.system.entity.SysPermission;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
+ */
 public class SysPermissionTree implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -51,8 +56,8 @@ public class SysPermissionTree implements Serializable {
 	 * 跳转网页链接
 	 */
 	private String url;
-	
-	/**
+
+    /**
 	 * 一级菜单跳转地址
 	 */
 	private String redirect;
@@ -71,8 +76,8 @@ public class SysPermissionTree implements Serializable {
 	 * 是否叶子节点: 1:是 0:不是
 	 */
 	private boolean isLeaf;
-	
-	/**
+
+    /**
 	 * 是否路由菜单: 0:不是  1:是(默认值1)
 	 */
 	private boolean route;
@@ -118,7 +123,7 @@ public class SysPermissionTree implements Serializable {
     private boolean alwaysShow;
     /**是否隐藏路由菜单: 0否,1是(默认值0)*/
     private boolean hidden;
-    
+
     /**按钮权限状态(0无效1有效)*/
 	private java.lang.String status;
 
@@ -375,5 +380,5 @@ public class SysPermissionTree implements Serializable {
 		this.status = status;
 	}
 
-	
+
 }

+ 21 - 16
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysUserDepartsVO.java

@@ -1,29 +1,34 @@
 package org.jeecg.modules.system.model;
 
-import java.io.Serializable;
-import java.util.List;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
+ */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @NoArgsConstructor
 public class SysUserDepartsVO implements Serializable{
-	private static final long serialVersionUID = 1L;
-	
-	/**用户id*/
-	private String userId;
-	/**对应的部门id集合*/
-	private List<String> departIdList;
-	public SysUserDepartsVO(String userId, List<String> departIdList) {
-		super();
-		this.userId = userId;
-		this.departIdList = departIdList;
-	}
-	
-	
+    private static final long serialVersionUID = 1L;
+
+    /**用户id*/
+    private String userId;
+    /**对应的部门id集合*/
+    private List<String> departIdList;
+
+    public SysUserDepartsVO(String userId, List<String> departIdList) {
+        super();
+        this.userId = userId;
+        this.departIdList = departIdList;
+    }
+
+
 }

+ 70 - 64
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/TreeSelectModel.java

@@ -5,91 +5,97 @@ import java.io.Serializable;
 import java.util.List;
 
 /**
-  * 树形下拉框
+ *
+ *  树形下拉框
+ */
+
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
  */
 public class TreeSelectModel implements Serializable {
 
-	private static final long serialVersionUID = 9016390975325574747L;
+    private static final long serialVersionUID = 9016390975325574747L;
+
+    private String key;
+
+    private String title;
+
+    private boolean isLeaf;
+
+    private String icon;
+
+    private String parentId;
+
+    private String value;
 
-	private String key;
-	
-	private String title;
-	
-	private boolean isLeaf;
-	
-	private String icon;
-	
-	private String parentId;
-	
-	private String value;
+    private String code;
 
-	private String code;
+    public String getValue() {
+        return value;
+    }
 
-	public String getValue() {
-		return value;
-	}
+    public void setValue(String value) {
+        this.value = value;
+    }
 
-	public void setValue(String value) {
-		this.value = value;
-	}
+    public String getParentId() {
+        return parentId;
+    }
 
-	public String getParentId() {
-		return parentId;
-	}
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
 
-	public void setParentId(String parentId) {
-		this.parentId = parentId;
-	}
+    public String getKey() {
+        return key;
+    }
 
-	public String getKey() {
-		return key;
-	}
+    public void setKey(String key) {
+        this.key = key;
+    }
 
-	public void setKey(String key) {
-		this.key = key;
-	}
+    public String getTitle() {
+        return title;
+    }
 
-	public String getTitle() {
-		return title;
-	}
+    public void setTitle(String title) {
+        this.title = title;
+    }
 
-	public void setTitle(String title) {
-		this.title = title;
-	}
+    public boolean isLeaf() {
+        return isLeaf;
+    }
 
-	public boolean isLeaf() {
-		return isLeaf;
-	}
+    public void setLeaf(boolean isLeaf) {
+        this.isLeaf = isLeaf;
+    }
 
-	public void setLeaf(boolean isLeaf) {
-		this.isLeaf = isLeaf;
-	}
+    public String getIcon() {
+        return icon;
+    }
 
-	public String getIcon() {
-		return icon;
-	}
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
 
-	public void setIcon(String icon) {
-		this.icon = icon;
-	}
 
+    public String getCode() {
+        return code;
+    }
 
-	public String getCode() {
-		return code;
-	}
+    public void setCode(String code) {
+        this.code = code;
+    }
 
-	public void setCode(String code) {
-		this.code = code;
-	}
-	
-	private List<TreeSelectModel> children;
+    private List<TreeSelectModel> children;
 
-	public List<TreeSelectModel> getChildren() {
-		return children;
-	}
+    public List<TreeSelectModel> getChildren() {
+        return children;
+    }
 
-	public void setChildren(List<TreeSelectModel> children) {
-		this.children = children;
-	}
+    public void setChildren(List<TreeSelectModel> children) {
+        this.children = children;
+    }
 
 }

+ 4 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDataLogServiceImpl.java

@@ -7,6 +7,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
+ */
 @Service
 public class SysDataLogServiceImpl extends ServiceImpl<SysDataLogMapper,SysDataLog> implements ISysDataLogService {
 	@Autowired

+ 9 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SysDepartUsersVO.java

@@ -1,14 +1,18 @@
 package org.jeecg.modules.system.vo;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.List;
 
-import lombok.Data;
-
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
+ */
 @Data
 public class SysDepartUsersVO implements Serializable{
 	private static final long serialVersionUID = 1L;
-	
+
 	/**部门id*/
 	private String depId;
 	/**对应的用户id集合*/
@@ -18,6 +22,6 @@ public class SysDepartUsersVO implements Serializable{
 		this.depId = depId;
 		this.userIdList = userIdList;
 	}
-	
-	
+
+
 }

+ 4 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SysDictPage.java

@@ -7,6 +7,10 @@ import org.jeecgframework.poi.excel.annotation.ExcelCollection;
 
 import java.util.List;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
+ */
 @Data
 public class SysDictPage {
 

+ 6 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/SysUserRoleVO.java

@@ -5,6 +5,10 @@ import lombok.Data;
 import java.io.Serializable;
 import java.util.List;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
+ */
 @Data
 public class SysUserRoleVO implements Serializable{
 	private static final long serialVersionUID = 1L;
@@ -18,6 +22,6 @@ public class SysUserRoleVO implements Serializable{
 		this.roleId = roleId;
 		this.userIdList = userIdList;
 	}
-	
-	
+
+
 }

+ 4 - 3
module-common/src/main/java/cn/com/ctop/common/module/service/impl/IpPoolServiceImpl.java

@@ -16,6 +16,10 @@ import org.springframework.stereotype.Service;
 import java.util.Date;
 import java.util.List;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日20:20:36
+ */
 @Slf4j
 @Service
 public class IpPoolServiceImpl extends ServiceImpl<IpPoolMapper, IpPool> implements IIpPoolService {
@@ -39,8 +43,6 @@ public class IpPoolServiceImpl extends ServiceImpl<IpPoolMapper, IpPool> impleme
     private void syncIpPool() {
         HttpClientUtils httpClientUtils = new HttpClientUtils();
         try {
-//            String result = httpClientUtils.get("http://d.jghttp.golangapi.com/getip?num=10&type=2&pro=&city=0&yys=0&port=11&pack=14503&ts=1&ys=1&cs=1&lb=1&sb=0&pb=45&mr=2&regions=");
-//            String result = httpClientUtils.get("http://webapi.http.zhimacangku.com/getip?num=10&type=2&pro=&city=0&yys=0&port=11&time=1&ts=1&ys=1&cs=1&lb=1&sb=0&pb=45&mr=2&regions=");
             String result = httpClientUtils.get("http://api.qingtingip.com/ip?app_key=31f9e03d6c362cb926d6c5d911e01387&num=10&ptc=http&fmt=json&lb=\\r\\n&port=0&mr=2&");
             ObjectMapper mapper = new ObjectMapper();
             JsonNode jsonNode = mapper.readTree(result);
@@ -62,7 +64,6 @@ public class IpPoolServiceImpl extends ServiceImpl<IpPoolMapper, IpPool> impleme
                         };
                         thread.start();
                     }
-//                    this.saveBatch(ipList);
                 }
             }
         } catch (Exception e) {

+ 16 - 8
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java

@@ -122,10 +122,14 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
             if (!Check.isNull(ascription)) {
                 MaterialAscription materialAscription = new MaterialAscription();
                 materialAscription.setMaterialId(info.getId());
-                materialAscription.setClipId(ascription.getString("clipId")); // 剪辑人
-                materialAscription.setShotId(ascription.getString("shotId")); // 拍摄人id
-                materialAscription.setPlanId(ascription.getString("planId")); // 策划id
-                materialAscription.setPlaneId(ascription.getString("planeId")); //平面id
+                // 剪辑人
+                materialAscription.setClipId(ascription.getString("clipId"));
+                // 拍摄人id
+                materialAscription.setShotId(ascription.getString("shotId"));
+                // 策划id
+                materialAscription.setPlanId(ascription.getString("planId"));
+                //平面id
+                materialAscription.setPlaneId(ascription.getString("planeId"));
                 materialAscriptionMapper.deleteByMap(deleteMap);
                 int i = materialAscriptionMapper.insert(materialAscription);
                 if (i > 0) {
@@ -271,10 +275,14 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
                 long secondDuration = duration / 1000;
                 MaterialParameter materialParameter = new MaterialParameter();
                 materialParameter.setMaterialId(materialInfo.getId());
-                materialParameter.setSecond(secondDuration); // 视频秒数
-                materialParameter.setFormat(m.getFormat()); // 视频格式
-                materialParameter.setWidth(String.valueOf(m.getVideo().getSize().getWidth()));// 视频宽
-                materialParameter.setHeight(String.valueOf(m.getVideo().getSize().getHeight()));// 视频高
+                // 视频秒数
+                materialParameter.setSecond(secondDuration);
+                // 视频格式
+                materialParameter.setFormat(m.getFormat());
+                // 视频宽
+                materialParameter.setWidth(String.valueOf(m.getVideo().getSize().getWidth()));
+                // 视频高
+                materialParameter.setHeight(String.valueOf(m.getVideo().getSize().getHeight()));
 
                 FileInputStream fis = new FileInputStream(file);
                 FileChannel fc = fis.getChannel();

+ 10 - 9
module-common/src/main/java/cn/com/ctop/common/module/utils/MpsUtils.java

@@ -137,10 +137,11 @@ public class MpsUtils {
     }
 
     public IAcsClient getClient(){
+        // 地域ID // RAM账号的AccessKey ID // RAM账号Access Key Secret
         DefaultProfile profile = DefaultProfile.getProfile(
-                "cn-beijing",      // 地域ID
-                "LTAIbNbqWzSOklQV",      // RAM账号的AccessKey ID
-                "1rkPz7JNoXk8sJevPaeYHWqfkQXBGh"); // RAM账号Access Key Secret
+                "cn-beijing",
+                "LTAIbNbqWzSOklQV",
+                "1rkPz7JNoXk8sJevPaeYHWqfkQXBGh");
         IAcsClient client = new DefaultAcsClient(profile);
         return client;
     }
@@ -177,9 +178,9 @@ public class MpsUtils {
                     request.setInput(input.toJSONString());
                 }else {
                     JSONObject mergeVideo = new JSONObject();
-                    String mergeVideoURL;
+                    String mergeVideoUrl;
                     try {
-                        mergeVideoURL = String.format(
+                        mergeVideoUrl = String.format(
                                 "http://%s.%s.aliyuncs.com/%s",
                                 ossBucket,
                                 ossLocation,
@@ -187,19 +188,19 @@ public class MpsUtils {
                     } catch (UnsupportedEncodingException e) {
                         throw new RuntimeException("mergeVideoURL encode failed");
                     }
-                    mergeVideo.put("MergeURL", mergeVideoURL);
+                    mergeVideo.put("MergeURL", mergeVideoUrl);
                     mergeList.add(mergeVideo);
                 }
             }
         }
-        String outputOSSObject;
+        String outputOssObject;
         try {
-            outputOSSObject = URLEncoder.encode(outputName, "utf-8");
+            outputOssObject = URLEncoder.encode(outputName, "utf-8");
         } catch (UnsupportedEncodingException e) {
             throw new RuntimeException("output URL encode failed");
         }
         JSONObject output = new JSONObject();
-        output.put("OutputObject", outputOSSObject);
+        output.put("OutputObject", outputOssObject);
         JSONObject video = new JSONObject();
         video.put("Width", "1280");
         video.put("Height", "720");

+ 4 - 0
module-common/src/main/java/cn/com/ctop/common/module/utils/ResultMapUtils.java

@@ -2,6 +2,10 @@ package cn.com.ctop.common.module.utils;
 
 import java.util.Map;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
+ */
 public class ResultMapUtils {
     private static final String MAP_CODE = "code";
     private static final String MAP_MESSAGE = "message";

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

@@ -1,5 +1,9 @@
 package cn.com.ctop.common.module.utils;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
+ */
 public enum StatusCode {
     /**
      * 0   请求成功

+ 4 - 0
module-common/src/main/java/cn/com/ctop/common/module/utils/StringUtils.java

@@ -4,6 +4,10 @@ import java.util.ArrayList;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
+ */
 public class StringUtils {
     public static final String COMMA = ",";
     public static ArrayList<String> stringCutFromBrace(String origin) {

+ 0 - 1
module-common/src/main/java/cn/com/ctop/common/module/utils/TransfMediaTool.java

@@ -72,7 +72,6 @@ public class TransfMediaTool {
      * @throws Exception
      */
     public String processAvi(String mencoderPath, String upFilePath, String codcAviPath) {
-//        boolean flag = false;
         List<String> commend = new ArrayList<String>();
         commend.add(mencoderPath);
         commend.add(upFilePath);

+ 4 - 2
module-crawler/src/main/java/cn/com/ctop/crawler/modules/appium/service/impl/AppiumJobServiceImpl.java

@@ -144,11 +144,12 @@ public class AppiumJobServiceImpl extends ServiceImpl<AppiumJobMapper, AppiumJob
         } catch (Exception e) {
             e.printStackTrace();
             log.error("绑定体验快手账号失败");
+            isBind = false;
         } finally {
             webDriver.manage().deleteAllCookies();
             webDriver.close();
-            return isBind;
         }
+        return isBind;
     }
 
     @Autowired
@@ -196,13 +197,14 @@ public class AppiumJobServiceImpl extends ServiceImpl<AppiumJobMapper, AppiumJob
             Thread.sleep(5000L);
             success = true;
         } catch (Exception e) {
+            success = false;
             e.printStackTrace();
             log.error("一键新机操作失败");
         } finally {
             webDriver.manage().deleteAllCookies();
             webDriver.close();
-            return success;
         }
+        return success;
     }
 
     @Override

文件差異過大導致無法顯示
+ 0 - 2
module-crawler/src/main/java/cn/com/ctop/crawler/modules/core/service/impl/KuaishouCrawlerServiceImpl.java


+ 20 - 20
module-crawler/src/main/java/cn/com/ctop/crawler/modules/core/util/AppiumUtil.java

@@ -105,7 +105,7 @@ public class AppiumUtil {
         System.out.println("当前包:" + pkg);
         System.out.println("当前activity:" + activity);
         Boolean isContinue = true;
-        if (pkg.equals("com.android.packageinstaller")) {
+        if ("com.android.packageinstaller".equals(pkg)) {
             switch (activity) {
                 case ".permission.ui.GrantPermissionsActivity":
                     WebElement permissionAllowBtn = getElementByType(androidDriver, FIND_ELEMENT_TYPE_ID, "com.android.packageinstaller:id/permission_allow_button");
@@ -136,7 +136,7 @@ public class AppiumUtil {
                     System.out.println("当前activity无法处理");
                     break;
             }
-        } else if (pkg.equals("com.smile.gifmaker")) {
+        } else if ("com.smile.gifmaker".equals(pkg)) {
             //干扰项
             WebElement positive = getElementByType(androidDriver, FIND_ELEMENT_TYPE_ID, "com.smile.gifmaker:id/positive");
             if (positive != null) {
@@ -223,7 +223,7 @@ public class AppiumUtil {
                     WebElement nextView = getElementByType(androidDriver, FIND_ELEMENT_TYPE_ID, "com.smile.gifmaker:id/next_view");
                     if (loginTitleTv != null) {
                         System.out.println(loginTitleTv.getText());
-                        if (loginTitleTv.getText().equals("输入密码")) {
+                        if ("输入密码".equals(loginTitleTv.getText())) {
                             WebElement forgetPsdBtn = getElementByType(androidDriver, FIND_ELEMENT_TYPE_ID, "com.smile.gifmaker:id/forget_psd_btn");
                             if (forgetPsdBtn != null) {
                                 forgetPsdBtn.click();
@@ -332,7 +332,7 @@ public class AppiumUtil {
                     System.out.println("当前activity无法处理");
                     break;
             }
-        } else if (pkg.equals("cn.com.longene.www.myapplication")) {
+        } else if ("cn.com.longene.www.myapplication".equals(pkg)) {
             switch (activity) {
                 case ".MainActivity":
                     isContinue = false;
@@ -441,7 +441,7 @@ public class AppiumUtil {
             WebElement nextView = getElementByType(androidDriver, FIND_ELEMENT_TYPE_ID, "com.smile.gifmaker:id/next_view");
             if (loginTitleTv != null) {
                 System.out.println(loginTitleTv.getText());
-                if (loginTitleTv.getText().equals("输入密码")) {
+                if ("输入密码".equals(loginTitleTv.getText())) {
                     WebElement forgetPsdBtn = getElementByType(androidDriver, FIND_ELEMENT_TYPE_ID, "com.smile.gifmaker:id/forget_psd_btn");
                     if (forgetPsdBtn != null) {
                         forgetPsdBtn.click();
@@ -614,7 +614,7 @@ public class AppiumUtil {
             return;
         }
 
-        if (null != activity && activity.equals("com.yxcorp.gifshow.webview.KwaiWebViewActivity")) {
+        if (null != activity && "com.yxcorp.gifshow.webview.KwaiWebViewActivity".equals(activity)) {
             //激活账号页面
             WebElement backButton = getElementByType(androidDriver, FIND_ELEMENT_TYPE_ID, "com.smile.gifmaker:id/left_tv");
             if (null != backButton) {
@@ -640,7 +640,7 @@ public class AppiumUtil {
         }
         Thread.sleep(1000L);
         String findKey = appiumTaskItem.getFindKey();
-        if (findKey.equals("exit")) {
+        if ("exit".equals(findKey)) {
             androidDriver.quit();
             ResultMapUtils.setResultMap(result, StatusCode.KUAISHOU_CRAWLER_APP_EXIT.getCode());
             log.error(StatusCode.KUAISHOU_CRAWLER_APP_EXIT.getDesc());
@@ -692,10 +692,10 @@ public class AppiumUtil {
                 y = taskItem.getOffsiteY();
             }
             tapPoint(androidDriver, x, y);
-        } else if (clickType.equals("send")) {
+        } else if ("send".equals(clickType)) {
             String text = taskItem.getTextEqualKey();
             element.sendKeys(text);
-        } else if (clickType.equals("text")) {
+        } else if ("text".equals(clickType)) {
             getText = element.getText();
         }
         return getText;
@@ -709,26 +709,26 @@ public class AppiumUtil {
                 Thread.sleep(appiumTaskItem.getWaitTime());
             }
             checkActivity(androidDriver);
-            if (appiumTaskItem.getLoopType() != null && appiumTaskItem.getLoopType().equals("noloop")) {
+            if (appiumTaskItem.getLoopType() != null && "noloop".equals(appiumTaskItem.getLoopType())) {
                 //非循环类型任务
                 if (appiumTaskItem.getFindType() != null) {
                     WebElement element = null;
-                    if (appiumTaskItem.getFindType().equals("loop")) {
+                    if ("loop".equals(appiumTaskItem.getFindType())) {
                         element = loopElement;
                     } else {
                         element = getElementByType(androidDriver, appiumTaskItem.getFindType(), appiumTaskItem.getFindKey());
                     }
                     if (element != null) {
                         if (appiumTaskItem.getTextEqualType() != null) {
-                            if (appiumTaskItem.getTextEqualType().equals("eq")) {
+                            if ("eq".equals(appiumTaskItem.getTextEqualType())) {
                                 if (!element.getText().equals(appiumTaskItem.getTextEqualKey())) {
                                     return getText;
                                 }
-                            } else if (appiumTaskItem.getTextEqualType().equals("neq")) {
+                            } else if ("neq".equals(appiumTaskItem.getTextEqualType())) {
                                 if (element.getText() == null || element.getText().equals(appiumTaskItem.getTextEqualKey())) {
                                     return getText;
                                 }
-                            } else if (appiumTaskItem.getTextEqualType().equals("start")) {
+                            } else if ("start".equals(appiumTaskItem.getTextEqualType())) {
                                 boolean check = checkAdvertiser(androidDriver, publishName);
                                 if (!check) {
                                     return getText;
@@ -736,9 +736,9 @@ public class AppiumUtil {
                             }
                         }
                         if (appiumTaskItem.getClickType() != null) {
-                            if (appiumTaskItem.getClickType().equals("element")) {
+                            if ("element".equals(appiumTaskItem.getClickType())) {
                                 element.click();
-                            } else if (appiumTaskItem.getClickType().equals("point")) {
+                            } else if ("point".equals(appiumTaskItem.getClickType())) {
                                 Point point = element.getLocation();
                                 System.out.println(point.getX() + ":" + point.getY());
                                 Integer x = point.getX();
@@ -750,10 +750,10 @@ public class AppiumUtil {
                                     y += appiumTaskItem.getOffsiteY();
                                 }
                                 tapPoint(androidDriver, x, y);
-                            } else if (appiumTaskItem.getClickType().equals("send")) {
+                            } else if ("send".equals(appiumTaskItem.getClickType())) {
                                 String text = appiumTaskItem.getTextEqualKey();
                                 element.sendKeys(text);
-                            } else if (appiumTaskItem.getClickType().equals("text")) {
+                            } else if ("text".equals(appiumTaskItem.getClickType())) {
                                 getText = element.getText();
                             }
                         }
@@ -772,7 +772,7 @@ public class AppiumUtil {
                             runTask(androidDriver, appiumTaskItem, element, publishName);
                         }
                         //非必须执行情况下
-                        if (appiumTaskItem.getClickType() != null && appiumTaskItem.getClickType().equals("point")) {
+                        if (appiumTaskItem.getClickType() != null && "point".equals(appiumTaskItem.getClickType())) {
                             tapPoint(androidDriver, appiumTaskItem.getOffsiteX(), appiumTaskItem.getOffsiteY());
                         }
                     }
@@ -780,7 +780,7 @@ public class AppiumUtil {
                 if (appiumTaskItem.getSwapType() != null) {
                     swipeByType(androidDriver, appiumTaskItem.getSwapType());
                 }
-            } else if (appiumTaskItem.getLoopType() != null && appiumTaskItem.getLoopType().equals("loop")) {
+            } else if (appiumTaskItem.getLoopType() != null && "loop".equals(appiumTaskItem.getLoopType())) {
                 while (isLoop) {
                     System.out.println("loop:" + isLoop);
                     if (appiumTaskItem.getFindType() != null) {

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

@@ -2,6 +2,10 @@ package cn.com.ctop.crawler.modules.core.util;
 
 import java.net.URL;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日20:20:36
+ */
 public class FateadmUtil {
     protected String app_id;
     protected String app_key;

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

@@ -2,6 +2,10 @@ package cn.com.ctop.crawler.modules.core.util;
 
 import org.jeecg.common.util.MD5Util;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
+ */
 public class SignUtil {
     public static String getMd5Sign(String source, String signKey) {
         return MD5Util.getMd5(source + signKey);

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

@@ -2,6 +2,10 @@ package cn.com.ctop.crawler.modules.core.util;
 
 import java.util.*;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
+ */
 public class SortUtil {
     public static <K, V extends Comparable<? super V>> Map<K, V> sortMapByValue(Map<K, V> map) {
         List<Map.Entry<K, V>> list = new LinkedList<>(map.entrySet());

+ 4 - 42
module-crawler/src/main/java/cn/com/ctop/crawler/modules/jiema/service/impl/WumaServiceImpl.java

@@ -2,11 +2,14 @@ package cn.com.ctop.crawler.modules.jiema.service.impl;
 
 import cn.com.ctop.common.module.utils.HttpUtils;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:57:58
+ */
 public class WumaServiceImpl {
     public static final String WUMA_API_URL = "http://56ji.cn:7777";
 
     public String login() throws Exception {
-//        String result = HttpUtils.httpPostNoParamRequest(WUMA_API_URL+"/Login?uName=xuzuoyun&pWord=heaven&isFixed=ojbk&Developer=U4iw3O%2fWTw6%2b17rjP8rmuA%3d%3d");
         String result = HttpUtils.httpGetRequest(WUMA_API_URL + "/Login?uName=xuzuoyun&pWord=heaven&isFixed=ojbk&Developer=U4iw3O%2fWTw6%2b17rjP8rmuA%3d%3d");
         return result.split("&")[0];
     }
@@ -15,47 +18,6 @@ public class WumaServiceImpl {
         String result = HttpUtils.httpGetRequest(WUMA_API_URL + "/getPhone?ItemId=3244&token=" + token);
         return result;
     }
-//    public String getMobile(String token,String projectId) throws Exception{
-//        String url = KUAIMI_API_URL+"?action=getPhone&sid="+projectId+"&token="+token;
-//        String result = HttpUtils.httpPostNoParamRequest(url);
-//        System.out.println(result);
-//        if(result != null && result.startsWith("1")){
-//            System.out.println(result);
-//            return result.split("\\|")[1];
-//        }else {
-//            throw new Exception();
-//        }
-//    }
-//    public String getMessage(String token,String projectId,String phone) throws Exception{
-//        String url = KUAIMI_API_URL+"?action=getMessage&sid="+projectId+"&token="+token+"&phone="+phone;
-//        String result = HttpUtils.httpPostNoParamRequest(url);
-//        if(result != null && result.startsWith("1")){
-//            System.out.println(result);
-//            return result.split("\\|")[1].substring(6,12);
-//        }else {
-//            throw new Exception();
-//        }
-//    }
-//    public String addBlackList(String token,String projectId,String phone) throws Exception{
-//        String url = KUAIMI_API_URL+"?action=addBlacklist&sid="+projectId+"&token="+token+"&phone="+phone;
-//        String result = HttpUtils.httpPostNoParamRequest(url);
-//        if(result != null && result.startsWith("1")){
-//            System.out.println(result);
-//            return result.split("\\|")[1];
-//        }else {
-//            throw new Exception();
-//        }
-//    }
-//    public String cancelRecv(String token,String projectId,String phone) throws Exception{
-//        String url = KUAIMI_API_URL+"?action=cancelRecv&sid="+projectId+"&token="+token+"&phone="+phone;
-//        String result = HttpUtils.httpPostNoParamRequest(url);
-//        if(result != null && result.startsWith("1")){
-//            System.out.println(result);
-//            return result.split("\\|")[1];
-//        }else {
-//            throw new Exception();
-//        }
-//    }
 
     public static void main(String[] args) {
         WumaServiceImpl k = new WumaServiceImpl();

+ 4 - 0
module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/entity/Actor.java

@@ -13,6 +13,10 @@ import org.jeecg.common.aspect.annotation.Dict;
 import java.util.Date;
 import java.util.List;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:55:14
+ */
 @Data
 @TableName("ctop_actor")
 @EqualsAndHashCode(callSuper = false)

+ 4 - 0
module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/entity/ActorComment.java

@@ -10,6 +10,10 @@ import lombok.experimental.Accessors;
 
 import java.util.Date;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:55:14
+ */
 @Data
 @TableName("ctop_actor_comment")
 @EqualsAndHashCode(callSuper = false)

+ 4 - 0
module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/entity/Yard.java

@@ -12,6 +12,10 @@ import lombok.experimental.Accessors;
 import java.util.Date;
 import java.util.List;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:55:14
+ */
 @Data
 @TableName("ctop_yard")
 @EqualsAndHashCode(callSuper = false)

+ 4 - 0
module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/entity/YardComment.java

@@ -10,6 +10,10 @@ import lombok.experimental.Accessors;
 
 import java.util.Date;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:55:14
+ */
 @Data
 @TableName("ctop_yard_comment")
 @EqualsAndHashCode(callSuper = false)

+ 4 - 0
module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/entity/YardPhoto.java

@@ -10,6 +10,10 @@ import lombok.experimental.Accessors;
 
 import java.util.Date;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:55:14
+ */
 @Data
 @TableName("ctop_yard_photo")
 @EqualsAndHashCode(callSuper = false)

+ 4 - 0
module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/entity/YardScheduler.java

@@ -11,6 +11,10 @@ import lombok.experimental.Accessors;
 import java.sql.Time;
 import java.util.Date;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:55:14
+ */
 @Data
 @TableName("ctop_yard_scheduler")
 @EqualsAndHashCode(callSuper = false)

+ 4 - 0
module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/entity/YardVideo.java

@@ -10,6 +10,10 @@ import lombok.experimental.Accessors;
 
 import java.util.Date;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:55:14
+ */
 @Data
 @TableName("ctop_yard_video")
 @EqualsAndHashCode(callSuper = false)

+ 4 - 0
module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/mapper/ActorCommentMapper.java

@@ -3,5 +3,9 @@ package cn.com.ctop.manage.modules.actor.mapper;
 import cn.com.ctop.manage.modules.actor.entity.ActorComment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:55:14
+ */
 public interface ActorCommentMapper extends BaseMapper<ActorComment> {
 }

+ 4 - 1
module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/mapper/YardCommentMapper.java

@@ -1,8 +1,11 @@
 package cn.com.ctop.manage.modules.actor.mapper;
 
-import cn.com.ctop.manage.modules.actor.entity.ActorComment;
 import cn.com.ctop.manage.modules.actor.entity.YardComment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:55:14
+ */
 public interface YardCommentMapper extends BaseMapper<YardComment> {
 }

+ 4 - 0
module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/mapper/YardMapper.java

@@ -3,5 +3,9 @@ package cn.com.ctop.manage.modules.actor.mapper;
 import cn.com.ctop.manage.modules.actor.entity.Yard;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:55:14
+ */
 public interface YardMapper extends BaseMapper<Yard> {
 }

+ 4 - 0
module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/mapper/YardPhotoMapper.java

@@ -3,5 +3,9 @@ package cn.com.ctop.manage.modules.actor.mapper;
 import cn.com.ctop.manage.modules.actor.entity.YardPhoto;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:55:14
+ */
 public interface YardPhotoMapper extends BaseMapper<YardPhoto> {
 }

+ 4 - 0
module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/mapper/YardSchedulerMapper.java

@@ -3,5 +3,9 @@ package cn.com.ctop.manage.modules.actor.mapper;
 import cn.com.ctop.manage.modules.actor.entity.YardScheduler;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:55:14
+ */
 public interface YardSchedulerMapper extends BaseMapper<YardScheduler> {
 }

+ 4 - 0
module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/mapper/YardVideoMapper.java

@@ -3,5 +3,9 @@ package cn.com.ctop.manage.modules.actor.mapper;
 import cn.com.ctop.manage.modules.actor.entity.YardVideo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:55:14
+ */
 public interface YardVideoMapper extends BaseMapper<YardVideo> {
 }

+ 4 - 3
module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/service/impl/YardCommentServiceImpl.java

@@ -1,14 +1,15 @@
 package cn.com.ctop.manage.modules.actor.service.impl;
 
-import cn.com.ctop.manage.modules.actor.entity.ActorComment;
 import cn.com.ctop.manage.modules.actor.entity.YardComment;
-import cn.com.ctop.manage.modules.actor.mapper.ActorCommentMapper;
 import cn.com.ctop.manage.modules.actor.mapper.YardCommentMapper;
-import cn.com.ctop.manage.modules.actor.service.IActorCommentService;
 import cn.com.ctop.manage.modules.actor.service.IYardCommentService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:55:14
+ */
 @Service
 public class YardCommentServiceImpl extends ServiceImpl<YardCommentMapper, YardComment> implements IYardCommentService {
 }

+ 4 - 1
module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/service/impl/YardPhotoServiceImpl.java

@@ -2,11 +2,14 @@ package cn.com.ctop.manage.modules.actor.service.impl;
 
 import cn.com.ctop.manage.modules.actor.entity.YardPhoto;
 import cn.com.ctop.manage.modules.actor.mapper.YardPhotoMapper;
-import cn.com.ctop.manage.modules.actor.service.IActorService;
 import cn.com.ctop.manage.modules.actor.service.IYardPhotoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:55:14
+ */
 @Service
 public class YardPhotoServiceImpl extends ServiceImpl<YardPhotoMapper, YardPhoto> implements IYardPhotoService {
 }

+ 4 - 1
module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/service/impl/YardSchedulerServiceImpl.java

@@ -2,11 +2,14 @@ package cn.com.ctop.manage.modules.actor.service.impl;
 
 import cn.com.ctop.manage.modules.actor.entity.YardScheduler;
 import cn.com.ctop.manage.modules.actor.mapper.YardSchedulerMapper;
-import cn.com.ctop.manage.modules.actor.service.IActorService;
 import cn.com.ctop.manage.modules.actor.service.IYardSchedulerService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:55:14
+ */
 @Service
 public class YardSchedulerServiceImpl extends ServiceImpl<YardSchedulerMapper, YardScheduler> implements IYardSchedulerService {
 }

+ 4 - 1
module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/service/impl/YardServiceImpl.java

@@ -2,11 +2,14 @@ package cn.com.ctop.manage.modules.actor.service.impl;
 
 import cn.com.ctop.manage.modules.actor.entity.Yard;
 import cn.com.ctop.manage.modules.actor.mapper.YardMapper;
-import cn.com.ctop.manage.modules.actor.service.IActorService;
 import cn.com.ctop.manage.modules.actor.service.IYardService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:55:14
+ */
 @Service
 public class YardServiceImpl extends ServiceImpl<YardMapper, Yard> implements IYardService {
 }

+ 4 - 1
module-ctop/src/main/java/cn/com/ctop/manage/modules/actor/service/impl/YardVideoServiceImpl.java

@@ -2,11 +2,14 @@ package cn.com.ctop.manage.modules.actor.service.impl;
 
 import cn.com.ctop.manage.modules.actor.entity.YardVideo;
 import cn.com.ctop.manage.modules.actor.mapper.YardVideoMapper;
-import cn.com.ctop.manage.modules.actor.service.IActorService;
 import cn.com.ctop.manage.modules.actor.service.IYardVideoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:55:14
+ */
 @Service
 public class YardVideoServiceImpl extends ServiceImpl<YardVideoMapper, YardVideo> implements IYardVideoService {
 }

+ 4 - 4
module-ctop/src/main/java/cn/com/ctop/manage/modules/material/service/impl/MaterialUploadServiceImpl.java

@@ -62,9 +62,9 @@ public class MaterialUploadServiceImpl implements IMaterialUploadService {
     public void uploadAccount(String mediaId, JSONArray materialArray, JSONArray accountArray) {
         try {
             if ("2".equals(mediaId)) {
-                this.KuaiShouUpload(mediaId, materialArray, accountArray);
+                this.kuaiShouUpload(mediaId, materialArray, accountArray);
             } else if ("1".equals(mediaId)) {
-                this.TouTiaoUpload(mediaId, materialArray, accountArray);
+                this.touTiaoUpload(mediaId, materialArray, accountArray);
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -74,7 +74,7 @@ public class MaterialUploadServiceImpl implements IMaterialUploadService {
     }
 
 
-    private void TouTiaoUpload(String mediaId, JSONArray materialArray, JSONArray accountArray) {
+    private void touTiaoUpload(String mediaId, JSONArray materialArray, JSONArray accountArray) {
         for (int j = 0; j < materialArray.size(); j++) {
             String materialId = materialArray.getString(j);
             MaterialInfo materialInfo = materialInfoMapper.selectById(materialId);
@@ -124,7 +124,7 @@ public class MaterialUploadServiceImpl implements IMaterialUploadService {
     }
 
 
-    private void KuaiShouUpload(String mediaId, JSONArray materialArray, JSONArray accountArray) {
+    private void kuaiShouUpload(String mediaId, JSONArray materialArray, JSONArray accountArray) {
         for (int j = 0; j < materialArray.size(); j++) {
             String materialId = materialArray.getString(j);
             MaterialInfo materialInfo = materialInfoMapper.selectById(materialId);

+ 0 - 36
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouController.java

@@ -2,10 +2,6 @@ package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
-import cn.com.ctop.common.module.utils.Check;
-import cn.com.ctop.common.module.utils.FileEntity;
-import cn.com.ctop.common.module.utils.FileUploadTool;
-import cn.com.ctop.common.module.utils.LoadFileUtil;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -57,26 +53,15 @@ public class KuaiShouController {
         requestJson.put("unit_name", "测试广告组名称");
         requestJson.put("bid_type", 2);
         requestJson.put("bid", 100000);
-        // requestJson.put("cpa_bid",100000 );
-        // requestJson.put("ocpx_action_type", 2);
         requestJson.put("deep_conversion_type", 3);
         requestJson.put("page", 2);
         requestJson.put("begin_time", "2019-07-24");
         requestJson.put("end_time", "2019-07-25");
-        // requestJson.put("schedule", 00000000000000000000000000000);
         requestJson.put("day_budget", 10000000);
-        //   requestJson.put("url_type", );
-        //   requestJson.put("url", );
         requestJson.put("app_id", 156982);
         requestJson.put("show_mode", 1);
         requestJson.put("speed", 1);
-
-
         JSONObject targetJson = new JSONObject();
-
-        //   targetJson.put("region", "");
-
-
         JSONObject ageJson = new JSONObject();
         ageJson.put("min", 15);
         ageJson.put("max", 50);
@@ -85,7 +70,6 @@ public class KuaiShouController {
         targetJson.put("gender", 0);
         targetJson.put("platform_os", 0);
         targetJson.put("android_osv", 3);
-        //  targetJson.put("ios_osv", 3);
         targetJson.put("network", 0);
         Map<String, Object> stringObjectMap = kuaishouInterfaceService.adUnitCreate(accessToken, advertiserId, requestJson);
         System.err.println(JSON.toJSONString(stringObjectMap));
@@ -130,39 +114,19 @@ public class KuaiShouController {
 
     @RequestMapping("/image/get")
     public void imageGet() {
-
         String accessToken = "360d43b49553684a011d6607322582b1";
         Long advertiserId = 23212L;
         String imageToken = "market825e095b83eb4456a31ce95704d03238.jpg";
-        /*FileUploadTool fileUploadTool = new FileUploadTool();
-        FileEntity entity = new FileEntity();
-
-        entity = fileUploadTool.createFile(multipartFile, request);
-        System.err.println(entity);*/
-
-
         kuaishouInterfaceService.imageGet(advertiserId, accessToken, imageToken);
-
-
     }
 
 
     @RequestMapping("/area/list")
     public void areaList() {
-
         String accessToken = "360d43b49553684a011d6607322582b1";
         Long advertiserId = 23212L;
         String imageToken = "market825e095b83eb4456a31ce95704d03238.jpg";
-        /*FileUploadTool fileUploadTool = new FileUploadTool();
-        FileEntity entity = new FileEntity();
-
-        entity = fileUploadTool.createFile(multipartFile, request);
-        System.err.println(entity);*/
-
-
         kuaishouInterfaceService.areaList(accessToken);
-
-
     }
 
 

+ 4 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java

@@ -1229,7 +1229,9 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
     @Autowired
     private ICtopOauthTokenService tokenService;
     static ExecutorService executorService = null;
-    //线程计数器          如果不用执行完后统一走流程,可以不要这个
+    /**
+     * 线程计数器          如果不用执行完后统一走流程,可以不要这个
+     */
     static CountDownLatch countDownLatch = null;
 
     @Override
@@ -1414,8 +1416,6 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
         } catch (Exception e) {
             e.printStackTrace();
         }
-
-
     }
 
     private void addGroup(Long advertiserId, JSONArray details) {
@@ -2648,6 +2648,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
     /**
      * 查询图片列表---测试使用
      */
+    @Override
     public void getImageList(String token, Long accountId, Date startDate, Date endDate, int page ) {
         String url = PropertiesUtils.getConfig("kuaishou_api_url") + KuaishouInterfaceConstant.IMAGE_LIST;
         Map<String, String> headers = new HashMap<String, String>();

+ 2 - 86
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/graphql/service/impl/KuaishouWebInterfaceServiceImpl.java

@@ -137,7 +137,6 @@ public class KuaishouWebInterfaceServiceImpl implements IKuaishouWebInterfaceSer
                 resultMap = mapper.readValue(httpClientEntity.getResult(), new TypeReference<Map<String, Object>>() {
                 });
                 JsonNode resultNode = mapper.readTree(httpClientEntity.getResult()).get("data");
-//                checkCaptcha(httpClientEntity.getResult());
                 if (resultNode.get("subCommentList").isNull() || resultNode.get("subCommentList").get("pcursor").isNull()) {
                     ipPool.setStatus(2);
                     iIpPoolService.updateById(ipPool);
@@ -380,17 +379,6 @@ public class KuaishouWebInterfaceServiceImpl implements IKuaishouWebInterfaceSer
                 resultMap = mapper.readValue(httpClientEntity.getResult(), new TypeReference<Map<String, Object>>() {
                 });
                 Integer code = ((Integer) resultMap.get("result"));
-//                if(code == 109){
-//
-//                }
-//                if (((Integer) resultMap.get("result")) == 109) {
-//                    reLogin(httpClientEntity,kuaishouUserCookie);
-//                    if(ipPool != null){
-//                        ipPool.setStatus(2);
-//                        iIpPoolService.updateById(ipPool);
-//                    }
-//                    return commentDelete(userId,ksid, photoId, commentId);
-//                }
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -438,12 +426,6 @@ public class KuaishouWebInterfaceServiceImpl implements IKuaishouWebInterfaceSer
                 ObjectMapper mapper = new ObjectMapper();
                 resultMap = mapper.readValue(httpClientEntity.getResult(), new TypeReference<Map<String, Object>>() {
                 });
-//                if (((Integer) resultMap.get("result")) == 109) {
-//                    reLogin(httpClientEntity,kuaishouUserCookie);
-//                    ipPool.setStatus(2);
-//                    iIpPoolService.updateById(ipPool);
-//                    return commentAdd(userId,ksid, photoId, content, replyToCommentId, replyTo);
-//                }
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -573,25 +555,11 @@ public class KuaishouWebInterfaceServiceImpl implements IKuaishouWebInterfaceSer
                 return;
             }
             String result = HttpUtils2.callingGraph(GRAPHQL_URL, jsonStr);
-//            Map<String, String> map = HttpUtils2.fontsMap.get(ttf);
-//            for (String key : map.keySet()) {
-//                result = result.replace(key, map.get(key));
-//            }
             ObjectMapper mapper = new ObjectMapper();
             mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
             KuaishouWebResult<KuaishouWebData> data = mapper.readValue(result, new TypeReference<KuaishouWebResult<KuaishouWebData>>() {
             });
             KuaishouPublicFeeds feeds = data.getData().getPublicFeeds();
-//            if (feeds.getList() != null && feeds.getList().size() > 0) {
-//                List<KuaishouVideo> videoList = feeds.getList();
-//                for (KuaishouVideo video : videoList) {
-//                    video.setUserId(video.getUser().getId());
-//                    video.setTimes(new Date(video.getTimestamp()));
-//                    video.setTtfName(ttf);
-//                    kuaishouUserService.saveOrUpdate(video.getUser());
-//                    kuaishouVideoService.saveOrUpdate(video);
-//                }
-//            }
             if (feeds.getPcursor() == null || !"no_more".equals(feeds.getPcursor())) {
                 Thread.sleep((int) Math.random() * 5000 + 10000);
                 getVedioList(principalId, feeds.getPcursor(), ttf, ++times);
@@ -628,7 +596,6 @@ public class KuaishouWebInterfaceServiceImpl implements IKuaishouWebInterfaceSer
         chromeOptions.addArguments("--user-agent=" + HttpUtils2.USER_AGENT);
         chromeOptions.setAcceptInsecureCerts(true);
         WebDriver webDriver = new RemoteWebDriver(service.getUrl(), chromeOptions);
-//        WebDriver webDriver = new ChromeDriver(chromeOptions);
         try {
 
             //全局隐式等待
@@ -642,30 +609,7 @@ public class KuaishouWebInterfaceServiceImpl implements IKuaishouWebInterfaceSer
             //点击登录
             webDriver.findElement(By.className("foot")).click();
             //等待2秒用于页面加载,保证Cookie响应全部获取。
-
             Thread.sleep(10000);
-//            String text = webDriver.findElement(By.tagName("iframe")).getAttribute("src");
-//            webDriver.get(text);
-
-//            String src = webDriver.findElement(By.id("clickCharTips")).getAttribute("src");
-//            Actions actions = new Actions(webDriver);
-//            actions.moveToElement(webDriver.findElement(By.className("aq_icon_refresh")));
-//            actions.moveByOffset(10,10);
-//            actions.moveByOffset(100,100);
-//            actions.click();
-
-//            webDriver.switchTo().frame(webDriver.findElement(By.tagName("iframe")));
-//            File scrFile = ((TakesScreenshot)webDriver).getScreenshotAs(OutputType.FILE);
-//            WebElement iframeElement = webDriver.findElement(By.tagName("iframe"));
-//            if (iframeElement != null) {
-//                File scrFile = captureElement(webDriver.findElement(By.tagName("iframe")));
-//                String savePath = "D:/capter.png";
-//                FileUtils.copyFile(scrFile, new File(savePath));
-//                webDriver.switchTo().frame(webDriver.findElement(By.tagName("iframe")));
-//                String result = ChaojiyingUtils.process(Base64Utils.ImageToBase64(savePath));
-//                ((JavascriptExecutor) webDriver).executeScript("arguments[0].click();", webDriver.findElement(By.className("aq_icon_refresh")));
-//            }
-
 
             webDriver.get("https://b.e.kuaishou.com/#/home/profile");
             //获取Cookie并打印
@@ -695,9 +639,6 @@ public class KuaishouWebInterfaceServiceImpl implements IKuaishouWebInterfaceSer
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
-//            webDriver.quit();
-//            service.stop();
-//            HttpUtils.cookieStore.clear();
         }
     }
 
@@ -721,7 +662,7 @@ public class KuaishouWebInterfaceServiceImpl implements IKuaishouWebInterfaceSer
             String ph = null;
             if (list != null && list.size() > 0) {
                 for (Cookie ck : list) {
-                    if (ck.getName().equals("kuaishou.ad.dsp_ph")) {
+                    if ("kuaishou.ad.dsp_ph".equals(ck.getName())) {
                         ph = ck.getValue();
                         break;
                     }
@@ -757,7 +698,6 @@ public class KuaishouWebInterfaceServiceImpl implements IKuaishouWebInterfaceSer
         chromeOptions.addArguments("--user-agent=" + HttpUtils2.USER_AGENT);
         chromeOptions.setAcceptInsecureCerts(true);
         WebDriver webDriver = new RemoteWebDriver(service.getUrl(), chromeOptions);
-//        WebDriver webDriver = new ChromeDriver(chromeOptions);
         try {
 
             //全局隐式等待
@@ -770,30 +710,8 @@ public class KuaishouWebInterfaceServiceImpl implements IKuaishouWebInterfaceSer
             webDriverWait.until(ExpectedConditions.elementToBeClickable(By.cssSelector(".password input"))).sendKeys(password);
             //点击登录
             webDriver.findElement(By.className("foot")).click();
-//            //等待2秒用于页面加载,保证Cookie响应全部获取。
-//
+            //等待2秒用于页面加载,保证Cookie响应全部获取。
             Thread.sleep(10000);
-//            String text = webDriver.findElement(By.tagName("iframe")).getAttribute("src");
-//            webDriver.get(text);
-
-//            String src = webDriver.findElement(By.id("clickCharTips")).getAttribute("src");
-//            Actions actions = new Actions(webDriver);
-//            actions.moveToElement(webDriver.findElement(By.className("aq_icon_refresh")));
-//            actions.moveByOffset(10,10);
-//            actions.moveByOffset(100,100);
-//            actions.click();
-
-//            webDriver.switchTo().frame(webDriver.findElement(By.tagName("iframe")));
-//            File scrFile = ((TakesScreenshot)webDriver).getScreenshotAs(OutputType.FILE);
-//            WebElement iframeElement = webDriver.findElement(By.tagName("iframe"));
-//            if (iframeElement != null) {
-//                File scrFile = captureElement(webDriver.findElement(By.tagName("iframe")));
-//                String savePath = "D:/capter.png";
-//                FileUtils.copyFile(scrFile, new File(savePath));
-//                webDriver.switchTo().frame(webDriver.findElement(By.tagName("iframe")));
-//                String result = ChaojiyingUtils.process(Base64Utils.ImageToBase64(savePath));
-//                ((JavascriptExecutor) webDriver).executeScript("arguments[0].click();", webDriver.findElement(By.className("aq_icon_refresh")));
-//            }
 
 
             webDriver.get("https://ad.e.kuaishou.com/#/index");
@@ -871,7 +789,6 @@ public class KuaishouWebInterfaceServiceImpl implements IKuaishouWebInterfaceSer
             for (org.openqa.selenium.Cookie cookie : webDriver.manage().getCookies()) {
                 BasicClientCookie ck = new BasicClientCookie(cookie.getName(), cookie.getValue());
                 ck.setDomain("live.kuaishou.com");
-//                ck.setDomain(cookie.getDomain());
                 ck.setExpiryDate(cookie.getExpiry());
                 ck.setPath(cookie.getPath());
                 HttpUtils2.cookieStore.addCookie(ck);
@@ -893,7 +810,6 @@ public class KuaishouWebInterfaceServiceImpl implements IKuaishouWebInterfaceSer
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
-//            HttpUtils.cookieStore.clear();
             //获得cookie
             Set<org.openqa.selenium.Cookie> coo = webDriver.manage().getCookies();
             //清除所有的缓存

+ 4 - 0
module-report/src/main/java/cn/com/ctop/bytedance/controller/AccountReportController.java

@@ -16,6 +16,10 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:55:14
+ */
 @Slf4j
 @Api(tags = "广告主日报表")
 @RestController

+ 0 - 6
module-report/src/main/java/cn/com/ctop/bytedance/controller/BytedanceReportController.java

@@ -25,14 +25,8 @@ public class BytedanceReportController {
      */
     @RequestMapping(value = "/accountReport")
     public JSONObject getAccountReport() {
-        /*LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if (Check.isNull(user)) {
-            JSONObject json = bytedanceReportService.getCost(user.getId());
-        }*/
-
         JSONObject json = bytedanceReportService.getAccountReport("e9ca23d68d884d4ebb19d07889727dae");
         return json;
-
     }
 
 

+ 99 - 107
module-report/src/main/java/cn/com/ctop/bytedance/entity/BytedanceCreativeHourlyReport.java

@@ -399,45 +399,45 @@ public class BytedanceCreativeHourlyReport {
         if (null != playFeedBreak75) {
             this.play75FeedBreak = playFeedBreak75;
         }
-        Long next_day_open = data.getLong("next_day_open");
-        if (null != next_day_open) {
-            this.nextDayOpen = next_day_open;
+        Long nextDayOpen = data.getLong("next_day_open");
+        if (null != nextDayOpen) {
+            this.nextDayOpen = nextDayOpen;
         }
         Long convert = data.getLong("convert");
         if (null != convert) {
             this.convertNum = convert;
         }
-        Long in_app_cart = data.getLong("in_app_cart");
-        if (null != in_app_cart) {
-            this.inAppCart = in_app_cart;
+        Long inAppCart = data.getLong("in_app_cart");
+        if (null != inAppCart) {
+            this.inAppCart = inAppCart;
         }
-        Long play_25_feed_break = data.getLong("play_25_feed_break");
-        if (null != play_25_feed_break) {
-            this.play25FeedBreak = play_25_feed_break;
+        Long play25feedBreak = data.getLong("play_25_feed_break");
+        if (null != play25feedBreak) {
+            this.play25FeedBreak = play25feedBreak;
         }
-        Long consult_effective = data.getLong("consult_effective");
-        if (null != consult_effective) {
-            this.consultEffective = consult_effective;
+        Long consultEffective = data.getLong("consult_effective");
+        if (null != consultEffective) {
+            this.consultEffective = consultEffective;
         }
         Long view = data.getLong("view");
         if (null != view) {
             this.view = view;
         }
-        Long phone_confirm = data.getLong("phone_confirm");
-        if (null != phone_confirm) {
-            this.phoneConfirm = phone_confirm;
+        Long phoneConfirm = data.getLong("phone_confirm");
+        if (null != phoneConfirm) {
+            this.phoneConfirm = phoneConfirm;
         }
-        Long ies_music_click = data.getLong("ies_music_click");
-        if (null != ies_music_click) {
-            this.iesMusicClick = ies_music_click;
+        Long iesMusicClick = data.getLong("ies_music_click");
+        if (null != iesMusicClick) {
+            this.iesMusicClick = iesMusicClick;
         }
-        Long wifi_play = data.getLong("wifi_play");
-        if (null != wifi_play) {
-            this.wifiPlay = wifi_play;
+        Long wifiPlay = data.getLong("wifi_play");
+        if (null != wifiPlay) {
+            this.wifiPlay = wifiPlay;
         }
-        String stat_datetime = data.getString("stat_datetime");
-        if (null != stat_datetime && !"".equals(stat_datetime.trim())) {
-            this.statDatetime = stat_datetime;
+        String statDatetime = data.getString("stat_datetime");
+        if (null != statDatetime && !"".equals(statDatetime.trim())) {
+            this.statDatetime = statDatetime;
         }
         Long shopping = data.getLong("shopping");
         if (null != shopping) {
@@ -451,9 +451,9 @@ public class BytedanceCreativeHourlyReport {
         if (null != like) {
             this.likeNum = like;
         }
-        Long play_50_feed_break = data.getLong("play_50_feed_break");
-        if (null != play_50_feed_break) {
-            this.play50FeedBreak = play_50_feed_break;
+        Long play50feedBreak = data.getLong("play_50_feed_break");
+        if (null != play50feedBreak) {
+            this.play50FeedBreak = play50feedBreak;
         }
         Long active = data.getLong("active");
         if (null != active) {
@@ -463,61 +463,61 @@ public class BytedanceCreativeHourlyReport {
         if (null != click) {
             this.click = click;
         }
-        Long advanced_creative_phone_click = data.getLong("advanced_creative_phone_click");
-        if (null != advanced_creative_phone_click) {
-            this.advancedCreativePhoneClick = advanced_creative_phone_click;
+        Long advancedCreativePhoneClick = data.getLong("advanced_creative_phone_click");
+        if (null != advancedCreativePhoneClick) {
+            this.advancedCreativePhoneClick = advancedCreativePhoneClick;
         }
-        Long download_start = data.getLong("download_start");
-        if (null != download_start) {
-            this.downloadStart = download_start;
+        Long downloadStart = data.getLong("download_start");
+        if (null != downloadStart) {
+            this.downloadStart = downloadStart;
         }
-        Long home_visited = data.getLong("home_visited");
-        if (null != home_visited) {
-            this.homeVisited = home_visited;
+        Long homeVisited = data.getLong("home_visited");
+        if (null != homeVisited) {
+            this.homeVisited = homeVisited;
         }
         Long phone = data.getLong("phone");
         if (null != phone) {
             this.phone = phone;
         }
-        Long in_app_pay = data.getLong("in_app_pay");
-        if (null != in_app_pay) {
-            this.inAppPay = in_app_pay;
+        Long inAppPay = data.getLong("in_app_pay");
+        if (null != inAppPay) {
+            this.inAppPay = inAppPay;
         }
-        BigDecimal next_day_open_cost = data.getBigDecimal("next_day_open_cost");
-        if (null != next_day_open_cost) {
-            this.nextDayOpenCost = next_day_open_cost;
+        BigDecimal nextDayOpenCost = data.getBigDecimal("next_day_open_cost");
+        if (null != nextDayOpenCost) {
+            this.nextDayOpenCost = nextDayOpenCost;
         }
-        Long ies_challenge_click = data.getLong("ies_challenge_click");
-        if (null != ies_challenge_click) {
-            this.iesChallengeClick = ies_challenge_click;
+        Long iesChallengeClick = data.getLong("ies_challenge_click");
+        if (null != iesChallengeClick) {
+            this.iesChallengeClick = iesChallengeClick;
         }
-        Long total_play = data.getLong("total_play");
-        if (null != total_play) {
-            this.totalPlay = total_play;
+        Long totalPlay = data.getLong("total_play");
+        if (null != totalPlay) {
+            this.totalPlay = totalPlay;
         }
         Long show = data.getLong("show");
         if (null != show) {
             this.showNum = show;
         }
-        BigDecimal next_day_open_rate = data.getBigDecimal("next_day_open_rate");
-        if (null != next_day_open_rate) {
-            this.nextDayOpenRate = next_day_open_rate;
+        BigDecimal nextDayOpenRate = data.getBigDecimal("next_day_open_rate");
+        if (null != nextDayOpenRate) {
+            this.nextDayOpenRate = nextDayOpenRate;
         }
-        Long map_search = data.getLong("map_search");
-        if (null != map_search) {
-            this.mapSearch = map_search;
+        Long mapSearch = data.getLong("map_search");
+        if (null != mapSearch) {
+            this.mapSearch = mapSearch;
         }
-        Long click_install = data.getLong("click_install");
-        if (null != click_install) {
-            this.clickInstall = click_install;
+        Long clickInstall = data.getLong("click_install");
+        if (null != clickInstall) {
+            this.clickInstall = clickInstall;
         }
-        BigDecimal interact_per_cost = data.getBigDecimal("interact_per_cost");
-        if (null != interact_per_cost) {
-            this.interactPerCost = interact_per_cost;
+        BigDecimal interactPerCost = data.getBigDecimal("interact_per_cost");
+        if (null != interactPerCost) {
+            this.interactPerCost = interactPerCost;
         }
-        Long advertiser_id = data.getLong("advertiser_id");
-        if (null != advertiser_id) {
-            this.advertiserId = advertiser_id;
+        Long advertiserId = data.getLong("advertiser_id");
+        if (null != advertiserId) {
+            this.advertiserId = advertiserId;
         } else {
             this.advertiserId = setAdvertiserId;
         }
@@ -525,17 +525,17 @@ public class BytedanceCreativeHourlyReport {
         if (null != button) {
             this.button = button;
         }
-        Long play_duration_sum = data.getLong("play_duration_sum");
-        if (null != play_duration_sum) {
-            this.playDurationSum = play_duration_sum;
+        Long playDurationSum = data.getLong("play_duration_sum");
+        if (null != playDurationSum) {
+            this.playDurationSum = playDurationSum;
         }
-        Long play_100_feed_break = data.getLong("play_100_feed_break");
-        if (null != play_100_feed_break) {
-            this.play100FeedBreak = play_100_feed_break;
+        Long play100FeedBreak = data.getLong("play_100_feed_break");
+        if (null != play100FeedBreak) {
+            this.play100FeedBreak = play100FeedBreak;
         }
-        Long advanced_creative_counsel_click = data.getLong("advanced_creative_counsel_click");
-        if (null != advanced_creative_counsel_click) {
-            this.advancedCreativeCounselClick = advanced_creative_counsel_click;
+        Long advancedCreativeCounselClick = data.getLong("advanced_creative_counsel_click");
+        if (null != advancedCreativeCounselClick) {
+            this.advancedCreativeCounselClick = advancedCreativeCounselClick;
         }
         Long share = data.getLong("share");
         if (null != share) {
@@ -549,29 +549,29 @@ public class BytedanceCreativeHourlyReport {
         if (null != vote) {
             this.vote = vote;
         }
-        Long valid_play = data.getLong("valid_play");
-        if (null != valid_play) {
-            this.validPlay = valid_play;
+        Long validPlay = data.getLong("valid_play");
+        if (null != validPlay) {
+            this.validPlay = validPlay;
         }
         Long redirect = data.getLong("redirect");
         if (null != redirect) {
             this.redirect = redirect;
         }
-        Long pay_count = data.getLong("pay_count");
-        if (null != pay_count) {
-            this.payCount = pay_count;
+        Long payCount = data.getLong("pay_count");
+        if (null != payCount) {
+            this.payCount = payCount;
         }
-        Long advanced_creative_form_click = data.getLong("advanced_creative_form_click");
-        if (null != advanced_creative_form_click) {
-            this.advancedCreativeFormClick = advanced_creative_form_click;
+        Long advancedCreativeFormClick = data.getLong("advanced_creative_form_click");
+        if (null != advancedCreativeFormClick) {
+            this.advancedCreativeFormClick = advancedCreativeFormClick;
         }
         BigDecimal cost = data.getBigDecimal("cost");
         if (null != cost) {
             this.cost = cost;
         }
-        Long download_finish = data.getLong("download_finish");
-        if (null != download_finish) {
-            this.downloadFinish = download_finish;
+        Long downloadFinish = data.getLong("download_finish");
+        if (null != downloadFinish) {
+            this.downloadFinish = downloadFinish;
         }
         Long wechat = data.getLong("wechat");
         if (null != wechat) {
@@ -581,41 +581,33 @@ public class BytedanceCreativeHourlyReport {
         if (null != lottery) {
             this.lottery = lottery;
         }
-        Long in_app_order = data.getLong("in_app_order");
-        if (null != in_app_order) {
-            this.inAppOrder = in_app_order;
+        Long inAppOrder = data.getLong("in_app_order");
+        if (null != inAppOrder) {
+            this.inAppOrder = inAppOrder;
         }
-        Long install_finish = data.getLong("install_finish");
-        if (null != install_finish) {
-            this.installFinish = install_finish;
+        Long installFinish = data.getLong("install_finish");
+        if (null != installFinish) {
+            this.installFinish = installFinish;
         }
         Long follow = data.getLong("follow");
         if (null != follow) {
             this.follow = follow;
         }
-//		Long message = data.getLong("message");
-//		if(null!=message){
-//			this.message = message;
-//		}
-        Long in_app_detail_uv = data.getLong("in_app_detail_uv");
-        if (null != in_app_detail_uv) {
-            this.inAppDetailUv = in_app_detail_uv;
+        Long inAppDetailUv = data.getLong("in_app_detail_uv");
+        if (null != inAppDetailUv) {
+            this.inAppDetailUv = inAppDetailUv;
         }
         Long form = data.getLong("form");
         if (null != form) {
             this.form = form;
         }
-//		BigDecimal convert_cost = data.getBigDecimal("convert_cost");
-//		if(null!=convert_cost){
-//			this.convertCost = convert_cost;
-//		}
         Long comment = data.getLong("comment");
         if (null != comment) {
             this.comment = comment;
         }
-        Long in_app_uv = data.getLong("in_app_uv");
-        if (null != in_app_uv) {
-            this.inAppUv = in_app_uv;
+        Long inAppUv = data.getLong("in_app_uv");
+        if (null != inAppUv) {
+            this.inAppUv = inAppUv;
         }
         Long register = data.getLong("register");
         if (null != register) {
@@ -633,9 +625,9 @@ public class BytedanceCreativeHourlyReport {
         if (null != adId) {
             this.adId = adId;
         }
-        Long creative_id = data.getLong("creative_id");
-        if (null != creative_id) {
-            this.creativeId = creative_id;
+        Long creativeId = data.getLong("creative_id");
+        if (null != creativeId) {
+            this.creativeId = creativeId;
         }
         this.id = "" + this.creativeId + this.statDatetime.substring(0, 13).replace(" ", "");
         this.createTime = new Date();

+ 75 - 75
module-report/src/main/java/cn/com/ctop/bytedance/entity/BytedancePlanDailyReport.java

@@ -432,9 +432,9 @@ public class BytedancePlanDailyReport {
         if (null != wifiPlay) {
             this.wifiPlay = wifiPlay;
         }
-        String stat_datetime = data.getString("stat_datetime");
-        if (null != stat_datetime && !"".equals(stat_datetime.trim())) {
-            this.statDatetime = stat_datetime;
+        String statDatetime = data.getString("stat_datetime");
+        if (null != statDatetime && !"".equals(statDatetime.trim())) {
+            this.statDatetime = statDatetime;
         }
         Long shopping = data.getLong("shopping");
         if (null != shopping) {
@@ -448,9 +448,9 @@ public class BytedancePlanDailyReport {
         if (null != like) {
             this.likeNum = like;
         }
-        Long play_50_feed_break = data.getLong("play_50_feed_break");
-        if (null != play_50_feed_break) {
-            this.play50FeedBreak = play_50_feed_break;
+        Long play50FeedBreak = data.getLong("play_50_feed_break");
+        if (null != play50FeedBreak) {
+            this.play50FeedBreak = play50FeedBreak;
         }
         Long active = data.getLong("active");
         if (null != active) {
@@ -460,61 +460,61 @@ public class BytedancePlanDailyReport {
         if (null != click) {
             this.click = click;
         }
-        Long advanced_creative_phone_click = data.getLong("advanced_creative_phone_click");
-        if (null != advanced_creative_phone_click) {
-            this.advancedCreativePhoneClick = advanced_creative_phone_click;
+        Long advancedCreativePhoneClick = data.getLong("advanced_creative_phone_click");
+        if (null != advancedCreativePhoneClick) {
+            this.advancedCreativePhoneClick = advancedCreativePhoneClick;
         }
-        Long download_start = data.getLong("download_start");
-        if (null != download_start) {
-            this.downloadStart = download_start;
+        Long downloadStart = data.getLong("download_start");
+        if (null != downloadStart) {
+            this.downloadStart = downloadStart;
         }
-        Long home_visited = data.getLong("home_visited");
-        if (null != home_visited) {
-            this.homeVisited = home_visited;
+        Long homeVisited = data.getLong("home_visited");
+        if (null != homeVisited) {
+            this.homeVisited = homeVisited;
         }
         Long phone = data.getLong("phone");
         if (null != phone) {
             this.phone = phone;
         }
-        Long in_app_pay = data.getLong("in_app_pay");
-        if (null != in_app_pay) {
-            this.inAppPay = in_app_pay;
+        Long inAppPay = data.getLong("in_app_pay");
+        if (null != inAppPay) {
+            this.inAppPay = inAppPay;
         }
-        BigDecimal next_day_open_cost = data.getBigDecimal("next_day_open_cost");
-        if (null != next_day_open_cost) {
-            this.nextDayOpenCost = next_day_open_cost;
+        BigDecimal nextDayOpenCost = data.getBigDecimal("next_day_open_cost");
+        if (null != nextDayOpenCost) {
+            this.nextDayOpenCost = nextDayOpenCost;
         }
-        Long ies_challenge_click = data.getLong("ies_challenge_click");
-        if (null != ies_challenge_click) {
-            this.iesChallengeClick = ies_challenge_click;
+        Long iesChallengeClick = data.getLong("ies_challenge_click");
+        if (null != iesChallengeClick) {
+            this.iesChallengeClick = iesChallengeClick;
         }
-        Long total_play = data.getLong("total_play");
-        if (null != total_play) {
-            this.totalPlay = total_play;
+        Long totalPlay = data.getLong("total_play");
+        if (null != totalPlay) {
+            this.totalPlay = totalPlay;
         }
         Long show = data.getLong("show");
         if (null != show) {
             this.showNum = show;
         }
-        BigDecimal next_day_open_rate = data.getBigDecimal("next_day_open_rate");
-        if (null != next_day_open_rate) {
-            this.nextDayOpenRate = next_day_open_rate;
+        BigDecimal nextDayOpenRate = data.getBigDecimal("next_day_open_rate");
+        if (null != nextDayOpenRate) {
+            this.nextDayOpenRate = nextDayOpenRate;
         }
-        Long map_search = data.getLong("map_search");
-        if (null != map_search) {
-            this.mapSearch = map_search;
+        Long mapSearch = data.getLong("map_search");
+        if (null != mapSearch) {
+            this.mapSearch = mapSearch;
         }
-        Long click_install = data.getLong("click_install");
-        if (null != click_install) {
-            this.clickInstall = click_install;
+        Long clickInstall = data.getLong("click_install");
+        if (null != clickInstall) {
+            this.clickInstall = clickInstall;
         }
-        BigDecimal interact_per_cost = data.getBigDecimal("interact_per_cost");
-        if (null != interact_per_cost) {
-            this.interactPerCost = interact_per_cost;
+        BigDecimal interactPerCost = data.getBigDecimal("interact_per_cost");
+        if (null != interactPerCost) {
+            this.interactPerCost = interactPerCost;
         }
-        Long advertiser_id = data.getLong("advertiser_id");
-        if (null != advertiser_id) {
-            this.advertiserId = advertiser_id;
+        Long advertiserId = data.getLong("advertiser_id");
+        if (null != advertiserId) {
+            this.advertiserId = advertiserId;
         } else {
             this.advertiserId = setAdvertiserId;
         }
@@ -522,17 +522,17 @@ public class BytedancePlanDailyReport {
         if (null != button) {
             this.button = button;
         }
-        Long play_duration_sum = data.getLong("play_duration_sum");
-        if (null != play_duration_sum) {
-            this.playDurationSum = play_duration_sum;
+        Long playDurationSum = data.getLong("play_duration_sum");
+        if (null != playDurationSum) {
+            this.playDurationSum = playDurationSum;
         }
-        Long play_100_feed_break = data.getLong("play_100_feed_break");
-        if (null != play_100_feed_break) {
-            this.play100FeedBreak = play_100_feed_break;
+        Long play100FeedBreak = data.getLong("play_100_feed_break");
+        if (null != play100FeedBreak) {
+            this.play100FeedBreak = play100FeedBreak;
         }
-        Long advanced_creative_counsel_click = data.getLong("advanced_creative_counsel_click");
-        if (null != advanced_creative_counsel_click) {
-            this.advancedCreativeCounselClick = advanced_creative_counsel_click;
+        Long advancedCreativeCounselClick = data.getLong("advanced_creative_counsel_click");
+        if (null != advancedCreativeCounselClick) {
+            this.advancedCreativeCounselClick = advancedCreativeCounselClick;
         }
         Long share = data.getLong("share");
         if (null != share) {
@@ -546,29 +546,29 @@ public class BytedancePlanDailyReport {
         if (null != vote) {
             this.vote = vote;
         }
-        Long valid_play = data.getLong("valid_play");
-        if (null != valid_play) {
-            this.validPlay = valid_play;
+        Long validPlay = data.getLong("valid_play");
+        if (null != validPlay) {
+            this.validPlay = validPlay;
         }
         Long redirect = data.getLong("redirect");
         if (null != redirect) {
             this.redirect = redirect;
         }
-        Long pay_count = data.getLong("pay_count");
-        if (null != pay_count) {
-            this.payCount = pay_count;
+        Long payCount = data.getLong("pay_count");
+        if (null != payCount) {
+            this.payCount = payCount;
         }
-        Long advanced_creative_form_click = data.getLong("advanced_creative_form_click");
-        if (null != advanced_creative_form_click) {
-            this.advancedCreativeFormClick = advanced_creative_form_click;
+        Long advancedCreativeFormClick = data.getLong("advanced_creative_form_click");
+        if (null != advancedCreativeFormClick) {
+            this.advancedCreativeFormClick = advancedCreativeFormClick;
         }
         BigDecimal cost = data.getBigDecimal("cost");
         if (null != cost) {
             this.cost = cost;
         }
-        Long download_finish = data.getLong("download_finish");
-        if (null != download_finish) {
-            this.downloadFinish = download_finish;
+        Long downloadFinish = data.getLong("download_finish");
+        if (null != downloadFinish) {
+            this.downloadFinish = downloadFinish;
         }
         Long wechat = data.getLong("wechat");
         if (null != wechat) {
@@ -578,13 +578,13 @@ public class BytedancePlanDailyReport {
         if (null != lottery) {
             this.lottery = lottery;
         }
-        Long in_app_order = data.getLong("in_app_order");
-        if (null != in_app_order) {
-            this.inAppOrder = in_app_order;
+        Long inAppOrder = data.getLong("in_app_order");
+        if (null != inAppOrder) {
+            this.inAppOrder = inAppOrder;
         }
-        Long install_finish = data.getLong("install_finish");
-        if (null != install_finish) {
-            this.installFinish = install_finish;
+        Long installFinish = data.getLong("install_finish");
+        if (null != installFinish) {
+            this.installFinish = installFinish;
         }
         Long follow = data.getLong("follow");
         if (null != follow) {
@@ -594,9 +594,9 @@ public class BytedancePlanDailyReport {
 //		if(null!=message){
 //			this.message = message;
 //		}
-        Long in_app_detail_uv = data.getLong("in_app_detail_uv");
-        if (null != in_app_detail_uv) {
-            this.inAppDetailUv = in_app_detail_uv;
+        Long inAppDetailUv = data.getLong("in_app_detail_uv");
+        if (null != inAppDetailUv) {
+            this.inAppDetailUv = inAppDetailUv;
         }
         Long form = data.getLong("form");
         if (null != form) {
@@ -610,9 +610,9 @@ public class BytedancePlanDailyReport {
         if (null != comment) {
             this.comment = comment;
         }
-        Long in_app_uv = data.getLong("in_app_uv");
-        if (null != in_app_uv) {
-            this.inAppUv = in_app_uv;
+        Long inAppUv = data.getLong("in_app_uv");
+        if (null != inAppUv) {
+            this.inAppUv = inAppUv;
         }
         Long register = data.getLong("register");
         if (null != register) {

+ 96 - 96
module-report/src/main/java/cn/com/ctop/bytedance/entity/BytedancePlanHourlyReport.java

@@ -396,45 +396,45 @@ public class BytedancePlanHourlyReport {
         if (null != playFeedBreak75) {
             this.play75FeedBreak = playFeedBreak75;
         }
-        Long next_day_open = data.getLong("next_day_open");
-        if (null != next_day_open) {
-            this.nextDayOpen = next_day_open;
+        Long nextDayOpen = data.getLong("next_day_open");
+        if (null != nextDayOpen) {
+            this.nextDayOpen = nextDayOpen;
         }
         Long convert = data.getLong("convert");
         if (null != convert) {
             this.convertNum = convert;
         }
-        Long in_app_cart = data.getLong("in_app_cart");
-        if (null != in_app_cart) {
-            this.inAppCart = in_app_cart;
+        Long inAppCart = data.getLong("in_app_cart");
+        if (null != inAppCart) {
+            this.inAppCart = inAppCart;
         }
-        Long play_25_feed_break = data.getLong("play_25_feed_break");
-        if (null != play_25_feed_break) {
-            this.play25FeedBreak = play_25_feed_break;
+        Long play25FeedBreak = data.getLong("play_25_feed_break");
+        if (null != play25FeedBreak) {
+            this.play25FeedBreak = play25FeedBreak;
         }
-        Long consult_effective = data.getLong("consult_effective");
-        if (null != consult_effective) {
-            this.consultEffective = consult_effective;
+        Long consultEffective = data.getLong("consult_effective");
+        if (null != consultEffective) {
+            this.consultEffective = consultEffective;
         }
         Long view = data.getLong("view");
         if (null != view) {
             this.view = view;
         }
-        Long phone_confirm = data.getLong("phone_confirm");
-        if (null != phone_confirm) {
-            this.phoneConfirm = phone_confirm;
+        Long phoneConfirm = data.getLong("phone_confirm");
+        if (null != phoneConfirm) {
+            this.phoneConfirm = phoneConfirm;
         }
-        Long ies_music_click = data.getLong("ies_music_click");
-        if (null != ies_music_click) {
-            this.iesMusicClick = ies_music_click;
+        Long iesMusicClick = data.getLong("ies_music_click");
+        if (null != iesMusicClick) {
+            this.iesMusicClick = iesMusicClick;
         }
-        Long wifi_play = data.getLong("wifi_play");
-        if (null != wifi_play) {
-            this.wifiPlay = wifi_play;
+        Long wifiPlay = data.getLong("wifi_play");
+        if (null != wifiPlay) {
+            this.wifiPlay = wifiPlay;
         }
-        String stat_datetime = data.getString("stat_datetime");
-        if (null != stat_datetime && !"".equals(stat_datetime.trim())) {
-            this.statDatetime = stat_datetime;
+        String statDatetime = data.getString("stat_datetime");
+        if (null != statDatetime && !"".equals(statDatetime.trim())) {
+            this.statDatetime = statDatetime;
         }
         Long shopping = data.getLong("shopping");
         if (null != shopping) {
@@ -448,9 +448,9 @@ public class BytedancePlanHourlyReport {
         if (null != like) {
             this.likeNum = like;
         }
-        Long play_50_feed_break = data.getLong("play_50_feed_break");
-        if (null != play_50_feed_break) {
-            this.play50FeedBreak = play_50_feed_break;
+        Long play50FeedBreak = data.getLong("play_50_feed_break");
+        if (null != play50FeedBreak) {
+            this.play50FeedBreak = play50FeedBreak;
         }
         Long active = data.getLong("active");
         if (null != active) {
@@ -460,61 +460,61 @@ public class BytedancePlanHourlyReport {
         if (null != click) {
             this.click = click;
         }
-        Long advanced_creative_phone_click = data.getLong("advanced_creative_phone_click");
-        if (null != advanced_creative_phone_click) {
-            this.advancedCreativePhoneClick = advanced_creative_phone_click;
+        Long advancedCreativePhoneClick = data.getLong("advanced_creative_phone_click");
+        if (null != advancedCreativePhoneClick) {
+            this.advancedCreativePhoneClick = advancedCreativePhoneClick;
         }
-        Long download_start = data.getLong("download_start");
-        if (null != download_start) {
-            this.downloadStart = download_start;
+        Long downloadStart = data.getLong("download_start");
+        if (null != downloadStart) {
+            this.downloadStart = downloadStart;
         }
-        Long home_visited = data.getLong("home_visited");
-        if (null != home_visited) {
-            this.homeVisited = home_visited;
+        Long homeVisited = data.getLong("home_visited");
+        if (null != homeVisited) {
+            this.homeVisited = homeVisited;
         }
         Long phone = data.getLong("phone");
         if (null != phone) {
             this.phone = phone;
         }
-        Long in_app_pay = data.getLong("in_app_pay");
-        if (null != in_app_pay) {
-            this.inAppPay = in_app_pay;
+        Long inAppPay = data.getLong("in_app_pay");
+        if (null != inAppPay) {
+            this.inAppPay = inAppPay;
         }
-        BigDecimal next_day_open_cost = data.getBigDecimal("next_day_open_cost");
-        if (null != next_day_open_cost) {
-            this.nextDayOpenCost = next_day_open_cost;
+        BigDecimal nextDayOpenCost = data.getBigDecimal("next_day_open_cost");
+        if (null != nextDayOpenCost) {
+            this.nextDayOpenCost = nextDayOpenCost;
         }
-        Long ies_challenge_click = data.getLong("ies_challenge_click");
-        if (null != ies_challenge_click) {
-            this.iesChallengeClick = ies_challenge_click;
+        Long iesChallengeClick = data.getLong("ies_challenge_click");
+        if (null != iesChallengeClick) {
+            this.iesChallengeClick = iesChallengeClick;
         }
-        Long total_play = data.getLong("total_play");
-        if (null != total_play) {
-            this.totalPlay = total_play;
+        Long totalPlay = data.getLong("total_play");
+        if (null != totalPlay) {
+            this.totalPlay = totalPlay;
         }
         Long show = data.getLong("show");
         if (null != show) {
             this.showNum = show;
         }
-        BigDecimal next_day_open_rate = data.getBigDecimal("next_day_open_rate");
-        if (null != next_day_open_rate) {
-            this.nextDayOpenRate = next_day_open_rate;
+        BigDecimal nextDayOpenRate = data.getBigDecimal("next_day_open_rate");
+        if (null != nextDayOpenRate) {
+            this.nextDayOpenRate = nextDayOpenRate;
         }
-        Long map_search = data.getLong("map_search");
-        if (null != map_search) {
-            this.mapSearch = map_search;
+        Long mapSearch = data.getLong("map_search");
+        if (null != mapSearch) {
+            this.mapSearch = mapSearch;
         }
-        Long click_install = data.getLong("click_install");
-        if (null != click_install) {
-            this.clickInstall = click_install;
+        Long clickInstall = data.getLong("click_install");
+        if (null != clickInstall) {
+            this.clickInstall = clickInstall;
         }
-        BigDecimal interact_per_cost = data.getBigDecimal("interact_per_cost");
-        if (null != interact_per_cost) {
-            this.interactPerCost = interact_per_cost;
+        BigDecimal interactPerCost = data.getBigDecimal("interact_per_cost");
+        if (null != interactPerCost) {
+            this.interactPerCost = interactPerCost;
         }
-        Long advertiser_id = data.getLong("advertiser_id");
-        if (null != advertiser_id) {
-            this.advertiserId = advertiser_id;
+        Long advertiserId = data.getLong("advertiser_id");
+        if (null != advertiserId) {
+            this.advertiserId = advertiserId;
         } else {
             this.advertiserId = setAdvertiserId;
         }
@@ -522,17 +522,17 @@ public class BytedancePlanHourlyReport {
         if (null != button) {
             this.button = button;
         }
-        Long play_duration_sum = data.getLong("play_duration_sum");
-        if (null != play_duration_sum) {
-            this.playDurationSum = play_duration_sum;
+        Long playDurationSum = data.getLong("play_duration_sum");
+        if (null != playDurationSum) {
+            this.playDurationSum = playDurationSum;
         }
-        Long play_100_feed_break = data.getLong("play_100_feed_break");
-        if (null != play_100_feed_break) {
-            this.play100FeedBreak = play_100_feed_break;
+        Long play100FeedBreak = data.getLong("play_100_feed_break");
+        if (null != play100FeedBreak) {
+            this.play100FeedBreak = play100FeedBreak;
         }
-        Long advanced_creative_counsel_click = data.getLong("advanced_creative_counsel_click");
-        if (null != advanced_creative_counsel_click) {
-            this.advancedCreativeCounselClick = advanced_creative_counsel_click;
+        Long advancedCreativeCounselClick = data.getLong("advanced_creative_counsel_click");
+        if (null != advancedCreativeCounselClick) {
+            this.advancedCreativeCounselClick = advancedCreativeCounselClick;
         }
         Long share = data.getLong("share");
         if (null != share) {
@@ -546,29 +546,29 @@ public class BytedancePlanHourlyReport {
         if (null != vote) {
             this.vote = vote;
         }
-        Long valid_play = data.getLong("valid_play");
-        if (null != valid_play) {
-            this.validPlay = valid_play;
+        Long validPlay = data.getLong("valid_play");
+        if (null != validPlay) {
+            this.validPlay = validPlay;
         }
         Long redirect = data.getLong("redirect");
         if (null != redirect) {
             this.redirect = redirect;
         }
-        Long pay_count = data.getLong("pay_count");
-        if (null != pay_count) {
-            this.payCount = pay_count;
+        Long payCount = data.getLong("pay_count");
+        if (null != payCount) {
+            this.payCount = payCount;
         }
-        Long advanced_creative_form_click = data.getLong("advanced_creative_form_click");
-        if (null != advanced_creative_form_click) {
-            this.advancedCreativeFormClick = advanced_creative_form_click;
+        Long advancedCreativeFormClick = data.getLong("advanced_creative_form_click");
+        if (null != advancedCreativeFormClick) {
+            this.advancedCreativeFormClick = advancedCreativeFormClick;
         }
         BigDecimal cost = data.getBigDecimal("cost");
         if (null != cost) {
             this.cost = cost;
         }
-        Long download_finish = data.getLong("download_finish");
-        if (null != download_finish) {
-            this.downloadFinish = download_finish;
+        Long downloadFinish = data.getLong("download_finish");
+        if (null != downloadFinish) {
+            this.downloadFinish = downloadFinish;
         }
         Long wechat = data.getLong("wechat");
         if (null != wechat) {
@@ -578,13 +578,13 @@ public class BytedancePlanHourlyReport {
         if (null != lottery) {
             this.lottery = lottery;
         }
-        Long in_app_order = data.getLong("in_app_order");
-        if (null != in_app_order) {
-            this.inAppOrder = in_app_order;
+        Long inAppOrder = data.getLong("in_app_order");
+        if (null != inAppOrder) {
+            this.inAppOrder = inAppOrder;
         }
-        Long install_finish = data.getLong("install_finish");
-        if (null != install_finish) {
-            this.installFinish = install_finish;
+        Long installFinish = data.getLong("install_finish");
+        if (null != installFinish) {
+            this.installFinish = installFinish;
         }
         Long follow = data.getLong("follow");
         if (null != follow) {
@@ -594,9 +594,9 @@ public class BytedancePlanHourlyReport {
 //		if(null!=message){
 //			this.message = message;
 //		}
-        Long in_app_detail_uv = data.getLong("in_app_detail_uv");
-        if (null != in_app_detail_uv) {
-            this.inAppDetailUv = in_app_detail_uv;
+        Long inAppDetailUv = data.getLong("in_app_detail_uv");
+        if (null != inAppDetailUv) {
+            this.inAppDetailUv = inAppDetailUv;
         }
         Long form = data.getLong("form");
         if (null != form) {
@@ -610,9 +610,9 @@ public class BytedancePlanHourlyReport {
         if (null != comment) {
             this.comment = comment;
         }
-        Long in_app_uv = data.getLong("in_app_uv");
-        if (null != in_app_uv) {
-            this.inAppUv = in_app_uv;
+        Long inAppUv = data.getLong("in_app_uv");
+        if (null != inAppUv) {
+            this.inAppUv = inAppUv;
         }
         Long register = data.getLong("register");
         if (null != register) {

+ 4 - 0
module-report/src/main/java/cn/com/ctop/bytedance/mapper/AccountReportMapper.java

@@ -8,6 +8,10 @@ import org.apache.ibatis.annotations.Param;
 import java.math.BigDecimal;
 import java.util.List;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:55:14
+ */
 public interface AccountReportMapper {
 
 

+ 16 - 15
module-report/src/main/java/cn/com/ctop/bytedance/service/impl/ReportServiceImpl.java

@@ -144,8 +144,8 @@ public class ReportServiceImpl implements IReportService {
     }
 
     @Override
-    public void getAdvertiserCampaignReport(CtopOauthToken token, Date startDate, Date endDate, String bytedanceReportTypePL) {
-        var conditions = getReportDTO(token, startDate, endDate, bytedanceReportTypePL);
+    public void getAdvertiserCampaignReport(CtopOauthToken token, Date startDate, Date endDate, String bytedanceReportTypePl) {
+        var conditions = getReportDTO(token, startDate, endDate, bytedanceReportTypePl);
         getCampaignReportByPage(token, conditions, 1);
     }
 
@@ -216,8 +216,8 @@ public class ReportServiceImpl implements IReportService {
     }
 
     @Override
-    public void getAdvertiserPlanReport(CtopOauthToken token, Date startDate, Date endDate, String bytedanceReportTypePL) {
-        var conditions = getReportDTO(token, startDate, endDate, bytedanceReportTypePL);
+    public void getAdvertiserPlanReport(CtopOauthToken token, Date startDate, Date endDate, String bytedanceReportTypePl) {
+        var conditions = getReportDTO(token, startDate, endDate, bytedanceReportTypePl);
         getPlanReportByPage(token, conditions, 1);
     }
 
@@ -289,18 +289,18 @@ public class ReportServiceImpl implements IReportService {
     }
 
     @Override
-    public void getAdvertiserCreativeReport(CtopOauthToken token, Date startDate, Date endDate, String bytedanceReportTypePL) {
-        var conditions = getReportDTO(token, startDate, endDate, bytedanceReportTypePL);
+    public void getAdvertiserCreativeReport(CtopOauthToken token, Date startDate, Date endDate, String bytedanceReportTypePl) {
+        var conditions = getReportDTO(token, startDate, endDate, bytedanceReportTypePl);
         getCreativeReportByPage(token, conditions, 1);
     }
 
-    private ByteDanceAdvertiserReportDTO getReportDTO(CtopOauthToken token, Date startDate, Date endDate, String bytedanceReportTypePL) {
+    private ByteDanceAdvertiserReportDTO getReportDTO(CtopOauthToken token, Date startDate, Date endDate, String bytedanceReportTypePl) {
         var conditions = new ByteDanceAdvertiserReportDTO();
         conditions.setAdvertiserId(token.getAccountId());
         conditions.setStartDate(DateUtils.formatDate(startDate));
         conditions.setEndDate(DateUtils.formatDate(endDate));
         conditions.setPageSize(1000);
-        conditions.setTimeGranularity(bytedanceReportTypePL);
+        conditions.setTimeGranularity(bytedanceReportTypePl);
         return conditions;
     }
 
@@ -794,24 +794,25 @@ public class ReportServiceImpl implements IReportService {
         //这里服务器上要将此图保存的路径
         String savePath = this.csvUploadPath + fileName;
         try {
-            URL url = new URL("https:" + fileUrl);/*将网络资源地址传给,即赋值给url*/
-            /*此为联系获得网络资源的固定格式用法,以便后面的in变量获得url截取网络资源的输入流*/
+            //将网络资源地址传给,即赋值给url
+            URL url = new URL("https:" + fileUrl);
+            //此为联系获得网络资源的固定格式用法,以便后面的in变量获得url截取网络资源的输入流
             HttpURLConnection connection = (HttpURLConnection) url.openConnection();
             DataInputStream in = new DataInputStream(connection.getInputStream());
-            /*此处也可用BufferedInputStream与BufferedOutputStream*/
+            //此处也可用BufferedInputStream与BufferedOutputStream
             DataOutputStream out = new DataOutputStream(new FileOutputStream(savePath));
-            /*将参数savePath,即将截取的图片的存储在本地地址赋值给out输出流所指定的地址*/
+            //将参数savePath,即将截取的图片的存储在本地地址赋值给out输出流所指定的地址
             byte[] buffer = new byte[4096];
             int count = 0;
-            /*将输入流以字节的形式读取并写入buffer中*/
+            //将输入流以字节的形式读取并写入buffer中
             while ((count = in.read(buffer)) > 0) {
                 out.write(buffer, 0, count);
             }
-            out.close();/*后面三行为关闭输入输出流以及网络资源的固定格式*/
+            out.close();
             in.close();
             connection.disconnect();
             //返回内容是保存后的完整的URL
-            return savePath;/*网络资源截取并存储本地成功返回true*/
+            return savePath;
 
         } catch (Exception e) {
             return null;

+ 0 - 248
module-toutiao/src/main/java/cn/com/ctop/toutiao/entity/ByteDanceAdvertisePlan.java

@@ -268,51 +268,17 @@ public class ByteDanceAdvertisePlan {
             this.auditRejectReason = auditRejectReason;
         }
 
-//        String dpa_open_url_field = dataObject.getString("dpa_open_url_field");
-//        if (null!=dpa_open_url_field&&!"".equals(dpa_open_url_field.trim())){
-//            this.dpa =dpa_open_url_field;
-//        }
-
-//        String external_url_params = dataObject.getString("external_url_params");
-//        if (null!=external_url_params&&!"".equals(external_url_params.trim())){
-//            this.externalUrlParams =external_url_params;
-//        }
-
         String pricing = dataObject.getString("pricing");
         if (null != pricing && !"".equals(pricing.trim())) {
             this.pricing = pricing;
         }
 
-//        String dpa_open_url_type = dataObject.getString("dpa_open_url_type");
-//        if (null!=dpa_open_url_type&&!"".equals(dpa_open_url_type.trim())){
-//            this.dpaOpenUrlType =dpa_open_url_type;
-//        }
-
-//        String dpa_categories = dataObject.getString("dpa_categories");
-//        if (null!=dpa_categories&&!"".equals(dpa_categories.trim())){
-//            this.dpaCategories =dpa_categories;
-//        }
 
         Integer hideIfExists = dataObject.getInteger("hide_if_exists");
         if (null != hideIfExists) {
             this.hideIfExists = hideIfExists;
         }
 
-//        String open_url_params = dataObject.getString("open_url_params");
-//        if (null!=open_url_params&&!"".equals(open_url_params.trim())){
-//            this.openUrlParams =open_url_params;
-//        }
-
-//        String dpa_open_urls = dataObject.getString("dpa_open_urls");
-//        if (null!=dpa_open_urls&&!"".equals(dpa_open_urls.trim())){
-//            this.dpaOpenUrls =dpa_open_urls;
-//        }
-
-//        String deep_cpabid = dataObject.getString("deep_cpabid");
-//        if (null!=deep_cpabid&&!"".equals(deep_cpabid.trim())){
-//            this.deepCpaaid =deep_cpabid;
-//        }
-
         String appType = dataObject.getString("app_type");
         if (null != appType && !"".equals(appType.trim())) {
             this.appType = appType;
@@ -323,46 +289,12 @@ public class ByteDanceAdvertisePlan {
             this.flowControlMode = flowControlMode;
         }
 
-//        String union_video_type = dataObject.getString("union_video_type");
-//        if (null!=union_video_type&&!"".equals(union_video_type.trim())){
-//            this.unionVideoType =union_video_type;
-//        }
-
-//        String download_url = dataObject.getString("download_url");
-//        if (null!=download_url&&!"".equals(download_url.trim())){
-//            this.downloadUrl =download_url;
-//        }
 
         BigDecimal cpaBid = dataObject.getBigDecimal("cpa_bid");
         if (null != cpaBid) {
             this.cpaBid = cpaBid;
         }
 
-//        String dpa_products = dataObject.getString("dpa_products");
-//        if (null!=dpa_products&&!"".equals(dpa_products.trim())){
-//            this.dpaProducts =dpa_products;
-//        }
-
-//        String category_type = dataObject.getString("category_type");
-//        if (null!=category_type&&!"".equals(category_type.trim())){
-//            this.categoryType =category_type;
-//        }
-
-//        String dpa_external_url_field = dataObject.getString("dpa_external_url_field");
-//        if (null!=dpa_external_url_field&&!"".equals(dpa_external_url_field.trim())){
-//            this.dpaExternalUrlField =dpa_external_url_field;
-//        }
-
-//        String smart_bid_type = dataObject.getString("smart_bid_type");
-//        if (null!=smart_bid_type&&!"".equals(smart_bid_type.trim())){
-//            this.smartBidType =smart_bid_type;
-//        }
-
-//        String dpa_external_urls = dataObject.getString("dpa_external_urls");
-//        if (null!=dpa_external_urls&&!"".equals(dpa_external_urls.trim())){
-//            this.dpaExternalUrls =dpa_external_urls;
-//        }
-
         String startTime = dataObject.getString("start_time");
         if (null != startTime && !"".equals(startTime.trim())) {
             this.startTime = startTime;
@@ -383,51 +315,16 @@ public class ByteDanceAdvertisePlan {
             this.toutiaoStatus = status;
         }
 
-//        String dpa_product_target = dataObject.getString("dpa_product_target");
-//        if (null!=dpa_product_target&&!"".equals(dpa_product_target.trim())){
-//            this.dpaProductTarget =dpa_product_target;
-//        }
-
-//        Long ad_id = dataObject.getLong("ad_id");
-//        if (null!=ad_id){
-//            this.openUrl =open_url;
-//        }
-
         Long convertId = dataObject.getLong("convert_id");
         if (null != convertId) {
             this.convertId = convertId;
         }
 
-//        String adjust_cpa = dataObject.getString("adjust_cpa");
-//        if (null!=adjust_cpa&&!"".equals(adjust_cpa.trim())){
-//            this.adjustCpa =adjust_cpa;
-//        }
-
         BigDecimal bid = dataObject.getBigDecimal("bid");
         if (null != bid) {
             this.bid = bid;
         }
 
-//        Long advertiser_id = dataObject.getLong("advertiser_id");
-//        if (null!=advertiser_id){
-//            this.asdasd =open_url;
-//        }
-
-//        String deep_bid_type = dataObject.getString("deep_bid_type");
-//        if (null!=deep_bid_type&&!"".equals(deep_bid_type.trim())){
-//            this.deepBidType =deep_bid_type;
-//        }
-//
-//        String dpa_adtype = dataObject.getString("dpa_adtype");
-//        if (null!=dpa_adtype&&!"".equals(dpa_adtype.trim())){
-//            this.dpaAdtype =dpa_adtype;
-//        }
-
-//        String external_actions = dataObject.getString("external_actions");
-//        if (null!=external_actions&&!"".equals(external_actions.trim())){
-//            this.externalActions =external_actions;
-//        }
-
         String hideIfConverted = dataObject.getString("hide_if_converted");
         if (null != hideIfConverted && !"".equals(hideIfConverted.trim())) {
             this.hideIfConverted = hideIfConverted;
@@ -443,11 +340,6 @@ public class ByteDanceAdvertisePlan {
             this.deliveryRange = deliveryRange;
         }
 
-//        String params_type = dataObject.getString("params_type");
-//        if (null!=params_type&&!"".equals(params_type.trim())){
-//            this.paramsType =params_type;
-//        }
-
         BigDecimal budget = dataObject.getBigDecimal("budget");
         if (null != budget) {
             this.budget = budget;
@@ -462,21 +354,6 @@ public class ByteDanceAdvertisePlan {
         if (null != scheduleTime && !"".equals(scheduleTime.trim())) {
             this.scheduleTime = scheduleTime;
         }
-//
-//        String modify_time = dataObject.getString("modify_time");
-//        if (null!=modify_time&&!"".equals(modify_time.trim())){
-//            this.modifyTime =modify_time;
-//        }
-//
-//        String advertiser_store_ids = dataObject.getString("advertiser_store_ids");
-//        if (null!=advertiser_store_ids&&!"".equals(advertiser_store_ids.trim())){
-//            this.advertiserStoreIds =advertiser_store_ids;
-//        }
-
-//        String product_platform_id = dataObject.getString("product_platform_id");
-//        if (null!=product_platform_id&&!"".equals(product_platform_id.trim())){
-//            this.productPlatformId =product_platform_id;
-//        }
 
         String downloadType = dataObject.getString("download_type");
         if (null != downloadType && !"".equals(downloadType.trim())) {
@@ -531,51 +408,16 @@ public class ByteDanceAdvertisePlan {
             this.auditRejectReason = auditRejectReason;
         }
 
-//        String dpa_open_url_field = dataObject.getString("dpa_open_url_field");
-//        if (null!=dpa_open_url_field&&!"".equals(dpa_open_url_field.trim())){
-//            this.dpa =dpa_open_url_field;
-//        }
-
-//        String external_url_params = dataObject.getString("external_url_params");
-//        if (null!=external_url_params&&!"".equals(external_url_params.trim())){
-//            this.externalUrlParams =external_url_params;
-//        }
-
         String pricing = params.getString("pricing");
         if (null != pricing && !"".equals(pricing.trim())) {
             this.pricing = pricing;
         }
 
-//        String dpa_open_url_type = dataObject.getString("dpa_open_url_type");
-//        if (null!=dpa_open_url_type&&!"".equals(dpa_open_url_type.trim())){
-//            this.dpaOpenUrlType =dpa_open_url_type;
-//        }
-
-//        String dpa_categories = dataObject.getString("dpa_categories");
-//        if (null!=dpa_categories&&!"".equals(dpa_categories.trim())){
-//            this.dpaCategories =dpa_categories;
-//        }
-
         Integer hideIfExists = params.getInteger("hide_if_exists");
         if (null != hideIfExists) {
             this.hideIfExists = hideIfExists;
         }
 
-//        String open_url_params = dataObject.getString("open_url_params");
-//        if (null!=open_url_params&&!"".equals(open_url_params.trim())){
-//            this.openUrlParams =open_url_params;
-//        }
-
-//        String dpa_open_urls = dataObject.getString("dpa_open_urls");
-//        if (null!=dpa_open_urls&&!"".equals(dpa_open_urls.trim())){
-//            this.dpaOpenUrls =dpa_open_urls;
-//        }
-
-//        String deep_cpabid = dataObject.getString("deep_cpabid");
-//        if (null!=deep_cpabid&&!"".equals(deep_cpabid.trim())){
-//            this.deepCpaaid =deep_cpabid;
-//        }
-
         String appType = params.getString("app_type");
         if (null != appType && !"".equals(appType.trim())) {
             this.appType = appType;
@@ -586,46 +428,11 @@ public class ByteDanceAdvertisePlan {
             this.flowControlMode = flowControlMode;
         }
 
-//        String union_video_type = dataObject.getString("union_video_type");
-//        if (null!=union_video_type&&!"".equals(union_video_type.trim())){
-//            this.unionVideoType =union_video_type;
-//        }
-
-//        String download_url = dataObject.getString("download_url");
-//        if (null!=download_url&&!"".equals(download_url.trim())){
-//            this.downloadUrl =download_url;
-//        }
-
         BigDecimal cpaBid = params.getBigDecimal("cpa_bid");
         if (null != cpaBid) {
             this.cpaBid = cpaBid;
         }
 
-//        String dpa_products = dataObject.getString("dpa_products");
-//        if (null!=dpa_products&&!"".equals(dpa_products.trim())){
-//            this.dpaProducts =dpa_products;
-//        }
-
-//        String category_type = dataObject.getString("category_type");
-//        if (null!=category_type&&!"".equals(category_type.trim())){
-//            this.categoryType =category_type;
-//        }
-
-//        String dpa_external_url_field = dataObject.getString("dpa_external_url_field");
-//        if (null!=dpa_external_url_field&&!"".equals(dpa_external_url_field.trim())){
-//            this.dpaExternalUrlField =dpa_external_url_field;
-//        }
-
-//        String smart_bid_type = dataObject.getString("smart_bid_type");
-//        if (null!=smart_bid_type&&!"".equals(smart_bid_type.trim())){
-//            this.smartBidType =smart_bid_type;
-//        }
-
-//        String dpa_external_urls = dataObject.getString("dpa_external_urls");
-//        if (null!=dpa_external_urls&&!"".equals(dpa_external_urls.trim())){
-//            this.dpaExternalUrls =dpa_external_urls;
-//        }
-
         String startTime = params.getString("start_time");
         if (null != startTime && !"".equals(startTime.trim())) {
             this.startTime = startTime;
@@ -646,51 +453,16 @@ public class ByteDanceAdvertisePlan {
             this.toutiaoStatus = status;
         }
 
-//        String dpa_product_target = dataObject.getString("dpa_product_target");
-//        if (null!=dpa_product_target&&!"".equals(dpa_product_target.trim())){
-//            this.dpaProductTarget =dpa_product_target;
-//        }
-
-//        Long ad_id = dataObject.getLong("ad_id");
-//        if (null!=ad_id){
-//            this.openUrl =open_url;
-//        }
-
         Long convertId = params.getLong("convert_id");
         if (null != convertId) {
             this.convertId = convertId;
         }
 
-//        String adjust_cpa = dataObject.getString("adjust_cpa");
-//        if (null!=adjust_cpa&&!"".equals(adjust_cpa.trim())){
-//            this.adjustCpa =adjust_cpa;
-//        }
-
         BigDecimal bid = params.getBigDecimal("bid");
         if (null != bid) {
             this.bid = bid;
         }
 
-//        Long advertiser_id = dataObject.getLong("advertiser_id");
-//        if (null!=advertiser_id){
-//            this.asdasd =open_url;
-//        }
-
-//        String deep_bid_type = dataObject.getString("deep_bid_type");
-//        if (null!=deep_bid_type&&!"".equals(deep_bid_type.trim())){
-//            this.deepBidType =deep_bid_type;
-//        }
-//
-//        String dpa_adtype = dataObject.getString("dpa_adtype");
-//        if (null!=dpa_adtype&&!"".equals(dpa_adtype.trim())){
-//            this.dpaAdtype =dpa_adtype;
-//        }
-
-//        String external_actions = dataObject.getString("external_actions");
-//        if (null!=external_actions&&!"".equals(external_actions.trim())){
-//            this.externalActions =external_actions;
-//        }
-
         String hideIfConverted = params.getString("hide_if_converted");
         if (null != hideIfConverted && !"".equals(hideIfConverted.trim())) {
             this.hideIfConverted = hideIfConverted;
@@ -706,11 +478,6 @@ public class ByteDanceAdvertisePlan {
             this.deliveryRange = deliveryRange;
         }
 
-//        String params_type = dataObject.getString("params_type");
-//        if (null!=params_type&&!"".equals(params_type.trim())){
-//            this.paramsType =params_type;
-//        }
-
         BigDecimal budget = params.getBigDecimal("budget");
         if (null != budget) {
             this.budget = budget;
@@ -725,21 +492,6 @@ public class ByteDanceAdvertisePlan {
         if (null != scheduleTime && !"".equals(scheduleTime.trim())) {
             this.scheduleTime = scheduleTime;
         }
-//
-//        String modify_time = dataObject.getString("modify_time");
-//        if (null!=modify_time&&!"".equals(modify_time.trim())){
-//            this.modifyTime =modify_time;
-//        }
-//
-//        String advertiser_store_ids = dataObject.getString("advertiser_store_ids");
-//        if (null!=advertiser_store_ids&&!"".equals(advertiser_store_ids.trim())){
-//            this.advertiserStoreIds =advertiser_store_ids;
-//        }
-
-//        String product_platform_id = dataObject.getString("product_platform_id");
-//        if (null!=product_platform_id&&!"".equals(product_platform_id.trim())){
-//            this.productPlatformId =product_platform_id;
-//        }
 
         String downloadType = params.getString("download_type");
         if (null != downloadType && !"".equals(downloadType.trim())) {

+ 2 - 3
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceAdvertiserDataServiceImpl.java

@@ -779,7 +779,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
      */
     @Override
     public Map<String, Object> flowPackageGet(String accountId) {
-        JSONObject jsonObject = flowPackageGetJSONObject(accountId);
+        JSONObject jsonObject = flowPackageGetJsonObject(accountId);
         JSONObject result = new JSONObject();
         Integer code = jsonObject.getInteger("code");
         String message = jsonObject.getString("message");
@@ -892,8 +892,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
     }
 
 
-
-    public JSONObject flowPackageGetJSONObject(String accountId) {
+    public JSONObject flowPackageGetJsonObject(String accountId) {
         CtopOauthToken token = tokenService.getOauthTokenByAccountId(accountId);
         // 请求地址
         String url = "https://ad.toutiao.com/open_api/2/tools/union/flow_package/get/";

+ 0 - 2
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/BytedanceAdvertisePlanTemplateServiceImpl.java

@@ -115,9 +115,7 @@ public class BytedanceAdvertisePlanTemplateServiceImpl extends ServiceImpl<Byted
         //广告投放结束时间
         data.put("end_time", budgetTemplate.getEndDate());
         /**
-         * 广告投放指定时间段
          * 广告投放时段,默认全时段投放,格式是48*7位字符串,且都是0或1。也就是以半个小时为最小粒度,周一至周日每天分为48个区段,0为不投放,1为投放,不传、全传0、全传1均代表全时段投放。
-         * data.put("schedule_time", "2019-07-31 01:00");
          */
         //付费方式
         data.put("pricing", budgetTemplate.getPriceType());

+ 0 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/BytedanceUrlInfoServiceImpl.java

@@ -52,7 +52,6 @@ public class BytedanceUrlInfoServiceImpl extends ServiceImpl<BytedanceUrlInfoMap
         Date now = new Date();
         template.setCreateTime(now);
         template.setUpdateTime(now);
-//        template.setStatus(1);
         this.saveOrUpdate(template);
         ResultMapUtils.setResultMap(resultMap, StatusCode.COMMON_SUCCESS.getCode());
         return resultMap;

+ 0 - 3
module-toutiao/src/main/java/cn/com/ctop/toutiao/test/Test.java

@@ -216,9 +216,6 @@ public class Test {
                 param5.put("campaign_id", campaignId);
                 String createResult = HttpUtils.httpPostRequest("https://ad.oceanengine.com/overture/ad/create/", param5, header);
             }
-//            webDriver.close();
-
-
         } catch (Exception e) {
             e.printStackTrace();
         }

+ 4 - 0
mondule-jbpm/src/main/java/cn/com/ctop/jbpm/service/ActivitiTable.java

@@ -3,6 +3,10 @@ package cn.com.ctop.jbpm.service;
 import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.ProcessEngineConfiguration;
 
+/**
+ * @author jeecg-boot
+ * 2019年12月5日19:55:14
+ */
 public class ActivitiTable {
     public static void main(String[] args) {
         // 引擎配置