Browse Source

Merge remote-tracking branch 'origin/master'

syh 4 years ago
parent
commit
e672181604

+ 1 - 1
jeecg-boot-module-system/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
 spring:
   profiles:
   profiles:
-    active: test
+    active: @activatedProperties@
   application:
   application:
     name: system-web
     name: system-web
 #分页pageHelper
 #分页pageHelper

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

@@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +22,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map;
 
 
+@Slf4j
 @RestController
 @RestController
 @RequestMapping("/MaterialRefuse")
 @RequestMapping("/MaterialRefuse")
 public class MaterialRefuseController {
 public class MaterialRefuseController {
@@ -43,6 +45,7 @@ public class MaterialRefuseController {
         try {
         try {
 
 
             QueryWrapper<KuaiShouCreative> queryWrapper = QueryGenerator.initQueryWrapper(creative, req.getParameterMap());
             QueryWrapper<KuaiShouCreative> queryWrapper = QueryGenerator.initQueryWrapper(creative, req.getParameterMap());
+            queryWrapper.eq("status", 42);
             queryWrapper.orderByDesc("creative_create_time");
             queryWrapper.orderByDesc("creative_create_time");
             Page<KuaiShouCreative> page = new Page<KuaiShouCreative>(pageNo, pageSize);
             Page<KuaiShouCreative> page = new Page<KuaiShouCreative>(pageNo, pageSize);
             IPage<KuaiShouCreative> pageList = creativeService.page(page, queryWrapper);
             IPage<KuaiShouCreative> pageList = creativeService.page(page, queryWrapper);
@@ -130,16 +133,17 @@ public class MaterialRefuseController {
                     Long creativeId = creativeJson.getLong("creativeId");
                     Long creativeId = creativeJson.getLong("creativeId");
                     JSONObject requestJson = new JSONObject();
                     JSONObject requestJson = new JSONObject();
                     requestJson.put("creativeId", creativeId);
                     requestJson.put("creativeId", creativeId);
-                    System.err.println(creativeId);
                     String description = creativeJson.getString("description");
                     String description = creativeJson.getString("description");
                     if (!Check.isNull(description)) {
                     if (!Check.isNull(description)) {
                         requestJson.put("description", convertMoString(description));
                         requestJson.put("description", convertMoString(description));
                         Map<String, Object> creativeMap = updateService.updateCreative(ctopOauthToken.getAccessToken(), accountId, requestJson);
                         Map<String, Object> creativeMap = updateService.updateCreative(ctopOauthToken.getAccessToken(), accountId, requestJson);
                         Integer code = (Integer) creativeMap.get("code");
                         Integer code = (Integer) creativeMap.get("code");
                         if (code == 0) {
                         if (code == 0) {
+                            log.info("拒审重提成功,accountId:{},creativeId:{}", accountId, creativeId);
                             successCount += 1;
                             successCount += 1;
 
 
                         } else {
                         } else {
+                            log.info("拒审重提失败,accountId:{},creativeId:{}", accountId, creativeId);
                             failCount += 1;
                             failCount += 1;
                         }
                         }
                     }
                     }