Ver código fonte

修改test环境nacos注册地址--清理不规范代码

songyh 3 anos atrás
pai
commit
0b604628d2
61 arquivos alterados com 224 adições e 322 exclusões
  1. 6 0
      jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseApi.java
  2. 1 1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java
  3. 4 4
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java
  4. 3 3
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java
  5. 5 0
      jeecg-boot-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/modules/redis/writer/JeecgRedisCacheWriter.java
  6. 4 4
      jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/advertise/controller/AiBytedanceAdvertiserStrategyController.java
  7. 1 1
      jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/advertise/controller/BytedanceGeneralCopywriterController.java
  8. 1 1
      jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/advertise/controller/BytedanceReportController.java
  9. 1 1
      jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/advertise/controller/BytedanceVideoSlogenInfoController.java
  10. 11 11
      jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/advertise/service/impl/AiBytedanceAdvertiserStrategyServiceImpl.java
  11. 1 0
      jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/advertise/service/impl/ByteDanceAdvertisePlanServiceImpl.java
  12. 2 1
      jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/advertise/service/impl/BytedanceRejectReasonServiceImpl.java
  13. 1 1
      jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/common/utils/Check.java
  14. 1 1
      jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/common/utils/ExcelUtil.java
  15. 1 1
      jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/report/service/impl/BytedanceAdvertiserHourlyReportServiceImpl.java
  16. 4 4
      jeecg-boot-module-system/src/main/java/cn/com/ctop/alarm/modules/controller/RuleSwitchController.java
  17. 1 1
      jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/impl/MaterialImageInfoServiceImpl.java
  18. 1 1
      jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/impl/UserAllocationServiceImpl.java
  19. 0 131
      jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/utils/TokenUtils.java
  20. 2 2
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/AiKuaiShouAppInfoServiceImpl.java
  21. 1 1
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/AiKuaishouCreateCreativeServiceImpl.java
  22. 15 15
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/AiKuaishouProjectCreateCreativeServiceImpl.java
  23. 1 1
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/AiKuaishouStrategyTargetBaseServiceImpl.java
  24. 11 11
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/AiStrategyServiceImpl.java
  25. 2 2
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/KuaishouAppPackageServiceImpl.java
  26. 1 1
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouVideoGetServiceImpl.java
  27. 1 1
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java
  28. 6 6
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/clean/service/impl/KuaiShouAccountCleanServiceImpl.java
  29. 2 2
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/dimension/controller/KuaiShouDimensionStrategyController.java
  30. 1 1
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/dimension/service/impl/KuaiShouDimensionStrategyServiceImpl.java
  31. 1 1
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/label/service/impl/MaterialLabelServiceImpl.java
  32. 7 7
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/material/service/impl/EtlKuaishouVideoInfoServiceImpl.java
  33. 2 2
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/controller/KsNewGroupReportCtrl.java
  34. 2 2
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/controller/KsNewPlanReportCtrl.java
  35. 3 3
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/EtlKuaiShouNewlyServiceImpl.java
  36. 3 3
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/EtlKuaishouReportAccountHourlyServiceImpl.java
  37. 1 1
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouProjectVideoEtlInfoServiceImpl.java
  38. 15 15
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouVideoEtlInfoServiceImpl.java
  39. 1 1
      jeecg-boot-module-system/src/main/java/cn/com/ctop/oa/modules/service/impl/AppchatCreateServiceImpl.java
  40. 1 1
      jeecg-boot-module-system/src/main/java/cn/com/ctop/shiwan/modules/controller/ShiwanFileUploadController.java
  41. 1 1
      jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/report/controller/BytedanceNewPlanReportCtrl.java
  42. 30 30
      jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/BytedanceVideoEtlInfoServiceImpl.java
  43. 4 4
      jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/ReportServiceImpl.java
  44. 1 1
      jeecg-boot-module-system/src/main/java/com/xxl/job/core/executor/impl/XxlJobSpringExecutor.java
  45. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ads/controller/AiKuaiShouReportAnalyzeCtrl.java
  46. 8 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/cas/util/XmlUtils.java
  47. 6 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceVideoEtlInfoController.java
  48. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CallbackController.java
  49. 6 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouVideoEtlInfoController.java
  50. 1 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialInfoController.java
  51. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TestController.java
  52. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/UserAllocationController.java
  53. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/MaterialReportOverViewServiceImpl.java
  54. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/service/impl/PlatformMaterialServiceImpl.java
  55. 6 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/rule/CategoryCodeRule.java
  56. 3 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/rule/OrderNumberRule.java
  57. 3 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/rule/OrgCodeRule.java
  58. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/controller/WpsFileController.java
  59. 3 3
      jeecg-cloud-module/jeecg-cloud-system-start/src/main/resources/application-test.yml
  60. 1 0
      jeecg-cloud-module/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java
  61. 11 7
      jeecg-cloud-module/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/cron/CronExpression.java

+ 6 - 0
jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseApi.java

@@ -295,10 +295,13 @@ public interface ISysBaseApi extends CommonAPI {
      * @param username
      * @return
      */
+    @Override
     LoginUser getUserByName(String username);
 
+    @Override
     List<SysPermissionDataRuleModel> queryPermissionDataRule(String component, String requestPath, String username);
 
+    @Override
     SysUserCacheInfo getCacheUser(String username);
 
     /**
@@ -313,6 +316,7 @@ public interface ISysBaseApi extends CommonAPI {
      * @param code
      * @return
      */
+    @Override
     public List<DictModel> queryDictItemsByCode(String code);
 
 
@@ -323,6 +327,7 @@ public interface ISysBaseApi extends CommonAPI {
      * @param code
      * @return
      */
+    @Override
     List<DictModel> queryTableDictItemsByCode(String table, String text, String code);
 
     /**
@@ -426,6 +431,7 @@ public interface ISysBaseApi extends CommonAPI {
      * @param dbSourceId
      * @return
      */
+    @Override
     DynamicDataSourceModel getDynamicDbSourceById(String dbSourceId);
 
     /**

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

@@ -158,7 +158,7 @@ public class PasswordUtil {
 	 * @return
 	 */
 	public static byte[] hexStringToBytes(String hexString) {
-		if (hexString == null || hexString.equals("")) {
+		if (hexString == null || "".equals(hexString)) {
 			return null;
 		}
 		hexString = hexString.toUpperCase();

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

@@ -41,7 +41,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);
@@ -66,7 +66,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 {
@@ -396,7 +396,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;
 	}
 
@@ -467,7 +467,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 - 3
jeecg-boot-base/jeecg-boot-base-core/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);

+ 5 - 0
jeecg-boot-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/modules/redis/writer/JeecgRedisCacheWriter.java

@@ -39,6 +39,7 @@ public class JeecgRedisCacheWriter implements RedisCacheWriter {
         this.sleepTime = sleepTime;
     }
 
+    @Override
     public void put(String name, byte[] key, byte[] value, @Nullable Duration ttl) {
         Assert.notNull(name, "Name must not be null!");
         Assert.notNull(key, "Key must not be null!");
@@ -54,6 +55,7 @@ public class JeecgRedisCacheWriter implements RedisCacheWriter {
         });
     }
 
+    @Override
     public byte[] get(String name, byte[] key) {
         Assert.notNull(name, "Name must not be null!");
         Assert.notNull(key, "Key must not be null!");
@@ -62,6 +64,7 @@ public class JeecgRedisCacheWriter implements RedisCacheWriter {
         });
     }
 
+    @Override
     public byte[] putIfAbsent(String name, byte[] key, byte[] value, @Nullable Duration ttl) {
         Assert.notNull(name, "Name must not be null!");
         Assert.notNull(key, "Key must not be null!");
@@ -97,6 +100,7 @@ public class JeecgRedisCacheWriter implements RedisCacheWriter {
         });
     }
 
+    @Override
     public void remove(String name, byte[] key) {
         Assert.notNull(name, "Name must not be null!");
         Assert.notNull(key, "Key must not be null!");
@@ -119,6 +123,7 @@ public class JeecgRedisCacheWriter implements RedisCacheWriter {
         }
     }
 
