Переглянути джерело

添加创建创意参数日志打印

songyh 4 роки тому
батько
коміт
3ba4f59be1

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

@@ -105,7 +105,7 @@ public class QueryGenerator {
 		*/
 		
 		//区间条件组装 模糊查询 高级查询组装 简单排序 权限查询
-		PropertyDescriptor origDescriptors[] = PropertyUtils.getPropertyDescriptors(searchObj);
+		PropertyDescriptor[] origDescriptors = PropertyUtils.getPropertyDescriptors(searchObj);
 		Map<String,SysPermissionDataRuleModel> ruleMap = getRuleMap();
 		
 		//权限规则自定义SQL表达式
@@ -810,7 +810,7 @@ public class QueryGenerator {
 
 	private static String getInConditionValue(Object value,boolean isString) {
 		if(isString) {
-			String temp[] = value.toString().split(",");
+			String[] temp = value.toString().split(",");
 			String res="";
 			for (String string : temp) {
 				if(DataBaseConstant.DB_TYPE_SQLSERVER.equals(getDbType())){
@@ -880,7 +880,7 @@ public class QueryGenerator {
 		StringBuffer sb = new StringBuffer();
 		//权限查询
 		Map<String,SysPermissionDataRuleModel> ruleMap = getRuleMap();
-		PropertyDescriptor origDescriptors[] = PropertyUtils.getPropertyDescriptors(clazz);
+		PropertyDescriptor[] origDescriptors = PropertyUtils.getPropertyDescriptors(clazz);
 		String sql_and = " and ";
 		for (String c : ruleMap.keySet()) {
 			if(oConvertUtils.isNotEmpty(c) && c.startsWith(SQL_RULES_COLUMN)){
@@ -925,7 +925,7 @@ public class QueryGenerator {
 	public static void installAuthMplus(QueryWrapper<?> queryWrapper,Class<?> clazz) {
 		//权限查询
 		Map<String,SysPermissionDataRuleModel> ruleMap = getRuleMap();
-		PropertyDescriptor origDescriptors[] = PropertyUtils.getPropertyDescriptors(clazz);
+		PropertyDescriptor[] origDescriptors = PropertyUtils.getPropertyDescriptors(clazz);
 		for (String c : ruleMap.keySet()) {
 			if(oConvertUtils.isNotEmpty(c) && c.startsWith(SQL_RULES_COLUMN)){
 				queryWrapper.and(i ->i.apply(getSqlRuleValue(ruleMap.get(c).getRuleValue())));

+ 2 - 2
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MD5Util.java

@@ -4,7 +4,7 @@ import java.security.MessageDigest;
 
 public class MD5Util {
 
-	public static String byteArrayToHexString(byte b[]) {
+	public static String byteArrayToHexString(byte[] b) {
 		StringBuffer resultSb = new StringBuffer();
 		for (int i = 0; i < b.length; i++){
 			resultSb.append(byteToHexString(b[i]));
@@ -37,7 +37,7 @@ public class MD5Util {
 		return resultString;
 	}
 
-	private static final String hexDigits[] = { "0", "1", "2", "3", "4", "5",
+	private static final String[] hexDigits = { "0", "1", "2", "3", "4", "5",
 			"6", "7", "8", "9", "a", "b", "c", "d", "e", "f" };
 
 }

+ 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();

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

@@ -41,7 +41,7 @@ public class PmsUtil {
             for (String s : msg) {
                 //写数据
                 if (s.indexOf("_") > 0) {
-                    String arr[] = s.split("_");
+                    String[] arr = s.split("_");
                     bw.write("第" + arr[0] + "行:" + arr[1]);
                 } else {
                     bw.write(s);

+ 6 - 6
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;
 	}
 
@@ -438,7 +438,7 @@ public class oConvertUtils {
 			//update-end--Author:zhoujf  Date:20180503 for:TASK #2500 【代码生成器】代码生成器开发一通用模板生成功能
 		}
 		// 用下划线将原始字符串分割
-		String camels[] = name.split("_");
+		String[] camels = name.split("_");
 		for (String camel : camels) {
 			// 跳过原始字符串中开头、结尾的下换线或双重下划线
 			if (camel.isEmpty()) {
@@ -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();
@@ -501,7 +501,7 @@ public class oConvertUtils {
 			return name.substring(0, 1).toUpperCase() + name.substring(1).toLowerCase();
 		}
 		// 用下划线将原始字符串分割
-		String camels[] = name.split("_");
+		String[] camels = name.split("_");
 		for (String camel : camels) {
 			// 跳过原始字符串中开头、结尾的下换线或双重下划线
 			if (camel.isEmpty()) {

+ 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);

+ 9 - 9
jeecg-boot-bytedance/src/main/java/org/jeecg/modules/bytedance/advertise/service/impl/AiBytedanceAdvertiserStrategyServiceImpl.java

@@ -479,7 +479,7 @@ public class AiBytedanceAdvertiserStrategyServiceImpl extends ServiceImpl<AiByte
             if(age.length>0){
                 JSONArray ageArray = new JSONArray();
                 for(int i=0;i<age.length;i++){
-                    if(null!=age[i]&&!age[i].equals("NONE")){
+                    if(null!=age[i]&&!"NONE".equals(age[i])){
                         ageArray.add(age[i]);
                     }
                 }
@@ -493,7 +493,7 @@ public class AiBytedanceAdvertiserStrategyServiceImpl extends ServiceImpl<AiByte
             if(retargetingTagsInclude.length>0){
                 JSONArray retargetingTagsIncludeArray = new JSONArray();
                 for(int i=0;i<retargetingTagsInclude.length;i++){
-                    if(null!=retargetingTagsInclude[i]&&!retargetingTagsInclude[i].equals("NONE")){
+                    if(null!=retargetingTagsInclude[i]&&!"NONE".equals(retargetingTagsInclude[i])){
                         retargetingTagsIncludeArray.add(Long.parseLong(retargetingTagsInclude[i]));
                     }
                 }
@@ -507,7 +507,7 @@ public class AiBytedanceAdvertiserStrategyServiceImpl extends ServiceImpl<AiByte
             if(getAdRetargetingTagsExclude.length>0){
                 JSONArray getAdRetargetingTagsExcludeArray = new JSONArray();
                 for(int i=0;i<getAdRetargetingTagsExclude.length;i++){
-                    if(null!=getAdRetargetingTagsExclude[i]&&!getAdRetargetingTagsExclude[i].equals("NONE")){
+                    if(null!=getAdRetargetingTagsExclude[i]&&!"NONE".equals(getAdRetargetingTagsExclude[i])){
                         getAdRetargetingTagsExcludeArray.add(getAdRetargetingTagsExclude[i]);
                     }
                 }
@@ -667,7 +667,7 @@ public class AiBytedanceAdvertiserStrategyServiceImpl extends ServiceImpl<AiByte
             if(ac.length>0){
                 JSONArray acArray = new JSONArray();
                 for(int i=0;i<ac.length;i++){
-                    if(null!=ac[i]&&!ac[i].equals("NONE")){
+                    if(null!=ac[i]&&!"NONE".equals(ac[i])){
                         acArray.add(ac[i]);
                     }
                 }
@@ -681,7 +681,7 @@ public class AiBytedanceAdvertiserStrategyServiceImpl extends ServiceImpl<AiByte
             if(carrier.length>0){
                 JSONArray carrierArray = new JSONArray();
                 for(int i=0;i<carrier.length;i++){
-                    if(null!=carrier[i]&&!carrier[i].equals("NONE")) {
+                    if(null!=carrier[i]&&!"NONE".equals(carrier[i])) {
                         carrierArray.add(carrier[i]);
                     }
                 }
@@ -818,7 +818,7 @@ public class AiBytedanceAdvertiserStrategyServiceImpl extends ServiceImpl<AiByte
 
     private String getAdName(AiBytedanceAdvertiserStrategy strategy, String dplinkCode, ByteDanceVideoInfo videoInfo) {
         String adName = strategy.getAdName();
-        if(null == adName||adName.trim().equals("")){
+        if(null == adName|| "".equals(adName.trim())){
             return null;
         }
         if(adName.contains("{{日期}}")){
@@ -859,13 +859,13 @@ public class AiBytedanceAdvertiserStrategyServiceImpl extends ServiceImpl<AiByte
         campaignParam.put("advertiser_id",strategy.getAccountId());
         campaignParam.put("campaign_name",campaignName);
         campaignParam.put("landing_type",strategy.getCampaignLandingType());
-        if(null==strategy.getCampaignBudgetMode()||strategy.getCampaignBudgetMode().equals("")){
+        if(null==strategy.getCampaignBudgetMode()|| "".equals(strategy.getCampaignBudgetMode())){
             campaignParam.put("budget_mode","BUDGET_MODE_INFINITE");
         }else{
             campaignParam.put("budget_mode",strategy.getCampaignBudgetMode());
         }
         //日预算必须设定预算金额
-        if(null!=strategy.getCampaignBudgetMode()&&strategy.getCampaignBudgetMode().equals("BUDGET_MODE_DAY")){
+        if(null!=strategy.getCampaignBudgetMode()&& "BUDGET_MODE_DAY".equals(strategy.getCampaignBudgetMode())){
             campaignParam.put("budget",strategy.getCampaignBudget());
         }
         if(!Check.isNull(strategy.getCampaignDeliveryRelatedNum())){
@@ -948,7 +948,7 @@ public class AiBytedanceAdvertiserStrategyServiceImpl extends ServiceImpl<AiByte
 
         }
 
-        return Result.successMsg("状态修改成功---》"+(state.equals("0") ? "开" : "关"), null);
+        return Result.successMsg("状态修改成功---》"+("0".equals(state) ? "开" : "关"), null);
     }
 
 

+ 7 - 1
jeecg-boot-bytedance/src/main/java/org/jeecg/modules/bytedance/common/service/impl/FileInfoServiceImpl.java

@@ -81,16 +81,22 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
         String result = null;
         for(int i=0;i<3;i++){
             JSONObject resultObject = marketingService.getSuggestImageId(token, vid);
+            log.info("获取推荐封面返回数据信息:{}",resultObject);
             if(null==resultObject||null==resultObject.getInteger("code")||0!=resultObject.getInteger("code")){
                 continue;
             }
             JSONObject data = resultObject.getJSONObject("data");
             String status = data.getString("status");
-            if(null!=status&&status.equals("SUCCESS")){
+            if(null!=status&& "SUCCESS".equals(status)){
                 JSONArray array  = data.getJSONArray("list");
                 JSONObject imageInfo = array.getJSONObject(0);
                 return imageInfo.getString("id");
             }
+            try {
+                Thread.sleep(5000L);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
         }
         return result;
 

+ 1 - 1
jeecg-boot-bytedance/src/main/java/org/jeecg/modules/bytedance/common/service/impl/MaterialImageInfoServiceImpl.java

@@ -185,7 +185,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-bytedance/src/main/java/org/jeecg/modules/bytedance/common/service/impl/MaterialInfoServiceImpl.java

@@ -22,7 +22,7 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
     @Override
     public MaterialInfo getParams(String signature, Integer status) {
         QueryWrapper<MaterialInfo>queryWrapper = new QueryWrapper<>();
-        if(null!=signature&&!signature.trim().equals("")){
+        if(null!=signature&&!"".equals(signature.trim())){
             queryWrapper.eq("code",signature);
         }
         if(null!=status){

+ 1 - 1
jeecg-boot-bytedance/src/main/java/org/jeecg/modules/bytedance/common/service/impl/UserAllocationServiceImpl.java

@@ -92,7 +92,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);

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

@@ -419,7 +419,7 @@ public class SysDepartController {
 		LambdaQueryWrapper<SysDepart> query = new LambdaQueryWrapper<SysDepart>();
 		query.orderByAsc(SysDepart::getOrgCode);
 		if(oConvertUtils.isNotEmpty(id)){
-			String arr[] = id.split(",");
+			String[] arr = id.split(",");
 			query.in(SysDepart::getId,arr);
 		}
 		List<SysDepart> ls = this.sysDepartService.list(query);