朋友圈

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/moment/QwMomentApiService.java

@@ -26,7 +26,7 @@ public interface QwMomentApiService {
     ServiceResponse<Page<QwMomentPlanDataDTO>> dataList(PlanDataListQDTO qdto) ;
 
     /**
-     * 全部导购处理
+     * 立即发送朋友圈
      * @param params
      */
     void initTaskClerk(String params) ;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/moment/impl/QwMomentPlanServiceImpl.java

@@ -6,10 +6,7 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.clerk.api.service.PowerService;
-import com.gic.commons.util.DateUtil;
-import com.gic.commons.util.EntityUtil;
-import com.gic.commons.util.PageHelperUtils;
-import com.gic.commons.util.UniqueIdUtils;
+import com.gic.commons.util.*;
 import com.gic.enterprise.api.dto.EnterpriseSettingDTO;
 import com.gic.enterprise.api.dto.StoreSearchDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
@@ -29,6 +26,7 @@ import com.gic.haoban.manage.service.service.QywxSendService;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
 import com.gic.haoban.manage.service.service.moment.QwMomentPlanAttendService;
 import com.gic.haoban.manage.service.service.moment.QwMomentPlanService;
+import com.gic.mq.sdk.GicMQClient;
 import com.gic.quartz.api.dto.QuartzTaskDTO;
 import com.gic.quartz.api.service.QuartzService;
 import com.gic.wechat.api.service.qywx.QywxExternalUserService;
@@ -74,6 +72,8 @@ public class QwMomentPlanServiceImpl implements QwMomentPlanService {
     @Autowired
     private WxEnterpriseService wxEnterpriseService ;
 
+    private GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
+
     @Override
     public ServiceResponse<Page<QwMomentPlanDTO>> planList(QwMomentPlanQDTO qdto) {
         PageHelper.startPage(qdto);
@@ -96,11 +96,12 @@ public class QwMomentPlanServiceImpl implements QwMomentPlanService {
         logger.info("保存朋友圈活动={}", JSONObject.toJSONString(dto));
         String enterpriseId = dto.getEnterpriseId() ;
         Long planId = dto.getPlanId() ;
+        boolean publishNow = dto.getPublishType()==1 ;
         TabQwMomentPlan plan = EntityUtil.changeEntity(TabQwMomentPlan.class,dto) ;
         Date now = new Date() ;
         plan.setUpdateTime(now);
         // 1立即发布2定时发布
-        if(plan.getPublishType()==1) {
+        if(publishNow) {
             plan.setPublishTime(now);
         }
         boolean createFlag = false ;
@@ -119,7 +120,7 @@ public class QwMomentPlanServiceImpl implements QwMomentPlanService {
         }else {
             TabQwMomentPlan oldPlan = this.qwMomentPlanMapper.getById(planId) ;
             // 更新为立即发布
-            if(oldPlan.getPublishType()==2 && plan.getPublishType()==1) {
+            if(oldPlan.getPublishType()==2 && publishNow) {
                 publishFlag = true ;
             }
             this.qwMomentPlanMapper.update(plan);
@@ -139,17 +140,17 @@ public class QwMomentPlanServiceImpl implements QwMomentPlanService {
                 }
             }
         }
-
-        if(plan.getPublishType()==2) {
+        if(!publishNow) {
             this.addOrDelTimer(planId, plan.getPublishTime(), 1);
         }else {
             this.addOrDelTimer(planId, new Date(), 0);
             if(createFlag || publishFlag) {
                JSONObject jsonObject = new JSONObject() ;
                 jsonObject.put("planId",planId) ;
-                this.initTaskClerk(jsonObject.toJSONString());
                 try {
-                  //  clientInstance.sendMessage("clerkTaskInitClerkMQ", jsonObject.toJSONString(),10);
+                    // initTaskClerk
+                    logger.info("立即开始执行");
+                    clientInstance.sendMessage("qwMomentInitClerkMQ", jsonObject.toJSONString(),10);
                 } catch (Exception e) {
                     throw new RuntimeException(e);
                 }
@@ -219,8 +220,8 @@ public class QwMomentPlanServiceImpl implements QwMomentPlanService {
     }
 
 
-    private void saveAttendClerkForTask(Long planId) {
-        TabQwMomentPlan plan = this.qwMomentPlanMapper.getById(planId) ;
+    private void saveAttendClerkForTask(TabQwMomentPlan plan) {
+        Long planId = plan.getPlanId() ;
         String creatorId = plan.getCreatorId() ;
         String enterpriseId = plan.getEnterpriseId() ;
         ClerkDTO clerkDTO = this.clerkService.getclerkById(creatorId) ;
@@ -261,12 +262,25 @@ public class QwMomentPlanServiceImpl implements QwMomentPlanService {
 
     @Override
     public void initTaskClerk(String params) {
+        logger.info("创建立即执行朋友圈={}",params);
         JSONObject json = JSONObject.parseObject(params) ;
         Long planId = json.getLong("planId") ;
         TabQwMomentPlan plan = this.qwMomentPlanMapper.getById(planId) ;
+        this.send(plan);
+    }
+
+    @Override
+    public void sendPlanNoticeTimer(String params) {
+        logger.info("定时发布任务发送通知={}",params);
+        Long planId = Long.valueOf(params) ;
+        TabQwMomentPlan plan = this.qwMomentPlanMapper.getById(planId) ;
+        this.send(plan);
+    }
+
+    private void send(TabQwMomentPlan plan) {
         // 0全部导购 1部分导购
         if(plan.getPlanClerkType()==0) {
-            this.saveAttendClerkForTask(planId) ;
+            this.saveAttendClerkForTask(plan) ;
         }
         this.sendPlanNotice(plan);
     }
@@ -306,16 +320,4 @@ public class QwMomentPlanServiceImpl implements QwMomentPlanService {
         String moment_id = resp2.getResult().toString() ;
 
     }
-
-    @Override
-    public void sendPlanNoticeTimer(String params) {
-        logger.info("定时发布任务发送通知={}",params);
-        Long planId = Long.valueOf(params) ;
-        TabQwMomentPlan plan = this.qwMomentPlanMapper.getById(planId) ;
-        // 0全部导购 1部分导购
-        if(plan.getPlanClerkType()==0) {
-            this.saveAttendClerkForTask(planId) ;
-        }
-        this.sendPlanNotice(plan);
-    }
 }