Kaynağa Gözat

音乐库接口修改

syh 4 yıl önce
ebeveyn
işleme
60666d18a8
76 değiştirilmiş dosya ile 471 ekleme ve 417 silme
  1. 8 8
      jeecg-boot-base-common/src/main/java/org/jeecg/common/util/PasswordUtil.java
  2. 4 4
      jeecg-boot-base-common/src/main/java/org/jeecg/common/util/oConvertUtils.java
  3. 3 1
      jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/service/Impl/ActNodeServiceImpl.java
  4. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java
  5. 42 24
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/append/xd_schedule/service/impl/XdScheduleServiceImpl.java
  6. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ActFormPorcessController.java
  7. 5 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AdvertiserController.java
  8. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BindAccountLoginController.java
  9. 13 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceMusicTypeController.java
  10. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialInfoController.java
  11. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectTransferRecordController.java
  12. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/UserAllocationController.java
  13. 12 12
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ImageReportDailyServiceImpl.java
  14. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/MediaReportServiceImpl.java
  15. 6 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ProjectMemberServiceImpl.java
  16. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ReleaseViewRecordServiceImpl.java
  17. 6 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/performance/entity/PerformanceQuarter.java
  18. 6 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/performance/service/impl/CalculatePerformanceServiceImpl.java
  19. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/performance/service/impl/PerformanceInfoInfoServiceImpl.java
  20. 11 10
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/performance/service/impl/PerformanceQuarterServiceImpl.java
  21. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/DictAspect.java
  22. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java
  23. 6 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/rule/OrgCodeRule.java
  24. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/controller/WpsFileController.java
  25. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/service/impl/WpsFileVersionServiceImpl.java
  26. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/service/impl/WpsFileWatermarkServiceImpl.java
  27. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/service/impl/WpsUserAclServiceImpl.java
  28. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/util/SignatureUtil.java
  29. 6 2
      module-common/src/main/java/cn/com/ctop/common/module/entity/SysCompany.java
  30. 1 1
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/BindAccountLoginServiceImpl.java
  31. 1 1
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/CtopOauthTokenServiceImpl.java
  32. 1 1
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/FileInfoServiceImpl.java
  33. 4 4
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java
  34. 1 1
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/RefreshTokenServiceImpl.java
  35. 4 4
      module-common/src/main/java/cn/com/ctop/common/module/utils/CloudVideoProcessUtil.java
  36. 1 1
      module-common/src/main/java/cn/com/ctop/common/module/utils/ParseInstallPackageUtil.java
  37. 2 2
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/oceanengine/service/impl/EffectCaseServiceImpl.java
  38. 3 3
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/service/impl/PangolinReportAppHourServiceImpl.java
  39. 1 1
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/service/impl/PangolinReportBillMonthServiceImpl.java
  40. 1 1
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/service/impl/PangolinReportChannelDailyServiceImpl.java
  41. 1 1
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/taobao/service/impl/TaobaoJhsbybtServiceImpl.java
  42. 3 3
      module-crawler/src/main/java/cn/com/ctop/crawler/modules/taobao/service/impl/TaobaoTttmServiceImpl.java
  43. 2 2
      module-ctop/src/main/java/cn/com/ctop/manage/modules/edu/service/impl/EduLessonServiceImpl.java
  44. 1 1
      module-job-bytedance/src/main/java/cn/com/ctop/job/bytedance/handler/BytedanceEffectVideoJob.java
  45. 8 8
      module-job-bytedance/src/main/java/cn/com/ctop/job/bytedance/handler/BytedanceMonitoringLinksCheckJob.java
  46. 0 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouController.java
  47. 2 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouVideoGetController.java
  48. 4 4
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/BatchServiceImpl.java
  49. 1 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouUpdateServiceImpl.java
  50. 2 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java
  51. 3 3
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/controller/KsVideoReportCtrl.java
  52. 1 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaiShouAccountReportServiceImpl.java
  53. 1 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/utils/LinkUtils.java
  54. 2 2
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/adlab/controller/CtopAdlabProjectDetailController.java
  55. 2 2
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/adlab/service/impl/CreateProjectServiceImpl.java
  56. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/impl/BytedanceIndustryInfoServiceImpl.java
  57. 2 2
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/controller/ByteDanceAdvertisePlanController.java
  58. 2 2
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/controller/ByteDanceCampaignController.java
  59. 5 5
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/controller/ByteDanceCreativeController.java
  60. 7 7
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/ByteDanceAdvertisePlanServiceImpl.java
  61. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/ByteDanceAdvertiserDataServiceImpl.java
  62. 3 3
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/ByteDanceCampaignServiceImpl.java
  63. 52 52
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/ByteDanceCreativeServiceImpl.java
  64. 116 116
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/controller/ByteDanceVideoReportDailyController.java
  65. 3 3
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/controller/BytedanceVideoReportCtrl.java
  66. 38 38
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/ByteDanceVideoReportDailyServiceImpl.java
  67. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/BytedanceAccountReportServiceImpl.java
  68. 5 5
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/BytedanceHomepageReportServiceImpl.java
  69. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/BytedanceReportMaterialDailyServiceImpl.java
  70. 3 3
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/BytedanceReportServiceImpl.java
  71. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/utils/ApkUtils.java
  72. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/utils/LinkUtils.java
  73. 2 2
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/tool/controller/ParseInstallPackageController.java
  74. 6 6
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/tool/service/impl/ByteDanceConvertToolServiceImpl.java
  75. 13 7
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/tool/service/impl/ByteDanceQueryToolServiceImpl.java
  76. 2 2
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/impl/PerformanceOptimizerServiceImpl.java

+ 8 - 8
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/PasswordUtil.java

