Browse Source

删除显式执行线程池shutdown操作代码

syh 4 years ago
parent
commit
4835fcaa67

+ 0 - 3
module-job-bytedance/src/main/java/cn/com/ctop/job/bytedance/handler/BaseReportVideoDailyLoadJob.java

@@ -43,8 +43,5 @@ public class BaseReportVideoDailyLoadJob {
         } catch (InterruptedException e) {
         } catch (InterruptedException e) {
             e.printStackTrace();
             e.printStackTrace();
         }
         }
-        if(!executorService.isShutdown()){
-            executorService.shutdown();
-        }
     }
     }
 }
 }

+ 30 - 4
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/controller/AiKuaishouAdvertiserStrategyController.java

@@ -2,6 +2,8 @@ package cn.com.ctop.kuaishou.modules.ai.controller;
 
 
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.common.module.service.IUserAllocationService;
+import cn.com.ctop.common.module.utils.ResultMapUtils;
+import cn.com.ctop.common.module.utils.StatusCode;
 import cn.com.ctop.kuaishou.modules.ai.entity.AiKuaishouAdvertiserStrategy;
 import cn.com.ctop.kuaishou.modules.ai.entity.AiKuaishouAdvertiserStrategy;
 import cn.com.ctop.kuaishou.modules.ai.service.IAiKuaishouAdvertiserStrategyService;
 import cn.com.ctop.kuaishou.modules.ai.service.IAiKuaishouAdvertiserStrategyService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;
@@ -17,9 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 
 /**
 /**
  * 快手账户策略设置信息表
  * 快手账户策略设置信息表
@@ -51,6 +51,7 @@ public class AiKuaishouAdvertiserStrategyController {
 		Result<IPage<AiKuaishouAdvertiserStrategy>> result = new Result<>();
 		Result<IPage<AiKuaishouAdvertiserStrategy>> result = new Result<>();
 		QueryWrapper<AiKuaishouAdvertiserStrategy> queryWrapper = QueryGenerator.initQueryWrapper(aiKuaishouAdvertiserStrategy, req.getParameterMap());
 		QueryWrapper<AiKuaishouAdvertiserStrategy> queryWrapper = QueryGenerator.initQueryWrapper(aiKuaishouAdvertiserStrategy, req.getParameterMap());
 		Page<AiKuaishouAdvertiserStrategy> page = new Page<>(pageNo, pageSize);
 		Page<AiKuaishouAdvertiserStrategy> page = new Page<>(pageNo, pageSize);
+		queryWrapper.orderByDesc("id");
 		IPage<AiKuaishouAdvertiserStrategy> pageList = aiKuaishouAdvertiserStrategyService.page(page, queryWrapper);
 		IPage<AiKuaishouAdvertiserStrategy> pageList = aiKuaishouAdvertiserStrategyService.page(page, queryWrapper);
 		List<AiKuaishouAdvertiserStrategy> records = pageList.getRecords();
 		List<AiKuaishouAdvertiserStrategy> records = pageList.getRecords();
 		List<AiKuaishouAdvertiserStrategy> setData = new ArrayList<>();
 		List<AiKuaishouAdvertiserStrategy> setData = new ArrayList<>();
@@ -119,7 +120,32 @@ public class AiKuaishouAdvertiserStrategyController {
 	}
 	}
 
 
 	/**
 	/**
-	  *   通过id删除
+	 *  开启
+	 * @return
+	 */
+	@GetMapping(value = "/oprateStatus")
+	public Map<String,Object> open(Long id, Integer status) {
+		Map<String,Object>result = new HashMap<>();
+		if(null == id||status == null){
+			ResultMapUtils.setResultMap(result, StatusCode.COMMON_PARAM_ERROR);
+			return result;
+		}
+		AiKuaishouAdvertiserStrategy aiKuaishouAdvertiserStrategyEntity = aiKuaishouAdvertiserStrategyService.getById(id);
+		if(aiKuaishouAdvertiserStrategyEntity==null) {
+			ResultMapUtils.setResultMap(result, StatusCode.COMMON_PARAM_ERROR);
+			return result;
+		}
+		if(status!=0){
+			status = 1;
+		}
+		aiKuaishouAdvertiserStrategyEntity.setStatus(status);
+		aiKuaishouAdvertiserStrategyService.updateById(aiKuaishouAdvertiserStrategyEntity);
+		ResultMapUtils.setResultMap(result,StatusCode.COMMON_SUCCESS);
+		return result;
+	}
+
+	/**
+	 * 通过id删除
 	 * @param id
 	 * @param id
 	 * @return
 	 * @return
 	 */
 	 */