add sms message

src/main/java/com/huiju/estateagents/common/SMSUtils.java

@@ -94,7 +94,7 @@ public class SMSUtils {
         return String.join("", nums);
     }
 
-    private boolean sendMessage(String code, String tel, String[] params) {
+    public boolean sendMessage(String code, String tel, String[] params) {
         // 发送内容
         SMSProperties.Template message = new SMSProperties.Template();
         message.setCode(code);
@@ -118,7 +118,7 @@ public class SMSUtils {
         );
 
         if (((ResponseEntity<String>) response).getStatusCodeValue() != HttpStatus.OK.value()) {
-            log.error("请求发送短信验证码失败: {}", response.toString());
+            log.error("请求发送短信失败: {}", response.toString());
             return false;
         }
 

src/main/java/com/huiju/estateagents/entity/SysSmsSetting.java

@@ -0,0 +1,56 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 短信消息模板
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysSmsSetting implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 序号
+     */
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    /**
+     * 模板名称
+     */
+    private String smsName;
+
+    /**
+     * 模板类型
+     */
+    private String smsType;
+
+    /**
+     * 模板编号
+     */
+    private String tplCode;
+
+    /**
+     * 模板签名
+     */
+    private String tplSign;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+}

src/main/java/com/huiju/estateagents/mapper/SysSmsSettingMapper.java

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.SysSmsSetting;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 项目参数配置表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-01
+ */
+@Mapper
+public interface SysSmsSettingMapper extends BaseMapper<SysSmsSetting> {
+
+}

src/main/java/com/huiju/estateagents/service/ISysProjectParamsService.java

@@ -7,11 +7,11 @@ import com.huiju.estateagents.entity.SysProjectParams;
 /**
  * <p>
  * 项目参数配置表  服务类
- * </p>
- *
- * @author jobob
- * @since 2019-08-01
- */
+         * </p>
+        *
+        * @author jobob
+        * @since 2019-08-01
+        */
 public interface ISysProjectParamsService extends IService<SysProjectParams> {
 
 }

src/main/java/com/huiju/estateagents/service/ISysSmsSettingService.java

@@ -0,0 +1,17 @@
+package com.huiju.estateagents.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.SysSmsSetting;
+
+/**
+ * <p>
+ * 短信消息配置表  服务类
+         * </p>
+        *
+        * @author jobob
+        * @since 2019-08-01
+        */
+public interface ISysSmsSettingService extends IService<SysSmsSetting> {
+
+}

src/main/java/com/huiju/estateagents/service/impl/MiniAppServiceImpl.java

@@ -6,14 +6,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.*;
-import com.huiju.estateagents.entity.TaMiniapp;
-import com.huiju.estateagents.entity.TaMiniappQrcode;
-import com.huiju.estateagents.entity.TaMiniappTemplate;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.mapper.TaMiniFormidsMapper;
-import com.huiju.estateagents.mapper.TaMiniappMapper;
-import com.huiju.estateagents.mapper.TaMiniappQrcodeMapper;
-import com.huiju.estateagents.mapper.TaMiniappTemplateMapper;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITaMiniFormidsService;
 import lombok.extern.slf4j.Slf4j;
@@ -45,9 +39,15 @@ public class MiniAppServiceImpl implements IMiniAppService {
     @Autowired
     TaMiniappTemplateMapper taMiniappTemplateMapper;
 
+    @Autowired
+    SysSmsSettingMapper sysSmsSettingMapper;
+
     @Autowired
     WxUtils wxUtils;
 
+    @Autowired
+    SMSUtils smsUtils;
+
     @Override
     public WxMaJscode2SessionResult getSessionInfo(String code, String appid) throws WxErrorException {
         WxMaService wxService = wxUtils.getMiniApp(appid);
@@ -76,20 +76,27 @@ public class MiniAppServiceImpl implements IMiniAppService {
 
     @Override
     public void sendNoticeMessage(TaPerson toUser, String link, String name, String phone, String content, LocalDateTime dt) {
+        TaMiniapp miniapp = taMiniappMapper.selectById(toUser.getMiniappId());
+        if (null == miniapp) {
+            log.error("小程序 {} 不存在", toUser.getMiniappId());
+            return ;
+        }
+        String[] smsParams = { name, miniapp.getName() + "小程序" };
+
         TaMiniappTemplate tpl = getTplByType(CommConstant.MINIAPP_TPL_NOTICE, toUser.getMiniappId());
         if (null == tpl) {
             log.error("小程序 {} 无通知消息模板 {}", toUser.getMiniappId(), CommConstant.MINIAPP_TPL_NOTICE);
 
-            // TODO
             // 短信发送
+            sendSmsMessage(StringUtils.ifNull(toUser.getTel(), toUser.getPhone()), CommConstant.MINIAPP_TPL_NOTICE, smsParams);
         };
 
         if (((Boolean) true).equals(tpl.getIsSubscribe())) {
             String[] data = new String[] { name, content, DateUtils.cutSecond(dt) };
             ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
             if (res.getCode() != ResponseBean.CODE_SUCCESS) {
-                // TODO
                 // 使用短信发送
+                sendSmsMessage(StringUtils.ifNull(toUser.getTel(), toUser.getPhone()), CommConstant.MINIAPP_TPL_NOTICE, smsParams);
             }
         } else {
             List<WxMaTemplateData> data = new ArrayList<>();
@@ -105,20 +112,27 @@ public class MiniAppServiceImpl implements IMiniAppService {
     
     @Override
     public void sendHelpMessage(TaPerson toUser, String link, String result, String activityName, LocalDateTime dt) {
+        TaMiniapp miniapp = taMiniappMapper.selectById(toUser.getMiniappId());
+        if (null == miniapp) {
+            log.error("小程序 {} 不存在", toUser.getMiniappId());
+            return ;
+        }
+        String[] smsParams = { miniapp.getName() + "小程序-" + activityName };
+
         TaMiniappTemplate tpl = getTplByType(CommConstant.MINIAPP_TPL_HELP, toUser.getMiniappId());
         if (null == tpl) {
             log.error("小程序 {} 无通知消息模板 {}", toUser.getMiniappId(), CommConstant.MINIAPP_TPL_HELP);
 
-            // TODO
             // 短信发送
+            sendSmsMessage(StringUtils.ifNull(toUser.getTel(), toUser.getPhone()), CommConstant.MINIAPP_TPL_HELP, smsParams);
         };
 
         if (((Boolean) true).equals(tpl.getIsSubscribe())) {
             String[] data = new String[] { activityName, result };
             ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
             if (res.getCode() != ResponseBean.CODE_SUCCESS) {
-                // TODO
                 // 使用短信发送
+                sendSmsMessage(StringUtils.ifNull(toUser.getTel(), toUser.getPhone()), CommConstant.MINIAPP_TPL_HELP, smsParams);
             }
         } else {
             List<WxMaTemplateData> data = new ArrayList<>();
@@ -132,20 +146,27 @@ public class MiniAppServiceImpl implements IMiniAppService {
 
     @Override
     public void sendGroupMessage(TaPerson toUser, String link, String result, String activityName, LocalDateTime dt) {
+        TaMiniapp miniapp = taMiniappMapper.selectById(toUser.getMiniappId());
+        if (null == miniapp) {
+            log.error("小程序 {} 不存在", toUser.getMiniappId());
+            return ;
+        }
+        String[] smsParams = { miniapp.getName() + "小程序-" + activityName };
+
         TaMiniappTemplate tpl = getTplByType(CommConstant.MINIAPP_TPL_GROUP, toUser.getMiniappId());
         if (null == tpl) {
             log.error("小程序 {} 无通知消息模板 {}", toUser.getMiniappId(), CommConstant.MINIAPP_TPL_GROUP);
 
-            // TODO
             // 短信发送
+            sendSmsMessage(StringUtils.ifNull(toUser.getTel(), toUser.getPhone()), CommConstant.MINIAPP_TPL_GROUP, smsParams);
         };
 
         if (((Boolean) true).equals(tpl.getIsSubscribe())) {
             String[] data = new String[] { activityName, result };
             ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
             if (res.getCode() != ResponseBean.CODE_SUCCESS) {
-                // TODO
                 // 使用短信发送
+                sendSmsMessage(StringUtils.ifNull(toUser.getTel(), toUser.getPhone()), CommConstant.MINIAPP_TPL_GROUP, smsParams);
             }
         } else {
             List<WxMaTemplateData> data = new ArrayList<>();
@@ -374,6 +395,25 @@ public class MiniAppServiceImpl implements IMiniAppService {
         }
     }
 
+    private String sendSmsMessage(String tel, String type, String[] params) {
+        if (StringUtils.isEmpty(tel) || StringUtils.isEmpty(type)) {
+            return "短信发送失败: 没有手机号或者短信模板";
+        }
+
+        QueryWrapper<SysSmsSetting> query = new QueryWrapper<>();
+        query.eq("sms_type", type);
+        query.eq("status", CommConstant.STATUS_NORMAL);
+        query.last("limit 1");
+
+        SysSmsSetting smsSetting = sysSmsSettingMapper.selectOne(query);
+        if (null == smsSetting) {
+            return "没有设置有效的【" + type + "】短信模板";
+        }
+
+        boolean success = smsUtils.sendMessage(smsSetting.getTplCode(), tel, params);
+        return success ? null : "短信发送失败";
+    }
+
     private List<WxMaSubscribeData> createMessageData(String[] list, String fieldsStr) {
         List<WxMaSubscribeData> data = new ArrayList<>();
         if (list == null || list.length == 0 || StringUtils.isEmpty(fieldsStr)) return data;

src/main/java/com/huiju/estateagents/service/impl/SysSmsSettingImpl.java

@@ -0,0 +1,24 @@
+package com.huiju.estateagents.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.SysProjectParams;
+import com.huiju.estateagents.entity.SysSmsSetting;
+import com.huiju.estateagents.mapper.SysProjectParamsMapper;
+import com.huiju.estateagents.mapper.SysSmsSettingMapper;
+import com.huiju.estateagents.service.ISysProjectParamsService;
+import com.huiju.estateagents.service.ISysSmsSettingService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 项目参数配置表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-01
+ */
+@Service
+public class SysSmsSettingImpl extends ServiceImpl<SysSmsSettingMapper, SysSmsSetting> implements ISysSmsSettingService {
+
+}

src/main/resources/mapper/SysSmsSettingMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.SysSmsSettingMapper">
+
+</mapper>