feats

src/main/java/com/yunzhi/marketing/common/CommConstant.java

@@ -494,6 +494,12 @@ public class CommConstant {
      */
     public static final String MESSAGE_CONTENT_OF_HOUSE = "house";
 
+    /**
+     * 活动开启通知
+     * 必须存在表   td_miniapp_template_type 中
+     */
+    public static final String MESSAGE_ACTIVITY = "activity";
+
     /**
      * 合同签订通知
      * 必须存在表   td_miniapp_template_type 中
@@ -679,6 +685,8 @@ public class CommConstant {
 
     public static final String RAISE_DETAIL_PATH = "/onlineSelling/pages/raiseProfile/index?id=%s";
 
+    public static final String ACTIVITY_DETAIL_PATH = "/pages/index/activityDetail/index?id=%s";
+
     /**
      * 已锁定
      */

src/main/java/com/yunzhi/marketing/controller/TaBuildingDynamicController.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.common.CommConstant;
+import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.event.EventBus;
 import com.yunzhi.marketing.excel.HelpInitiateRecordSucceed;
 import com.yunzhi.marketing.excel.TaActivityDynamicEnlistExport;
@@ -587,7 +588,7 @@ public class TaBuildingDynamicController extends BaseController {
         // 如果是看房团发布，检验只能发布一次
         if (dynamic.getType().equals("look")) {
             LambdaQueryWrapper<TaBuildingDynamic> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-            lambdaQueryWrapper.eq(TaBuildingDynamic::getStatus,1);
+            lambdaQueryWrapper.eq(TaBuildingDynamic::getStatus,CommConstant.IS_PUBLISH);
             lambdaQueryWrapper.eq(TaBuildingDynamic::getType,"look");
             lambdaQueryWrapper.eq(TaBuildingDynamic::getBuildingId,dynamic.getBuildingId());
             List<TaBuildingDynamic> list = iBuildingDynamicService.list(lambdaQueryWrapper);
@@ -596,10 +597,16 @@ public class TaBuildingDynamicController extends BaseController {
                 return responseBean;
             }
         }
-        dynamic.setStatus(1);
+        dynamic.setStatus(CommConstant.IS_PUBLISH);
         dynamic.setPublishDate(LocalDateTime.now());
         dynamic.setOrgId(getOrgId(request));
         iBuildingDynamicService.update(dynamic, dynamicQueryWrapper);
+
+        // 发送消息
+        if (CommConstant.IS_PUBLISH.equals(dynamic.getStatus()) && !StringUtils.isEmpty(dynamic.getBuildingId())) {
+            iBuildingDynamicService.sendMessageToSubscribers(dynamic);
+        }
+
         return responseBean;
     }
     

src/main/java/com/yunzhi/marketing/mapper/TaMiniappMessagePersonMapper.java

@@ -4,6 +4,8 @@ import com.yunzhi.marketing.entity.TaMiniappMessagePerson;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 消息订阅人员 Mapper 接口
@@ -15,4 +17,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaMiniappMessagePersonMapper extends BaseMapper<TaMiniappMessagePerson> {
 
+    List<TaMiniappMessagePerson> getPersonBy(Integer orgId, String buildingId, String messageType);
 }

src/main/java/com/yunzhi/marketing/service/IMiniAppService.java

@@ -31,6 +31,8 @@ public interface IMiniAppService {
 
     void sendCheckMessage(TaPerson toUser, String link, String name, String result, String programName, String failReason, String remark, LocalDateTime dt, Boolean isSuccess);
 
+    void sendActivityMessage(TaPerson toUser, String link, String activityName, String address, LocalDateTime dt);
+
     ResponseBean getQrCode(String paramsStr, String appid);
 
     String createQrCode(WxMaService service, String path) throws Exception;

src/main/java/com/yunzhi/marketing/service/ITaBuildingDynamicService.java

@@ -140,4 +140,6 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * @return
      */
     ResponseBean iBuildingDynamicSelectedList(Integer pageNum, Integer pageSize, String name, String buildingId, Integer cityId, String isEnlist, LocalDateTime time, String title, Integer orgId, String activityStatus,List<TaPersonBuilding> personBuildingList);
+
+    void sendMessageToSubscribers(TaBuildingDynamic dynamic);
 }

src/main/java/com/yunzhi/marketing/service/impl/MiniAppServiceImpl.java

@@ -309,6 +309,28 @@ public class MiniAppServiceImpl implements IMiniAppService {
         iTaPersonMessageRuleService.saveOrUpdateByPersonAndMessage(toUser.getPersonId(), messageType, contentType, toUser.getOrgId());
     }
 
+    @Override
+    public void sendActivityMessage(TaPerson toUser, String link, String activityName, String address, LocalDateTime dt) {
+        TaMiniapp miniapp = taMiniappMapper.selectById(toUser.getMiniappId());
+        if (null == miniapp) {
+            log.error("小程序 {} 不存在", toUser.getMiniappId());
+            return;
+        }
+
+        // 消息内容类型
+        String contentType = CommConstant.MESSAGE_ACTIVITY;
+        TaMiniappTemplate tpl = getTplByType(contentType, toUser.getMiniappId());
+        if (tpl == null) {
+            log.error("小程序 {} 无通知消息模板 {}", toUser.getMiniappId(), contentType);
+            return;
+        }
+
+        String[] data = new String[]{activityName, DateUtils.cutSecond(dt), address, "点击下方【查看详情】, 查看活动参与方式"};
+
+        ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
+        iTaPersonMessageRuleService.saveOrUpdateByPersonAndMessage(toUser.getPersonId(), CommConstant.MESSAGE_TYPE_OF_MINIAPP_SUBSCRIBE, contentType, toUser.getOrgId());
+    }
+
 
     @Override
     public ResponseBean getQrCode(String paramsStr, String appid) {

src/main/java/com/yunzhi/marketing/service/impl/TaBuildingDynamicServiceImpl.java

@@ -2,6 +2,7 @@ package com.yunzhi.marketing.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -9,17 +10,14 @@ import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.excel.HelpInitiateRecordSucceed;
-import com.yunzhi.marketing.mapper.TaActivityDynamicEnlistMapper;
-import com.yunzhi.marketing.mapper.TaBuildingDynamicMapper;
-import com.yunzhi.marketing.mapper.TaBuildingMapper;
-import com.yunzhi.marketing.mapper.TaPersonMapper;
-import com.yunzhi.marketing.service.ITaBuildingDynamicService;
-import com.yunzhi.marketing.service.ITaSaveService;
-import com.yunzhi.marketing.service.TaPosterService;
-import com.yunzhi.marketing.service.TaShareContentService;
+import com.yunzhi.marketing.mapper.*;
+import com.yunzhi.marketing.service.*;
 import com.yunzhi.marketing.entity.*;
+import lombok.extern.log4j.Log4j;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.ServletRequestDataBinder;
 
@@ -43,6 +41,7 @@ import java.util.List;
  * @author jobob
  * @since 2019-03-21
  */
+@Slf4j
 @Service
 public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicMapper, TaBuildingDynamic> implements ITaBuildingDynamicService {
 
@@ -67,6 +66,12 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     @Autowired
     private TaShareContentService taShareContentService;
 
+    @Autowired
+    private TaMiniappMessagePersonMapper taMiniappMessagePersonMapper;
+
+    @Autowired
+    private IMiniAppService iMiniAppService;
+
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         CustomDateEditor editor = new CustomDateEditor(df, true);//true表示允许为空，false反之
@@ -244,8 +249,10 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
 
         // 当报名人数已满时，活动为已结束
         if ((enlistCount + taActivityDynamicEnlist.getAttendNum()) > buildingDynamic.getPersonNum()) {
-            //taBuildingDynamic.setIsEnlist(2);
-            buildingDynamicMapper.updateById(taBuildingDynamic);
+//            UpdateWrapper<TaBuildingDynamic> updateWrapper = new UpdateWrapper<>();
+//            updateWrapper.set("is_enlist", 2);
+//            updateWrapper.eq("dynamic_id", taBuildingDynamic.getDynamicId());
+//            buildingDynamicMapper.update(taBuildingDynamic, updateWrapper);
             responseBean.addError("当前报名人数已满");
             return responseBean;
         }
@@ -273,8 +280,11 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
                 .setBuildingId(taBuildingDynamic.getBuildingId());
         int state = taActivityDynamicEnlistMapper.insert(taActivityDynamicEnlist);
         int joinNum = taBuildingDynamic.getEnlistNum() == null ? taActivityDynamicEnlist.getAttendNum():taBuildingDynamic.getEnlistNum()+taActivityDynamicEnlist.getAttendNum();
-        taBuildingDynamic.setEnlistNum(joinNum);
-        buildingDynamicMapper.updateById(taBuildingDynamic);
+
+        UpdateWrapper<TaBuildingDynamic> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.set("enlist_num", joinNum);
+        updateWrapper.eq("dynamic_id", taBuildingDynamic.getDynamicId());
+        buildingDynamicMapper.update(taBuildingDynamic, updateWrapper);
         return ResponseBean.success(state);
     }
 
@@ -406,6 +416,41 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         return ResponseBean.success(hashMap);
     }
 
+    @Async
+    @Override
+    public void sendMessageToSubscribers(TaBuildingDynamic dynamic) {
+        try {
+            String buildingId = dynamic.getBuildingId();
+            String dynamicId = dynamic.getDynamicId();
+            String title = dynamic.getTitle();
+            String address = dynamic.getAddress();
+            LocalDateTime startDate = dynamic.getStartDate();
+
+            List<TaMiniappMessagePerson> personList = taMiniappMessagePersonMapper.getPersonBy(dynamic.getOrgId(), buildingId, CommConstant.MESSAGE_ACTIVITY);
+
+            for (TaMiniappMessagePerson item : personList) {
+                String personId = item.getPersonId();
+                TaPerson taPerson = taPersonMapper.getById(personId);
+
+                try {
+                    log.info("================ 发送活动 【{}】 开始信息给 {}({})", title, taPerson.getNickname(), personId);
+                    iMiniAppService.sendActivityMessage(taPerson,
+                            String.format(CommConstant.ACTIVITY_DETAIL_PATH, dynamicId),
+                            title,
+                            address,
+                            startDate);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
+                // 每间隔1秒发送一次
+                Thread.sleep(1000);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     @Override
     public IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String building,TaPerson person,Integer orgId){
         QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlistQueryWrapper = new QueryWrapper<>();

src/main/resources/application-prod.yml

@@ -6,7 +6,7 @@ spring:
   datasource:
     username: marketing
     password: u@cSFJ5*kS9hGP7a
-    url: jdbc:mysql://localhost:3306/marketing-cloud?useUnicode=true&serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://210.13.107.60:3306/marketing-cloud?useUnicode=true&serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
     driver-class-name: com.mysql.cj.jdbc.Driver
     initial-size: 10 # 初始化连接数
     max-active: 20 # 最大连接数

src/main/resources/mapper/TaMiniappMessagePersonMapper.xml

@@ -2,4 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.marketing.mapper.TaMiniappMessagePersonMapper">
 
+    <select id="getPersonBy" resultType="com.yunzhi.marketing.entity.TaMiniappMessagePerson">
+        select * from ta_miniapp_message_person
+        where org_id = #{orgId} and message_type = #{messageType} and building_id = #{buildingId}
+        order by create_date asc
+    </select>
 </mapper>