diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CampaignQuotaMapper.xml b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CampaignQuotaMapper.xml index c37b8490..9e598f30 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CampaignQuotaMapper.xml +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CampaignQuotaMapper.xml @@ -32,6 +32,7 @@ and cq.campaign_id = #{campaignId} and time_to_sec(time(now())) between cq.daily_from and cq.daily_to + and cq.active = 1 group by account, cq.quota diff --git a/server/src/main/java/com/pudonghot/yo/openapi/controller/CampaignController.java b/server/src/main/java/com/pudonghot/yo/openapi/controller/CampaignController.java index a36fe955..a3e30860 100644 --- a/server/src/main/java/com/pudonghot/yo/openapi/controller/CampaignController.java +++ b/server/src/main/java/com/pudonghot/yo/openapi/controller/CampaignController.java @@ -1,11 +1,7 @@ package com.pudonghot.yo.openapi.controller; -import com.pudonghot.yo.model.domain.Campaign; -import com.pudonghot.yo.service.CommonCampaignQuotaService; import lombok.val; import javax.validation.Valid; -import javax.validation.constraints.NotBlank; - import lombok.extern.slf4j.Slf4j; import com.pudonghot.yo.service.AgentService; import org.springframework.stereotype.Controller; @@ -14,11 +10,13 @@ import com.pudonghot.yo.openapi.auth.SessionAbility; import com.pudonghot.yo.service.CommonCampaignService; import com.pudonghot.yo.service.CommonAgentStatusService; import com.pudonghot.yo.openapi.service.AgentEventService; +import com.pudonghot.yo.service.CommonCampaignQuotaService; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.beans.factory.annotation.Autowired; import static com.pudonghot.yo.model.agentevent.EventType.AgentState_CancelNotReady_Success; +import static com.pudonghot.yo.model.agentevent.EventType.AgentState_SetNotReady_Success; /** * @author Donghuang @@ -55,11 +53,14 @@ public class CampaignController implements SessionAbility { if (!commonCampaignQuotaService.isLimited(campaign.getId(), account)) { val queueId = commonCampaignService.enqueue(campaign.getTargetId(), agent); agent.setQueues(String.valueOf(queueId)); + // agent ready + agentStatusService.ready(agent); + agentEventService.publish(agent, AgentState_CancelNotReady_Success); + } + else { + agentStatusService.notReady(agent); + agentEventService.publish(agent, AgentState_SetNotReady_Success); } - - // agent ready - agentStatusService.ready(agent); - agentEventService.publish(agent, AgentState_CancelNotReady_Success); } @RequestMapping("/resource/task/start")