@@ -27,7 +27,7 @@ public class PasswordUtil {
 
 	/**
 	 * 获取加密算法中使用的盐值,解密中使用的盐值必须与加密中使用的相同才能完成操作. 盐长度必须为8字节
-	 * 
+	 *
 	 * @return byte[] 盐值
 	 * */
 	public static byte[] getSalt() throws Exception {
@@ -44,7 +44,7 @@ public class PasswordUtil {
 
 	/**
 	 * 根据PBE密码生成一把密钥
-	 * 
+	 *
 	 * @param password
 	 *            生成密钥时所使用的密码
 	 * @return Key PBE算法密钥
@@ -69,7 +69,7 @@ public class PasswordUtil {
 
 	/**
 	 * 加密明文字符串
-	 * 
+	 *
 	 * @param plaintext
 	 *            待加密的明文字符串
 	 * @param password
@@ -98,7 +98,7 @@ public class PasswordUtil {
 
 	/**
 	 * 解密密文字符串
-	 * 
+	 *
 	 * @param ciphertext
 	 *            待解密的密文字符串
 	 * @param password
@@ -129,7 +129,7 @@ public class PasswordUtil {
 
 	/**
 	 * 将字节数组转换为十六进制字符串
-	 * 
+	 *
 	 * @param src
 	 *            字节数组
 	 * @return
@@ -152,13 +152,13 @@ public class PasswordUtil {
 
 	/**
 	 * 将十六进制字符串转换为字节数组
-	 * 
+	 *
 	 * @param hexString
 	 *            十六进制字符串
 	 * @return
 	 */
 	public static byte[] hexStringToBytes(String hexString) {
-		if (hexString == null || hexString.equals("")) {
+		if (hexString == null || "".equals(hexString)) {
 			return null;
 		}
 		hexString = hexString.toUpperCase();
@@ -177,4 +177,4 @@ public class PasswordUtil {
 	}
 
 
-}
+}

+ 4 - 4
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/oConvertUtils.java

@@ -38,7 +38,7 @@ public class oConvertUtils {
 	}
 
 	public static boolean isNotEmpty(Object object) {
-		if (object != null && !object.equals("") && !object.equals("null")) {
+		if (object != null && !"".equals(object) && !"null".equals(object)) {
 			return (true);
 		}
 		return (false);
@@ -63,7 +63,7 @@ public class oConvertUtils {
 
 	private static String code2code(String strIn, String sourceCode, String targetCode) {
 		String strOut = null;
-		if (strIn == null || (strIn.trim()).equals("")) {
+		if (strIn == null || "".equals(strIn.trim())) {
 			return strIn;
 		}
 		try {
@@ -390,7 +390,7 @@ public class oConvertUtils {
 		long bEnd = getIpNum("172.31.255.255");
 		long cBegin = getIpNum("192.168.0.0");
 		long cEnd = getIpNum("192.168.255.255");
-		isInnerIp = isInner(ipNum, aBegin, aEnd) || isInner(ipNum, bBegin, bEnd) || isInner(ipNum, cBegin, cEnd) || ipAddress.equals("127.0.0.1");
+		isInnerIp = isInner(ipNum, aBegin, aEnd) || isInner(ipNum, bBegin, bEnd) || isInner(ipNum, cBegin, cEnd) || "127.0.0.1".equals(ipAddress);
 		return isInnerIp;
 	}
 
@@ -461,7 +461,7 @@ public class oConvertUtils {
 	 * @return 转换后的驼峰式命名的字符串
 	 */
 	public static String camelNames(String names) {
-		if(names==null||names.equals("")){
+		if(names==null|| "".equals(names)){
 			return null;
 		}
 		StringBuffer sf = new StringBuffer();

+ 3 - 1
jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/service/Impl/ActNodeServiceImpl.java

@@ -31,7 +31,9 @@ public class ActNodeServiceImpl extends ServiceImpl<ActNodeMapper, ActNode> impl
 
     public List<LoginUser> findUserByNodeId(String nodeId) {
         List<LoginUser> users = this.baseMapper.findUserByNodeId(nodeId);
-        if (users.size()==0) users = Lists.newArrayList();
+        if (users.size()==0){
+            users = Lists.newArrayList();
+        }
         return users;
     }
 

+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java

@@ -48,7 +48,7 @@ public class MybatisInterceptor implements Interceptor {
 						field.setAccessible(true);
 						Object local_createBy = field.get(parameter);
 						field.setAccessible(false);
-						if (local_createBy == null || local_createBy.equals("")) {
+						if (local_createBy == null || "".equals(local_createBy)) {
 							if (sysUser != null) {
 								// 登录人账号
 								field.setAccessible(true);
@@ -62,7 +62,7 @@ public class MybatisInterceptor implements Interceptor {
 						field.setAccessible(true);
 						Object local_createDate = field.get(parameter);
 						field.setAccessible(false);
-						if (local_createDate == null || local_createDate.equals("")) {
+						if (local_createDate == null || "".equals(local_createDate)) {
 							field.setAccessible(true);
 							field.set(parameter, new Date());
 							field.setAccessible(false);
@@ -73,7 +73,7 @@ public class MybatisInterceptor implements Interceptor {
 						field.setAccessible(true);
 						Object local_sysOrgCode = field.get(parameter);
 						field.setAccessible(false);
-						if (local_sysOrgCode == null || local_sysOrgCode.equals("")) {
+						if (local_sysOrgCode == null || "".equals(local_sysOrgCode)) {
 							// 获取登录用户信息
 							if (sysUser != null) {
 								field.setAccessible(true);

+ 42 - 24
jeecg-boot-module-system/src/main/java/org/jeecg/modules/append/xd_schedule/service/impl/XdScheduleServiceImpl.java

@@ -34,16 +34,17 @@ public class XdScheduleServiceImpl extends ServiceImpl<XdScheduleMapper, XdSched
     @Autowired
     RedisUtil redisUtil;
     /**单例 缓存,避免多次重复查*/
-    private List<XdSchedule> ScheduleList;
+    private List<XdSchedule> scheduleList;
     /**有效期*/
-    private Date ScheduleListDate = new Date();
+    private Date scheduleListDate = new Date();
 
     public List<XdSchedule> getDays() {
-        if (CollectionUtil.isEmpty(ScheduleList)||ScheduleListDate.getTime()<new Date().getTime()){
-            ScheduleList = this.list(new QueryWrapper<XdSchedule>().orderByAsc("day"));
-            ScheduleListDate = DateUtils.getDate(new Date().getTime()+60*1000);//缓存一分
+        if (CollectionUtil.isEmpty(scheduleList)||scheduleListDate.getTime()<System.currentTimeMillis()){
+            scheduleList = this.list(new QueryWrapper<XdSchedule>().orderByAsc("day"));
+            //缓存一分
+            scheduleListDate = DateUtils.getDate(System.currentTimeMillis()+60*1000);
         }
-        return this.ScheduleList;
+        return this.scheduleList;
     }
 
     /**
@@ -53,7 +54,7 @@ public class XdScheduleServiceImpl extends ServiceImpl<XdScheduleMapper, XdSched
      */
     public List<XdSchedule> getDays(String weeknum) {
         getDays();
-        List<XdSchedule> weekFilter = ScheduleList.stream().filter(o -> StrUtil.equals(o.getWeeknum().intValue() + "", weeknum)).collect(Collectors.toList());
+        List<XdSchedule> weekFilter = scheduleList.stream().filter(o -> StrUtil.equals(o.getWeeknum().intValue() + "", weeknum)).collect(Collectors.toList());
         return weekFilter;
     }
     /**
@@ -62,9 +63,9 @@ public class XdScheduleServiceImpl extends ServiceImpl<XdScheduleMapper, XdSched
     public List<XdSchedule> getDays(Integer yyyyMM) {
         getDays();
         if (yyyyMM==null){
-            return ScheduleList;
+            return scheduleList;
         }
-       return ScheduleList.stream().filter(d->{
+       return scheduleList.stream().filter(d->{
             String formatDate = DateUtils.formatDate(d.getDay(),"yyyyMM");
             return formatDate.equals(yyyyMM+"");
         }).collect(Collectors.toList());
@@ -108,33 +109,49 @@ public class XdScheduleServiceImpl extends ServiceImpl<XdScheduleMapper, XdSched
 
 
         //生成该年的数据信息
-        int year = Convert.toInt(yyyy);//定义一个字段,接收输入的年份
-        Calendar calendar = new GregorianCalendar();//定义一个日历,变量作为年初
-        Calendar calendarEnd = new GregorianCalendar();//定义一个日历,变量作为年末
+        //定义一个字段,接收输入的年份
+        int year = Convert.toInt(yyyy);
+        //定义一个日历,变量作为年初
+        Calendar calendar = new GregorianCalendar();
+        //定义一个日历,变量作为年末
+        Calendar calendarEnd = new GregorianCalendar();
         calendar.set(Calendar.YEAR, year);
         calendar.set(Calendar.MONTH, 0);
-        calendar.set(Calendar.DAY_OF_MONTH, 1);//设置年初的日期为1月1日
+        //设置年初的日期为1月1日
+        calendar.set(Calendar.DAY_OF_MONTH, 1);
         calendarEnd.set(Calendar.YEAR, year);
         calendarEnd.set(Calendar.MONTH, 11);
-        calendarEnd.set(Calendar.DAY_OF_MONTH, 31);//设置年末的日期为12月31日
+        //设置年末的日期为12月31日
+        calendarEnd.set(Calendar.DAY_OF_MONTH, 31);
 
         SimpleDateFormat sf = new SimpleDateFormat("yyyyMMdd");
         ArrayList<XdSchedule> addDays = Lists.newArrayList();
-        while(calendar.getTime().getTime()<=calendarEnd.getTime().getTime()){//用一整年的日期循环
+        //用一整年的日期循环
+        while(calendar.getTime().getTime()<=calendarEnd.getTime().getTime()){
             Date date = calendar.getTime();
             String format = sf.format(date);
 
-            int weekOfYear = calendar.get(Calendar.WEEK_OF_YEAR);//第几周
-            int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR);//第几天
-            int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);//一周中第几周
-            int month = calendar.get(Calendar.MONTH)+1;//月份
+            //第几周
+            int weekOfYear = calendar.get(Calendar.WEEK_OF_YEAR);
+            //第几天
+            int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR);
+            //一周中第几周
+            int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
+            //月份
+            int month = calendar.get(Calendar.MONTH)+1;
             //是否工作日
-            boolean isworking = dayOfWeek!=1&&dayOfWeek!=7;//周末休息
+            //周末休息
+            boolean isworking = dayOfWeek!=1&&dayOfWeek!=7;
             if (StrUtil.isNotBlank(body)){
                 Integer dayType = apiData.getInteger(format);
-                if (dayType!=null){ //1法定调休,2法定放假
-                    if (dayType==1) isworking = true;
-                    if (dayType==2) isworking = false;
+                //1法定调休,2法定放假
+                if (dayType!=null){
+                    if (dayType==1){
+                        isworking = true;
+                    }
+                    if (dayType==2){
+                        isworking = false;
+                    }
                 }
             }
             String weekNum;
@@ -175,7 +192,8 @@ public class XdScheduleServiceImpl extends ServiceImpl<XdScheduleMapper, XdSched
             xdSchedule.setIsworking(isworking?"1":"0");
             addDays.add(xdSchedule);
 
-            calendar.add(Calendar.DAY_OF_MONTH, 1);//日期+1
+            //日期+1
+            calendar.add(Calendar.DAY_OF_MONTH, 1);
         }
         this.remove(new LambdaQueryWrapper<XdSchedule>().likeRight(XdSchedule::getYear,year));
         this.saveBatch(addDays);

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ActFormPorcessController.java

@@ -59,7 +59,7 @@ public class ActFormPorcessController {
 	@PostMapping("bindProcess")
 	public Map<String,Object>bindProcess(Long formId,String processId){
 		Map<String,Object>result = new HashMap<>();
-		if(null == formId||formId == 0||null == processId||processId.trim().equals("")){
+		if(null == formId||formId == 0||null == processId|| "".equals(processId.trim())){
 			ResultMapUtils.setResultMap(result, StatusCode.COMMON_PARAM_ERROR);
 			return result;
 		}

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

@@ -426,34 +426,34 @@ public class AdvertiserController {
         HttpUtils.setResponseHeader(response, "快手效果报表" + date + ".xlsx");
         ExcelWriter excelWriter = EasyExcelFactory.getWriter(outputStream);
         String type = dto.getType();
-        if (null != type && type.trim().equals("project")) {
+        if (null != type && "project".equals(type.trim())) {
             SheetInfoVo projectSheetVo = this.getProjectSheetVo(dto, "项目报表");
             Sheet sheet = new Sheet(1, 0, EffecfReportProjectEntity.class);
             sheet.setSheetName(projectSheetVo.getSheetName());
             excelWriter.write(projectSheetVo.getDetails(), sheet);
         }
-        if (null != type && type.trim().equals("account")) {
+        if (null != type && "account".equals(type.trim())) {
             SheetInfoVo accountSheetVo = this.getAccountSheetVo(dto, "账户报表");
             Sheet sheet = new Sheet(1, 0, EffecfReportAccountEntity.class);
             sheet.setSheetName(accountSheetVo.getSheetName());
             excelWriter.write(accountSheetVo.getDetails(), sheet);
         }
 
-        if (null != type && type.trim().equals("campaign")) {
+        if (null != type && "campaign".equals(type.trim())) {
             SheetInfoVo planSheetVo = this.getPlanSheetVo(dto, "广告计划报表");
             Sheet sheet = new Sheet(1, 0, EffecfReportPlanEntity.class);
             sheet.setSheetName(planSheetVo.getSheetName());
             excelWriter.write(planSheetVo.getDetails(), sheet);
         }
 
-        if (null != type && type.trim().equals("group")) {
+        if (null != type && "group".equals(type.trim())) {
             SheetInfoVo campaignSheetVo = this.getGroupSheetVo(dto, "广告组报表");
             Sheet sheet = new Sheet(1, 0, EffecfReportGroupEntity.class);
             sheet.setSheetName(campaignSheetVo.getSheetName());
             excelWriter.write(campaignSheetVo.getDetails(), sheet);
         }
 
-        if (null != type && type.trim().equals("creative")) {
+        if (null != type && "creative".equals(type.trim())) {
             SheetInfoVo creativeSheetVo = this.getCreativeSheetVo(dto, "广告创意");
             Sheet sheet = new Sheet(1, 0, EffecfReportCreativeEntity.class);
             sheet.setSheetName(creativeSheetVo.getSheetName());

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

@@ -138,7 +138,7 @@ public class BindAccountLoginController {
         }
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String roleCode = sysRoleService.getRoleCodeByUserId(user.getId());
-        if(!roleCode.equals("admin")){
+        if(!"admin".equals(roleCode)){
             queryWrapper.eq("user_id", user.getId());
         }
         queryWrapper.orderByDesc("id");

+ 13 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceMusicTypeController.java

@@ -47,11 +47,23 @@ public class BytedanceMusicTypeController {
 														   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 														   HttpServletRequest req) {
 		String typeValue = bytedanceMusicType.getTypeValue();
+		String author = bytedanceMusicType.getAuthor();
+		String musicName = bytedanceMusicType.getMusicName();
 		bytedanceMusicType.setTypeValue(null);
+		bytedanceMusicType.setAuthor(null);
+		bytedanceMusicType.setMusicName(null);
 		Result<IPage<BytedanceMusicType>> result = new Result<>();
 		QueryWrapper<BytedanceMusicType> queryWrapper = QueryGenerator.initQueryWrapper(bytedanceMusicType, req.getParameterMap());
-		if(null!=typeValue&&!typeValue.trim().equals("")){
+		if(null!=typeValue&&!"".equals(typeValue.trim())){
 			queryWrapper.like("type_value",typeValue);
+		}else {
+			queryWrapper.select("DISTINCT music_id");
+		}
+		if(null!=author&&!"".equals(author.trim())){
+			queryWrapper.like("author",author);
+		}
+		if(null!=musicName&&!"".equals(musicName.trim())){
+			queryWrapper.like("music_name",musicName);
 		}
 		Page<BytedanceMusicType> page = new Page<>(pageNo, pageSize);
 		IPage<BytedanceMusicType> pageList = bytedanceMusicTypeService.page(page, queryWrapper);

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

@@ -350,7 +350,7 @@ public class MaterialInfoController {
         List<Long> projectIds = null;
         String userId = user.getId();
         String roleCode = roleService.getRoleCodeByUserId(userId);
-        if (null == tagCode || tagCode.trim().equals("")) {
+        if (null == tagCode || "".equals(tagCode.trim())) {
             tagCode = null;
         }
         if (CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN.equals(roleCode) || "operator".equals(roleCode) || "kuaishouOperationManager".equals(roleCode) || "operationAssistant".equals(roleCode) || "touTiaoOperationManager".equals(roleCode) || roleCode.contains("sale")) {

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

@@ -65,7 +65,7 @@ public class ProjectTransferRecordController {
         QueryWrapper<ProjectTransferRecord> queryWrapper = QueryGenerator.initQueryWrapper(projectTransferRecord, req.getParameterMap());
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String rodeCode = sysRoleService.getRoleCodeByUserId(sysUser.getId());
-        if (null != rodeCode && rodeCode.trim().equals("admin")) {
+        if (null != rodeCode && "admin".equals(rodeCode.trim())) {
             queryWrapper.eq("user_id", sysUser.getId());
         }
         queryWrapper.ne("status", 0);
@@ -100,7 +100,7 @@ public class ProjectTransferRecordController {
         QueryWrapper<ProjectTransferRecord> queryWrapper = QueryGenerator.initQueryWrapper(projectTransferRecord, req.getParameterMap());
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String rodeCode = sysRoleService.getRoleCodeByUserId(sysUser.getId());
-        if (null != rodeCode && !rodeCode.trim().equals("admin")) {
+        if (null != rodeCode && !"admin".equals(rodeCode.trim())) {
             queryWrapper.eq("reviewer_id", sysUser.getId());
         }
         queryWrapper.ne("status", 0);

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

@@ -220,7 +220,7 @@ public class UserAllocationController {
             }
 
             String authName = null;
-            if (mediaId.equals("2") || mediaId.equals("4")) {
+            if ("2".equals(mediaId) || "4".equals(mediaId)) {
                 Map<String, Object> advertiseBaseInfoMap = kuaishouInterfaceService.advertiserInfo(accountId, oauthToken.getAccessToken());
                 Integer code = (Integer) advertiseBaseInfoMap.get("code");
                 if (code != 0) {
@@ -228,7 +228,7 @@ public class UserAllocationController {
 
                 }
                 authName = (String) advertiseBaseInfoMap.get("userName");
-            } else if (mediaId.equals("1") || mediaId.equals("3")) {
+            } else if ("1".equals(mediaId) || "3".equals(mediaId)) {
                 Map<String, Object> advertiserDataMap = advertiserDataService.getAdvertiserInfo(String.valueOf(accountId), oauthToken.getAccessToken());
                 Integer code = (Integer) advertiserDataMap.get("code");
                 if (code != 0) {

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

@@ -32,11 +32,11 @@ public class ImageReportDailyServiceImpl implements IImageReportDailyService {
     public Map<String,Object> bytedanceImageCost(JSONObject data) {
         Map<String,Object>result = new HashMap<>();
         String startDate = data.getString("startDate");
-        if(null == startDate||startDate.trim().equals("")){
+        if(null == startDate|| "".equals(startDate.trim())){
             startDate = null;
         }
         String endDate = data.getString("endDate");
-        if(null == endDate||endDate.trim().equals("")){
+        if(null == endDate|| "".equals(endDate.trim())){
             endDate = null;
         }
         JSONArray accountList = data.getJSONArray("accountList");
@@ -44,7 +44,7 @@ public class ImageReportDailyServiceImpl implements IImageReportDailyService {
             accountList = null;
         }
         String code = data.getString("code");
-        if(null == code||code.trim().equals("")){
+        if(null == code|| "".equals(code.trim())){
             code = null;
         }
         Integer pageSize = data.getInteger("pageSize");
@@ -67,11 +67,11 @@ public class ImageReportDailyServiceImpl implements IImageReportDailyService {
     public SheetInfoVo getbytedanceImageCostVo(JSONObject data) {
         SheetInfoVo sheetInfoVo = new SheetInfoVo<BytedanceImageCostVOEntity>();
         String startDate = data.getString("startDate");
-        if(null == startDate||startDate.trim().equals("")){
+        if(null == startDate|| "".equals(startDate.trim())){
             startDate = null;
         }
         String endDate = data.getString("endDate");
-        if(null == endDate||endDate.trim().equals("")){
+        if(null == endDate|| "".equals(endDate.trim())){
             endDate = null;
         }
         JSONArray accountList = data.getJSONArray("accountList");
@@ -79,7 +79,7 @@ public class ImageReportDailyServiceImpl implements IImageReportDailyService {
             accountList = null;
         }
         String code = data.getString("code");
-        if(null == code||code.trim().equals("")){
+        if(null == code|| "".equals(code.trim())){
             code = null;
         }
         List<BytedanceImageCostVOEntity>details = bytedanceReportMaterialDailyMapper.bytedanceImageCostEntity(startDate,endDate,accountList,code);
@@ -91,11 +91,11 @@ public class ImageReportDailyServiceImpl implements IImageReportDailyService {
     public Map<String, Object> kuaishouImageCost(JSONObject data) {
         Map<String,Object>result = new HashMap<>();
         String startDate = data.getString("startDate");
-        if(null == startDate||startDate.trim().equals("")){
+        if(null == startDate|| "".equals(startDate.trim())){
             startDate = null;
         }
         String endDate = data.getString("endDate");
-        if(null == endDate||endDate.trim().equals("")){
+        if(null == endDate|| "".equals(endDate.trim())){
             endDate = null;
         }
         JSONArray accountList = data.getJSONArray("accountList");
@@ -103,7 +103,7 @@ public class ImageReportDailyServiceImpl implements IImageReportDailyService {
             accountList = null;
         }
         String code = data.getString("code");
-        if(null == code||code.trim().equals("")){
+        if(null == code|| "".equals(code.trim())){
             code = null;
         }
         Integer pageSize = data.getInteger("pageSize");
@@ -126,11 +126,11 @@ public class ImageReportDailyServiceImpl implements IImageReportDailyService {
     public SheetInfoVo getkuaishouImageCostVo(JSONObject data) {
         SheetInfoVo sheetInfoVo = new SheetInfoVo<KuaishouImageCostVOEntity>();
         String startDate = data.getString("startDate");
-        if(null == startDate||startDate.trim().equals("")){
+        if(null == startDate|| "".equals(startDate.trim())){
             startDate = null;
         }
         String endDate = data.getString("endDate");
-        if(null == endDate||endDate.trim().equals("")){
+        if(null == endDate|| "".equals(endDate.trim())){
             endDate = null;
         }
         JSONArray accountList = data.getJSONArray("accountList");
@@ -138,7 +138,7 @@ public class ImageReportDailyServiceImpl implements IImageReportDailyService {
             accountList = null;
         }
         String code = data.getString("code");
-        if(null == code||code.trim().equals("")){
+        if(null == code|| "".equals(code.trim())){
             code = null;
         }
         sheetInfoVo.setSheetName("快手图片消耗统计");

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

@@ -38,7 +38,7 @@ public class MediaReportServiceImpl implements IMediaReportService {
     @Override
     public PageInfo<JSONObject> queryReportByCondition(int pageNO, int pageSize, JSONObject requestBody) {
         PageInfo<JSONObject> pageInfo;
-        if(requestBody.getString("companyId").equals("6weq589875c040119adst08751712368")){
+        if("6weq589875c040119adst08751712368".equals(requestBody.getString("companyId"))){
             pageInfo=getAgentReportByCondition(pageNO,pageSize,requestBody);
         }else {
             pageInfo=getMediaReportByCondition(pageNO,pageSize,requestBody);
@@ -65,7 +65,7 @@ public class MediaReportServiceImpl implements IMediaReportService {
     @Override
     public List<JSONObject> queryReportByCondition(JSONObject requestBody) {
         List<JSONObject> list;
-        if(requestBody.getString("companyId").equals("6weq589875c040119adst08751712368")){
+        if("6weq589875c040119adst08751712368".equals(requestBody.getString("companyId"))){
             list=getAgentReportListByCondition(requestBody);
         }else {
             list=getMediaReportListByCondition(requestBody);

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

@@ -84,13 +84,13 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
 
         //角色权限判断
         List<ProjectMember> projectMemberList = null;
-        if (roleCode.equals("plan") || roleCode.equals("clip") || roleCode.equals("shot") || roleCode.equals("plane") || roleCode.equals("planeLeader")) {
+        if ("plan".equals(roleCode) || "clip".equals(roleCode) || "shot".equals(roleCode) || "plane".equals(roleCode) || "planeLeader".equals(roleCode)) {
             projectMemberList = memberMapper.designProjects(userId, mediaIds);
-        } else if (roleCode.equals("designTeamLeader")) {
+        } else if ("designTeamLeader".equals(roleCode)) {
             projectMemberList = memberMapper.designLeaderProjects(companyId, mediaIds);
-        } else if (roleCode.equals("admin")) {
+        } else if ("admin".equals(roleCode)) {
             projectMemberList = memberMapper.adminProjects(mediaIds);
-        } else if (roleCode.equals("operator") || roleCode.equals("operationAssistant") || roleCode.equals("touTiaoOperationManager")) {
+        } else if ("operator".equals(roleCode) || "operationAssistant".equals(roleCode) || "touTiaoOperationManager".equals(roleCode)) {
             projectMemberList = memberMapper.designProjects(userId, mediaIds);
         } else {
             //如果以上角色都不是的话直接查询此角色所属项目
@@ -177,7 +177,7 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
 
         //角色权限判断
         List<ProjectMember> projectMemberList = null;
-        if (roleCode.equals("admin")) {
+        if ("admin".equals(roleCode)) {
             projectMemberList = memberMapper.adminProjects(mediaIds);
         } else {
             //如果以上角色都不是的话直接查询此角色所属项目
@@ -216,7 +216,7 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
 
         //角色权限判断
         List<ProjectMember> projectMemberList = null;
-        if (roleCode.equals("admin")) {
+        if ("admin".equals(roleCode)) {
             projectMemberList = memberMapper.adminProjects(mediaIds);
         } else {
             //如果以上角色都不是的话直接查询此角色所属项目

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

@@ -68,7 +68,7 @@ public class ReleaseViewRecordServiceImpl extends ServiceImpl<ReleaseViewRecordM
 
     public ReleaseViewRecord getRecordByParams(String userId,Long releaseId){
         QueryWrapper<ReleaseViewRecord> queryWrapper = new QueryWrapper<>();
-        if(null!=userId&&!userId.trim().equals("")){
+        if(null!=userId&&!"".equals(userId.trim())){
             queryWrapper.eq("user_id",userId);
         }
         if(null!=releaseId&&releaseId!=0){

+ 6 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/performance/entity/PerformanceQuarter.java

@@ -92,8 +92,12 @@ public class PerformanceQuarter {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o){
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()){
+            return false;
+        }
         PerformanceQuarter that = (PerformanceQuarter) o;
         return Objects.equals(id, that.id) &&
                 Objects.equals(userId, that.userId) &&

+ 6 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/performance/service/impl/CalculatePerformanceServiceImpl.java

@@ -30,8 +30,12 @@ public class CalculatePerformanceServiceImpl implements ICalculatePerformanceSer
     public void CalculateOperatePerformance(int year, String quarter, int mediaType) {
         //TODO 查询配置的提成点
         BigDecimal point =new BigDecimal(0);
-        if (mediaType == 1) point = RateConstant.THOUSAND_2;
-        if (mediaType == 2) point = RateConstant.THOUSAND_3;
+        if (mediaType == 1) {
+            point = RateConstant.THOUSAND_2;
+        }
+        if (mediaType == 2){
+            point = RateConstant.THOUSAND_3;
+        }
         String startDate= year+"-"+ PeriodConstant.valueOf(quarter).getStart();
         String endDate= year+"-"+PeriodConstant.valueOf(quarter).getEnd();
         List<JSONObject> operateCost = calculatePerformanceMapper.queryOperateCostGroupByUser(startDate, endDate, mediaType);

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/performance/service/impl/PerformanceInfoInfoServiceImpl.java

@@ -60,7 +60,7 @@ public class PerformanceInfoInfoServiceImpl implements IPerformanceInfoService {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String userId = sysUser.getId();
         Map<String,Object> role=sysUserService.queryRoleCode(userId);
-        if(role.get("roleName").equals("管理员")){
+        if("管理员".equals(role.get("roleName"))){
             result=sysCompanyService.list();
         }else {
             String companyId=projectMemberMapper.getCompanyIdByUserId(userId);

+ 11 - 10
jeecg-boot-module-system/src/main/java/org/jeecg/modules/performance/service/impl/PerformanceQuarterServiceImpl.java

@@ -48,10 +48,10 @@ public class PerformanceQuarterServiceImpl extends ServiceImpl<PerformanceQuarte
         String[] columns={"user_id","user_name","company_name","role_name","media_type","year","quarter","cost","point","performance","additional_fees"};
         quarterWrapper.select(columns);
         Map<String,Object> map = new HashMap<>(10);
-        if(!requestBody.getString("company").equals("")) {
+        if(!"".equals(requestBody.getString("company"))) {
             map.put("company_id",requestBody.getString("company"));
         }
-        if(!requestBody.getString("department").equals("")) {
+        if(!"".equals(requestBody.getString("department"))) {
             map.put("department",requestBody.getString("department"));
         }
         if(requestBody.getInteger("mediaType")!=0) {
@@ -60,10 +60,10 @@ public class PerformanceQuarterServiceImpl extends ServiceImpl<PerformanceQuarte
         if(requestBody.getInteger("year")!=0) {
             map.put("year",requestBody.getInteger("year"));
         }
-        if(!requestBody.getString("quarter").equals("")) {
+        if(!"".equals(requestBody.getString("quarter"))) {
             map.put("quarter",requestBody.getString("quarter"));
         }
-        if(!requestBody.getString("roleCode").equals("")) {
+        if(!"".equals(requestBody.getString("roleCode"))) {
             map.put("role_code",requestBody.getString("roleCode"));
         }
         quarterWrapper.allEq(map);
@@ -77,10 +77,10 @@ public class PerformanceQuarterServiceImpl extends ServiceImpl<PerformanceQuarte
         String[] columns={"user_id","user_name","company_name","department","role_name","media_type","year","quarter","cost","point","performance","additional_fees"};
         quarterWrapper.select(columns);
         Map<String,Object> map = new HashMap<>(16);
-        if(!requestBody.getString("company").equals("")) {
+        if(!"".equals(requestBody.getString("company"))) {
             map.put("company_id",requestBody.getString("company"));
         }
-        if(!requestBody.getString("department").equals("")) {
+        if(!"".equals(requestBody.getString("department"))) {
             map.put("department",requestBody.getString("department"));
         }
         if(requestBody.getInteger("mediaType")!=0) {
@@ -89,18 +89,19 @@ public class PerformanceQuarterServiceImpl extends ServiceImpl<PerformanceQuarte
         if(requestBody.getInteger("year")!=0) {
             map.put("year",requestBody.getInteger("year"));
         }
-        if(!requestBody.getString("quarter").equals("")) {
+        if(!"".equals(requestBody.getString("quarter"))) {
             map.put("quarter",requestBody.getString("quarter"));
         }
-        if(!requestBody.getString("roleCode").equals("")) {
+        if(!"".equals(requestBody.getString("roleCode"))) {
             map.put("role_code",requestBody.getString("roleCode"));
         }
         quarterWrapper.allEq(map);
         quarterWrapper.like("user_name",requestBody.getString("userName"));
-        if(order.equals("asc"))
+        if("asc".equals(order)){
             quarterWrapper.orderByAsc("cost");
-        else
+        } else{
             quarterWrapper.orderByDesc("cost");
+        }
         PageHelper.startPage(pageNo,pageSize);
         List<PerformanceQuarter> maps = performanceQuarterMapper.selectList(quarterWrapper);
         return (PageInfo<PerformanceQuarter>) new PageInfo(maps);

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/DictAspect.java

@@ -104,11 +104,11 @@ public class DictAspect {
                             String text = field.getAnnotation(Dict.class).dicText();
                             String table = field.getAnnotation(Dict.class).dictTable();
                             String extendsKey = field.getAnnotation(Dict.class).extendsKey();
-                            if(extendsKey.trim().equals("")){
+                            if("".equals(extendsKey.trim())){
                                 extendsKey = null;
                             }
                             String extendsValue = field.getAnnotation(Dict.class).extendsValue();
-                            if(extendsValue.trim().equals("")){
+                            if("".equals(extendsValue.trim())){
                                 extendsValue = null;
                             }
                             String key = String.valueOf(item.get(field.getName()));

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

@@ -97,7 +97,7 @@ public class LoginController {
         Result<JSONObject> result = new Result<>();
         //1:根据code值获取用户飞书信息
         try {
-            if(code.trim().equals("code")){
+            if("code".equals(code.trim())){
                 JSONObject setData = new JSONObject();
                 String url = AuthProvider.getAuthUrl("");
                 setData.put("url",url);
@@ -113,7 +113,7 @@ public class LoginController {
             JSONObject userData = AuthProvider.getUserInfo(accessToken);
             JSONObject dataObject = userData.getJSONObject("data");
             String email = dataObject.getString("email");
-            if(null == email||email.trim().equals("")){
+            if(null == email|| "".equals(email.trim())){
                 return result.error500(StatusCode.CTOP_FEISHU_EMAIL_NOT_EXIST.getDesc());
             }
             SysUser sysUser = sysUserService.getUserByEmail(email);

+ 6 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/rule/OrgCodeRule.java

@@ -38,11 +38,15 @@ public class OrgCodeRule implements IFillRuleHandler {
         String parentId = null;
         if (formData != null && formData.size() > 0) {
             Object obj = formData.get("parentId");
-            if (obj != null) parentId = obj.toString();
+            if (obj != null){
+                parentId = obj.toString();
+            }
         } else {
             if (params != null) {
                 Object obj = params.get("parentId");
-                if (obj != null) parentId = obj.toString();
+                if (obj != null) {
+                    parentId = obj.toString();
+                }
             }
         }
 

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

@@ -78,7 +78,7 @@ public class WpsFileController {
 		wpsFile.setName(null);
 		Result<IPage<WpsFile>> result = new Result<>();
 		QueryWrapper<WpsFile> queryWrapper = QueryGenerator.initQueryWrapper(wpsFile, req.getParameterMap());
-		if(null!=name&&!name.trim().equals("")){
+		if(null!=name&&!"".equals(name.trim())){
 			queryWrapper.like("name",name);
 		}
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();

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

@@ -21,7 +21,7 @@ public class WpsFileVersionServiceImpl extends ServiceImpl<WpsFileVersionMapper,
     @Override
     public WpsFileVersion findByFileIdAndVersion(String fileId, Integer version) {
         QueryWrapper<WpsFileVersion>queryWrapper = new QueryWrapper<>();
-        if(null!=fileId&&!fileId.trim().equals("")){
+        if(null!=fileId&&!"".equals(fileId.trim())){
             queryWrapper.eq("file_id",fileId);
         }
         if(null!=version&&version!=0){
@@ -34,7 +34,7 @@ public class WpsFileVersionServiceImpl extends ServiceImpl<WpsFileVersionMapper,
     @Override
     public List<WpsFileVersion> findByFileIdOrderByVersionDesc(String fileId) {
         QueryWrapper<WpsFileVersion>queryWrapper = new QueryWrapper<>();
-        if(null!=fileId&&fileId.trim().equals("")){
+        if(null!=fileId&& "".equals(fileId.trim())){
             queryWrapper.eq("file_id",fileId);
         }
         queryWrapper.orderByDesc("version");

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/service/impl/WpsFileWatermarkServiceImpl.java

@@ -19,7 +19,7 @@ public class WpsFileWatermarkServiceImpl extends ServiceImpl<WpsFileWatermarkMap
     @Override
     public WpsFileWatermark findFirstByFileId(String fileId) {
         QueryWrapper<WpsFileWatermark>queryWrapper = new QueryWrapper<>();
-        if(null!=fileId&&!fileId.trim().equals("")){
+        if(null!=fileId&&!"".equals(fileId.trim())){
             queryWrapper.eq("file_id",fileId);
         }
         queryWrapper.orderByDesc("id").last("limit 1");

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

@@ -18,10 +18,10 @@ public class WpsUserAclServiceImpl extends ServiceImpl<WpsUserAclMapper, WpsUser
     @Override
     public WpsUserAcl findFirstByFileIdAndUserId(String fileId, String userId) {
         QueryWrapper<WpsUserAcl> queryWrapper = new QueryWrapper<>();
-        if(null!=fileId&&!fileId.trim().equals("")){
+        if(null!=fileId&&!"".equals(fileId.trim())){
             queryWrapper.eq("file_id",fileId);
         }
-        if(null!=userId&&!userId.trim().equals("")){
+        if(null!=userId&&!"".equals(userId.trim())){
             queryWrapper.eq("user_id",userId);
         }
         queryWrapper.last("limit 1");

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/util/SignatureUtil.java

@@ -38,7 +38,7 @@ public class SignatureUtil {
         // 构造签名的源字符串
         StringBuilder contents = new StringBuilder();
         for (String key : keys) {
-            if (key.equals("_w_signature")) {
+            if ("_w_signature".equals(key)) {
                 continue;
             }
             contents.append(key).append("=").append(params.get(key));

+ 6 - 2
module-common/src/main/java/cn/com/ctop/common/module/entity/SysCompany.java

@@ -27,8 +27,12 @@ public class SysCompany {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o){
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
         SysCompany that = (SysCompany) o;
         return id.equals(that.id) &&
                 companyId.equals(that.companyId) &&

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/module/service/impl/BindAccountLoginServiceImpl.java

@@ -105,7 +105,7 @@ public class BindAccountLoginServiceImpl extends ServiceImpl<BindAccountLoginMap
     @Override
     public List<BindAccountLogin> getListByParams(String loginType, Integer status) {
         QueryWrapper<BindAccountLogin> queryWrapper = new QueryWrapper<>();
-        if(null!=loginType&&!loginType.equals("")){
+        if(null!=loginType&&!"".equals(loginType)){
             queryWrapper.eq("login_type",loginType);
         }
         if(status!=null){

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

@@ -66,7 +66,7 @@ public class CtopOauthTokenServiceImpl extends ServiceImpl<CtopOauthTokenMapper,
         String result = HttpUtils.httpPostRequest(url, param, new HashMap<>());
         System.err.println(JSONObject.parseObject(result));
         XxlJobLogger.log("头条刷新token;accountId:{},返回信息:{}", token.getAccountId(), result);
-        if (null == result || result.trim().equals("") || result.equalsIgnoreCase("null")) {
+        if (null == result || "".equals(result.trim()) || "null".equalsIgnoreCase(result)) {
             XxlJobLogger.log("头条刷新token失败;accountId:{},返回信息:{}", token.getAccountId(), result);
             resultMap.put("message", "token刷新失败");
             resultMap.put("token", token);

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/module/service/impl/FileInfoServiceImpl.java

@@ -144,7 +144,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
                 getWord.remove("words");
                 getWord.remove("max_word_len");
                 String status = getWord.getString("status");
-                if (null != status && status.trim().equals("CREATIVE_WORD_STATUS_APPROVE")) {
+                if (null != status && "CREATIVE_WORD_STATUS_APPROVE".equals(status.trim())) {
                     array.add(getWord);
                 }
             });

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

@@ -116,11 +116,11 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
                 log.error(e.getMessage());
             }
             taskDetailResponse = getTaskDetailResponse(taskId);
-            if (taskDetailResponse.getStatus().equals("FINISH")) {
+            if ("FINISH".equals(taskDetailResponse.getStatus())) {
                 break;
             }
         }
-        if (taskDetailResponse.getStatus().equals("FINISH")) {
+        if ("FINISH".equals(taskDetailResponse.getStatus())) {
             String videoUrl = taskDetailResponse.getWorkflowTask().getMediaProcessResultSet()[0].getTranscodeTask().getOutput().getPath();
             VideoWatermarkTask videoWatermarkTask = new VideoWatermarkTask();
             videoWatermarkTask.setVideoUrl(CosConstant.COS_MEDIA_URL_PREFIX + videoUrl);
@@ -159,11 +159,11 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
                     log.error(e.getMessage());
                 }
                 taskDetailResponse = getTaskDetailResponse(taskId);
-                if (taskDetailResponse.getStatus().equals("FINISH")) {
+                if ("FINISH".equals(taskDetailResponse.getStatus())) {
                     break;
                 }
             }
-            if (taskDetailResponse.getStatus().equals("FINISH")) {
+            if ("FINISH".equals(taskDetailResponse.getStatus())) {
                 String url = taskDetailResponse.getWorkflowTask().getMediaProcessResultSet()[0].getTranscodeTask().getOutput().getPath();
                 SupplierWatermark supplierWatermark = new SupplierWatermark();
                 supplierWatermark.setVideoSignature(videoSignature);

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/module/service/impl/RefreshTokenServiceImpl.java

@@ -49,7 +49,7 @@ public class RefreshTokenServiceImpl implements IRefreshTokenService {
 
     @Override
     public void byteDanceRefresh(String accountId) {
-        if (null == accountId || "".equals(accountId.trim()) || accountId.equalsIgnoreCase("null")) {
+        if (null == accountId || "".equals(accountId.trim()) || "null".equalsIgnoreCase(accountId)) {
             List<CtopOauthToken> byteDanceOauthTokens = oauthTokenMapper.selectByteDanceTokens(CtopAdConstant.PLATFORM_TYPE_BYTEDANCE);
             if (!Check.isNull(byteDanceOauthTokens)) {
                 for (CtopOauthToken oauthToken : byteDanceOauthTokens) {

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

@@ -134,7 +134,7 @@ public class CloudVideoProcessUtil {
         }
         Map<String, Object> mapResp = XmlToMapUtil.multilayerXmlToMap(response);
         Map JobsDetail = (Map) ((Map) mapResp.get("Response")).get("JobsDetail");
-        if (JobsDetail.get("Code").equals("Success")) {
+        if ("Success".equals(JobsDetail.get("Code"))) {
             return JobsDetail;
         } else {
             return MapUtil.newHashMap();
@@ -185,7 +185,7 @@ public class CloudVideoProcessUtil {
         }
         Map<String, Object> mapResp = XmlToMapUtil.multilayerXmlToMap(response);
         Map JobsDetail = (Map) ((Map) mapResp.get("Response")).get("JobsDetail");
-        if (JobsDetail.get("Code").equals("Success")) {
+        if ("Success".equals(JobsDetail.get("Code"))) {
             Map jobStatusMap = null;
             for (int i = 0; i < 30; i++) {
                 try {
@@ -194,11 +194,11 @@ public class CloudVideoProcessUtil {
                     logger.error(e.getMessage());
                 }
                 jobStatusMap = getMediaJobsResponse(JobsDetail.get("JobId").toString());
-                if (jobStatusMap.get("State").equals("Success")) {
+                if ("Success".equals(jobStatusMap.get("State"))) {
                     break;
                 }
             }
-            if (jobStatusMap.get("State").equals("Success")) {
+            if ("Success".equals(jobStatusMap.get("State"))) {
                 result = getFrameUrl(outputPath);
             } else {
                 result = getErrorUrl();

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

@@ -55,7 +55,7 @@ public class ParseInstallPackageUtil {
                                 break;
                             }
                             String name = parser.getName();
-                            if (null != name && name.toLowerCase().equals("manifest")) {
+                            if (null != name && "manifest".equals(name.toLowerCase())) {
                                 for (int i = 0; i != parser.getAttributeCount(); i++) {
                                     if ("versionName".equals(parser.getAttributeName(i))) {
                                         String versionName = getAttributeValue(parser, i);

+ 2 - 2
module-crawler/src/main/java/cn/com/ctop/crawler/modules/oceanengine/service/impl/EffectCaseServiceImpl.java

@@ -44,13 +44,13 @@ public class EffectCaseServiceImpl extends ServiceImpl<EffectCaseMapper, EffectC
             queryWrapper.between("create_time", start, end);
         }
         if (null != orderByType && "desc".equals(orderByType)) {
-            if(orderByColumn.equals("create_time")){
+            if("create_time".equals(orderByColumn)){
                 queryWrapper.orderByAsc(orderByColumn);
             }else{
                 queryWrapper.orderByDesc(orderByColumn);
             }
         } else {
-            if(orderByColumn.equals("create_time")){
+            if("create_time".equals(orderByColumn)){
                 queryWrapper.orderByDesc(orderByColumn);
             }else{
                 queryWrapper.orderByAsc(orderByColumn);

+ 3 - 3
module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/service/impl/PangolinReportAppHourServiceImpl.java

@@ -63,16 +63,16 @@ public class PangolinReportAppHourServiceImpl extends ServiceImpl<PangolinReport
 
     private JSONObject getComparedDate(Integer appId,Integer hour,String userId,String type,String today, String yesterday, String sevenDaysAgo, String compareTime1, String compareTime2,List<Long>projectIds,List<String>  accountNames) {
         JSONObject data = pangolinReportAppHourMapper.getComparedDate(appId,hour,userId,type,today, yesterday,sevenDaysAgo,compareTime1,compareTime2,projectIds,accountNames);
-        if(null==data||data.toJSONString().equals("null")){
+        if(null==data|| "null".equals(data.toJSONString())){
             data = new JSONObject();
             data.put("today",0);
             data.put("yesterday",0);
             data.put("sevendaysAgo",0);
             data.put("hour",hour);
-            if(null!=compareTime1&&!compareTime1.trim().equals("")){
+            if(null!=compareTime1&&!"".equals(compareTime1.trim())){
                 data.put(compareTime1,0);
             }
-            if(null!=compareTime2&&!compareTime2.trim().equals("")){
+            if(null!=compareTime2&&!"".equals(compareTime2.trim())){
                 data.put(compareTime2,0);
             }
         }

+ 1 - 1
module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/service/impl/PangolinReportBillMonthServiceImpl.java

@@ -53,7 +53,7 @@ public class PangolinReportBillMonthServiceImpl extends ServiceImpl<PangolinRepo
         String startDate = data.getString("startDate");
         String endDate = data.getString("endDate");
         String operateSystem = data.getString("operateSystem");
-        if(null!=operateSystem&&operateSystem.trim().equals("all")){
+        if(null!=operateSystem&& "all".equals(operateSystem.trim())){
             operateSystem = null;
         }
         PageHelper.startPage(pageNo,pageSize);

+ 1 - 1
module-crawler/src/main/java/cn/com/ctop/crawler/modules/pangolin/service/impl/PangolinReportChannelDailyServiceImpl.java

@@ -36,7 +36,7 @@ public class PangolinReportChannelDailyServiceImpl extends ServiceImpl<PangolinR
             pageSize = 10;
         }
         String operateSystem = data.getString("operateSystem");
-        if(null!=operateSystem&&operateSystem.trim().equals("all")){
+        if(null!=operateSystem&& "all".equals(operateSystem.trim())){
             operateSystem = null;
         }
         Integer appId = data.getInteger("appId");

Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
module-crawler/src/main/java/cn/com/ctop/crawler/modules/taobao/service/impl/TaobaoJhsbybtServiceImpl.java


+ 3 - 3
module-crawler/src/main/java/cn/com/ctop/crawler/modules/taobao/service/impl/TaobaoTttmServiceImpl.java

@@ -43,7 +43,7 @@ public class TaobaoTttmServiceImpl implements TaobaoTttmService {
         String token = "";
         String cookie = "";
         for (Cookie ck : cookieList) {
-            if (ck.getName().equals("_m_h5_tk")) {
+            if ("_m_h5_tk".equals(ck.getName())) {
                 token = ck.getValue().split("_")[0];
             }
             cookie = cookie + ck.getName() + "=" + ck.getValue() + ";";
@@ -93,7 +93,7 @@ public class TaobaoTttmServiceImpl implements TaobaoTttmService {
 
                     JsonNode itemNode = items.next();
                     String itemType = itemNode.get("itemType").asText();
-                    if (itemType.equals("rankList")) {
+                    if ("rankList".equals(itemType)) {
                         Iterator<JsonNode> subitems = itemNode.get("items").iterator();
                         while (subitems.hasNext()) {
                             JsonNode subNode = subitems.next();
@@ -110,7 +110,7 @@ public class TaobaoTttmServiceImpl implements TaobaoTttmService {
                             String itemUrl = subNode.get("itemHref").asText();
                             String itemId = subNode.get("itemId").asText();
                         }
-                    } else if (itemType.equals("item")) {
+                    } else if ("item".equals(itemType)) {
                         String cjmsItemName = itemNode.get("shortName").asText();
                         Integer itemSoldInfo = itemNode.get("soldCount").asInt();
                         String picUrl = itemNode.get("preview").asText();

+ 2 - 2
module-ctop/src/main/java/cn/com/ctop/manage/modules/edu/service/impl/EduLessonServiceImpl.java

@@ -103,7 +103,7 @@ public class EduLessonServiceImpl extends ServiceImpl<EduLessonMapper, EduLesson
         try {
             JsonNode rootNode = mapper.readTree(result);
             String status = rootNode.get("status").asText();
-            if (status == null || !status.equals("success")) {
+            if (status == null || !"success".equals(status)) {
                 return;
             }
             String title = rootNode.get("data").get("title").asText();
@@ -120,7 +120,7 @@ public class EduLessonServiceImpl extends ServiceImpl<EduLessonMapper, EduLesson
                     String detailResult = HttpUtils2.httpGet(detailUrl+id,null,headMap);
                     JsonNode detailNode = mapper.readTree(detailResult);
                     status = detailNode.get("status").asText();
-                    if (status == null || !status.equals("success")) {
+                    if (status == null || !"success".equals(status)) {
                         return;
                     }
                     JsonNode courseNode = detailNode.get("data").get("course_data");

+ 1 - 1
module-job-bytedance/src/main/java/cn/com/ctop/job/bytedance/handler/BytedanceEffectVideoJob.java

@@ -15,7 +15,7 @@ public class BytedanceEffectVideoJob {
     private IBytedanceEffectVideoInfoService bytedanceEffectVideoInfoService;
     @XxlJob("bytedanceEffectVideoJob")
     public ReturnT<String> execute(String date) throws Exception {
-        if(null == date||date.trim().equalsIgnoreCase("")||date.trim().equalsIgnoreCase("null")){
+        if(null == date|| "".equalsIgnoreCase(date.trim())|| "null".equalsIgnoreCase(date.trim())){
             date = DateUtils.formatDate(DateUtils.addDay(new Date(),-14));
         }
         bytedanceEffectVideoInfoService.loadEffectVideo(date);

+ 8 - 8
module-job-bytedance/src/main/java/cn/com/ctop/job/bytedance/handler/BytedanceMonitoringLinksCheckJob.java

@@ -66,21 +66,21 @@ public class BytedanceMonitoringLinksCheckJob {
         boolean errorflag = false;
         String errorMsg = "";
         String token = plan.getName().split("-")[0];
-        if(null!=token&&token.equals("衍生计划")){
+        if(null!=token&& "衍生计划".equals(token)){
             token = plan.getName().split("-")[1];
         }
         String tokenInfo = "surl_token="+token;
         String appType = plan.getAppType();
 
         if(null!=downloadUrl){
-            if(null!=appType&&appType.equals("APP_IOS")){
+            if(null!=appType&& "APP_IOS".equals(appType)){
 //                if(!downloadUrl.equals("https://apps.apple.com/cn/app/id1468454200")){
                 if(!downloadUrl.contains("https://apps.apple.com/cn/app")){
                     errorMsg+= "应用下载链接填写异常;";
                     errorflag = true;
                 }
             }
-            if(null!=appType&&appType.equals("APP_ANDROID")){
+            if(null!=appType&& "APP_ANDROID".equals(appType)){
                 if(!downloadUrl.contains(token)){
                     errorMsg+= "应用下载链接填写异常;";
                     errorflag = true;
@@ -89,7 +89,7 @@ public class BytedanceMonitoringLinksCheckJob {
         }
         //展示监测链接
         String trackUrl = data.getString("trackUrl");
-        if(null!=trackUrl&&!trackUrl.trim().equals("")){
+        if(null!=trackUrl&&!"".equals(trackUrl.trim())){
             if(!trackUrl.contains(tokenInfo)){
                 errorMsg+= "展示监测链接填写异常;";
                 errorflag = true;
@@ -97,14 +97,14 @@ public class BytedanceMonitoringLinksCheckJob {
         }
         //点击监测链接
         String actionTrackUrl = data.getString("actionTrackUrl");
-        if(null!=actionTrackUrl&&!actionTrackUrl.trim().equals("")){
-            if(null!=appType&&appType.equals("APP_IOS")){
+        if(null!=actionTrackUrl&&!"".equals(actionTrackUrl.trim())){
+            if(null!=appType&& "APP_IOS".equals(appType)){
                 if(!actionTrackUrl.contains(tokenInfo)||!actionTrackUrl.contains("app_platform=ios")){
                     errorMsg+= "点击监测链接填写异常;";
                     errorflag = true;
                 }
             }
-            if(null!=appType&&appType.equals("APP_ANDROID")){
+            if(null!=appType&& "APP_ANDROID".equals(appType)){
                 if(!actionTrackUrl.contains(tokenInfo)||!actionTrackUrl.contains("tt/")){
                     errorMsg+= "点击监测链接填写异常;";
                     errorflag = true;
@@ -113,7 +113,7 @@ public class BytedanceMonitoringLinksCheckJob {
         }
         //视频有效播放监测链接
         String videoPlayEffectiveTrackUrl = data.getString("videoPlayEffectiveTrackUrl");
-        if(null!=videoPlayEffectiveTrackUrl&&!videoPlayEffectiveTrackUrl.trim().equals("")){
+        if(null!=videoPlayEffectiveTrackUrl&&!"".equals(videoPlayEffectiveTrackUrl.trim())){
             if(!videoPlayEffectiveTrackUrl.contains(tokenInfo)){
                 errorMsg+= "视频有效播放监测链接填写异常;";
                 errorflag = true;

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

@@ -128,7 +128,6 @@ public class KuaiShouController {
             log.error(e.getMessage());
             result.setSuccess(false);
             result.setMessage("执行出错");
-        }finally {
         }
 
         return result;

+ 2 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouVideoGetController.java

@@ -114,13 +114,13 @@ public class KuaiShouVideoGetController {
             requestMap.put("orderBy", orderBy);
             requestMap.put("materialType", materialType);
             requestMap.put("channelType", channelType);
-            if (orderBy.equals("time")) {
+            if ("time".equals(orderBy)) {
                 if (!Check.isNull(startDate) && !Check.isNull(endDate)) {
                     requestMap.put("startDate", startDate + " 00:00:00");
                     requestMap.put("endDate", endDate + " 59:59:59");
                 }
                 list = kuaiShouVideoGetService.getVideoList(requestMap);
-            } else if (orderBy.equals("cost")) {
+            } else if ("cost".equals(orderBy)) {
                 if (!Check.isNull(startDate) && !Check.isNull(endDate)) {
                     requestMap.put("startDate", startDate);
                     requestMap.put("endDate", endDate);

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

@@ -1334,7 +1334,7 @@ public class BatchServiceImpl implements IBatchService {
                                     creativeJson.put("creative_tag", creativeTag);
                                 }
 
-                                if (creativeMaterialType.equals("4")) {
+                                if ("4".equals(creativeMaterialType)) {
                                     if (!Check.isNull("shortSlogan")) {
                                         creativeJson.put("short_slogan", shortSlogan);
                                     }
@@ -1361,7 +1361,7 @@ public class BatchServiceImpl implements IBatchService {
                                         continue;
                                     }
                                 }
-                                if (creativeMaterialType.equals("4")) {
+                                if ("4".equals(creativeMaterialType)) {
                                     JSONArray tokenArr = new JSONArray();
                                     tokenArr.add(imageToken);
                                     creativeJson.put("image_tokens", tokenArr);
@@ -1474,7 +1474,7 @@ public class BatchServiceImpl implements IBatchService {
                                 creativeJson.put("creative_category", creativeCategory);
                                 creativeJson.put("creative_tag", creativeTag);
                             }
-                            if (creativeMaterialType.equals("4")) {
+                            if ("4".equals(creativeMaterialType)) {
                                 if (!Check.isNull("shortSlogan")) {
                                     creative.put("short_slogan", shortSlogan);
                                 }
@@ -1497,7 +1497,7 @@ public class BatchServiceImpl implements IBatchService {
                                     continue;
                                 }
                             }
-                            if (creativeMaterialType.equals("4")) {
+                            if ("4".equals(creativeMaterialType)) {
                                 JSONArray tokenArr = new JSONArray();
                                 tokenArr.add(imageToken);
                                 creative.put("image_tokens", tokenArr);

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouUpdateServiceImpl.java

@@ -520,7 +520,7 @@ public class KuaiShouUpdateServiceImpl implements IKuaiShouUpdateService {
                     returnMap.put("code", -1);
                     returnMap.put("success", false);
                     returnMap.put("message", resultJson.getString("message"));
-                    if (resultJson.getString("message").equals("该账户下创意不存在")) {
+                    if ("该账户下创意不存在".equals(resultJson.getString("message"))) {
                         Map<String, Object> deleteMap = new HashMap<>();
                         deleteMap.put("creative_id", creativeId);
                         creativeMapper.deleteByMap(deleteMap);

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

@@ -1945,7 +1945,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                         creativeCreate(accessToken, advertiserId, requestJson, count + 1);
                     }
 
-                    if (code == 400001 && resultJson.getString("message").equals("/rest/openapi/v2/creative/create已超日限")) {
+                    if (code == 400001 && "/rest/openapi/v2/creative/create已超日限".equals(resultJson.getString("message"))) {
                         overRunSendMessageService.creativeOverRunSendMessage(advertiserId);
                     }
                     log.error("创建广告创意失败,advertiser_id:{},返回信息:{},入参:{}", advertiserId, resultJson, requestJson, count + 1);
@@ -2024,7 +2024,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                         creativeCreate(accessToken, advertiserId, requestJson, count + 1);
                     }
 
-                    if (code == 400001 && resultJson.getString("message").equals("/rest/openapi/v2/creative/create已超日限")) {
+                    if (code == 400001 && "/rest/openapi/v2/creative/create已超日限".equals(resultJson.getString("message"))) {
                         overRunSendMessageService.creativeOverRunSendMessage(advertiserId);
                     }
                     log.error("创建广告创意失败,advertiser_id:{},返回信息:{},入参:{}", advertiserId, resultJson, requestJson, count + 1);

+ 3 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/controller/KsVideoReportCtrl.java

@@ -118,7 +118,7 @@ public class KsVideoReportCtrl {
         String filed = JsonResourceUtil.joinFiled(AccountReportConstants.dicMapKs, columns);
         List<String> titles = new ArrayList<>();
         //此处增加两个元素是为了保证数据顺序
-        if(exportType.equals("exportDetail")){
+        if("exportDetail".equals(exportType)){
             titles.add(0,"客户");
             titles.add(1,"项目名称");
             titles.add(2,"时间");
@@ -153,9 +153,9 @@ public class KsVideoReportCtrl {
         String target = requestBody.getString("target");
         String order = requestBody.getString("order");
         List<JSONObject> excelData=null;
-        if(exportType.equals("exportTable")){
+        if("exportTable".equals(exportType)){
             excelData = ksVideoReportService.exportExcelReportBy(accountIds, startDate, endDate, filed, target, order,clip,shot,plan);
-        }else if(exportType.equals("exportDetail")){
+        }else if("exportDetail".equals(exportType)){
             excelData = ksVideoReportService.getVideoDetailBy(accountIds,startDate,endDate,filed,signature);
         }
         if (null!=excelData&&excelData.isEmpty()) {

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaiShouAccountReportServiceImpl.java

@@ -180,7 +180,7 @@ public class KuaiShouAccountReportServiceImpl implements IKuaiShouAccountReportS
         JSONObject jsonObject = new JSONObject();
         after.forEach((k, v) -> {
             //去除没法计算的字段
-            if (k.equals("accountId") || k.equals("authName") || v.toString().contains("%")||before.getString(k).contains("%")) {
+            if ("accountId".equals(k) || "authName".equals(k) || v.toString().contains("%")||before.getString(k).contains("%")) {
                 jsonObject.put(k, "-");
             }else {
                 jsonObject.put(k, LinkUtils.countLink(after.getBigDecimal(k)==null?zero:after.getBigDecimal(k), before.getBigDecimal(k)==null?zero:before.getBigDecimal(k)));

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/utils/LinkUtils.java

@@ -40,7 +40,7 @@ public class LinkUtils {
     //环比计算
     public static BigDecimal countLink(BigDecimal numA, BigDecimal numB) {
         BigDecimal link = new BigDecimal(0);
-        if (!(numB.compareTo(BigDecimal.ZERO)==0)) {
+        if (numB.compareTo(BigDecimal.ZERO)!=0) {
             link = (numA.subtract(numB)).divide(numB, 4, RoundingMode.HALF_UP);
         }
         return link;

+ 2 - 2
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/adlab/controller/CtopAdlabProjectDetailController.java

@@ -57,7 +57,7 @@ public class CtopAdlabProjectDetailController {
         if (!requestBody.getJSONArray("accountIds").isEmpty()) {
             queryWrapper.in("account_id", requestBody.getJSONArray("accountIds"));
         }
-        if (!requestBody.getString("optStatus").equals("")) {
+        if (!"".equals(requestBody.getString("optStatus"))) {
             queryWrapper.eq("opt_status", requestBody.getString("optStatus"));
         }
         if (!requestBody.getJSONArray("createTime").isEmpty()) {
@@ -109,7 +109,7 @@ public class CtopAdlabProjectDetailController {
                 jsonObject.put("userId", temp.get("userId"));
                 params.add(jsonObject);
                 if (repo.getInteger("code") == 0) {
-                    if (((Map<String, Object>) it).get("optStatus").equals("DELETED")) {
+                    if ("DELETED".equals(((Map<String, Object>) it).get("optStatus"))) {
                     	ctopAdlabProjectDetailService.removeById((Long) temp.get("groupId"));
                     } else {
                         ctopAdlabProjectDetailService.putStorage(params);

+ 2 - 2
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/adlab/service/impl/CreateProjectServiceImpl.java

@@ -78,7 +78,7 @@ public class CreateProjectServiceImpl implements ICreateProjectService {
         params.put("group_id", requestBody.get("groupId"));
         params.put("inventory_type", requestBody.get("inventoryType"));
         //投放范围为穿山甲时可选 ORIGINAL_VIDEO 表示原生,REWARDED_VIDEO 表示激励视频
-        if (requestBody.get("deliveryRange").equals("UNION")) {
+        if ("UNION".equals(requestBody.get("deliveryRange"))) {
             params.put("union_video_type", requestBody.get("unionVideoType"));
         }
         //定向信息
@@ -111,7 +111,7 @@ public class CreateProjectServiceImpl implements ICreateProjectService {
         params.put("playable_url", requestBody.get("playableUrl"));
         params.put("action_track_url", requestBody.get("actionTrackUrl"));
         params.put("track_url", requestBody.get("trackUrl"));
-        if (!requestBody.get("deliveryRange").equals("UNION")) {
+        if (!"UNION".equals(requestBody.get("deliveryRange"))) {
             params.put("video_play_track_url", requestBody.get("videoPlayTrackUrl"));
             params.put("video_play_done_track_url", requestBody.get("videoPlayDoneTrackUrl"));
             params.put("video_play_effective_track_url", requestBody.get("videoPlayEffectiveTrackUrl"));

+ 1 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/batch/service/impl/BytedanceIndustryInfoServiceImpl.java

@@ -108,7 +108,7 @@ public class BytedanceIndustryInfoServiceImpl extends ServiceImpl<BytedanceIndus
         if(null!=level&&level!=0){
             queryWrapper.eq("level",level);
         }
-        if(null!=parentCode&&!parentCode.trim().equals("")){
+        if(null!=parentCode&&!"".equals(parentCode.trim())){
             queryWrapper.eq("parent_code",parentCode);
         }
        return this.list(queryWrapper);

+ 2 - 2
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/controller/ByteDanceAdvertisePlanController.java

@@ -53,7 +53,7 @@ public class ByteDanceAdvertisePlanController {
             byteDanceAdvertisePlan.setAccountId(accountId);
         }
         QueryWrapper<ByteDanceAdvertisePlan> queryWrapper = QueryGenerator.initQueryWrapper(byteDanceAdvertisePlan, req.getParameterMap());
-        if(status!=null&&!status.trim().equals("")){
+        if(status!=null&&!"".equals(status.trim())){
             queryWrapper.eq("opt_status","AD_STATUS_"+status);
         }
         if(null!=startDate&&!"".equals(startDate)){
@@ -68,7 +68,7 @@ public class ByteDanceAdvertisePlanController {
         //处理计划投放状态
         if (!pageList.getRecords().isEmpty()) {
             pageList.getRecords().forEach(it -> {
-                if (it.getOptStatus().equals("AD_STATUS_ENABLE")) {
+                if ("AD_STATUS_ENABLE".equals(it.getOptStatus())) {
                     it.setPlanStatus(true);
                 } else {
                     it.setPlanStatus(false);

+ 2 - 2
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/controller/ByteDanceCampaignController.java

@@ -80,7 +80,7 @@ public class ByteDanceCampaignController {
         IPage<ByteDanceCampaign> pageList = byteDanceCampaignService.page(page, queryWrapper);
         List<ByteDanceCampaign> records = pageList.getRecords();
         if(null!=records&&!records.isEmpty()){
-            List<ByteDanceCampaign> campaigns = records.stream().map(campaign-> campaign.setCampaignStatus(campaign.getStatus().equalsIgnoreCase("CAMPAIGN_STATUS_ENABLE"))).collect(Collectors.toList());
+            List<ByteDanceCampaign> campaigns = records.stream().map(campaign-> campaign.setCampaignStatus("CAMPAIGN_STATUS_ENABLE".equalsIgnoreCase(campaign.getStatus()))).collect(Collectors.toList());
             pageList.setRecords(campaigns);
         }
         result.setSuccess(true);
@@ -123,7 +123,7 @@ public class ByteDanceCampaignController {
                                          @RequestParam(name = "ids") String ids,
                                          @RequestParam(name = "status")String status){
         Map<String,Object>result = new HashMap();
-        if(null == accountId||accountId==0||null == ids||ids.trim().equals("")||null==status||status.trim().equals("")){
+        if(null == accountId||accountId==0||null == ids|| "".equals(ids.trim())||null==status|| "".equals(status.trim())){
             ResultMapUtils.setResultMap(result, StatusCode.COMMON_PARAM_ERROR);
             return result;
         }

+ 5 - 5
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/controller/ByteDanceCreativeController.java

@@ -58,7 +58,7 @@ public class ByteDanceCreativeController {
             @RequestParam(name = "name",defaultValue = "",required = false)String name) {
         Result<IPage<ByteDanceCreative>> result = new Result<>();
         QueryWrapper<ByteDanceCreative> queryWrapper = new QueryWrapper<>();
-        if(null!=startDate&&!startDate.trim().equals("")){
+        if(null!=startDate&&!"".equals(startDate.trim())){
             queryWrapper.ge("creative_create_time",startDate+" 00:00:00");
         }
         if(null!=accountId){
@@ -67,13 +67,13 @@ public class ByteDanceCreativeController {
         if(null!=planId&&planId!=0){
             queryWrapper.eq("plan_id",planId);
         }
-        if(null!=endDate&&!endDate.trim().equals("")){
+        if(null!=endDate&&!"".equals(endDate.trim())){
             queryWrapper.le("creative_create_time",endDate+" 23:59:59");
         }
         if(null!=name&&!"".equals(name.trim())){
             queryWrapper.like("title",name);
         }
-        if(null!=status&&!status.trim().equals("")){
+        if(null!=status&&!"".equals(status.trim())){
             queryWrapper.eq("opt_status","CREATIVE_STATUS_"+status);
         }
         queryWrapper.orderByDesc("creative_create_time");
@@ -81,7 +81,7 @@ public class ByteDanceCreativeController {
         IPage<ByteDanceCreative> pageList = byteDanceCreativeService.page(page, queryWrapper);
         List<ByteDanceCreative> records = pageList.getRecords();
         if(null!=records&&!records.isEmpty()){
-            List<ByteDanceCreative> creatives = records.stream().map(creative-> creative.setCreateStatus(creative.getOptStatus().equalsIgnoreCase("CREATIVE_STATUS_ENABLE"))).collect(Collectors.toList());
+            List<ByteDanceCreative> creatives = records.stream().map(creative-> creative.setCreateStatus("CREATIVE_STATUS_ENABLE".equalsIgnoreCase(creative.getOptStatus()))).collect(Collectors.toList());
             pageList.setRecords(creatives);
         }
         result.setSuccess(true);
@@ -119,7 +119,7 @@ public class ByteDanceCreativeController {
                                          @RequestParam(name = "ids") String ids,
                                          @RequestParam(name = "status")String status){
         Map<String,Object>result = new HashMap();
-        if(null == accountId||accountId==0||null == ids||ids.trim().equals("")||null==status||status.trim().equals("")){
+        if(null == accountId||accountId==0||null == ids|| "".equals(ids.trim())||null==status|| "".equals(status.trim())){
             ResultMapUtils.setResultMap(result, StatusCode.COMMON_PARAM_ERROR);
             return result;
         }

+ 7 - 7
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/ByteDanceAdvertisePlanServiceImpl.java

@@ -57,14 +57,14 @@ public class ByteDanceAdvertisePlanServiceImpl extends ServiceImpl<ByteDanceAdve
         params.put("start_time", byteDanceAdvertisePlan.getStartTime());
         params.put("end_time", byteDanceAdvertisePlan.getEndTime());
         //广告投放时段
-        if(!byteDanceAdvertisePlan.getScheduleTime().equals("")){
+        if(!"".equals(byteDanceAdvertisePlan.getScheduleTime())){
             params.put("schedule_time",byteDanceAdvertisePlan.getScheduleTime());
         }
         params.put("pricing", byteDanceAdvertisePlan.getPricing());
         params.put("bid", byteDanceAdvertisePlan.getBid());
         params.put("cpa_bid", byteDanceAdvertisePlan.getCpaBid());
         params.put("flow_control_mode", byteDanceAdvertisePlan.getFlowControlMode());
-        if (byteDanceAdvertisePlan.getPricing().equals("PRICING_OCPM")) {
+        if ("PRICING_OCPM".equals(byteDanceAdvertisePlan.getPricing())) {
             if(byteDanceAdvertisePlan.getConvertId()!=null){
                 //查询必填参数convert_id
                 params.put("convert_id", byteDanceAdvertisePlan.getConvertId());
@@ -86,14 +86,14 @@ public class ByteDanceAdvertisePlanServiceImpl extends ServiceImpl<ByteDanceAdve
         params.put("adjust_cpa", 0);
         //暂时不需要定向包id
         //params.put("audience_package_id",byteDanceAdvertisePlan.getLong("audiencePackageId"));
-        if(byteDanceAdvertisePlan.getUseOpenUrl().equals("YES")){
+        if("YES".equals(byteDanceAdvertisePlan.getUseOpenUrl())){
             params.put("open_url", byteDanceAdvertisePlan.getOpenUrl());
         }
         //判断推广目的
-        if (landingType.equals("LINK")) {
+        if ("LINK".equals(landingType)) {
             params.put("external_url", byteDanceAdvertisePlan.getExternalUrl());
         }
-        if (landingType.equals("APP")) {
+        if ("APP".equals(landingType)) {
             params.put("download_type", byteDanceAdvertisePlan.getDownloadType());
             params.put("download_url", byteDanceAdvertisePlan.getDownloadUrl());
             params.put("package", byteDanceAdvertisePlan.getToutiaoPackage());
@@ -167,7 +167,7 @@ public class ByteDanceAdvertisePlanServiceImpl extends ServiceImpl<ByteDanceAdve
             params.put("start_time", byteDanceAdvertisePlan.getStartTime());
             params.put("end_time", byteDanceAdvertisePlan.getEndTime());
             //广告投放时段
-            if(!byteDanceAdvertisePlan.getScheduleTime().equals("")){
+            if(!"".equals(byteDanceAdvertisePlan.getScheduleTime())){
                 params.put("schedule_time",byteDanceAdvertisePlan.getScheduleTime());
             }
             params.put("bid", byteDanceAdvertisePlan.getBid());
@@ -413,7 +413,7 @@ public class ByteDanceAdvertisePlanServiceImpl extends ServiceImpl<ByteDanceAdve
     public List<ByteDanceAdvertisePlan> getAllPlans(Long accountId,String createDate) {
         QueryWrapper<ByteDanceAdvertisePlan>queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("account_id",accountId+"");
-        if(null!=createDate&&!createDate.trim().equals("")){
+        if(null!=createDate&&!"".equals(createDate.trim())){
             queryWrapper.ge("ad_create_time",createDate+" 00:00:00");
         }
         queryWrapper.ne("opt_status","AD_STATUS_DELETE");

+ 1 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/ByteDanceAdvertiserDataServiceImpl.java

@@ -491,7 +491,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
     @Override
     public Map<String, Object> advertiserCustomAudienceSelect(String accountId) {
         Map<String, Object> resultMap = new HashMap<>();
-        if (null == accountId || accountId.trim().equals("")) {
+        if (null == accountId || "".equals(accountId.trim())) {
             ResultMapUtils.setResultMap(resultMap, StatusCode.COMMON_PARAM_ERROR);
             return resultMap;
         }

+ 3 - 3
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/ByteDanceCampaignServiceImpl.java

@@ -51,15 +51,15 @@ public class ByteDanceCampaignServiceImpl extends ServiceImpl<ByteDanceCampaignM
         JSONObject param = new JSONObject();
         param.put("advertiser_id",token.getAccountId());
         param.put("campaign_name",campaignName);
-        if(null!=operation&&!operation.trim().equals("")){
+        if(null!=operation&&!"".equals(operation.trim())){
             param.put("operation",operation);
         }
         param.put("budget_mode", budgetMode);
-        if(null != budget&&!budget.trim().equals("")){
+        if(null != budget&&!"".equals(budget.trim())){
             param.put("budget",budget);
         }
         param.put("landing_type", landingType);
-        if(null != uniqueFk&&!uniqueFk.trim().equals("")){
+        if(null != uniqueFk&&!"".equals(uniqueFk.trim())){
             param.put("unique_fk",uniqueFk);
         }
         JSONObject data = HttpUtils.bytedancePostRequest(token.getAccessToken(),url,param);

+ 52 - 52
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/ByteDanceCreativeServiceImpl.java

@@ -217,7 +217,7 @@ public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeM
             return resultMap;
         }
         ByteDanceAdvertisePlan plan = byteDanceAdvertisePlanService.getById(planId);
-        if(null == plan||plan.getOptStatus().equals("AD_STATUS_DELETE")){
+        if(null == plan|| "AD_STATUS_DELETE".equals(plan.getOptStatus())){
             ResultMapUtils.setResultMap(resultMap,StatusCode.BYTEDANCE_ACCOUNT_DATA_NOT_EXIST);
             resultMap.put("data",null);
             return resultMap;
@@ -278,27 +278,27 @@ public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeM
             data.put("adId",adId);
         }
         String modifyTime = getData.getString("modify_time");
-        if(null!=modifyTime&&!modifyTime.trim().equals("")){
+        if(null!=modifyTime&&!"".equals(modifyTime.trim())){
             data.put("modifyTime",modifyTime);
         }
         String trackUrl = getData.getString("track_url");
-        if(null!=trackUrl&&!trackUrl.trim().equals("")){
+        if(null!=trackUrl&&!"".equals(trackUrl.trim())){
             data.put("trackUrl",trackUrl);
         }
         String actionTrackUrl = getData.getString("action_track_url");
-        if(null!=actionTrackUrl&&!actionTrackUrl.trim().equals("")){
+        if(null!=actionTrackUrl&&!"".equals(actionTrackUrl.trim())){
             data.put("actionTrackUrl",actionTrackUrl);
         }
         String videoPlayEffectiveTrackUrl = getData.getString("video_play_effective_track_url");
-        if(null!=videoPlayEffectiveTrackUrl&&!videoPlayEffectiveTrackUrl.trim().equals("")){
+        if(null!=videoPlayEffectiveTrackUrl&&!"".equals(videoPlayEffectiveTrackUrl.trim())){
             data.put("videoPlayEffectiveTrackUrl",videoPlayEffectiveTrackUrl);
         }
         String videoPlayDoneTrackUrl = getData.getString("video_play_done_track_url");
-        if(null!=videoPlayDoneTrackUrl&&!videoPlayDoneTrackUrl.trim().equals("")){
+        if(null!=videoPlayDoneTrackUrl&&!"".equals(videoPlayDoneTrackUrl.trim())){
             data.put("videoPlayDoneTrackUrl",videoPlayDoneTrackUrl);
         }
         String videoPlayTrackUrl = getData.getString("video_play_track_url");
-        if(null!=videoPlayTrackUrl&&!videoPlayTrackUrl.trim().equals("")){
+        if(null!=videoPlayTrackUrl&&!"".equals(videoPlayTrackUrl.trim())){
             data.put("videoPlayTrackUrl",videoPlayTrackUrl);
         }
         Integer isCommentDisable = getData.getInteger("is_comment_disable");
@@ -310,7 +310,7 @@ public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeM
             data.put("closeVideoDetail",closeVideoDetail);
         }
         String creativeDisplayMode = getData.getString("creative_display_mode");
-        if(null!=creativeDisplayMode&&!creativeDisplayMode.trim().equals("")){
+        if(null!=creativeDisplayMode&&!"".equals(creativeDisplayMode.trim())){
             data.put("creativeDisplayMode",creativeDisplayMode);
         }
         Long smartInventory = getData.getLong("smart_inventory");
@@ -318,7 +318,7 @@ public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeM
             data.put("smartInventory",smartInventory);
         }
         String sceneInventory = getData.getString("scene_inventory");
-        if(null!=sceneInventory&&!sceneInventory.trim().equals("")){
+        if(null!=sceneInventory&&!"".equals(sceneInventory.trim())){
             data.put("sceneInventory",sceneInventory);
         }
         Long generateDerivedAd = getData.getLong("generate_derived_ad");
@@ -330,15 +330,15 @@ public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeM
             data.put("inventoryType",inventoryType);
         }
         String source = getData.getString("source");
-        if(null!=source&&!source.trim().equals("")){
+        if(null!=source&&!"".equals(source.trim())){
             data.put("source",source);
         }
         String appName = getData.getString("app_name");
-        if(null!=appName&&!appName.trim().equals("")){
+        if(null!=appName&&!"".equals(appName.trim())){
             data.put("appName",appName);
         }
         String webUrl = getData.getString("web_url");
-        if(null!=webUrl&&!webUrl.trim().equals("")){
+        if(null!=webUrl&&!"".equals(webUrl.trim())){
             data.put("webUrl",webUrl);
         }
         JSONArray adKeywords = getData.getJSONArray("ad_keywords");
@@ -350,35 +350,35 @@ public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeM
             data.put("thirdIndustryId",thirdIndustryId);
         }
         String advancedCreativeType = getData.getString("advanced_creative_type");
-        if(null!=advancedCreativeType&&!advancedCreativeType.trim().equals("")){
+        if(null!=advancedCreativeType&&!"".equals(advancedCreativeType.trim())){
             data.put("advancedCreativeType",advancedCreativeType);
         }
         String advancedCreativeTitle = getData.getString("advanced_creative_title");
-        if(null!=advancedCreativeTitle&&!advancedCreativeTitle.trim().equals("")){
+        if(null!=advancedCreativeTitle&&!"".equals(advancedCreativeTitle.trim())){
             data.put("advancedCreativeTitle",advancedCreativeTitle);
         }
         String phoneNumber = getData.getString("phone_number");
-        if(null!=phoneNumber&&!phoneNumber.trim().equals("")){
+        if(null!=phoneNumber&&!"".equals(phoneNumber.trim())){
             data.put("phoneNumber",phoneNumber);
         }
         String buttonText = getData.getString("button_text");
-        if(null!=buttonText&&!buttonText.trim().equals("")){
+        if(null!=buttonText&&!"".equals(buttonText.trim())){
             data.put("buttonText",buttonText);
         }
         String actionText = getData.getString("action_text");
-        if(null!=actionText&&!actionText.trim().equals("")){
+        if(null!=actionText&&!"".equals(actionText.trim())){
             data.put("actionText",actionText);
         }
         String formUrl = getData.getString("form_url");
-        if(null!=formUrl&&!formUrl.trim().equals("")){
+        if(null!=formUrl&&!"".equals(formUrl.trim())){
             data.put("formUrl",formUrl);
         }
         String creativeMaterialMode = getData.getString("creative_material_mode");
-        if(null!=creativeMaterialMode&&!creativeMaterialMode.trim().equals("")){
+        if(null!=creativeMaterialMode&&!"".equals(creativeMaterialMode.trim())){
             data.put("creativeMaterialMode",creativeMaterialMode);
         }
         String iesCoreUserId = getData.getString("ies_core_user_id");
-        if(null!=iesCoreUserId&&!iesCoreUserId.trim().equals("")){
+        if(null!=iesCoreUserId&&!"".equals(iesCoreUserId.trim())){
             data.put("iesCoreUserId",iesCoreUserId);
         }
         Long isFeedAndFavSee = getData.getLong("is_feed_and_fav_see");
@@ -390,7 +390,7 @@ public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeM
             data.put("commerceCards",commerceCards);
         }
         String playableUrl = getData.getString("playable_url");
-        if(null!=playableUrl&&!playableUrl.trim().equals("")){
+        if(null!=playableUrl&&!"".equals(playableUrl.trim())){
             data.put("playableUrl",playableUrl);
         }
         Long proceduralPackageId = getData.getLong("procedural_package_id");
@@ -406,7 +406,7 @@ public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeM
             data.put("isPresentedVideo",isPresentedVideo);
         }
         String subTitle = getData.getString("sub_title");
-        if(null!=subTitle&&!subTitle.trim().equals("")){
+        if(null!=subTitle&&!"".equals(subTitle.trim())){
             data.put("subTitle",subTitle);
         }
         Long creativeAutoGenerateSwitch = getData.getLong("creative_auto_generate_switch");
@@ -414,7 +414,7 @@ public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeM
             data.put("creativeAutoGenerateSwitch",creativeAutoGenerateSwitch);
         }
         String trackUrlSendType = getData.getString("track_url_send_type");
-        if(null!=trackUrlSendType&&!trackUrlSendType.trim().equals("")){
+        if(null!=trackUrlSendType&&!"".equals(trackUrlSendType.trim())){
             data.put("trackUrlSendType",trackUrlSendType);
         }
         JSONArray subLinkIdList = getData.getJSONArray("sub_link_id_list");
@@ -445,7 +445,7 @@ public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeM
                 String imageMode = getImage.getString("image_mode");
                 setImage.put("imageMode",imageMode);
                 String imageId = getImage.getString("image_id");
-                if(null!=imageId&&!imageId.trim().equals("")){
+                if(null!=imageId&&!"".equals(imageId.trim())){
                     setImage.put("imageId",imageId);
                     if(imageId.contains("web")){
                         setImage.put("imageUrl","https://sf6-ttcdn-tos.pstatp.com/obj/"+imageId);
@@ -454,7 +454,7 @@ public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeM
                     }
                 }
                 String videoId = getImage.getString("video_id");
-                if(null!=videoId&&!videoId.trim().equals("")){
+                if(null!=videoId&&!"".equals(videoId.trim())){
                     setImage.put("videoId",videoId);
                     setImage.put("videoUrl","https://aweme.snssdk.com/aweme/v1/playwm/?video_id="+videoId+"&line=0");
                 }
@@ -463,7 +463,7 @@ public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeM
                     setImage.put("imageIds",imageIds);
                 }
                 String templateId = getImage.getString("template_id");
-                if(null!=templateId&&!templateId.trim().equals("")){
+                if(null!=templateId&&!"".equals(templateId.trim())){
                     setImage.put("templateId",templateId);
                 }
                 imageArray.add(setImage);
@@ -477,11 +477,11 @@ public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeM
                 JSONObject getCreative = creativeList.getJSONObject(i);
                 JSONObject setCreative = new JSONObject();
                 String creative_id = getCreative.getString("creative_id");
-                if(null!=creative_id&&!creative_id.trim().equals("")){
+                if(null!=creative_id&&!"".equals(creative_id.trim())){
                     setCreative.put("creative_id",creative_id);
                 }
                 String title = getCreative.getString("title");
-                if(null!=title&&!title.trim().equals("")){
+                if(null!=title&&!"".equals(title.trim())){
                     setCreative.put("title",title);
                 }
                 JSONArray creativeWordIds = getCreative.getJSONArray("creative_word_ids");
@@ -493,7 +493,7 @@ public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeM
                     setCreative.put("dpaDictIds",dpaDictIds);
                 }
                 String imageMode = getCreative.getString("image_mode");
-                if(null!=imageMode&&!imageMode.trim().equals("")){
+                if(null!=imageMode&&!"".equals(imageMode.trim())){
                     setCreative.put("imageMode",imageMode);
                 }
                 JSONArray imageIds = getCreative.getJSONArray("imageIds");
@@ -501,17 +501,17 @@ public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeM
                     setCreative.put("imageIds",imageIds);
                 }
                 String imageId = getCreative.getString("image_id");
-                if(null!=imageId&&!imageId.trim().equals("")){
+                if(null!=imageId&&!"".equals(imageId.trim())){
                     setCreative.put("imageId",imageId);
                     setCreative.put("imageUrl","https://sf6-ttcdn-tos.pstatp.com/obj/mosaic-legacy/"+imageId);
                 }
                 String videoId = getCreative.getString("video_id");
-                if(null!=videoId&&!videoId.trim().equals("")){
+                if(null!=videoId&&!"".equals(videoId.trim())){
                     setCreative.put("videoId",videoId);
                     setCreative.put("videoUrl","https://aweme.snssdk.com/aweme/v1/playwm/?video_id="+videoId+"&line=0");
                 }
                 String thirdPartyId = getCreative.getString("third_party_id");
-                if(null!=thirdPartyId&&!thirdPartyId.trim().equals("")){
+                if(null!=thirdPartyId&&!"".equals(thirdPartyId.trim())){
                     setCreative.put("thirdPartyId",thirdPartyId);
                 }
                 Long derivePosterCid = getCreative.getLong("derive_poster_cid");
@@ -523,7 +523,7 @@ public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeM
                     setCreative.put("templateId",templateId);
                 }
                 String templateImageId = getCreative.getString("template_image_id");
-                if(null!=templateImageId&&!templateImageId.trim().equals("")){
+                if(null!=templateImageId&&!"".equals(templateImageId.trim())){
                     setCreative.put("templateImageId",templateImageId);
                 }
                 Long dpaTemplate = getCreative.getLong("dpa_template");
@@ -531,7 +531,7 @@ public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeM
                     setCreative.put("dpaTemplate",dpaTemplate);
                 }
                 String dpaVideoTemplateType = getCreative.getString("dpa_video_template_type");
-                if(null!=dpaVideoTemplateType&&!dpaVideoTemplateType.trim().equals("")){
+                if(null!=dpaVideoTemplateType&&!"".equals(dpaVideoTemplateType.trim())){
                     setCreative.put("dpaVideoTemplateType",dpaVideoTemplateType);
                 }
                 JSONArray dpaVideoTaskIds = getCreative.getJSONArray("dpa_video_task_ids");
@@ -681,7 +681,7 @@ public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeM
         }
         //场景指定位置
         String sceneInventory = data.getString("sceneInventory");
-        if(null!=sceneInventory&&!sceneInventory.trim().equals("")){
+        if(null!=sceneInventory&&!"".equals(sceneInventory.trim())){
             params.put("scene_inventory",sceneInventory);
         }
         JSONArray adKeywords = data.getJSONArray("adKeywords");
@@ -697,27 +697,27 @@ public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeM
          * 创意展现方式
          */
         String creativeDisplayMode = data.getString("creativeDisplayMode");
-        if(null!=creativeDisplayMode&&creativeDisplayMode.trim().equals("")){
+        if(null!=creativeDisplayMode&& "".equals(creativeDisplayMode.trim())){
             params.put("creative_display_mode",creativeDisplayMode);
         }
         String trackUrl = data.getString("trackUrl");
-        if(null!=trackUrl&&trackUrl.trim().equals("")){
+        if(null!=trackUrl&& "".equals(trackUrl.trim())){
             params.put("track_url",trackUrl);
         }
         String actionTrackUrl = data.getString("actionTrackUrl");
-        if(null!=actionTrackUrl&&actionTrackUrl.trim().equals("")){
+        if(null!=actionTrackUrl&& "".equals(actionTrackUrl.trim())){
             params.put("action_track_url",actionTrackUrl);
         }
         String videoPlayEffectiveTrackUrl = data.getString("videoPlayEffectiveTrackUrl");
-        if(null!=videoPlayEffectiveTrackUrl&&videoPlayEffectiveTrackUrl.trim().equals("")){
+        if(null!=videoPlayEffectiveTrackUrl&& "".equals(videoPlayEffectiveTrackUrl.trim())){
             params.put("video_play_effective_track_url",videoPlayEffectiveTrackUrl);
         }
         String videoPlayDoneTrackUrl = data.getString("videoPlayDoneTrackUrl");
-        if(null!=videoPlayDoneTrackUrl&&videoPlayDoneTrackUrl.trim().equals("")){
+        if(null!=videoPlayDoneTrackUrl&& "".equals(videoPlayDoneTrackUrl.trim())){
             params.put("video_play_done_track_url",videoPlayDoneTrackUrl);
         }
         String videoPlayTrackUrl = data.getString("videoPlayTrackUrl");
-        if(null!=videoPlayTrackUrl&&videoPlayTrackUrl.trim().equals("")){
+        if(null!=videoPlayTrackUrl&& "".equals(videoPlayTrackUrl.trim())){
             params.put("video_play_track_url",videoPlayTrackUrl);
         }
         Long isCommentDisable = data.getLong("isCommentDisable");
@@ -762,52 +762,52 @@ public class ByteDanceCreativeServiceImpl extends ServiceImpl<ByteDanceCreativeM
         }
 
         String source = data.getString("source");
-        if(null!=source&&!source.trim().equals("")){
+        if(null!=source&&!"".equals(source.trim())){
             params.put("source",source);
         }
         //###############公共参数结束################################
 
         //#######推广目的为APP######################################
         String appName = data.getString("appName");
-        if(null!=appName&&!appName.trim().equals("")){
+        if(null!=appName&&!"".equals(appName.trim())){
             params.put("app_name",appName);
         }
         String webUrl = data.getString("webUrl");
-        if(null!=webUrl&&!webUrl.trim().equals("")){
+        if(null!=webUrl&&!"".equals(webUrl.trim())){
             params.put("web_url",webUrl);
         }
         String actionText = data.getString("actionText");
-        if(null!=actionText&&!actionText.trim().equals("")){
+        if(null!=actionText&&!"".equals(actionText.trim())){
             params.put("action_text",actionText);
         }
         String subTitle = data.getString("subTitle");
-        if(null!=subTitle&&!subTitle.trim().equals("")){
+        if(null!=subTitle&&!"".equals(subTitle.trim())){
             params.put("sub_title",subTitle);
         }
         //###############################################
         //############创意推广目的为link的时候###################
         String advancedCreativeType = data.getString("advancedCreativeType");
-        if(null!=advancedCreativeType&&!advancedCreativeType.trim().equals("")){
+        if(null!=advancedCreativeType&&!"".equals(advancedCreativeType.trim())){
             params.put("advanced_creative_type",advancedCreativeType);
         }
         String advancedCreativeTitle = data.getString("advancedCreativeTitle");
-        if(null!=advancedCreativeTitle&&!advancedCreativeTitle.trim().equals("")){
+        if(null!=advancedCreativeTitle&&!"".equals(advancedCreativeTitle.trim())){
             params.put("advanced_creative_title",advancedCreativeTitle);
         }
         String phoneNumber = data.getString("phoneNumber");
-        if(null!=phoneNumber&&!phoneNumber.trim().equals("")){
+        if(null!=phoneNumber&&!"".equals(phoneNumber.trim())){
             params.put("phone_number",phoneNumber);
         }
         String buttonText = data.getString("buttonText");
-        if(null!=buttonText&&!buttonText.trim().equals("")){
+        if(null!=buttonText&&!"".equals(buttonText.trim())){
             params.put("button_text",buttonText);
         }
         String formUrl = data.getString("formUrl");
-        if(null!=formUrl&&!formUrl.trim().equals("")){
+        if(null!=formUrl&&!"".equals(formUrl.trim())){
             params.put("form_url",formUrl);
         }
 
-        if(null!=creativeWay&&creativeWay.trim().equals("proceduralCreativity")){
+        if(null!=creativeWay&& "proceduralCreativity".equals(creativeWay.trim())){
             //程序化
             params.put("creative_material_mode","STATIC_ASSEMBLE");
             JSONArray titleList = data.getJSONArray("titleList");

+ 116 - 116
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/controller/ByteDanceVideoReportDailyController.java

@@ -320,7 +320,7 @@ public class ByteDanceVideoReportDailyController {
 				 //循环
 				 for(String column:columns){
 
-					 if( column.equals("videoU")){
+					 if( "videoU".equals(column)){
 						 continue;
 					 }
 
@@ -329,7 +329,7 @@ public class ByteDanceVideoReportDailyController {
 						// continue;
 					 //}
 					 //
-					 if( column.equals("projectName")){
+					 if( "projectName".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getProjectName() );  //
 						 continue;
 					 }
@@ -344,82 +344,82 @@ public class ByteDanceVideoReportDailyController {
 						// continue;
 					 //}
 
-					 if( column.equals("statDatetime")){
+					 if( "statDatetime".equals(column)){
 						 ByteDanceVideoReportDaily.add(dateDTO.getStartDate() + "  ~  " + dateDTO.getEndDate() );  //
 						 continue;
 					 }
 
-					 if( column.equals("cost")){
+					 if( "cost".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getCost().setScale(2,BigDecimal.ROUND_HALF_UP) );  //
 						 continue;
 					 }
 
-					 if( column.equals("signature")){
+					 if( "signature".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getSignature() );  //
 						 continue;
 					 }
 
-					 if( column.equals("url")){
+					 if( "url".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getVideoUrl() );  //下载的时候链接转换成头条的链接
 						 continue;
 					 }
 
-					 if( column.equals("materialName")){
+					 if( "materialName".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getMaterialName() );  //
 						 continue;
 					 }
 
-					 if( column.equals("appType")){
+					 if( "appType".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getAppType() );  //
 						 continue;
 					 }
 
-					 if( column.equals("clickMaterial")){
+					 if( "clickMaterial".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getClickMaterial() );  //
 						 continue;
 					 }
 
-					 if( column.equals("play25FeedBreakRate")){
+					 if( "play25FeedBreakRate".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getPlay25FeedBreakRate().multiply(new BigDecimal("100")).setScale(2,BigDecimal.ROUND_HALF_UP) + "%" );  //
 						 continue;
 					 }
 
-					 if( column.equals("playOverRate")){
+					 if( "playOverRate".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getPlayOverRate().multiply(new BigDecimal("100")).setScale(2,BigDecimal.ROUND_HALF_UP) + "%" );  //
 						 continue;
 					 }
 
-					 if( column.equals("convertRate")){
+					 if( "convertRate".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getConvertRate().multiply(new BigDecimal("100")).setScale(2,BigDecimal.ROUND_HALF_UP) + "%" );  //
 						 continue;
 					 }
 
-					 if( column.equals("active")){
+					 if( "active".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getActive());  //
 						 continue;
 					 }
 
-					 if( column.equals("downloadFinish")){
+					 if( "downloadFinish".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getDownloadFinish());  //
 						 continue;
 					 }
 
-					 if( column.equals("downloadStart")){
+					 if( "downloadStart".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getDownloadStart());  //
 						 continue;
 					 }
 
-					 if( column.equals("installFinish")){
+					 if( "installFinish".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getInstallFinish());  //
 						 continue;
 					 }
 
-					 if( column.equals("register")){
+					 if( "register".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getRegister());  //
 						 continue;
 					 }
 
-					 if( column.equals("payCount")){
+					 if( "payCount".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getPayCount());  //
 						 continue;
 					 }
@@ -454,7 +454,7 @@ public class ByteDanceVideoReportDailyController {
 						// continue;
 					 //}
 
-					 if( column.equals("form")){
+					 if( "form".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getForm());  //
 						 continue;
 					 }
@@ -525,37 +525,37 @@ public class ByteDanceVideoReportDailyController {
 						// continue;
 					 //}
 
-					 if( column.equals("totalPlay")){
+					 if( "totalPlay".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getTotalPlay());  //
 						 continue;
 					 }
 
-					 if( column.equals("validPlay")){
+					 if( "validPlay".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getValidPlay());  //
 						 continue;
 					 }
 
-					 if( column.equals("wifiPlay")){
+					 if( "wifiPlay".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getWifiPlay());  //
 						 continue;
 					 }
 
-					 if( column.equals("play25FeedBreak")){
+					 if( "play25FeedBreak".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getPlay25FeedBreak());  //
 						 continue;
 					 }
 
-					 if( column.equals("play50FeedBreak")){
+					 if( "play50FeedBreak".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getPlay50FeedBreak());  //
 						 continue;
 					 }
 
-					 if( column.equals("play75FeedBreak")){
+					 if( "play75FeedBreak".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getPlay75FeedBreak());  //
 						 continue;
 					 }
 
-					 if( column.equals("play100FeedBreak")){
+					 if( "play100FeedBreak".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getPlay100FeedBreak());  //
 						 continue;
 					 }
@@ -575,7 +575,7 @@ public class ByteDanceVideoReportDailyController {
 						// continue;
 					 //}
 
-					 if( column.equals("shareMaterial")){
+					 if( "shareMaterial".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getShowMaterial());  //
 						 continue;
 					 }
@@ -585,7 +585,7 @@ public class ByteDanceVideoReportDailyController {
 						// continue;
 					 //}
 
-					 if( column.equals("follow")){
+					 if( "follow".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getFollow());  //
 						 continue;
 					 }
@@ -605,27 +605,27 @@ public class ByteDanceVideoReportDailyController {
 						// continue;
 					 //}
 
-					 if( column.equals("nextDayOpen")){
+					 if( "nextDayOpen".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getNextDayOpen());  //
 						 continue;
 					 }
 
-					 if( column.equals("nextDayOpenRate")){
+					 if( "nextDayOpenRate".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getNextDayOpenRate().multiply(new BigDecimal("100")).setScale(2,BigDecimal.ROUND_HALF_UP) + "%" );  //
 						 continue;
 					 }
 
-					 if( column.equals("nextDayOpenCost")){
+					 if( "nextDayOpenCost".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getNextDayOpenCost().setScale(2,BigDecimal.ROUND_HALF_UP));  //
 						 continue;
 					 }
 
-					 if( column.equals("activePayAmount")){
+					 if( "activePayAmount".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getActivePayAmount());  //
 						 continue;
 					 }
 
-					 if( column.equals("validPlayCost")){
+					 if( "validPlayCost".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getValidPlayCost().setScale(2,BigDecimal.ROUND_HALF_UP));  //
 						 continue;
 					 }
@@ -635,12 +635,12 @@ public class ByteDanceVideoReportDailyController {
 						// continue;
 					 //}
 
-					 if( column.equals("convertMaterial")){
+					 if( "convertMaterial".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getConvertMaterial());  //
 						 continue;
 					 }
 
-					 if( column.equals("activePayCost")){
+					 if( "activePayCost".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getActivePayCost()==null?0:sum.getActivePayCost().setScale(2,BigDecimal.ROUND_HALF_UP));  //
 						 continue;
 					 }
@@ -650,7 +650,7 @@ public class ByteDanceVideoReportDailyController {
 						// continue;
 					 //}
 
-					 if( column.equals("cpc")){
+					 if( "cpc".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getCpc().setScale(2,BigDecimal.ROUND_HALF_UP));  //
 						 continue;
 					 }
@@ -660,78 +660,78 @@ public class ByteDanceVideoReportDailyController {
 						// continue;
 					 //}
 
-					 if( column.equals("ctr")){
+					 if( "ctr".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getCtr().multiply(new BigDecimal("100")).setScale(2,BigDecimal.ROUND_HALF_UP) + "%");  //
 						 continue;
 					 }
 
-					 if( column.equals("cpm")){
+					 if( "cpm".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getCpm());  //
 						 continue;
 					 }
 
-					 if( column.equals("wifiPlayRate")){
+					 if( "wifiPlayRate".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getWifiPlayRate().multiply(new BigDecimal("100")).setScale(2,BigDecimal.ROUND_HALF_UP) + "%");  //
 						 continue;
 					 }
 
-					 if( column.equals("likeMaterial")){
+					 if( "likeMaterial".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getLikeMaterial());  //
 						 continue;
 					 }
 
-					 if( column.equals("activeCost")){
+					 if( "activeCost".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getActiveCost().setScale(2,BigDecimal.ROUND_HALF_UP));  //
 						 continue;
 					 }
 
-					 if( column.equals("gameAddictionCost")){
+					 if( "gameAddictionCost".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getGameAddictionCost().setScale(2,BigDecimal.ROUND_HALF_UP));  //
 						 continue;
 					 }
 
-					 if( column.equals("gameAddiction")){
+					 if( "gameAddiction".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getGameAddiction());  //
 						 continue;
 					 }
 
-					 if( column.equals("activeRate")){
+					 if( "activeRate".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getActiveRate().multiply(new BigDecimal("100")).setScale(2,BigDecimal.ROUND_HALF_UP) + "%");  //
 						 continue;
 					 }
 
-					 if( column.equals("gameAddictionRate")){
+					 if( "gameAddictionRate".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getGameAddictionRate().multiply(new BigDecimal("100")).setScale(2,BigDecimal.ROUND_HALF_UP) + "%");  //
 						 continue;
 					 }
 
-					 if( column.equals("activeRegisterRate")){
+					 if( "activeRegisterRate".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getActiveRegisterRate().multiply(new BigDecimal("100")).setScale(2,BigDecimal.ROUND_HALF_UP) + "%");  //
 						 continue;
 					 }
 
-					 if( column.equals("downloadFinishCost")){
+					 if( "downloadFinishCost".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getDownloadFinishCost().setScale(2,BigDecimal.ROUND_HALF_UP));  //
 						 continue;
 					 }
 
-					 if( column.equals("activeRegisterCost")){
+					 if( "activeRegisterCost".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getActiveRegisterCost().setScale(2,BigDecimal.ROUND_HALF_UP));  //
 						 continue;
 					 }
 
-					 if( column.equals("showMaterial")){
+					 if( "showMaterial".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getShowMaterial());  //
 						 continue;
 					 }
 
 
-					 if( column.equals("downloadFinishRate")){
+					 if( "downloadFinishRate".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getDownloadFinishRate().multiply(new BigDecimal("100")).setScale(2,BigDecimal.ROUND_HALF_UP) + "%");  //
 						 continue;
 					 }
 
-					 if( column.equals("installFinishRate")){
+					 if( "installFinishRate".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getInstallFinishRate().multiply(new BigDecimal("100")).setScale(2,BigDecimal.ROUND_HALF_UP) + "%");  //
 						 continue;
 					 }
@@ -746,12 +746,12 @@ public class ByteDanceVideoReportDailyController {
 						// continue;
 					 //}
 
-					 if( column.equals("playOver")){
+					 if( "playOver".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getPlayOver());  //
 						 continue;
 					 }
 
-					 if( column.equals("downloadStartCost")){
+					 if( "downloadStartCost".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getDownloadStartCost().setScale(2,BigDecimal.ROUND_HALF_UP));  //
 						 continue;
 					 }
@@ -761,32 +761,32 @@ public class ByteDanceVideoReportDailyController {
 						// continue;
 					 //}
 
-					 if( column.equals("validPlayRate")){
+					 if( "validPlayRate".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getValidPlayRate().multiply(new BigDecimal("100")).setScale(2,BigDecimal.ROUND_HALF_UP) + "%");  //
 						 continue;
 					 }
 
-					 if( column.equals("averagePlayTimePerPlay")){
+					 if( "averagePlayTimePerPlay".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getAveragePlayTimePerPlay().setScale(2,BigDecimal.ROUND_HALF_UP));  //
 						 continue;
 					 }
 
-					 if( column.equals("convertCost")){
+					 if( "convertCost".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getConvertCost().setScale(2,BigDecimal.ROUND_HALF_UP));  //
 						 continue;
 					 }
 
-					 if( column.equals("installFinishCost")){
+					 if( "installFinishCost".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getInstallFinishCost().setScale(2,BigDecimal.ROUND_HALF_UP));  //
 						 continue;
 					 }
 
-					 if( column.equals("downloadStartRate")){
+					 if( "downloadStartRate".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getDownloadStartRate().multiply(new BigDecimal("100")).setScale(2,BigDecimal.ROUND_HALF_UP) + "%");  //
 						 continue;
 					 }
 
-					 if( column.equals("companyId")){
+					 if( "companyId".equals(column)){
 						 ByteDanceVideoReportDaily.add(sum.getCompanyId());  //
 						 continue;
 					 }
@@ -806,7 +806,7 @@ public class ByteDanceVideoReportDailyController {
 				// listHeaders.add("projectId");
 			 //}
 
-			 if( column.equals("projectName")){
+			 if( "projectName".equals(column)){
 				 listHeaders.add("项目名称");
 			 }
 
@@ -818,23 +818,23 @@ public class ByteDanceVideoReportDailyController {
 				// listHeaders.add("客户");
 			 //}
 
-			 if( column.equals("statDatetime")){
+			 if( "statDatetime".equals(column)){
 				 listHeaders.add("时间");
 			 }  /////
 
-			 if( column.equals("cost")){
+			 if( "cost".equals(column)){
 				 listHeaders.add("消耗");
 			 }  /////
 
-			 if( column.equals("signature")){
+			 if( "signature".equals(column)){
 				 listHeaders.add("视频id");
 			 }  /////
 
-			 if( column.equals("url")){
+			 if( "url".equals(column)){
 				 listHeaders.add("视频链接");
 			 }  /////
 
-			 if( column.equals("materialName")){
+			 if( "materialName".equals(column)){
 				 listHeaders.add("视频描述");
 			 }  /////
 
@@ -842,43 +842,43 @@ public class ByteDanceVideoReportDailyController {
 				// listHeaders.add("媒体");
 			 //}
 
-			 if( column.equals("clickMaterial")){
+			 if( "clickMaterial".equals(column)){
 				 listHeaders.add("点击数");
 			 }  /////
 
-			 if( column.equals("play25FeedBreakRate")){
+			 if( "play25FeedBreakRate".equals(column)){
 				 listHeaders.add("25%进度播放率");
 			 }
 
-			 if( column.equals("playOverRate")){
+			 if( "playOverRate".equals(column)){
 				 listHeaders.add("播完率");
 			 }  /////
 
-			 if( column.equals("convertRate")){
+			 if( "convertRate".equals(column)){
 				 listHeaders.add("转化率");
 			 }  /////
 
-			 if( column.equals("active")){
+			 if( "active".equals(column)){
 				 listHeaders.add("激活数");
 			 }  /////
 
-			 if( column.equals("downloadFinish")){
+			 if( "downloadFinish".equals(column)){
 				 listHeaders.add("安卓下载完成数");
 			 }  /////
 
-			 if( column.equals("downloadStart")){
+			 if( "downloadStart".equals(column)){
 				 listHeaders.add("安卓下载开始数");
 			 }  /////
 
-			 if( column.equals("installFinish")){
+			 if( "installFinish".equals(column)){
 				 listHeaders.add("安卓安装完成");
 			 }
 
-			 if( column.equals("register")){
+			 if( "register".equals(column)){
 				 listHeaders.add("注册数");
 			 }
 
-			 if( column.equals("payCount")){
+			 if( "payCount".equals(column)){
 				 listHeaders.add("付费次数");
 			 }  /////
 
@@ -906,7 +906,7 @@ public class ByteDanceVideoReportDailyController {
 				// listHeaders.add("点击电话按钮");
 			 //}
 
-			 if( column.equals("form")){
+			 if( "form".equals(column)){
 				 listHeaders.add("表单提交");
 			 }  /////
 
@@ -963,31 +963,31 @@ public class ByteDanceVideoReportDailyController {
 				// listHeaders.add("有效咨询");
 			 //}  /////
 
-			 if( column.equals("totalPlay")){
+			 if( "totalPlay".equals(column)){
 				 listHeaders.add("播放数");
 			 }  /////
 
-			 if( column.equals("validPlay")){
+			 if( "validPlay".equals(column)){
 				 listHeaders.add("有效播放数");
 			 }  /////
 
-			 if( column.equals("wifiPlay")){
+			 if( "wifiPlay".equals(column)){
 				 listHeaders.add("wifi播放");
 			 }
 
-			 if( column.equals("play25FeedBreak")){
+			 if( "play25FeedBreak".equals(column)){
 				 listHeaders.add("25%进度播放数");
 			 }
 
-			 if( column.equals("play50FeedBreak")){
+			 if( "play50FeedBreak".equals(column)){
 				 listHeaders.add("50%进度播放数");
 			 }
 
-			 if( column.equals("play75FeedBreak")){
+			 if( "play75FeedBreak".equals(column)){
 				 listHeaders.add("75%进度播放数");
 			 }
 
-			 if( column.equals("play100FeedBreak")){
+			 if( "play100FeedBreak".equals(column)){
 				 listHeaders.add("100%进度播放数");
 			 }
 
@@ -1003,7 +1003,7 @@ public class ByteDanceVideoReportDailyController {
 				// listHeaders.add("附加创意表单按钮点击");
 			 //}  /////
 
-			 if( column.equals("shareMaterial")){
+			 if( "shareMaterial".equals(column)){
 				 listHeaders.add("分享数");
 			 }  /////
 
@@ -1011,7 +1011,7 @@ public class ByteDanceVideoReportDailyController {
 				// listHeaders.add("评论提交数");
 			 //}  /////
 
-			 if( column.equals("follow")){
+			 if( "follow".equals(column)){
 				 listHeaders.add("新增关注数");
 			 }  /////
 
@@ -1027,23 +1027,23 @@ public class ByteDanceVideoReportDailyController {
 				// listHeaders.add("音乐查看数");
 			 //}  /////
 
-			 if( column.equals("nextDayOpen")){
+			 if( "nextDayOpen".equals(column)){
 				 listHeaders.add("次留数");
 			 }  /////
 
-			 if( column.equals("nextDayOpenRate")){
+			 if( "nextDayOpenRate".equals(column)){
 				 listHeaders.add("次留率");
 			 }  /////
 
-			 if( column.equals("nextDayOpenCost")){
+			 if( "nextDayOpenCost".equals(column)){
 				 listHeaders.add("次留成本");
 			 }  /////
 
-			 if( column.equals("activePayAmount")){
+			 if( "activePayAmount".equals(column)){
 				 listHeaders.add("付费次数");
 			 }
 
-			 if( column.equals("validPlayCost")){
+			 if( "validPlayCost".equals(column)){
 				 listHeaders.add("有效播放成本");
 			 }  /////
 
@@ -1051,11 +1051,11 @@ public class ByteDanceVideoReportDailyController {
 				// listHeaders.add("附加创意卡券领取");
 			 //}  /////
 
-			 if( column.equals("convertMaterial")){
+			 if( "convertMaterial".equals(column)){
 				 listHeaders.add("转化数");
 			 }
 
-			 if( column.equals("activePayCost")){
+			 if( "activePayCost".equals(column)){
 				 listHeaders.add("付费成本");
 			 }  /////
 
@@ -1063,7 +1063,7 @@ public class ByteDanceVideoReportDailyController {
 				// listHeaders.add("下载开始");
 			 //}  ////
 
-			 if( column.equals("cpc")){
+			 if( "cpc".equals(column)){
 				 listHeaders.add("平均点击单价");
 			 }
 
@@ -1071,63 +1071,63 @@ public class ByteDanceVideoReportDailyController {
 				// listHeaders.add("POI点击数");
 			 //}
 
-			 if( column.equals("ctr")){
+			 if( "ctr".equals(column)){
 				 listHeaders.add("点击率");
 			 }
 
-			 if( column.equals("cpm")){
+			 if( "cpm".equals(column)){
 				 listHeaders.add("平均千次展现费用");
 			 }
 
-			 if( column.equals("wifiPlayRate")){
+			 if( "wifiPlayRate".equals(column)){
 				 listHeaders.add("WiFi播放占比");
 			 }  /////
 
-			 if( column.equals("likeMaterial")){
+			 if( "likeMaterial".equals(column)){
 				 listHeaders.add("点赞数");
 			 }  /////
 
-			 if( column.equals("activeCost")){
+			 if( "activeCost".equals(column)){
 				 listHeaders.add("激活成本");
 			 }  ////
 
-			 if( column.equals("gameAddictionCost")){
+			 if( "gameAddictionCost".equals(column)){
 				 listHeaders.add("关键行为成本");
 			 }  /////
 
-			 if( column.equals("gameAddiction")){
+			 if( "gameAddiction".equals(column)){
 				 listHeaders.add("关键行为数");
 			 }  ////
 
-			 if( column.equals("activeRate")){
+			 if( "activeRate".equals(column)){
 				 listHeaders.add("激活率");
 			 }  /////
 
-			 if( column.equals("gameAddictionRate")){
+			 if( "gameAddictionRate".equals(column)){
 				 listHeaders.add("关键行为率");
 			 }  /////
 
-			 if( column.equals("activeRegisterRate")){
+			 if( "activeRegisterRate".equals(column)){
 				 listHeaders.add("注册率");
 			 }  /////
 
-			 if( column.equals("downloadFinishCost")){
+			 if( "downloadFinishCost".equals(column)){
 				 listHeaders.add("安卓下载完成成本");
 			 }  /////
 
-			 if( column.equals("activeRegisterCost")){
+			 if( "activeRegisterCost".equals(column)){
 				 listHeaders.add("注册成本");
 			 }  ////
 
-			 if( column.equals("showMaterial")){
+			 if( "showMaterial".equals(column)){
 				 listHeaders.add("展示数");
 			 }  /////
 
-			 if( column.equals("downloadFinishRate")){
+			 if( "downloadFinishRate".equals(column)){
 				 listHeaders.add("安卓下载完成率");
 			 }  /////
 
-			 if( column.equals("installFinishRate")){
+			 if( "installFinishRate".equals(column)){
 				 listHeaders.add("安卓安装完成率");
 			 }
 
@@ -1139,35 +1139,35 @@ public class ByteDanceVideoReportDailyController {
 				// listHeaders.add("卡券页领取");
 			 //}  /////
 
-			 if( column.equals("playOver")){
+			 if( "playOver".equals(column)){
 				 listHeaders.add("完播数");
 			 }
 
-			 if( column.equals("downloadStartCost")){
+			 if( "downloadStartCost".equals(column)){
 				 listHeaders.add("安卓下载开始成本");
 			 }  /////
 
-			 if( column.equals("message")){
+			 if( "message".equals(column)){
 				 listHeaders.add("短信咨询");
 			 }  /////
 
-			 if( column.equals("validPlayRate")){
+			 if( "validPlayRate".equals(column)){
 				 listHeaders.add("有效播放率");
 			 }  /////
 
-			 if( column.equals("averagePlayTimePerPlay")){
+			 if( "averagePlayTimePerPlay".equals(column)){
 				 listHeaders.add("平均单次播放时长");
 			 }
 
-			 if( column.equals("convertCost")){
+			 if( "convertCost".equals(column)){
 				 listHeaders.add("转化成本");
 			 }
 
-			 if( column.equals("installFinishCost")){
+			 if( "installFinishCost".equals(column)){
 				 listHeaders.add("安卓安装完成成本");
 			 }
 
-			 if( column.equals("downloadStartRate")){
+			 if( "downloadStartRate".equals(column)){
 				 listHeaders.add("安卓下载开始率");
 			 }  /////
 

+ 3 - 3
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/controller/BytedanceVideoReportCtrl.java

@@ -118,7 +118,7 @@ public class BytedanceVideoReportCtrl {
         String filed = JsonResourceUtil.joinFiled(AccountReportConstants.dicMapByVideo, columns);
         List<String> titles = new ArrayList<>();
         //此处增加两个元素是为了保证数据顺序
-        if(exportType.equals("exportDetail")){
+        if("exportDetail".equals(exportType)){
             titles.add(0,"客户");
             titles.add(1,"项目名称");
             titles.add(2,"时间");
@@ -152,9 +152,9 @@ public class BytedanceVideoReportCtrl {
         String target = requestBody.getString("target");
         String order = requestBody.getString("order");
         List<JSONObject> excelData=null;
-        if(exportType.equals("exportTable")){
+        if("exportTable".equals(exportType)){
             excelData = bytedanceVideoReportService.exportExcelReportBy(accountIds, startDate, endDate, filed, target, order,clip,shot,plan);
-        }else if(exportType.equals("exportDetail")){
+        }else if("exportDetail".equals(exportType)){
             excelData = bytedanceVideoReportService.getVideoDetailBy(accountIds,startDate,endDate,filed,signature);
         }
         if (null!=excelData&&excelData.isEmpty()) {

+ 38 - 38
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/ByteDanceVideoReportDailyServiceImpl.java

@@ -57,13 +57,13 @@ public class ByteDanceVideoReportDailyServiceImpl extends ServiceImpl<ByteDanceV
         if(null!=mList&&!mList.isEmpty()){
             List<ByteDanceVideoReportDaily> reports = new ArrayList<>();
             for(ByteDanceVideoReportDaily report :mList){
-                if(null == report.getMaterialName()||report.getMaterialName().trim().equals("")){
+                if(null == report.getMaterialName()|| "".equals(report.getMaterialName().trim())){
                     report.setMaterialName("-");
                 }
-                if(null == report.getProjectName()||report.getProjectName().trim().equals("")){
+                if(null == report.getProjectName()|| "".equals(report.getProjectName().trim())){
                     report.setProjectName("-");
                 }
-                if(null == report.getAdvertiserName()||report.getAdvertiserName().trim().equals("")){
+                if(null == report.getAdvertiserName()|| "".equals(report.getAdvertiserName().trim())){
                     report.setAdvertiserName("-");
                 }
                 reports.add(report);
@@ -113,7 +113,7 @@ public class ByteDanceVideoReportDailyServiceImpl extends ServiceImpl<ByteDanceV
         if(roleCode.equals(CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN)){
             PageHelper.startPage(pageNo,pageSize,sort);
             mList = byteDanceVideoReportDailyMapper.videoInfoListGroupAdmin(startDate, endDate, accountIdsList, signature, cost);
-        }else if(roleCode.equals("touTiaoOperationManager") || roleCode.equals("operator") || roleCode.equals("operationAssistant")||roleCode.equals("huananyunying")) {
+        }else if("touTiaoOperationManager".equals(roleCode) || "operator".equals(roleCode) || "operationAssistant".equals(roleCode)|| "huananyunying".equals(roleCode)) {
             if (accountIdsList != null && !accountIdsList.isEmpty()){
                 PageHelper.startPage(pageNo,pageSize,sort);
                 mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accountIdsList,signature,cost);
@@ -125,19 +125,19 @@ public class ByteDanceVideoReportDailyServiceImpl extends ServiceImpl<ByteDanceV
                 PageHelper.startPage(pageNo,pageSize,sort);
                 mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accoutnIds,signature,cost);
             }
-        }else if(roleCode.equals("shot")){
+        }else if("shot".equals(roleCode)){
             PageHelper.startPage(pageNo,pageSize,sort);
             mList = byteDanceVideoReportDailyMapper.videoInfoListGroupShot(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
-        }else if(roleCode.equals("plan")){
+        }else if("plan".equals(roleCode)){
             PageHelper.startPage(pageNo,pageSize,sort);
             mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlan(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
-        }else if(roleCode.equals("plane")  || roleCode.equals("planeLeader")){
+        }else if("plane".equals(roleCode)  || "planeLeader".equals(roleCode)){
             PageHelper.startPage(pageNo,pageSize,sort);
             mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlaneAndPlaneLeader(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
-        }else if(roleCode.equals("clip")){
+        }else if("clip".equals(roleCode)){
             PageHelper.startPage(pageNo,pageSize,sort);
             mList = byteDanceVideoReportDailyMapper.videoInfoListGroupClip(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
-        }else if(roleCode.equals("designTeamLeader")){
+        }else if("designTeamLeader".equals(roleCode)){
             PageHelper.startPage(pageNo,pageSize,sort);
             mList = byteDanceVideoReportDailyMapper.videoInfoListGroupdesignTeamLeader(startDate, endDate, companyId, accountIdsList, signature, cost);
         }else{
@@ -200,7 +200,7 @@ public class ByteDanceVideoReportDailyServiceImpl extends ServiceImpl<ByteDanceV
         if(roleCode.equals(CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN)){
             PageHelper.startPage(pageNo,pageSize,sort);
             mList = byteDanceVideoReportDailyMapper.videoInfoListGroupAdmin(startDate, endDate, accountIdsList, signature, cost);
-        }else if(roleCode.equals("touTiaoOperationManager") || roleCode.equals("operator") || roleCode.equals("operationAssistant")||roleCode.equals("huananyunying")) {
+        }else if("touTiaoOperationManager".equals(roleCode) || "operator".equals(roleCode) || "operationAssistant".equals(roleCode)|| "huananyunying".equals(roleCode)) {
             if (accountIdsList != null && !accountIdsList.isEmpty()){
                 PageHelper.startPage(pageNo,pageSize,sort);
                 mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accountIdsList,signature,cost);
@@ -212,19 +212,19 @@ public class ByteDanceVideoReportDailyServiceImpl extends ServiceImpl<ByteDanceV
                 PageHelper.startPage(pageNo,pageSize,sort);
                 mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accoutnIds,signature,cost);
             }
-        }else if(roleCode.equals("shot")){
+        }else if("shot".equals(roleCode)){
                 PageHelper.startPage(pageNo,pageSize,sort);
                 mList = byteDanceVideoReportDailyMapper.videoInfoListGroupShot(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
-        }else if(roleCode.equals("plan")){
+        }else if("plan".equals(roleCode)){
                 PageHelper.startPage(pageNo,pageSize,sort);
                 mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlan(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
-        }else if(roleCode.equals("plane")  || roleCode.equals("planeLeader")){
+        }else if("plane".equals(roleCode)  || "planeLeader".equals(roleCode)){
                 PageHelper.startPage(pageNo,pageSize,sort);
                 mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlaneAndPlaneLeader(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
-        }else if(roleCode.equals("clip")){
+        }else if("clip".equals(roleCode)){
                 PageHelper.startPage(pageNo,pageSize,sort);
                 mList = byteDanceVideoReportDailyMapper.videoInfoListGroupClip(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
-        }else if(roleCode.equals("designTeamLeader")){
+        }else if("designTeamLeader".equals(roleCode)){
                 PageHelper.startPage(pageNo,pageSize,sort);
                 mList = byteDanceVideoReportDailyMapper.videoInfoListGroupdesignTeamLeader(startDate, endDate, companyId, accountIdsList, signature, cost);
         }else {
@@ -286,7 +286,7 @@ public class ByteDanceVideoReportDailyServiceImpl extends ServiceImpl<ByteDanceV
         if(roleCode.equals(CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN)){
             PageHelper.startPage(pageNo,pageSize,sort);
             mList = byteDanceVideoReportDailyMapper.videoInfoListGroupAdmin(startDate, endDate, accountIdsList, signature, cost);
-        }else if(roleCode.equals("touTiaoOperationManager") || roleCode.equals("operator") || roleCode.equals("operationAssistant")||roleCode.equals("huananyunying")) {
+        }else if("touTiaoOperationManager".equals(roleCode) || "operator".equals(roleCode) || "operationAssistant".equals(roleCode)|| "huananyunying".equals(roleCode)) {
             if (accountIdsList != null && !accountIdsList.isEmpty()){
                 PageHelper.startPage(pageNo,pageSize,sort);
                 mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accountIdsList,signature,cost);
@@ -298,19 +298,19 @@ public class ByteDanceVideoReportDailyServiceImpl extends ServiceImpl<ByteDanceV
                 PageHelper.startPage(pageNo,pageSize,sort);
                 mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accoutnIds,signature,cost);
             }
-        }else if(roleCode.equals("shot")){
+        }else if("shot".equals(roleCode)){
             PageHelper.startPage(pageNo,pageSize,sort);
             mList = byteDanceVideoReportDailyMapper.videoInfoListGroupShot(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
-        }else if(roleCode.equals("plan")){
+        }else if("plan".equals(roleCode)){
             PageHelper.startPage(pageNo,pageSize,sort);
             mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlan(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
-        }else if(roleCode.equals("plane")  || roleCode.equals("planeLeader")){
+        }else if("plane".equals(roleCode)  || "planeLeader".equals(roleCode)){
             PageHelper.startPage(pageNo,pageSize,sort);
             mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlaneAndPlaneLeader(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
-        }else if(roleCode.equals("clip")){
+        }else if("clip".equals(roleCode)){
             PageHelper.startPage(pageNo,pageSize,sort);
             mList = byteDanceVideoReportDailyMapper.videoInfoListGroupClip(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
-        }else if(roleCode.equals("designTeamLeader")){
+        }else if("designTeamLeader".equals(roleCode)){
             PageHelper.startPage(pageNo,pageSize,sort);
             mList = byteDanceVideoReportDailyMapper.videoInfoListGroupdesignTeamLeader(startDate, endDate, companyId, accountIdsList, signature, cost);
         }else {
@@ -375,7 +375,7 @@ public class ByteDanceVideoReportDailyServiceImpl extends ServiceImpl<ByteDanceV
         if(roleCode.equals(CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN)){
             PageHelper.orderBy(sort);
             mList = byteDanceVideoReportDailyMapper.videoInfoListGroupAdmin(startDate, endDate, accountIdsList, signature, cost);
-        }else if(roleCode.equals("touTiaoOperationManager") || roleCode.equals("operator") || roleCode.equals("operationAssistant")||roleCode.equals("huananyunying")) {
+        }else if("touTiaoOperationManager".equals(roleCode) || "operator".equals(roleCode) || "operationAssistant".equals(roleCode)|| "huananyunying".equals(roleCode)) {
             if (accountIdsList != null && !accountIdsList.isEmpty()){
                 PageHelper.orderBy(sort);
                 mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accountIdsList,signature,cost);
@@ -387,19 +387,19 @@ public class ByteDanceVideoReportDailyServiceImpl extends ServiceImpl<ByteDanceV
                 PageHelper.orderBy(sort);
                 mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accoutnIds,signature,cost);
             }
-        }else if(roleCode.equals("shot")){
+        }else if("shot".equals(roleCode)){
             PageHelper.orderBy(sort);
             mList = byteDanceVideoReportDailyMapper.videoInfoListGroupShot(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
-        }else if(roleCode.equals("plan")){
+        }else if("plan".equals(roleCode)){
             PageHelper.orderBy(sort);
             mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlan(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
-        }else if(roleCode.equals("plane")  || roleCode.equals("planeLeader")){
+        }else if("plane".equals(roleCode)  || "planeLeader".equals(roleCode)){
             PageHelper.orderBy(sort);
             mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlaneAndPlaneLeader(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
-        }else if(roleCode.equals("clip")){
+        }else if("clip".equals(roleCode)){
             PageHelper.orderBy(sort);
             mList = byteDanceVideoReportDailyMapper.videoInfoListGroupClip(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
-        }else if(roleCode.equals("designTeamLeader")){
+        }else if("designTeamLeader".equals(roleCode)){
             PageHelper.orderBy(sort);
             mList = byteDanceVideoReportDailyMapper.videoInfoListGroupdesignTeamLeader(startDate, endDate, companyId, accountIdsList, signature, cost);
         }else {
@@ -443,7 +443,7 @@ public class ByteDanceVideoReportDailyServiceImpl extends ServiceImpl<ByteDanceV
         if(roleCode.equals(CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN)){
             PageHelper.startPage(pageNo,pageSize,sort);
             mList = byteDanceVideoReportDailyMapper.videoInfoListGroupAdmin(startDate, endDate, accountIdsList, signature, cost);
-        }else if(roleCode.equals("touTiaoOperationManager") || roleCode.equals("operator") || roleCode.equals("operationAssistant")||roleCode.equals("huananyunying")) {
+        }else if("touTiaoOperationManager".equals(roleCode) || "operator".equals(roleCode) || "operationAssistant".equals(roleCode)|| "huananyunying".equals(roleCode)) {
             if (accountIdsList != null && !accountIdsList.isEmpty()){
                 PageHelper.startPage(pageNo,pageSize,sort);
                 mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accountIdsList,signature,cost);
@@ -455,19 +455,19 @@ public class ByteDanceVideoReportDailyServiceImpl extends ServiceImpl<ByteDanceV
                 PageHelper.startPage(pageNo,pageSize,sort);
                 mList = byteDanceVideoReportDailyMapper.videoInfoListGroupOperator(startDate,endDate,accoutnIds,signature,cost);
             }
-        }else if(roleCode.equals("shot")){
+        }else if("shot".equals(roleCode)){
             PageHelper.startPage(pageNo,pageSize,sort);
             mList = byteDanceVideoReportDailyMapper.videoInfoListGroupShot(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
-        }else if(roleCode.equals("plan")){
+        }else if("plan".equals(roleCode)){
             PageHelper.startPage(pageNo,pageSize,sort);
             mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlan(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
-        }else if(roleCode.equals("plane")  || roleCode.equals("planeLeader")){
+        }else if("plane".equals(roleCode)  || "planeLeader".equals(roleCode)){
             PageHelper.startPage(pageNo,pageSize,sort);
             mList = byteDanceVideoReportDailyMapper.videoInfoListGroupPlaneAndPlaneLeader(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
-        }else if(roleCode.equals("clip")){
+        }else if("clip".equals(roleCode)){
             PageHelper.startPage(pageNo,pageSize,sort);
             mList = byteDanceVideoReportDailyMapper.videoInfoListGroupClip(startDate, endDate, companyId, userId, accountIdsList, signature, cost);
-        }else if(roleCode.equals("designTeamLeader")){
+        }else if("designTeamLeader".equals(roleCode)){
             PageHelper.startPage(pageNo,pageSize,sort);
             mList = byteDanceVideoReportDailyMapper.videoInfoListGroupdesignTeamLeader(startDate, endDate, companyId, accountIdsList, signature, cost);
         }else{
@@ -522,16 +522,16 @@ public class ByteDanceVideoReportDailyServiceImpl extends ServiceImpl<ByteDanceV
         //admin能看所有视频
         if(roleCode.equals(CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN)){
             mList = byteDanceVideoReportDailyMapper.videoInfoListDetail(companyId, startDate, endDate, signature, accountIdsList);
-        }else if(roleCode.equals("touTiaoOperationManager") || roleCode.equals("operator") || roleCode.equals("operationAssistant")||roleCode.equals("huananyunying")) {
+        }else if("touTiaoOperationManager".equals(roleCode) || "operator".equals(roleCode) || "operationAssistant".equals(roleCode)|| "huananyunying".equals(roleCode)) {
             if (accountIdsList != null && !accountIdsList.isEmpty()){
                 mList = byteDanceVideoReportDailyMapper.videoInfoListDetailOperator(companyId, startDate,endDate,signature, accountIdsList);
             }else{
                 accountIdsList= byteDanceVideoReportDailyMapper.getAccountIdsByOperatorIdAndMediaId(userId);
                 mList = byteDanceVideoReportDailyMapper.videoInfoListDetailOperator(companyId, startDate,endDate,signature, accountIdsList);
             }
-        }else if(roleCode.equals("shot") || roleCode.equals("plan") || roleCode.equals("plane")  || roleCode.equals("planeLeader") || roleCode.equals("clip") || roleCode.equals("designTeamLeader")){
+        }else if("shot".equals(roleCode) || "plan".equals(roleCode) || "plane".equals(roleCode)  || "planeLeader".equals(roleCode) || "clip".equals(roleCode) || "designTeamLeader".equals(roleCode)){
             mList = byteDanceVideoReportDailyMapper.videoInfoListDetailDesign(companyId, startDate, endDate, signature, accountIdsList);
-        }else if(roleCode.equals("designTeamLeader")){
+        }else if("designTeamLeader".equals(roleCode)){
             accountIdsList = byteDanceVideoReportDailyMapper.getAccountIds(companyId, signature);
             mList = byteDanceVideoReportDailyMapper.videoInfoListDetailDesign(companyId, startDate,endDate,signature, accountIdsList);
         }else {
@@ -593,8 +593,8 @@ public class ByteDanceVideoReportDailyServiceImpl extends ServiceImpl<ByteDanceV
 
         //拥有头条视频报表权限的是 管理员-可看所有公司视频  设计组长-可看所在公司所有视频  设计-可以自己所在项目的所有视频
         if(roleCode.equals(CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN)
-                || roleCode.equals("designTeamLeader") || roleCode.equals("plan") ||
-                roleCode.equals("plane") || roleCode.equals("clip") || roleCode.equals("shot") || roleCode.equals("planeLeader")
+                || "designTeamLeader".equals(roleCode) || "plan".equals(roleCode) ||
+                "plane".equals(roleCode) || "clip".equals(roleCode) || "shot".equals(roleCode) || "planeLeader".equals(roleCode)
         ){
             return 1;
         }else{

+ 1 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/BytedanceAccountReportServiceImpl.java

@@ -187,7 +187,7 @@ public class BytedanceAccountReportServiceImpl implements IBytedanceAccountRepor
         JSONObject jsonObject = new JSONObject();
         after.forEach((k, v) -> {
             //去除没法计算的字段
-            if (k.equals("accountId") || k.equals("authName") || v.toString().contains("%") || before.getString(k).contains("%")) {
+            if ("accountId".equals(k) || "authName".equals(k) || v.toString().contains("%") || before.getString(k).contains("%")) {
                 jsonObject.put(k, "-");
             } else {
                 jsonObject.put(k, LinkUtils.countLink(after.getBigDecimal(k) == null ? zero : after.getBigDecimal(k), before.getBigDecimal(k) == null ? zero : before.getBigDecimal(k)));

+ 5 - 5
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/BytedanceHomepageReportServiceImpl.java

@@ -187,19 +187,19 @@ public class BytedanceHomepageReportServiceImpl implements IBytedanceHomepageRep
     //自定义日期对比(日对比,月对比)
     private JSONObject getCompareChart(String sign, String smallDate, String bigDate) {
         JSONObject result = new JSONObject();
-        if (!sign.isEmpty() && sign.equals("month")) {
+        if (!sign.isEmpty() && "month".equals(sign)) {
             result.put("compare",this.getCompareGroupByDay(smallDate, bigDate));
-        } else if (!sign.isEmpty() && sign.equals("day")) {
+        } else if (!sign.isEmpty() && "day".equals(sign)) {
             result.put("compare",this.getCompareGroupByHour(bigDate, smallDate));
         }
         return result;
     }
     private JSONObject getCompareList(String sign, String smallDate, String bigDate){
         JSONObject result = new JSONObject();
-        if (!sign.isEmpty() && sign.equals("month")) {
+        if (!sign.isEmpty() && "month".equals(sign)) {
             result.put("smallDate",getListLink(bytedanceHomepageMapper.queryDetailGroupDayByMonth(smallDate)));
             result.put("bigDate",getListLink(bytedanceHomepageMapper.queryDetailGroupDayByMonth(bigDate)));
-        } else if (!sign.isEmpty() && sign.equals("day")) {
+        } else if (!sign.isEmpty() && "day".equals(sign)) {
             result.put("smallDate",getListLink(bytedanceHomepageMapper.queryTodayDetailReportBy(smallDate)));
             result.put("bigDate",getListLink(bytedanceHomepageMapper.queryTodayDetailReportBy(bigDate)));
         }
@@ -233,4 +233,4 @@ public class BytedanceHomepageReportServiceImpl implements IBytedanceHomepageRep
         return LinkUtils.getCompareDate(beforeDetail, afterDetail, "statHour");
     }
 
-}
+}

+ 1 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/BytedanceReportMaterialDailyServiceImpl.java

@@ -27,7 +27,7 @@ public class BytedanceReportMaterialDailyServiceImpl extends ServiceImpl<Bytedan
     @Override
     public List<BytedanceReportMaterialDaily> getListByParams(String date) {
         QueryWrapper<BytedanceReportMaterialDaily>queryWrapper = new QueryWrapper<>();
-        if(null != date&&!date.trim().equals("")){
+        if(null != date&&!"".equals(date.trim())){
             queryWrapper.eq("stat_datetime",date);
         }
         queryWrapper.orderByAsc("stat_datetime");

Dosya farkı çok büyük olduğundan ihmal edildi
+ 3 - 3
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/BytedanceReportServiceImpl.java


+ 1 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/utils/ApkUtils.java

@@ -43,7 +43,7 @@ public class ApkUtils {
                                 break;
                             }
                             String name = parser.getName();
-                            if(null != name && name.toLowerCase().equals("manifest")){
+                            if(null != name && "manifest".equals(name.toLowerCase())){
                                 for (int i = 0; i != parser.getAttributeCount(); i++) {
                                     if ("versionName".equals(parser.getAttributeName(i))) {
                                         String versionName = getAttributeValue(parser, i);

+ 1 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/utils/LinkUtils.java

@@ -40,7 +40,7 @@ public class LinkUtils {
     //环比计算
     public static BigDecimal countLink(BigDecimal numA, BigDecimal numB) {
         BigDecimal link = new BigDecimal(0);
-        if (!(numB.compareTo(BigDecimal.ZERO)==0)) {
+        if (numB.compareTo(BigDecimal.ZERO)!=0) {
             link = (numA.subtract(numB)).divide(numB, 4, RoundingMode.HALF_UP);
         }
         return link;

+ 2 - 2
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/tool/controller/ParseInstallPackageController.java

@@ -54,9 +54,9 @@ public class ParseInstallPackageController {
                 }
             }
             Map<String, String> packageInfo=new HashMap<>();
-            if(appType.equals("APP_ANDROID")){
+            if("APP_ANDROID".equals(appType)){
                 packageInfo=ParseInstallPackageUtil.parseAPK(installPath);
-            }else if(appType.equals("APP_IOS")){
+            }else if("APP_IOS".equals(appType)){
                 packageInfo=ParseInstallPackageUtil.parseIpa(installPath);
             }
             if(packageInfo.isEmpty()){

+ 6 - 6
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/tool/service/impl/ByteDanceConvertToolServiceImpl.java

@@ -27,20 +27,20 @@ public class ByteDanceConvertToolServiceImpl implements IByteDanceConvertToolSer
         JSONObject params=new JSONObject();
         params.put("advertiser_id",accountId);
         params.put("landing_type",landingType);
-        if(landingType.equals("LINK")){
+        if("LINK".equals(landingType)){
             params.put("promotion_content","EXTERNAL_URL");
             params.put("external_url",externalUrl);
-        }else if(landingType.equals("APP")){
-            if(downloadType.equals("DOWNLOAD_URL")){
+        }else if("APP".equals(landingType)){
+            if("DOWNLOAD_URL".equals(downloadType)){
                 params.put("promotion_content","DOWNLOAD_URL");
-                if(appType.equals("APP_ANDROID")){
+                if("APP_ANDROID".equals(appType)){
                     params.put("package_name",toutiaoPackage);
                     params.put("app_type",appType);
-                }else if(appType.equals("APP_IOS")){
+                }else if("APP_IOS".equals(appType)){
                     params.put("itunes_url",itunesUrl);
                     params.put("app_type",appType);
                 }
-            }else if(downloadType.equals("EXTERNAL_URL")){
+            }else if("EXTERNAL_URL".equals(downloadType)){
                 params.put("promotion_content","EXTERNAL_URL");
                 params.put("external_url",externalUrl);
             }

+ 13 - 7
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/tool/service/impl/ByteDanceQueryToolServiceImpl.java

@@ -28,18 +28,24 @@ public class ByteDanceQueryToolServiceImpl implements IByteDanceQueryToolService
         headers.put("Access-Token", token.getAccessToken());
 
         JSONObject params=new JSONObject();
-        if(requestBody.getString("retargetingType")!=null)
+        if(requestBody.getString("retargetingType")!=null){
             params.put("retargetingType",requestBody.getString("retargetingType"));
-        if(requestBody.getJSONArray("retargetingType")!=null)
+        }
+        if(requestBody.getJSONArray("retargetingType")!=null){
             params.put("retargetingTags",requestBody.getString("retargetingTags"));
-        if(requestBody.getJSONArray("retargetingTagsInclude")!=null)
+        }
+        if(requestBody.getJSONArray("retargetingTagsInclude")!=null){
             params.put("retargetingTagsInclude",requestBody.getString("retargetingTagsInclude"));
-        if(requestBody.getJSONArray("retargetingTagsExclude")!=null)
+        }
+        if(requestBody.getJSONArray("retargetingTagsExclude")!=null){
             params.put("retargetingTagsExclude",requestBody.getString("retargetingTagsExclude"));
-        if(requestBody.getString("gender")!=null)
+        }
+        if(requestBody.getString("gender")!=null){
             params.put("gender",requestBody.getString("gender"));
-        if(requestBody.getJSONArray("age")!=null)
+        }
+        if(requestBody.getJSONArray("age")!=null){
             params.put("age",requestBody.getString("age"));
+        }
         JSONObject jsonObject = JSONObject.parseObject(HttpUtils.httpPostRequest(QueryToolUrlConstant.ESTIMATE_AUDIENCE_URL, params, headers));
         return null;
     }
@@ -53,7 +59,7 @@ public class ByteDanceQueryToolServiceImpl implements IByteDanceQueryToolService
 
         JSONObject params=new JSONObject();
         params.put("advertiser_id",advertiserId);
-        if(requestBody.getString("searchBy").equals("APP_NAME")){
+        if("APP_NAME".equals(requestBody.getString("searchBy"))){
             params.put("advertiser_id",requestBody.getString("advertiserId"));
             params.put("app_name",requestBody.getString("appName"));
         }else {

+ 2 - 2
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/impl/PerformanceOptimizerServiceImpl.java

@@ -251,7 +251,7 @@ public class PerformanceOptimizerServiceImpl extends ServiceImpl<PerformanceOpti
             BigDecimal personalTask = config.getPersonalTask();
             //判断个人任务是否完成 ,如果完成则给到千分之5,如果未完成,则给到千分之3的绩效
             String roleCode = userEfficientVideoMapMapper.getRoleCodeByUserId(userAccountKey);
-            if (!roleCode.equals("operationAssistant")) {
+            if (!"operationAssistant".equals(roleCode)) {
                 if (totalCharge.compareTo(personalTask) > 0) {
                     totalPerformance = totalCharge.multiply(config.getMediaTaskFinishRate()).divide(new BigDecimal("1000")).setScale(2, RoundingMode.HALF_UP);
                 } else {
@@ -441,7 +441,7 @@ public class PerformanceOptimizerServiceImpl extends ServiceImpl<PerformanceOpti
             BigDecimal personalTask = config.getPersonalTask();
             //判断个人任务是否完成 ,如果完成则给到千分之5,如果未完成,则给到千分之3的绩效
             String roleCode = userEfficientVideoMapMapper.getRoleCodeByUserId(userAccountKey);
-            if (!roleCode.equals("operationAssistant")) {
+            if (!"operationAssistant".equals(roleCode)) {
                 if (totalCharge.compareTo(personalTask) > 0) {
                     totalPerformance = totalCharge.multiply(config.getMediaTaskFinishRate()).divide(new BigDecimal("1000")).setScale(2, RoundingMode.HALF_UP);
                 } else {