+    @Override
     public void clean(String name, byte[] pattern) {
         Assert.notNull(name, "Name must not be null!");
         Assert.notNull(pattern, "Pattern must not be null!");

+ 4 - 4
jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/advertise/controller/AiBytedanceAdvertiserStrategyController.java

@@ -200,7 +200,7 @@ public class AiBytedanceAdvertiserStrategyController {
 			//账户预算 同步 头条
 			//BUDGET_MODE_DAY-日预算
 			// BUDGET_MODE_INFINITE-不限
-			String accountBudgetMode = aiBytedanceAdvertiserStrategy.getAccountBudgetMode().equals("1") ? "BUDGET_MODE_INFINITE" : "BUDGET_MODE_DAY";
+			String accountBudgetMode = "1".equals(aiBytedanceAdvertiserStrategy.getAccountBudgetMode()) ? "BUDGET_MODE_INFINITE" : "BUDGET_MODE_DAY";
 			Result resultBudget = marketingService.updateBudget(token,accountBudgetMode,aiBytedanceAdvertiserStrategy.getAccountBudget());
 			/*if (!resultBudget.isSuccess()){
 				return Result.errorMsg(resultBudget.getMessage());
@@ -416,16 +416,16 @@ public class AiBytedanceAdvertiserStrategyController {
 			urlPath = LoadFileUtil.downLoadFromUrl(urlPath, "appFiles");
 			// android 根据附件地址 读取 apk 信息
 			map = ApkUtils.readAPK(urlPath);
-			if (!map.get("code").toString().equals("-1")){
+			if (!"-1".equals(map.get("code").toString())){
 				map.put("platform", "APP_ANDROID");
 			}else {
 				//ios
 				map = ApkUtils.readIPA(urlPath);
-				if (!map.get("code").toString().equals("-1")){
+				if (!"-1".equals(map.get("code").toString())){
 					map.put("platform", "APP_IOS");
 				}
 			}
-			if (map.get("code").toString().equals("-1")){
+			if ("-1".equals(map.get("code").toString())){
 				return Result.error(map.get("error").toString()+"请输入正确的链接。");
 			}
 			return Result.successMsg("根据下载链接获取应用包名成功", map);

+ 1 - 1
jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/advertise/controller/BytedanceGeneralCopywriterController.java

@@ -288,7 +288,7 @@ public class BytedanceGeneralCopywriterController {
         try {
             ByteDanceGeneralCopywriter generalCopywriter = byteDanceGeneralCopywriterService.getById(id);
             if(null == generalCopywriter||generalCopywriter.getStatus() == 0){
-                return result.ok("此文案不存在或者已经被删除");
+                return Result.ok("此文案不存在或者已经被删除");
             }
             generalCopywriter.setStatus(0);
             generalCopywriter.setUpdateTime(new Date());

+ 1 - 1
jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/advertise/controller/BytedanceReportController.java

@@ -273,7 +273,7 @@ public class BytedanceReportController {
 			if (result.isSuccess()){
 				ByteDanceAdvertisePlan byteDanceAdvertisePlan = new ByteDanceAdvertisePlan();
 				byteDanceAdvertisePlan.setId(adId);
-				byteDanceAdvertisePlan.setOptStatus(optStatus.equalsIgnoreCase("enable") ? "AD_STATUS_ENABLE" : "AD_STATUS_DISABLE");
+				byteDanceAdvertisePlan.setOptStatus("enable".equalsIgnoreCase(optStatus) ? "AD_STATUS_ENABLE" : "AD_STATUS_DISABLE");
 				//更新 表 计划状态
 				byteDanceAdvertisePlanService.updatePlanOrPackage(byteDanceAdvertisePlan);
 				return Result.successMsg(result.getMessage(), null);

+ 1 - 1
jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/advertise/controller/BytedanceVideoSlogenInfoController.java

@@ -314,7 +314,7 @@ public class BytedanceVideoSlogenInfoController {
 			Result result = new Result();
 			List<BytedanceVideoSlogenInfo> videoSlogenInfoList = bytedanceVideoSlogenInfoService.getVideoSlogenBySlogenAndProjectId(slogan,projectId);
 			if(Check.isNull(videoSlogenInfoList)) {
-				return result.ok("此文案不存在或者已经被删除");
+				return Result.ok("此文案不存在或者已经被删除");
 			}
 			LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 			videoSlogenInfoList.forEach(videoSlogenInfo->{

+ 11 - 11
jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/advertise/service/impl/AiBytedanceAdvertiserStrategyServiceImpl.java

@@ -391,7 +391,7 @@ public class AiBytedanceAdvertiserStrategyServiceImpl extends ServiceImpl<AiByte
                 JSONObject titleObject = new JSONObject();
                 titleObject.put("title",slogenInfo.getSlogan());
                 String creativeWordsIds = slogenInfo.getCreativeWordIds();
-                if(null!=creativeWordsIds&&!creativeWordsIds.trim().equals("")){
+                if(null!=creativeWordsIds&&!"".equals(creativeWordsIds.trim())){
                     JSONArray creativeWordsArray = JSON.parseArray(creativeWordsIds);
                     if(null!=creativeWordsArray&&!creativeWordsArray.isEmpty()){
                         titleObject.put("creative_word_ids",creativeWordsArray);
@@ -412,7 +412,7 @@ public class AiBytedanceAdvertiserStrategyServiceImpl extends ServiceImpl<AiByte
                     JSONObject titleObject = new JSONObject();
                     titleObject.put("title",byteDanceGeneralCopywriter.get(i).getTextCopywriter());
                     String creativeWordsIds = byteDanceGeneralCopywriter.get(i).getCreativeWordIds();
-                    if(null!=creativeWordsIds&&!creativeWordsIds.trim().equals("")){
+                    if(null!=creativeWordsIds&&!"".equals(creativeWordsIds.trim())){
                         JSONArray creativeWordsArray = JSON.parseArray(creativeWordsIds);
                         if(null!=creativeWordsArray&&!creativeWordsArray.isEmpty()){
                             titleObject.put("creative_word_ids",creativeWordsArray);
@@ -429,7 +429,7 @@ public class AiBytedanceAdvertiserStrategyServiceImpl extends ServiceImpl<AiByte
                     JSONObject titleObject = new JSONObject();
                     titleObject.put("title",byteDanceGeneralCopywriter.getTextCopywriter());
                     String creativeWordsIds = byteDanceGeneralCopywriter.getCreativeWordIds();
-                    if(null!=creativeWordsIds&&!creativeWordsIds.trim().equals("")){
+                    if(null!=creativeWordsIds&&!"".equals(creativeWordsIds.trim())){
                         JSONArray creativeWordsArray = JSON.parseArray(creativeWordsIds);
                         if(null!=creativeWordsArray&&!creativeWordsArray.isEmpty()){
                             titleObject.put("creative_word_ids",creativeWordsArray);
@@ -885,7 +885,7 @@ public class AiBytedanceAdvertiserStrategyServiceImpl extends ServiceImpl<AiByte
                 }
             }
         }
-        if(!Check.isNull(strategy.getAdDeviceType())&&!strategy.getAdDeviceType().trim().equals("NONE")){
+        if(!Check.isNull(strategy.getAdDeviceType())&&!"NONE".equals(strategy.getAdDeviceType().trim())){
             String[] deviceType = strategy.getAdDeviceType().split(",");
             if(deviceType.length>0){
                 params.put("device_type",deviceType);
@@ -900,7 +900,7 @@ public class AiBytedanceAdvertiserStrategyServiceImpl extends ServiceImpl<AiByte
         if(!Check.isNull(strategy.getAdHideIfConverted())){
             String hideIfConverted = strategy.getAdHideIfConverted();
             params.put("hide_if_converted",hideIfConverted);
-            if(hideIfConverted.equals("APP")||hideIfConverted.equals("CUSTOMER")){
+            if("APP".equals(hideIfConverted)|| "CUSTOMER".equals(hideIfConverted)){
                 if(!Check.isNull(strategy.getAdConvertedTimeDuration())){
                     params.put("converted_time_duration",strategy.getAdConvertedTimeDuration());
                 }
@@ -1113,7 +1113,7 @@ public class AiBytedanceAdvertiserStrategyServiceImpl extends ServiceImpl<AiByte
             String campaignSufix = getRangeIndex(strategy.getDpLinkStartIndex(),strategy.getDpLinkEndIndex(),strategy.getCampaignAdCnt(),dplinkIndex);
             result = result + campaignSufix;
         }
-        if(null!=date&&!date.trim().equals("")) {
+        if(null!=date&&!"".equals(date.trim())) {
             result = result + "-" + date;
         }
 
@@ -1202,8 +1202,8 @@ public class AiBytedanceAdvertiserStrategyServiceImpl extends ServiceImpl<AiByte
 
     private List<ByteDanceVideoInfo> getvideoOrImageInfoByCreateType(Long projectId,AiBytedanceAdvertiserStrategy strategy, String startTime, String endTime, Integer createType, Long videoCnt) {
         //横板视频 || 竖版视频
-        if (strategy.getCreativeImageMode().equalsIgnoreCase("CREATIVE_IMAGE_MODE_VIDEO")
-                || strategy.getCreativeImageMode().equalsIgnoreCase("CREATIVE_IMAGE_MODE_VIDEO_VERTICAL")){
+        if ("CREATIVE_IMAGE_MODE_VIDEO".equalsIgnoreCase(strategy.getCreativeImageMode())
+                || "CREATIVE_IMAGE_MODE_VIDEO_VERTICAL".equalsIgnoreCase(strategy.getCreativeImageMode())){
             //获取 视频 素材
             return getVideoInfoByCreateType(projectId,strategy,startTime,endTime,createType,videoCnt);
         }
@@ -1283,7 +1283,7 @@ public class AiBytedanceAdvertiserStrategyServiceImpl extends ServiceImpl<AiByte
         if (BytedanceConstant.UPDTYPE_BUDGET.equals(updAdStaOrCpaOrBudget.getType())) {
 
             //指定预算
-            if (updAdStaOrCpaOrBudget.getBudgetType().equals("2")){
+            if ("2".equals(updAdStaOrCpaOrBudget.getBudgetType())){
                 //  前者 < 后者
                 int a = new BigDecimal(updAdStaOrCpaOrBudget.getBudget()).compareTo(updAdStaOrCpaOrBudget.getCost().multiply(new BigDecimal(1.05)));
                 if (a == -1){
@@ -1295,7 +1295,7 @@ public class AiBytedanceAdvertiserStrategyServiceImpl extends ServiceImpl<AiByte
             //账户预算 同步 头条
             //BUDGET_MODE_DAY-日预算
             // BUDGET_MODE_INFINITE-不限
-            String accountBudgetMode = updAdStaOrCpaOrBudget.getBudgetType().equals("1") ? "BUDGET_MODE_INFINITE" : "BUDGET_MODE_DAY";
+            String accountBudgetMode = "1".equals(updAdStaOrCpaOrBudget.getBudgetType()) ? "BUDGET_MODE_INFINITE" : "BUDGET_MODE_DAY";
             Result resultBudget = marketingService.updateBudget(token,accountBudgetMode,new BigDecimal(updAdStaOrCpaOrBudget.getBudget()));
            /* if (!resultBudget.isSuccess()){
                 return Result.error(resultBudget.getMessage());
@@ -1561,7 +1561,7 @@ public class AiBytedanceAdvertiserStrategyServiceImpl extends ServiceImpl<AiByte
         //账户预算 同步 头条
         //BUDGET_MODE_DAY-日预算
         // BUDGET_MODE_INFINITE-不限
-        String accountBudgetMode = aiBytedanceAdvertiserStrategy.getAccountBudgetMode().equals("1") ? "BUDGET_MODE_INFINITE" : "BUDGET_MODE_DAY";
+        String accountBudgetMode = "1".equals(aiBytedanceAdvertiserStrategy.getAccountBudgetMode()) ? "BUDGET_MODE_INFINITE" : "BUDGET_MODE_DAY";
         Result resultBudget = marketingService.updateBudget(token,accountBudgetMode,aiBytedanceAdvertiserStrategy.getAccountBudget());
        /* if (!resultBudget.isSuccess()){
             return Result.error(resultBudget.getMessage());

+ 1 - 0
jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/advertise/service/impl/ByteDanceAdvertisePlanServiceImpl.java

@@ -107,6 +107,7 @@ public class ByteDanceAdvertisePlanServiceImpl extends ServiceImpl<ByteDanceAdve
         return resultMap;
     }
 
+    @Override
     public Map<String, Object> getAdvertiserPlanRejectReason(CtopOauthToken token, Long advertiserId, List<Long> adIds) {
 
         Map<String, Object> resultMap = new HashMap<>();

+ 2 - 1
jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/advertise/service/impl/BytedanceRejectReasonServiceImpl.java

@@ -41,7 +41,8 @@ public class BytedanceRejectReasonServiceImpl implements BytedanceRejectReasonSe
 
     @Resource
     LowQualityRejectReasonMapper lowQualityRejectReasonMapper;
-    public void saveRejectReasonToDb(JSONArray jsonArray,Long accountId){
+    @Override
+    public void saveRejectReasonToDb(JSONArray jsonArray, Long accountId){
         for(int i=0; i<jsonArray.size(); i++){
             JSONObject jsonObject = jsonArray.getJSONObject(i);
             JSONObject ad_reject = jsonObject.getJSONObject("ad_reject");

+ 1 - 1
jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/common/utils/Check.java

@@ -83,7 +83,7 @@ public class Check {
     public static JSONObject jsonRemoveEmpty(JSONObject jsonObject){
         JSONObject jsonResult = new JSONObject();
         for (Object key :jsonObject.keySet() ) {
-            if (!Check.isNull(jsonObject.get(key)) && !jsonObject.get(key).equals("")){
+            if (!Check.isNull(jsonObject.get(key)) && !"".equals(jsonObject.get(key))){
                 jsonResult.put(key.toString(), jsonObject.get(key));
             }
         }

+ 1 - 1
jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/common/utils/ExcelUtil.java

@@ -117,7 +117,7 @@ public class ExcelUtil {
         }
         //如果当前单元格内容为日期类型,需要特殊处理
         String dataFormatString = cell.getCellStyle().getDataFormatString();
-        if(dataFormatString.equals("m/d/yy")){
+        if("m/d/yy".equals(dataFormatString)){
             cellValue = new SimpleDateFormat(DATE_FORMAT).format(cell.getDateCellValue());
             return cellValue;
         }

+ 1 - 1
jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/report/service/impl/BytedanceAdvertiserHourlyReportServiceImpl.java

@@ -84,7 +84,7 @@ public class BytedanceAdvertiserHourlyReportServiceImpl extends ServiceImpl<Byte
          * 日期相差不为 0 则 展示 日报(每天数据总和)数据
          * 日期相差天数为0  则 展示 24小时 数据
          */
-        if (!lastTimeMap.get("daysBetween").equals("0")){
+        if (!"0".equals(lastTimeMap.get("daysBetween"))){
             // 账户 日报 阶段 数据
             nowCostList = bytedanceAdvertiserHourlyReportMapper.selectPlanCostInfoCount(accountId,null,startTime,endTime);
             lastCostList = bytedanceAdvertiserHourlyReportMapper.selectPlanCostInfoCount(accountId,null,lastTimeMap.get("lastTimeStart"),lastTimeMap.get("lastTimeEnd"));

+ 4 - 4
jeecg-boot-module-system/src/main/java/cn/com/ctop/alarm/modules/controller/RuleSwitchController.java

@@ -28,14 +28,14 @@ public class RuleSwitchController {
         userAllocation.setAccountId(accountId);
         UpdateWrapper<UserAllocation> wrapper=new UpdateWrapper<>();
         //开启预警
-        if(switchType.equals("on")){
+        if("on".equals(switchType)){
             wrapper.set("monitoring_link",0);
             wrapper.setEntity(userAllocation);
             boolean update = userAllocationService.update(wrapper);
             if(update){
                 result.success("监测链接预警开启成功");
             }
-        }else if(switchType.equals("off")){
+        }else if("off".equals(switchType)){
             wrapper.set("monitoring_link",1);
             wrapper.setEntity(userAllocation);
             boolean update = userAllocationService.update(wrapper);
@@ -58,14 +58,14 @@ public class RuleSwitchController {
         userAllocation.setAccountId(accountId);
         UpdateWrapper<UserAllocation> wrapper=new UpdateWrapper<>();
         //开启预警
-        if(switchType.equals("on")){
+        if("on".equals(switchType)){
             wrapper.set("landing_page",0);
             wrapper.setEntity(userAllocation);
             boolean update = userAllocationService.update(wrapper);
             if(update){
                 result.success("落地页链接预警开启成功");
             }
-        }else if(switchType.equals("off")){
+        }else if("off".equals(switchType)){
             wrapper.set("landing_page",1);
             wrapper.setEntity(userAllocation);
             boolean update = userAllocationService.update(wrapper);

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/impl/MaterialImageInfoServiceImpl.java

@@ -155,7 +155,7 @@ public class MaterialImageInfoServiceImpl extends ServiceImpl<MaterialImageInfoM
     @Override
     public List<MaterialImageInfo> getListByVideoSignature(String signature) {
         QueryWrapper<MaterialImageInfo>queryWrapper =new QueryWrapper<>();
-        if(null!=signature&&!signature.trim().equals("")){
+        if(null!=signature&&!"".equals(signature.trim())){
             queryWrapper.eq("video_id",signature);
         }
         return this.list(queryWrapper);

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/impl/UserAllocationServiceImpl.java

@@ -129,7 +129,7 @@ public class UserAllocationServiceImpl extends ServiceImpl<UserAllocationMapper,
     @Override
     public List<JSONObject> getAccountIdsByUserId(String userId) {
         List<JSONObject> result = new ArrayList<>();
-        if (userId.equals("e9ca23d68d884d4ebb19d07889727dae")) {
+        if ("e9ca23d68d884d4ebb19d07889727dae".equals(userId)) {
             result = userAllocationMapper.getAllAccountIdsByMediaId("2");
         } else {
             result = userAllocationMapper.getAccountIdsByUserId(userId);

+ 0 - 131
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/utils/TokenUtils.java

@@ -1,131 +0,0 @@
-package cn.com.ctop.common.module.utils;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.apache.shiro.authc.AuthenticationException;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.api.ISysBaseApi;
-import org.jeecg.common.system.util.JwtUtil;
-import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.util.RedisUtil;
-import org.jeecg.common.util.oConvertUtils;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * @Author scott
- * @Date 2019/9/23 14:12
- * @Description: 编程校验token有效性
- */
-@Slf4j
-public class TokenUtils {
-
-    /**
-     * 获取 request 里传递的 token
-     *
-     * @param request
-     * @return
-     */
-    public static String getTokenByRequest(HttpServletRequest request) {
-        String token = request.getParameter("token");
-        if (token == null) {
-            token = request.getHeader("X-Access-Token");
-        }
-        return token;
-    }
-
-    /**
-     * 验证Token
-     */
-    public static boolean verifyToken(String token, ISysBaseApi sysBaseApi, RedisUtil redisUtil) {
-        if (StringUtils.isBlank(token)) {
-            throw new AuthenticationException("token不能为空!");
-        }
-
-        // 解密获得username,用于和数据库进行对比
-        String username = JwtUtil.getUsername(token);
-        if (username == null) {
-            throw new AuthenticationException("token非法无效!");
-        }
-
-        // 查询用户信息
-        LoginUser user = sysBaseApi.getUserByName(username);
-        if (user == null) {
-            throw new AuthenticationException("用户不存在!");
-        }
-        // 判断用户状态
-        if (user.getStatus() != 1) {
-            throw new AuthenticationException("账号已被锁定,请联系管理员!");
-        }
-        // 校验token是否超时失效 & 或者账号密码是否错误
-        if (!jwtTokenRefresh(token, username, user.getPassword(), redisUtil)) {
-            throw new AuthenticationException("Token失效,请重新登录!");
-        }
-        return true;
-    }
-
-
-    /**
-     * 验证Token
-     */
-    public static boolean verifyToken(HttpServletRequest request, ISysBaseApi sysBaseApi, RedisUtil redisUtil) {
-        log.info(" -- url --" + request.getRequestURL());
-        String token = getTokenByRequest(request);
-
-        if (StringUtils.isBlank(token)) {
-            throw new AuthenticationException("token不能为空!");
-        }
-
-        // 解密获得username,用于和数据库进行对比
-        String username = JwtUtil.getUsername(token);
-        if (username == null) {
-            throw new AuthenticationException("token非法无效!");
-        }
-
-        // 查询用户信息
-        LoginUser user = sysBaseApi.getUserByName(username);
-        if (user == null) {
-            throw new AuthenticationException("用户不存在!");
-        }
-        // 判断用户状态
-        if (user.getStatus() != 1) {
-            throw new AuthenticationException("账号已被锁定,请联系管理员!");
-        }
-        // 校验token是否超时失效 & 或者账号密码是否错误
-        if (!jwtTokenRefresh(token, username, user.getPassword(), redisUtil)) {
-            throw new AuthenticationException("Token失效,请重新登录!");
-        }
-        return true;
-    }
-
-    /**
-     * 刷新token(保证用户在线操作不掉线)
-     * @param token
-     * @param userName
-     * @param passWord
-     * @param redisUtil
-     * @return
-     */
-    private static boolean jwtTokenRefresh(String token, String userName, String passWord, RedisUtil redisUtil) {
-        String cacheToken = String.valueOf(redisUtil.get(CommonConstant.PREFIX_USER_TOKEN + token));
-        if (oConvertUtils.isNotEmpty(cacheToken)) {
-            // 校验token有效性
-            if (!JwtUtil.verify(cacheToken, userName, passWord)) {
-                String newAuthorization = JwtUtil.sign(userName, passWord);
-                // 设置Toekn缓存有效时间
-                redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, newAuthorization);
-                redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME*2 / 1000);
-            }
-            //update-begin--Author:scott  Date:20191005  for:解决每次请求,都重写redis中 token缓存问题
-//            else {
-//                redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, cacheToken);
-//                // 设置超时时间
-//                redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 1000);
-//            }
-            //update-end--Author:scott  Date:20191005  for:解决每次请求,都重写redis中 token缓存问题
-            return true;
-        }
-        return false;
-    }
-
-}

+ 2 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/AiKuaiShouAppInfoServiceImpl.java

@@ -61,9 +61,9 @@ public class AiKuaiShouAppInfoServiceImpl extends ServiceImpl<AiKuaiShouAppInfoM
             Workbook workbook = null;
             String fileName = myFile.getOriginalFilename();
             String substring = fileName.substring(fileName.lastIndexOf(".") + 1).toUpperCase();
-            if (substring.equals("XLS")) {
+            if ("XLS".equals(substring)) {
                 workbook = new HSSFWorkbook(myFile.getInputStream());
-            } else if (substring.equals("XLSX")) {
+            } else if ("XLSX".equals(substring)) {
                 workbook = new XSSFWorkbook(myFile.getInputStream());
             } else {
                 throw new Exception("文件不是Excel文件");

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/AiKuaishouCreateCreativeServiceImpl.java

@@ -1581,7 +1581,7 @@ public class AiKuaishouCreateCreativeServiceImpl implements IAiKuaishouCreateCre
         }
         Date date = new Date();
         String nowDate = DateUtils.formatDate(date, "yy-MMdd");
-        if (type.equals("plan")) {
+        if ("plan".equals(type)) {
             if (wildcard.contains("{{日期}}")) {
                 wildcard = wildcard.replace("{{日期}}", nowDate);
             } else {

+ 15 - 15
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/AiKuaishouProjectCreateCreativeServiceImpl.java

@@ -1068,7 +1068,7 @@ public class AiKuaishouProjectCreateCreativeServiceImpl implements IAiKuaishouPr
                         continue;
                     }
                     if (!Check.isNull(dir.getUserType()) && dir.getUserType() != 2) {
-                        if (dir.getUserType() != target.getUserType()) {
+                        if (!dir.getUserType().equals(target.getUserType())) {
                             continue;
                         }
                     }
@@ -1084,37 +1084,37 @@ public class AiKuaishouProjectCreateCreativeServiceImpl implements IAiKuaishouPr
                         }
                     }
                     if (!Check.isNull(dir.getGender()) && dir.getGender() != 0) {
-                        if (dir.getGender() != target.getGender()) {
+                        if (!dir.getGender().equals(target.getGender())) {
                             continue;
                         }
                     }
                     if (!Check.isNull(dir.getPlatformOs()) && dir.getPlatformOs() != 0) {
-                        if (dir.getPlatformOs() != target.getPlatformOs()) {
+                        if (!dir.getPlatformOs().equals(target.getPlatformOs())) {
                             continue;
                         }
                     }
                     if (!Check.isNull(dir.getAndroidOsv()) && dir.getAndroidOsv() != 3) {
-                        if (dir.getAndroidOsv() != target.getAndroidOsv()) {
+                        if (!dir.getAndroidOsv().equals(target.getAndroidOsv())) {
                             continue;
                         }
                     }
                     if (!Check.isNull(dir.getIosOsv()) && dir.getIosOsv() != 6) {
-                        if (dir.getIosOsv() != target.getIosOsv()) {
+                        if (!dir.getIosOsv().equals(target.getIosOsv())) {
                             continue;
                         }
                     }
                     if (!Check.isNull(dir.getNetwork()) && dir.getNetwork() != 0) {
-                        if (dir.getNetwork() != target.getNetwork()) {
+                        if (!dir.getNetwork().equals(target.getNetwork())) {
                             continue;
                         }
                     }
                     if (!Check.isNull(dir.getFilterConvertedLevel()) && dir.getFilterConvertedLevel() != 0) {
-                        if (dir.getFilterConvertedLevel() != target.getFilterConvertedLevel()) {
+                        if (!dir.getFilterConvertedLevel().equals(target.getFilterConvertedLevel())) {
                             continue;
                         }
                     }
                     if (!Check.isNull(dir.getBusinessInterestType()) && dir.getBusinessInterestType() != 0) {
-                        if (dir.getBusinessInterestType() != target.getBusinessInterestType()) {
+                        if (!dir.getBusinessInterestType().equals(target.getBusinessInterestType())) {
                             continue;
                         }
                     }
@@ -1140,22 +1140,22 @@ public class AiKuaishouProjectCreateCreativeServiceImpl implements IAiKuaishouPr
                         continue;
                     }
                     if (!Check.isNull(dir.getIsOpen()) && dir.getIsOpen() != 0) {
-                        if (dir.getIsOpen() != target.getIsOpen()) {
+                        if (!dir.getIsOpen().equals(target.getIsOpen())) {
                             continue;
                         }
                     }
                     if (!Check.isNull(dir.getNoAgeBreak()) && dir.getNoAgeBreak() != 0) {
-                        if (dir.getNoAgeBreak() != target.getNoAgeBreak()) {
+                        if (!dir.getNoAgeBreak().equals(target.getNoAgeBreak())) {
                             continue;
                         }
                     }
                     if (!Check.isNull(dir.getNoGenderBreak()) && dir.getNoGenderBreak() != 0) {
-                        if (dir.getNoGenderBreak() != target.getNoGenderBreak()) {
+                        if (!dir.getNoGenderBreak().equals(target.getNoGenderBreak())) {
                             continue;
                         }
                     }
                     if (!Check.isNull(dir.getNoAreaBreak()) && dir.getNoAreaBreak() != 0) {
-                        if (dir.getNoAreaBreak() != target.getNoAreaBreak()) {
+                        if (!dir.getNoAreaBreak().equals(target.getNoAreaBreak())) {
                             continue;
                         }
                     }
@@ -1172,12 +1172,12 @@ public class AiKuaishouProjectCreateCreativeServiceImpl implements IAiKuaishouPr
                         continue;
                     }
                     if (!Check.isNull(dir.getTimeType()) && dir.getTimeType() != -1) {
-                        if (dir.getTimeType() != target.getTimeType()) {
+                        if (!dir.getTimeType().equals(target.getTimeType())) {
                             continue;
                         }
                     }
                     if (!Check.isNull(dir.getStrengthType()) && dir.getStrengthType() != 0) {
-                        if (dir.getStrengthType() != target.getStrengthType()) {
+                        if (!dir.getStrengthType().equals(target.getStrengthType())) {
                             continue;
                         }
                     }
@@ -1453,7 +1453,7 @@ public class AiKuaishouProjectCreateCreativeServiceImpl implements IAiKuaishouPr
         }
         Date date = new Date();
         String nowDate = DateUtils.formatDate(date, "yy-MMdd");
-        if (type.equals("plan")) {
+        if ("plan".equals(type)) {
             if (wildcard.contains("{{日期}}")) {
                 wildcard = wildcard.replace("{{日期}}", nowDate);
             } else {

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/AiKuaishouStrategyTargetBaseServiceImpl.java

@@ -21,7 +21,7 @@ public class AiKuaishouStrategyTargetBaseServiceImpl extends ServiceImpl<AiKuais
     @Override
     public List<AiKuaishouStrategyTargetBase> listByType(String testDirection) {
         QueryWrapper<AiKuaishouStrategyTargetBase>queryWrapper =new QueryWrapper<>();
-        if(null!=testDirection&&!testDirection.trim().equals("")){
+        if(null!=testDirection&&!"".equals(testDirection.trim())){
             queryWrapper.eq("target_type",testDirection);
         }
         queryWrapper.eq("status",1);

+ 11 - 11
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/AiStrategyServiceImpl.java

@@ -124,7 +124,7 @@ public class AiStrategyServiceImpl implements IAiStrategyService {
         String materialFixType = strategyTemplate.getMaterialFixType();
         Date campaignDate = new Date();
         String timestamp = DateUtils.formatDate(campaignDate,"yyyyMMddHHmmss");
-        if(scenes.equals("1")){
+        if("1".equals(scenes)){
             //素材+出价
             List<Long>getCapbids = splitCapBidByDomain(strategy.getCpaBidMin(),strategy.getCpaBidMax(),strategy.getStepSize());
             if(null == getCapbids||getCapbids.isEmpty()){
@@ -150,7 +150,7 @@ public class AiStrategyServiceImpl implements IAiStrategyService {
             // 8、根据素材和出价,两层循环 创建组和创意
             for (Long item:getCapbids) {
                 //判定素材搭配方式
-                if(null!=materialFixType&&materialFixType.trim().equals("single")){
+                if(null!=materialFixType&& "single".equals(materialFixType.trim())){
                     // 选择素材,创建创意
                     for(KuaiShouVideoGet videoItem: fullVideos){
                         //拼装广告组参数
@@ -314,7 +314,7 @@ public class AiStrategyServiceImpl implements IAiStrategyService {
             int unitCnt = 0;
             // 8、根据定向和素材,两层循环 创建组和创意
             for (AiKuaishouStrategyTargetBase item:getBases) {
-                if(null!=materialFixType&&materialFixType.trim().equals("single")){
+                if(null!=materialFixType&& "single".equals(materialFixType.trim())){
                     // 策略定向拆分数据,写入数据库
                     AiKuaishouStrategyTargetUnion targetUnion = new AiKuaishouStrategyTargetUnion(strategyMiddle.getId(),item.getId(),item.getTargetContent());
                     targetUnionService.save(targetUnion);
@@ -546,16 +546,16 @@ public class AiStrategyServiceImpl implements IAiStrategyService {
 
     private String getStragyDefDomain(AiKuaishouStrategyTemplate strategyTemplate,KuaishouStrategy strategy){
         String definitionDomain = null;
-        if (strategyTemplate.getTestDirection().equals("age")){
+        if ("age".equals(strategyTemplate.getTestDirection())){
             definitionDomain = strategy.getAgesRange();
         }
-        if (strategyTemplate.getTestDirection().equals("gender")){
+        if ("gender".equals(strategyTemplate.getTestDirection())){
             definitionDomain = strategy.getGender().toString();
         }
-        if (strategyTemplate.getTestDirection().equals("region")){
+        if ("region".equals(strategyTemplate.getTestDirection())){
             definitionDomain = strategy.getRegion();
         }
-        if (strategyTemplate.getTestDirection().equals("operation_system")){
+        if ("operation_system".equals(strategyTemplate.getTestDirection())){
             definitionDomain = strategy.getPlatformOs().toString();
         }
         return definitionDomain;
@@ -606,28 +606,28 @@ public class AiStrategyServiceImpl implements IAiStrategyService {
         // 设置定向内容
         JSONObject targetJsonObject = new JSONObject();
         //TODO 34
-        if (strategyTemplate.getTestDirection().equals("region")){
+        if ("region".equals(strategyTemplate.getTestDirection())){
             targetJsonObject.put("region",JSONArray.parseArray(item.getTargetContent()));
         } else {
             targetJsonObject.put("region",JSONArray.parseArray(strategy.getRegion()));
         }
 
         //TODO 5
-        if (strategyTemplate.getTestDirection().equals("age")){
+        if ("age".equals(strategyTemplate.getTestDirection())){
             targetJsonObject.put("ages_range",JSONArray.parseArray(item.getTargetContent()));
         } else{
             targetJsonObject.put("ages_range",JSONArray.parseArray(strategy.getAgesRange()));
         }
 
         //TODO 3
-        if (strategyTemplate.getTestDirection().equals("gender")){
+        if ("gender".equals(strategyTemplate.getTestDirection())){
             targetJsonObject.put("gender",item.getTargetContent());
         } else {
             targetJsonObject.put("gender",strategy.getGender());
         }
 
         //TODO
-        if (strategyTemplate.getTestDirection().equals("operation_system")){
+        if ("operation_system".equals(strategyTemplate.getTestDirection())){
             targetJsonObject.put("platform_os",item.getTargetContent());
         } else {
             targetJsonObject.put("platform_os",strategy.getPlatformOs());

+ 2 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/ai/service/impl/KuaishouAppPackageServiceImpl.java

@@ -84,9 +84,9 @@ public class KuaishouAppPackageServiceImpl extends ServiceImpl<KuaishouAppPackag
         Workbook workbook = null;
         String fileName = file.getOriginalFilename();
         String substring = fileName.substring(fileName.lastIndexOf(".") + 1).toUpperCase();
-        if (substring.equals("XLS")) {
+        if ("XLS".equals(substring)) {
             workbook = new HSSFWorkbook(file.getInputStream());
-        } else if (substring.equals("XLSX")) {
+        } else if ("XLSX".equals(substring)) {
             workbook = new XSSFWorkbook(file.getInputStream());
         } else {
             throw new Exception("文件不是Excel文件");

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouVideoGetServiceImpl.java

@@ -163,7 +163,7 @@ public class KuaiShouVideoGetServiceImpl extends ServiceImpl<KuaiShouVideoGetMap
             queryWrapper.eq("channel_type", channelType);
         }
 
-        if (null != appVersion && !appVersion.trim().equals("")) {
+        if (null != appVersion && !"".equals(appVersion.trim())) {
             queryWrapper.likeRight("photo_name", appVersion);
         }
         if (null != videoCnt && videoCnt != 0) {

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java

@@ -967,7 +967,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                     }
 
                 } else {
-                    if (code == 400001 && resultJson.getString("message").equals("/rest/openapi/v2/ad_unit/create调用已超日限,次日可恢复调用")) {
+                    if (code == 400001 && "/rest/openapi/v2/ad_unit/create调用已超日限,次日可恢复调用".equals(resultJson.getString("message"))) {
                         String nowDate = DateUtils.getNowDate("yyyy-MM-dd");
                         String key = advertiserId + "_" + nowDate + "unit_create_overrun";
                         redisUtil.set(key, 1, 60 * 60 * 24);

+ 6 - 6
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/clean/service/impl/KuaiShouAccountCleanServiceImpl.java

@@ -86,7 +86,7 @@ public class KuaiShouAccountCleanServiceImpl implements KuaiShouAccountCleanServ
             //查询当前登录人角色
             String roleCode = sysRoleService.getRoleCodeByUserId(userId);
             PageHelper.startPage(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
-            if (roleCode != null && roleCode.equals("admin")) {
+            if (roleCode != null && "admin".equals(roleCode)) {
                 //管理员查询全部
                 templateList = kuaishouAccountCleanTemplateMapper.getTemplateList(templateId, createUser, null);
             } else {
@@ -185,10 +185,10 @@ public class KuaiShouAccountCleanServiceImpl implements KuaiShouAccountCleanServ
     public Result updateTemplateStatus(String templateId, String status) {
         Result result = new Result();
         String message = "修改";
-        if (status.equals("0")) {
+        if ("0".equals(status)) {
             message = "开启";
         }
-        if (status.equals("1")) {
+        if ("1".equals(status)) {
             message = "关闭";
         }
         try {
@@ -252,7 +252,7 @@ public class KuaiShouAccountCleanServiceImpl implements KuaiShouAccountCleanServ
             //查询当前登录人角色
             String roleCode = sysRoleService.getRoleCodeByUserId(userId);
             PageHelper.startPage(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
-            if (roleCode != null && roleCode.equals("admin")) {
+            if (roleCode != null && "admin".equals(roleCode)) {
                 //管理员查询全部
                 templateList = kuaishouAccountCleanTemplateMapper.getMyselfTemplateList(accountId, userName, null);
             } else {
@@ -333,10 +333,10 @@ public class KuaiShouAccountCleanServiceImpl implements KuaiShouAccountCleanServ
                         });
                         //操作类型
                         String operationType = null;
-                        if (ob.getPerformOperations().equals("2")) {
+                        if ("2".equals(ob.getPerformOperations())) {
                             operationType = "暂停";
                         }
-                        if (ob.getPerformOperations().equals("3")) {
+                        if ("3".equals(ob.getPerformOperations())) {
                             operationType = "删除";
                         }
                         //执行信息

+ 2 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/dimension/controller/KuaiShouDimensionStrategyController.java

@@ -93,7 +93,7 @@ public class KuaiShouDimensionStrategyController {
             KuaiShouDimensionStrategy one = kuaiShouDimensionStrategyService.getOne(dimensionStrategyQueryWrapper);
             Boolean trueOrFalse = false;
             if (!Check.isNull(one)) {
-                if (one.getId() != id) {
+                if (!one.getId().equals(id)) {
                     trueOrFalse = true;
                 }
 
@@ -186,7 +186,7 @@ public class KuaiShouDimensionStrategyController {
         queryWrapper.orderByDesc("create_time");
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String roleCode = sysRoleService.getRoleCodeByUserId(sysUser.getId());
-        if (!roleCode.equals("admin")) {
+        if (!"admin".equals(roleCode)) {
             queryWrapper.eq("user_id", sysUser.getId());
         }
 

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/dimension/service/impl/KuaiShouDimensionStrategyServiceImpl.java

@@ -412,7 +412,7 @@ public class KuaiShouDimensionStrategyServiceImpl extends ServiceImpl<KuaiShouDi
                     String intention_target = variableJson.getString("intention_target");
                     if (!Check.isNull(intention_target)) {
                         if (!"unlimited".equals(intention_target)) {
-                            if (intention_target.equals("1")) {
+                            if ("1".equals(intention_target)) {
                                 unit.setIntentionTarget(true);
                             } else {
                                 unit.setIntentionTarget(false);

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/label/service/impl/MaterialLabelServiceImpl.java

@@ -70,7 +70,7 @@ public class MaterialLabelServiceImpl implements MaterialLabelService {
         String AfterDate=null;
         try {
             calc.setTime(sdf.parse(date));
-            calc.add(calc.DATE, number);
+            calc.add(Calendar.DATE, number);
             AfterDate=sdf.format(calc.getTime());
         }catch (Exception e){
             log.info("获取日期失败:{}",e.toString());

+ 7 - 7
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/material/service/impl/EtlKuaishouVideoInfoServiceImpl.java

@@ -75,13 +75,13 @@ public class EtlKuaishouVideoInfoServiceImpl extends ServiceImpl<EtlKuaishouVide
                         JSONObject ascription = ascriptionService.getDetailByCode(videoGet.getSignature());
                         if(null!=ascription){
                             String clipId = ascription.getString("clipId");
-                            if(null!=clipId&&!clipId.trim().equals("")){
+                            if(null!=clipId&&!"".equals(clipId.trim())){
                                 etlKuaishouVideoInfo.setClipId(clipId);
                                 //根据id查询剪辑所属的设计负责人
                                 SysUser user = sysUserService.getById(clipId);
                                 if(null!=user){
                                     String roleCode = sysUserService.getRoleCodeByUserId(user.getId());
-                                    if(null!=roleCode&&roleCode.trim().equals("designTeamLeader")){
+                                    if(null!=roleCode&& "designTeamLeader".equals(roleCode.trim())){
                                         etlKuaishouVideoInfo.setDesignTeamLeaderId(user.getId());
                                         etlKuaishouVideoInfo.setDesignTeamLeaderName(user.getRealname());
                                     }else{
@@ -91,23 +91,23 @@ public class EtlKuaishouVideoInfoServiceImpl extends ServiceImpl<EtlKuaishouVide
                                 }
                             }
                             String clipName = ascription.getString("clipName");
-                            if(null!=clipName&&!clipName.trim().equals("")){
+                            if(null!=clipName&&!"".equals(clipName.trim())){
                                 etlKuaishouVideoInfo.setClipName(clipName);
                             }
                             String planId = ascription.getString("planId");
-                            if(null!=planId&&!planId.trim().equals("")){
+                            if(null!=planId&&!"".equals(planId.trim())){
                                 etlKuaishouVideoInfo.setPlanId(planId);
                             }
                             String planName = ascription.getString("planName");
-                            if(null!=planName&&!planName.trim().equals("")){
+                            if(null!=planName&&!"".equals(planName.trim())){
                                 etlKuaishouVideoInfo.setPlanName(planName);
                             }
                             String shotId = ascription.getString("shotId");
-                            if(null!=shotId&&!shotId.trim().equals("")){
+                            if(null!=shotId&&!"".equals(shotId.trim())){
                                 etlKuaishouVideoInfo.setShotId(shotId);
                             }
                             String shotName = ascription.getString("shotName");
-                            if(null!=shotName&&!shotName.trim().equals("")){
+                            if(null!=shotName&&!"".equals(shotName.trim())){
                                 etlKuaishouVideoInfo.setShotName(shotName);
                             }
                         }

+ 2 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/controller/KsNewGroupReportCtrl.java

@@ -48,7 +48,7 @@ public class KsNewGroupReportCtrl {
         JSONArray accountIds = requestBody.getJSONArray("accountIds");
         String userId = requestBody.getString("userId");
         //TODO 没有维护快手事业部负责人角色,增加判断
-        if (userId.equals("b73c6a1cafb4469a8c0081acd50f703b") || userId.equals("228c45f913924639bf20c79ce5dadb16")) {
+        if ("b73c6a1cafb4469a8c0081acd50f703b".equals(userId) || "228c45f913924639bf20c79ce5dadb16".equals(userId)) {
             accountIds = newPlanReportService.getAccountIdsByMedia();
         } else {
             if (!userId.isEmpty()) {
@@ -109,7 +109,7 @@ public class KsNewGroupReportCtrl {
         JSONArray accountIds = requestBody.getJSONArray("accountIds");
         String userId = requestBody.getString("userId");
         //TODO 没有维护快手事业部负责人角色,增加判断
-        if (userId.equals("6b4c821adc414dc8b7718ab63ccbfcaf")) {
+        if ("6b4c821adc414dc8b7718ab63ccbfcaf".equals(userId)) {
             accountIds = newPlanReportService.getAccountIdsByMedia();
         } else {
             if (!userId.isEmpty()) {

+ 2 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/controller/KsNewPlanReportCtrl.java

@@ -44,7 +44,7 @@ public class KsNewPlanReportCtrl {
         JSONArray accountIds = requestBody.getJSONArray("accountIds");
         String userId = requestBody.getString("userId");
         //TODO 没有维护快手事业部负责人角色,增加判断
-        if (userId.equals("6b4c821adc414dc8b7718ab63ccbfcaf")) {
+        if ("6b4c821adc414dc8b7718ab63ccbfcaf".equals(userId)) {
             accountIds = newPlanReportService.getAccountIdsByMedia();
         } else {
             if (!userId.isEmpty()) {
@@ -108,7 +108,7 @@ public class KsNewPlanReportCtrl {
         JSONArray accountIds = requestBody.getJSONArray("accountIds");
         String userId = requestBody.getString("userId");
         //TODO 没有维护快手事业部负责人角色,增加判断
-        if (userId.equals("6b4c821adc414dc8b7718ab63ccbfcaf")) {
+        if ("6b4c821adc414dc8b7718ab63ccbfcaf".equals(userId)) {
             accountIds = newPlanReportService.getAccountIdsByMedia();
         } else {
             if (!userId.isEmpty()) {

+ 3 - 3
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/EtlKuaiShouNewlyServiceImpl.java

@@ -88,11 +88,11 @@ public class EtlKuaiShouNewlyServiceImpl extends ServiceImpl<EtlKuaiShouNewlyMap
                     addNewly.setUserName(userMap.get(allocation.getUserId()));
                 }
                 Integer count = 0;
-                if (newType.equals("campaign")) {
+                if ("campaign".equals(newType)) {
                     count = campaignService.getNewDataByAccountIdAndDate(allocation.getAccountId(), statDate);
-                } else if (newType.equals("unit")) {
+                } else if ("unit".equals(newType)) {
                     count = groupService.getNewDataByAccountIdAndDate(allocation.getAccountId(), statDate);
-                } else if (newType.equals("creative")) {
+                } else if ("creative".equals(newType)) {
                     count = creativeService.getNewDataByAccountIdAndDate(allocation.getAccountId(), statDate);
                 }
                 addNewly.setNewCount(count);

+ 3 - 3
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/EtlKuaishouReportAccountHourlyServiceImpl.java

@@ -85,7 +85,7 @@ public class EtlKuaishouReportAccountHourlyServiceImpl extends ServiceImpl<EtlKu
         List<EtlKuaishouReportAccountHourly> list = etlDailyAccountMapper.selectList(lastStartDate, lastStartDate);
         if (!Check.isNull(list)) {
             for (EtlKuaishouReportAccountHourly accountHourly : list) {
-                accountHourly.setStatHour(23l);
+                accountHourly.setStatHour(23L);
             }
             etlHourlyAccountMapper.replaceBatch(list);
         }
@@ -163,7 +163,7 @@ public class EtlKuaishouReportAccountHourlyServiceImpl extends ServiceImpl<EtlKu
             completionTime(todayList);
             completionTime(yesterdayList);
         } else {
-            if (value.equals("play_3s_ratio")) {
+            if ("play_3s_ratio".equals(value)) {
                 value = request.getString("value");
                 type = "more";
             }
@@ -450,7 +450,7 @@ public class EtlKuaishouReportAccountHourlyServiceImpl extends ServiceImpl<EtlKu
             updateTime = etlHourlyAccountMapper.getNewlyUpdateTime();
         } else {
             updateTime = etlDailyAccountMapper.getNewlyUpdateTime();
-            if (parameterCode.equals("campaign") || parameterCode.equals("unit")) {
+            if ("campaign".equals(parameterCode) || "unit".equals(parameterCode)) {
                 data = etlDailyAccountMapper.queryEveryDayCount(request);
             } else {
                 data = etlDailyAccountMapper.queryEveryDayCharge(request);

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouProjectVideoEtlInfoServiceImpl.java

@@ -19,7 +19,7 @@ public class KuaishouProjectVideoEtlInfoServiceImpl extends ServiceImpl<Kuaishou
     @Override
     public KuaishouProjectVideoEtlInfo getByProjectVideoEtlInfoByParams(String signature, Long projectId) {
         QueryWrapper<KuaishouProjectVideoEtlInfo>queryWrapper = new QueryWrapper<>();
-        if(null!=signature&&!signature.trim().equals("")){
+        if(null!=signature&&!"".equals(signature.trim())){
             queryWrapper.eq("video_code",signature);
         }
         if(null!=projectId&&projectId!=0){

+ 15 - 15
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouVideoEtlInfoServiceImpl.java

@@ -55,7 +55,7 @@ public class KuaishouVideoEtlInfoServiceImpl extends ServiceImpl<KuaishouVideoEt
             materials.forEach(material -> {
                 executorService.submit(() -> {
                     try {
-                        if (null == material.getSignature() || material.getSignature().trim().equals("")) {
+                        if (null == material.getSignature() || "".equals(material.getSignature().trim())) {
                             return;
                         }
 
@@ -72,33 +72,33 @@ public class KuaishouVideoEtlInfoServiceImpl extends ServiceImpl<KuaishouVideoEt
                             String clipId = null;
                             if (null != ascription) {
                                 String planId = ascription.getString("planId");
-                                if (null != planId && !planId.trim().equals("")) {
+                                if (null != planId && !"".equals(planId.trim())) {
                                     etlInfo.setPlanId(planId);
                                 }
                                 String planName = ascription.getString("planName");
-                                if (null != planName && !planName.trim().equals("")) {
+                                if (null != planName && !"".equals(planName.trim())) {
                                     etlInfo.setPlanName(planName);
                                 }
                                 clipId = ascription.getString("clipId");
-                                if (null != clipId && !clipId.trim().equals("")) {
+                                if (null != clipId && !"".equals(clipId.trim())) {
                                     etlInfo.setClipId(clipId);
                                 }
                                 String clipName = ascription.getString("clipName");
-                                if (null != clipName && !clipName.trim().equals("")) {
+                                if (null != clipName && !"".equals(clipName.trim())) {
                                     etlInfo.setClipName(clipName);
                                 }
                                 String shotId = ascription.getString("shotId");
-                                if (null != shotId && !shotId.trim().equals("")) {
+                                if (null != shotId && !"".equals(shotId.trim())) {
                                     etlInfo.setShotId(shotId);
                                 }
                                 String shotName = ascription.getString("shotName");
-                                if (null != shotName && !shotName.trim().equals("")) {
+                                if (null != shotName && !"".equals(shotName.trim())) {
                                     etlInfo.setShotName(shotName);
                                 }
                             }
                             if (null != clipId) {
                                 String companyName = kuaishouVideoEtlInfoMapper.getCompanyNameByUserId(clipId);
-                                if (null != companyName && !companyName.trim().equals("")) {
+                                if (null != companyName && !"".equals(companyName.trim())) {
                                     etlInfo.setCompanyName(companyName);
                                 }
                             }
@@ -131,33 +131,33 @@ public class KuaishouVideoEtlInfoServiceImpl extends ServiceImpl<KuaishouVideoEt
                             String clipId = null;
                             if (null != ascription) {
                                 String planId = ascription.getString("planId");
-                                if (null != planId && !planId.trim().equals("")) {
+                                if (null != planId && !"".equals(planId.trim())) {
                                     etlInfo.setPlanId(planId);
                                 }
                                 String planName = ascription.getString("planName");
-                                if (null != planName && !planName.trim().equals("")) {
+                                if (null != planName && !"".equals(planName.trim())) {
                                     etlInfo.setPlanName(planName);
                                 }
                                 clipId = ascription.getString("clipId");
-                                if (null != clipId && !clipId.trim().equals("")) {
+                                if (null != clipId && !"".equals(clipId.trim())) {
                                     etlInfo.setClipId(clipId);
                                 }
                                 String clipName = ascription.getString("clipName");
-                                if (null != clipName && !clipName.trim().equals("")) {
+                                if (null != clipName && !"".equals(clipName.trim())) {
                                     etlInfo.setClipName(clipName);
                                 }
                                 String shotId = ascription.getString("shotId");
-                                if (null != shotId && !shotId.trim().equals("")) {
+                                if (null != shotId && !"".equals(shotId.trim())) {
                                     etlInfo.setShotId(shotId);
                                 }
                                 String shotName = ascription.getString("shotName");
-                                if (null != shotName && !shotName.trim().equals("")) {
+                                if (null != shotName && !"".equals(shotName.trim())) {
                                     etlInfo.setShotName(shotName);
                                 }
                             }
                             if (null != clipId) {
                                 String companyName = kuaishouVideoEtlInfoMapper.getCompanyNameByUserId(clipId);
-                                if (null != companyName && !companyName.trim().equals("")) {
+                                if (null != companyName && !"".equals(companyName.trim())) {
                                     etlInfo.setCompanyName(companyName);
                                 }
                             }

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/oa/modules/service/impl/AppchatCreateServiceImpl.java

@@ -88,7 +88,7 @@ public class AppchatCreateServiceImpl implements IAppchatCreateService {
             if (Check.isNull(userInfo)) {
                 continue;
             }
-            if (userInfo.getWexinName().equals("于蒙蒙") || userInfo.getWexinName().equals("吴永前")) {
+            if ("于蒙蒙".equals(userInfo.getWexinName()) || "吴永前".equals(userInfo.getWexinName())) {
                 continue;
             }
             text.append("@" + userInfo.getWexinName() + "");

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/shiwan/modules/controller/ShiwanFileUploadController.java

@@ -121,7 +121,7 @@ public class ShiwanFileUploadController {
                 result.success("查询成功!");
                 result.setResult(list);
             } else {
-                result.error(-1, "查询失败");
+                Result.error(-1, "查询失败");
             }
         }
         return result;

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/report/controller/BytedanceNewPlanReportCtrl.java

@@ -36,7 +36,7 @@ public class BytedanceNewPlanReportCtrl {
         JSONArray accountIds = requestBody.getJSONArray("accountIds");
         //TODO 没有维护头条事业部负责人角色,增加判断
         String userId = requestBody.getString("userId");
-        if (userId.equals("0c2113fb63b94941be024efce2d83369")) {
+        if ("0c2113fb63b94941be024efce2d83369".equals(userId)) {
             accountIds = newPlanReportService.getAccountIdsByMedia();
         } else {
             if (!userId.isEmpty()) {

+ 30 - 30
jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/BytedanceVideoEtlInfoServiceImpl.java

@@ -48,7 +48,7 @@ public class BytedanceVideoEtlInfoServiceImpl extends ServiceImpl<BytedanceVideo
             materials.forEach(material->{
                 executorService.submit(()->{
                     try {
-                        if(null == material.getVideoCode()||material.getVideoCode().trim().equals("")){
+                        if(null == material.getVideoCode()|| "".equals(material.getVideoCode().trim())){
                             return;
                         }
                         String signature = material.getVideoCode();
@@ -64,33 +64,33 @@ public class BytedanceVideoEtlInfoServiceImpl extends ServiceImpl<BytedanceVideo
                             String planId = null;
                             if(null!=ascription){
                                 planId = ascription.getString("planId");
-                                if(null!=planId&&!planId.trim().equals("")){
+                                if(null!=planId&&!"".equals(planId.trim())){
                                     etlInfo.setPlanId(planId);
                                 }
                                 String planName =  ascription.getString("planName");
-                                if(null!=planName&&!planName.trim().equals("")){
+                                if(null!=planName&&!"".equals(planName.trim())){
                                     etlInfo.setPlanName(planName);
                                 }
                                 String clipId = ascription.getString("clipId");
-                                if(null!=clipId&&!clipId.trim().equals("")){
+                                if(null!=clipId&&!"".equals(clipId.trim())){
                                     etlInfo.setClipId(clipId);
                                 }
                                 String clipName = ascription.getString("clipName");
-                                if(null!=clipName&&!clipName.trim().equals("")){
+                                if(null!=clipName&&!"".equals(clipName.trim())){
                                     etlInfo.setClipName(clipName);
                                 }
                                 String shotId = ascription.getString("shotId");
-                                if(null!=shotId&&!shotId.trim().equals("")){
+                                if(null!=shotId&&!"".equals(shotId.trim())){
                                     etlInfo.setShotId(shotId);
                                 }
                                 String shotName = ascription.getString("shotName");
-                                if(null!=shotName&&!shotName.trim().equals("")){
+                                if(null!=shotName&&!"".equals(shotName.trim())){
                                     etlInfo.setShotName(shotName);
                                 }
                             }
                             if(null!=planId){
                                 String companyName = userAllocationMapper.getCompanyNameByUserId(planId);
-                                if (null!=companyName&&!companyName.trim().equals("")){
+                                if (null!=companyName&&!"".equals(companyName.trim())){
                                     etlInfo.setCompanyName(companyName);
                                 }
                             }
@@ -123,33 +123,33 @@ public class BytedanceVideoEtlInfoServiceImpl extends ServiceImpl<BytedanceVideo
                             String planId = null;
                             if(null!=ascription){
                                 planId = ascription.getString("planId");
-                                if(null!=planId&&!planId.trim().equals("")){
+                                if(null!=planId&&!"".equals(planId.trim())){
                                     etlInfo.setPlanId(planId);
                                 }
                                 String planName =  ascription.getString("planName");
-                                if(null!=planName&&!planName.trim().equals("")){
+                                if(null!=planName&&!"".equals(planName.trim())){
                                     etlInfo.setPlanName(planName);
                                 }
                                 String clipId = ascription.getString("clipId");
-                                if(null!=clipId&&!clipId.trim().equals("")){
+                                if(null!=clipId&&!"".equals(clipId.trim())){
                                     etlInfo.setClipId(clipId);
                                 }
                                 String clipName = ascription.getString("clipName");
-                                if(null!=clipName&&!clipName.trim().equals("")){
+                                if(null!=clipName&&!"".equals(clipName.trim())){
                                     etlInfo.setClipName(clipName);
                                 }
                                 String shotId = ascription.getString("shotId");
-                                if(null!=shotId&&!shotId.trim().equals("")){
+                                if(null!=shotId&&!"".equals(shotId.trim())){
                                     etlInfo.setShotId(shotId);
                                 }
                                 String shotName = ascription.getString("shotName");
-                                if(null!=shotName&&!shotName.trim().equals("")){
+                                if(null!=shotName&&!"".equals(shotName.trim())){
                                     etlInfo.setShotName(shotName);
                                 }
                             }
                             if(null!=planId){
                                 String companyName = userAllocationMapper.getCompanyNameByUserId(planId);
-                                if (null!=companyName&&!companyName.trim().equals("")){
+                                if (null!=companyName&&!"".equals(companyName.trim())){
                                     etlInfo.setCompanyName(companyName);
                                 }
                             }
@@ -220,7 +220,7 @@ public class BytedanceVideoEtlInfoServiceImpl extends ServiceImpl<BytedanceVideo
             materials.forEach(material->{
                 executorService.submit(()->{
                     try {
-                        if(null == material.getVideoCode()||material.getVideoCode().trim().equals("")){
+                        if(null == material.getVideoCode()|| "".equals(material.getVideoCode().trim())){
                             return;
                         }
                         String signature = material.getVideoCode();
@@ -236,33 +236,33 @@ public class BytedanceVideoEtlInfoServiceImpl extends ServiceImpl<BytedanceVideo
                             String planId = null;
                             if(null!=ascription){
                                 planId = ascription.getString("planId");
-                                if(null!=planId&&!planId.trim().equals("")){
+                                if(null!=planId&&!"".equals(planId.trim())){
                                     etlInfo.setPlanId(planId);
                                 }
                                 String planName =  ascription.getString("planName");
-                                if(null!=planName&&!planName.trim().equals("")){
+                                if(null!=planName&&!"".equals(planName.trim())){
                                     etlInfo.setPlanName(planName);
                                 }
                                 String clipId = ascription.getString("clipId");
-                                if(null!=clipId&&!clipId.trim().equals("")){
+                                if(null!=clipId&&!"".equals(clipId.trim())){
                                     etlInfo.setClipId(clipId);
                                 }
                                 String clipName = ascription.getString("clipName");
-                                if(null!=clipName&&!clipName.trim().equals("")){
+                                if(null!=clipName&&!"".equals(clipName.trim())){
                                     etlInfo.setClipName(clipName);
                                 }
                                 String shotId = ascription.getString("shotId");
-                                if(null!=shotId&&!shotId.trim().equals("")){
+                                if(null!=shotId&&!"".equals(shotId.trim())){
                                     etlInfo.setShotId(shotId);
                                 }
                                 String shotName = ascription.getString("shotName");
-                                if(null!=shotName&&!shotName.trim().equals("")){
+                                if(null!=shotName&&!"".equals(shotName.trim())){
                                     etlInfo.setShotName(shotName);
                                 }
                             }
                             if(null!=planId){
                                 String companyName = userAllocationMapper.getCompanyNameByUserId(planId);
-                                if (null!=companyName&&!companyName.trim().equals("")){
+                                if (null!=companyName&&!"".equals(companyName.trim())){
                                     etlInfo.setCompanyName(companyName);
                                 }
                             }
@@ -295,33 +295,33 @@ public class BytedanceVideoEtlInfoServiceImpl extends ServiceImpl<BytedanceVideo
                             String planId = null;
                             if(null!=ascription){
                                 planId = ascription.getString("planId");
-                                if(null!=planId&&!planId.trim().equals("")){
+                                if(null!=planId&&!"".equals(planId.trim())){
                                     etlInfo.setPlanId(planId);
                                 }
                                 String planName =  ascription.getString("planName");
-                                if(null!=planName&&!planName.trim().equals("")){
+                                if(null!=planName&&!"".equals(planName.trim())){
                                     etlInfo.setPlanName(planName);
                                 }
                                 String clipId = ascription.getString("clipId");
-                                if(null!=clipId&&!clipId.trim().equals("")){
+                                if(null!=clipId&&!"".equals(clipId.trim())){
                                     etlInfo.setClipId(clipId);
                                 }
                                 String clipName = ascription.getString("clipName");
-                                if(null!=clipName&&!clipName.trim().equals("")){
+                                if(null!=clipName&&!"".equals(clipName.trim())){
                                     etlInfo.setClipName(clipName);
                                 }
                                 String shotId = ascription.getString("shotId");
-                                if(null!=shotId&&!shotId.trim().equals("")){
+                                if(null!=shotId&&!"".equals(shotId.trim())){
                                     etlInfo.setShotId(shotId);
                                 }
                                 String shotName = ascription.getString("shotName");
-                                if(null!=shotName&&!shotName.trim().equals("")){
+                                if(null!=shotName&&!"".equals(shotName.trim())){
                                     etlInfo.setShotName(shotName);
                                 }
                             }
                             if(null!=planId){
                                 String companyName = userAllocationMapper.getCompanyNameByUserId(planId);
-                                if (null!=companyName&&!companyName.trim().equals("")){
+                                if (null!=companyName&&!"".equals(companyName.trim())){
                                     etlInfo.setCompanyName(companyName);
                                 }
                             }

+ 4 - 4
jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/ReportServiceImpl.java

@@ -195,12 +195,12 @@ public class ReportServiceImpl implements IReportService {
             if(null!=plan){
                 String status = plan.getToutiaoStatus();
                 String optStatus = plan.getOptStatus();
-                if(null == optStatus||optStatus.equals("AD_STATUS_DISABLE")||optStatus.trim().equals("")){
+                if(null == optStatus|| "AD_STATUS_DISABLE".equals(optStatus)|| "".equals(optStatus.trim())){
                     continue;
                 }
-                if(null == status||status.trim().equals("")||status.equals("AD_STATUS_DISABLE")
-                        ||status.equals("AD_STATUS_DONE")||status.equals("AD_STATUS_AUDIT_DENY")||status.equals("AD_STATUS_BALANCE_EXCEED")
-                        ||status.equals("AD_STATUS_CAMPAIGN_DISABLE")||status.equals("AD_STATUS_CAMPAIGN_EXCEED")||status.equals("AD_STATUS_DELETE")){
+                if(null == status|| "".equals(status.trim())|| "AD_STATUS_DISABLE".equals(status)
+                        || "AD_STATUS_DONE".equals(status)|| "AD_STATUS_AUDIT_DENY".equals(status)|| "AD_STATUS_BALANCE_EXCEED".equals(status)
+                        || "AD_STATUS_CAMPAIGN_DISABLE".equals(status)|| "AD_STATUS_CAMPAIGN_EXCEED".equals(status)|| "AD_STATUS_DELETE".equals(status)){
                     continue;
                 }
                 ruleDataPlan.setBudget(plan.getBudget());

+ 1 - 1
jeecg-boot-module-system/src/main/java/com/xxl/job/core/executor/impl/XxlJobSpringExecutor.java

@@ -162,7 +162,7 @@ public class XxlJobSpringExecutor extends XxlJobExecutor implements ApplicationC
 
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        this.applicationContext = applicationContext;
+        XxlJobSpringExecutor.applicationContext = applicationContext;
     }
 
     public static ApplicationContext getApplicationContext() {

+ 4 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ads/controller/AiKuaiShouReportAnalyzeCtrl.java

@@ -39,10 +39,10 @@ public class AiKuaiShouReportAnalyzeCtrl {
         if(params.isEmpty()){
             result.error500("参数为空");
         }else {
-            if(params.getString("type").equals("target")){
+            if("target".equals(params.getString("type"))){
                 result.setResult(aiKuaiShouReportAnalyzeService.getTargetReportBy(params));
             }
-            else if(params.getString("type").equals("material")){
+            else if("material".equals(params.getString("type"))){
                 result.setResult(aiKuaiShouReportAnalyzeService.getMaterialReportBy(params));
             }
             result.setSuccess(true);
@@ -57,10 +57,10 @@ public class AiKuaiShouReportAnalyzeCtrl {
         if(params.isEmpty()){
             result.error500("参数为空");
         }else {
-            if(params.getString("type").equals("target")){
+            if("target".equals(params.getString("type"))){
                 result.setResult(aiKuaiShouReportAnalyzeService.getTargetChartBy(params));
             }
-            else if(params.getString("type").equals("material")){
+            else if("material".equals(params.getString("type"))){
                 result.setResult(aiKuaiShouReportAnalyzeService.getMaterialChartBy(params));
             }
             result.setSuccess(true);

+ 8 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/cas/util/XmlUtils.java

@@ -94,13 +94,15 @@ public final class XmlUtils {
 
             private StringBuilder buffer = new StringBuilder();
 
+            @Override
             public void startElement(final String uri, final String localName, final String qName,
-                    final Attributes attributes) throws SAXException {
+                                     final Attributes attributes) throws SAXException {
                 if (localName.equals(element)) {
                     this.foundElement = true;
                 }
             }
 
+            @Override
             public void endElement(final String uri, final String localName, final String qName) throws SAXException {
                 if (localName.equals(element)) {
                     this.foundElement = false;
@@ -109,6 +111,7 @@ public final class XmlUtils {
                 }
             }
 
+            @Override
             public void characters(char[] ch, int start, int length) throws SAXException {
                 if (this.foundElement) {
                     this.buffer.append(ch, start, length);
@@ -145,19 +148,22 @@ public final class XmlUtils {
 
             private boolean foundElement = false;
 
+            @Override
             public void startElement(final String uri, final String localName, final String qName,
-                    final Attributes attributes) throws SAXException {
+                                     final Attributes attributes) throws SAXException {
                 if (localName.equals(element)) {
                     this.foundElement = true;
                 }
             }
 
+            @Override
             public void endElement(final String uri, final String localName, final String qName) throws SAXException {
                 if (localName.equals(element)) {
                     this.foundElement = false;
                 }
             }
 
+            @Override
             public void characters(char[] ch, int start, int length) throws SAXException {
                 if (this.foundElement) {
                     builder.append(ch, start, length);

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

@@ -65,8 +65,8 @@ public class BytedanceVideoEtlInfoController {
 		String endDate = bytedanceVideoEtlInfo.getEndDate();
 		bytedanceVideoEtlInfo.setEndDate(null);
 		QueryWrapper<BytedanceVideoEtlInfo> queryWrapper = QueryGenerator.initQueryWrapper(bytedanceVideoEtlInfo, req.getParameterMap());
-		if(null!=type&&!type.equals("")){
-			if(type.trim().equals("valid")){
+		if(null!=type&&!"".equals(type)){
+			if("valid".equals(type.trim())){
 				//有效
 				if(null!=startDate&&!"".equals(startDate.trim())){
 					queryWrapper.ge("effect_date",startDate);
@@ -75,7 +75,7 @@ public class BytedanceVideoEtlInfoController {
 					queryWrapper.le("effect_date",endDate);
 				}
 				queryWrapper.le("effect_day_num",7);
-			}else if(type.trim().equals("hot")){
+			}else if("hot".equals(type.trim())){
 				//爆款
 				if(null!=startDate&&!"".equals(startDate.trim())){
 					queryWrapper.ge("faddish_date",startDate);
@@ -177,8 +177,8 @@ public class BytedanceVideoEtlInfoController {
 		String endDate = bytedanceVideoEtlInfo.getEndDate();
 		bytedanceVideoEtlInfo.setEndDate(null);
 		QueryWrapper<BytedanceVideoEtlInfo> queryWrapper = QueryGenerator.initQueryWrapper(bytedanceVideoEtlInfo, request.getParameterMap());
-		if(null!=type&&!type.equals("")){
-			if(type.trim().equals("valid")){
+		if(null!=type&&!"".equals(type)){
+			if("valid".equals(type.trim())){
 				//有效
 				if(null!=startDate&&!"".equals(startDate.trim())){
 					queryWrapper.ge("effect_date",startDate);
@@ -187,7 +187,7 @@ public class BytedanceVideoEtlInfoController {
 					queryWrapper.le("effect_date",endDate);
 				}
 				queryWrapper.le("effect_day_num",7);
-			}else if(type.trim().equals("hot")){
+			}else if("hot".equals(type.trim())){
 				//爆款
 				if(null!=startDate&&!"".equals(startDate.trim())){
 					queryWrapper.ge("faddish_date",startDate);

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

@@ -203,7 +203,7 @@ public class CallbackController {
                     userAllocation.setSystemType(systemType);
                     // 获取快手昵称
                     userAllocation.setAuthName((String) advertiseBaseInfoMap.get("userName"));
-                    if (null != authBeginTime && !authBeginTime.trim().equals("")) {
+                    if (null != authBeginTime && !"".equals(authBeginTime.trim())) {
                         userAllocation.setAuthBeginTime(authBeginTime);
                     }
                     userAllocation.setMediaId(mediaId);
@@ -385,7 +385,7 @@ public class CallbackController {
                             userAllocation.setProjectId(projectId);
                             userAllocation.setSystemType(systemType);
                             userAllocation.setAuthName((String) advertiserDataMap.get("name"));
-                            if (null != authBeginTime && !authBeginTime.trim().equals("")) {
+                            if (null != authBeginTime && !"".equals(authBeginTime.trim())) {
                                 userAllocation.setAuthBeginTime(authBeginTime);
                             }
                             userAllocation.setAdvertiserId(advertiserId);
@@ -440,7 +440,7 @@ public class CallbackController {
                     userAllocation.setProjectId(projectId);
                     userAllocation.setSystemType(systemType);
                     userAllocation.setAuthName((String) advertiserDataMap.get("name"));
-                    if (null != authBeginTime && !authBeginTime.trim().equals("")) {
+                    if (null != authBeginTime && !"".equals(authBeginTime.trim())) {
                         userAllocation.setAuthBeginTime(authBeginTime);
                     }
                     userAllocation.setAdvertiserId(advertiserId);

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

@@ -62,8 +62,8 @@ public class KuaishouVideoEtlInfoController {
        String endDate = kuaishouVideoEtlInfo.getEndDate();
        kuaishouVideoEtlInfo.setEndDate(null);
        QueryWrapper<KuaishouVideoEtlInfo> queryWrapper = QueryGenerator.initQueryWrapper(kuaishouVideoEtlInfo, req.getParameterMap());
-       if(null!=type&&!type.equals("")){
-           if(type.trim().equals("valid")){
+       if(null!=type&&!"".equals(type)){
+           if("valid".equals(type.trim())){
                //有效
                if(null!=startDate&&!"".equals(startDate.trim())){
                    queryWrapper.ge("effect_date",startDate);
@@ -72,7 +72,7 @@ public class KuaishouVideoEtlInfoController {
                    queryWrapper.le("effect_date",endDate);
                }
                queryWrapper.lt("effect_day_num",7);
-           }else if(type.trim().equals("hot")){
+           }else if("hot".equals(type.trim())){
                //爆款
                if(null!=startDate&&!"".equals(startDate.trim())){
                    queryWrapper.ge("faddish_date",startDate);
@@ -185,8 +185,8 @@ public class KuaishouVideoEtlInfoController {
      String endDate = kuaishouVideoEtlInfo.getEndDate();
      kuaishouVideoEtlInfo.setEndDate(null);
      QueryWrapper<KuaishouVideoEtlInfo> queryWrapper = QueryGenerator.initQueryWrapper(kuaishouVideoEtlInfo, request.getParameterMap());
-     if(null!=type&&!type.equals("")){
-         if(type.trim().equals("valid")){
+     if(null!=type&&!"".equals(type)){
+         if("valid".equals(type.trim())){
              //有效
              if(null!=startDate&&!"".equals(startDate.trim())){
                  queryWrapper.ge("effect_date",startDate);
@@ -195,7 +195,7 @@ public class KuaishouVideoEtlInfoController {
                  queryWrapper.le("effect_date",endDate);
              }
              queryWrapper.lt("effect_day_num",7);
-         }else if(type.trim().equals("hot")){
+         }else if("hot".equals(type.trim())){
              //爆款
              if(null!=startDate&&!"".equals(startDate.trim())){
                  queryWrapper.ge("faddish_date",startDate);

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

@@ -782,6 +782,7 @@ public class MaterialInfoController {
         if (materialInfoEntity == null) {
             return result.error500("未找到对应实体");
         }
+        //TODO 驳回重新上传素材时需要清空素材的水印信息数据
         String url = materialInfo.getUrl();
         if (!Check.isNull(url)) {
             if (!url.contains(KuaishouInterfaceConstant.HTTPS_PREFIX)) {

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

@@ -674,7 +674,7 @@ public class TestController {
     public Map<String, Object> getKuaishouPlanHourlyReport(String params) {
         Long start = System.currentTimeMillis();
         Map<String, Object> result = new HashMap<>();
-        if (null == params || params.trim().equals("")) {
+        if (null == params || "".equals(params.trim())) {
             ResultMapUtils.setResultMap(result, StatusCode.COMMON_PARAM_ERROR);
             result.put("message", "COMMON_PARAM_ERROR");
             return result;

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

@@ -195,7 +195,7 @@ public class UserAllocationController {
         projectMemberService.getOwnProjects(mediaList);
         List<ProjectMember> projectMemberList = new ArrayList<>();
         for (ProjectMember projectMember : projectList) {
-            if (projectMember.getProductId() != productId) {
+            if (!projectMember.getProductId().equals(productId)) {
                 continue;
             }
             List<UserAllocation> userAllocationList = userAllocationService.getAccountListByUserIdAndProductId(userId, projectMember.getProjectId(), productId);

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

@@ -488,7 +488,7 @@ public class MaterialReportOverViewServiceImpl implements IMaterialReportOverVie
         //String currentUser = "e9ca23d68d884d4ebb19d07889727dae";
         //TODO 为了解决管理员等角色初始化查全部项目查询效率慢的问题判断角色,待优化
         String roleCode = roleService.getRoleCodeByUserId(currentUser);
-        if (roleCode.equals("admin")) {
+        if ("admin".equals(roleCode)) {
             return null;
         }
         return Check.isNull(queryProjectIdBy(recursiveQuerySubordinate(currentUser), mediaId)) ? null : queryProjectIdBy(recursiveQuerySubordinate(currentUser), mediaId);

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

@@ -68,7 +68,7 @@ public class PlatformMaterialServiceImpl extends ServiceImpl<PlatformMaterialMap
     public List<JSONObject> queryMaterialsByDesignUserId(String materialStatus, String designUserId) {
         JSONArray materialStatusJsonArray = JsonArrayUtil.Varchar2JSONArray(materialStatus);
         List<JSONObject> result = new ArrayList<>();
-        if (materialStatus.equals("0")) {
+        if ("0".equals(materialStatus)) {
             result = platformMaterialMapper.queryMaterialsByDesignLeader(materialStatusJsonArray, designUserId);
         } else {
             result = platformMaterialMapper.queryMaterialsByDesignUserId(materialStatusJsonArray, designUserId);

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

@@ -28,11 +28,15 @@ public class CategoryCodeRule implements IFillRuleHandler {
 
         if (formData != null && formData.size() > 0) {
             Object obj = formData.get("pid");
-            if (oConvertUtils.isNotEmpty(obj)) categoryPid = obj.toString();
+            if (oConvertUtils.isNotEmpty(obj)){
+                categoryPid = obj.toString();
+            }
         } else {
             if (params != null) {
                 Object obj = params.get("pid");
-                if (oConvertUtils.isNotEmpty(obj)) categoryPid = obj.toString();
+                if (oConvertUtils.isNotEmpty(obj)){
+                    categoryPid = obj.toString();
+                }
             }
         }
 

+ 3 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/rule/OrderNumberRule.java

@@ -20,7 +20,9 @@ public class OrderNumberRule implements IFillRuleHandler {
         //订单前缀默认为CN 如果规则参数不为空,则取自定义前缀
         if (params != null) {
             Object obj = params.get("prefix");
-            if (obj != null) prefix = obj.toString();
+            if (obj != null) {
+                prefix = obj.toString();
+            }
         }
         SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");
         int random = RandomUtils.nextInt(90) + 10;

+ 3 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/rule/OrgCodeRule.java

@@ -38,7 +38,9 @@ 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");

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

@@ -76,7 +76,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);
 		}
 		//只查询题库的文件

+ 3 - 3
jeecg-cloud-module/jeecg-cloud-system-start/src/main/resources/application-test.yml

@@ -10,10 +10,10 @@ dubbo:
     id: sys-center-dubbo-prodiver
     name: sys-center-dubbo-prodiver
   registry:
-    address: nacos://172.30.0.3:8848
+    address: nacos://172.30.0.14:8848
   protocol:
     name: dubbo
-    port: 20881
+    port: 20880
 #swagger
 knife4j:
   production: false
@@ -30,7 +30,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 172.30.0.3:8848
+        server-addr: 172.30.0.14:8848
         service: jeecg-system
   servlet:
     multipart:

+ 1 - 0
jeecg-cloud-module/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java

@@ -32,6 +32,7 @@ public class EmailJobAlarm implements JobAlarm {
      *
      * @param jobLog
      */
+    @Override
     public boolean doAlarm(XxlJobInfo info, XxlJobLog jobLog){
         boolean alarmResult = true;
 

+ 11 - 7
jeecg-cloud-module/jeecg-cloud-xxljob/src/main/java/com/xxl/job/admin/core/cron/CronExpression.java

@@ -363,9 +363,10 @@ public final class CronExpression implements Serializable, Cloneable {
         // the second immediately following it.
         while (difference == 1000) {
             newDate = getTimeAfter(lastDate);
-            if(newDate == null)
+            if(newDate == null){
                 break;
-            
+            }
+
             difference = newDate.getTime() - lastDate.getTime();
             
             if (difference == 1000) {
@@ -532,7 +533,7 @@ public final class CronExpression implements Serializable, Cloneable {
             return i;
         }
         char c = s.charAt(i);
-        if ((c >= 'A') && (c <= 'Z') && (!s.equals("L")) && (!s.equals("LW")) && (!s.matches("^L-[0-9]*[W]?"))) {
+        if ((c >= 'A') && (c <= 'Z') && (!"L".equals(s)) && (!"LW".equals(s)) && (!s.matches("^L-[0-9]*[W]?"))) {
             String sub = s.substring(i, i + 3);
             int sval = -1;
             int eval = -1;
@@ -668,8 +669,9 @@ public final class CronExpression implements Serializable, Cloneable {
                 if(c == '-') {
                     ValueSet vs = getValue(0, s, i+1);
                     lastdayOffset = vs.value;
-                    if(lastdayOffset > 30)
+                    if(lastdayOffset > 30) {
                         throw new ParseException("Offset from last day must be <= 30", i+1);
+                    }
                     i = vs.pos;
                 }                        
                 if(s.length() > i) {
@@ -732,8 +734,9 @@ public final class CronExpression implements Serializable, Cloneable {
 
         if (c == 'L') {
             if (type == DAY_OF_WEEK) {
-                if(val < 1 || val > 7)
+                if(val < 1 || val > 7) {
                     throw new ParseException("Day-of-Week values must be between 1 and 7", -1);
+                }
                 lastdayOfWeek = true;
             } else {
                 throw new ParseException("'L' option is not valid here. (pos=" + i + ")", i);
@@ -750,8 +753,9 @@ public final class CronExpression implements Serializable, Cloneable {
             } else {
                 throw new ParseException("'W' option is not valid here. (pos=" + i + ")", i);
             }
-            if(val > 31)
-                throw new ParseException("The 'W' option does not make sense with values larger than 31 (max number of days in a month)", i); 
+            if(val > 31) {
+                throw new ParseException("The 'W' option does not make sense with values larger than 31 (max number of days in a month)", i);
+            }
             TreeSet<Integer> set = getSet(type);
             set.add(val);
             i++;