消息通知修改

tianhu-system/src/main/java/com/tianhu/system/controller/OwnNoticeController.java

@@ -81,8 +81,8 @@ public class OwnNoticeController extends BaseController
      * @param userIds       收到信息用户id集合
      */
     @PostMapping("sendNotice")
-    public R sendNotice(String companyId, String tableId, String title, String type, String noticeType, String workType, String messageSend, List<Long> userIds)throws Exception {
-        R r = iOwnNoticeService.sendNotice(companyId, tableId, title, type, noticeType, workType, messageSend, userIds);
+    public R sendNotice(String companyId, String tableId, String title, String type, String noticeType, String workType, String messageSend, List<Long> userIds, String templateCode)throws Exception {
+        R r = iOwnNoticeService.sendNotice(companyId, tableId, title, type, noticeType, workType, messageSend, userIds, templateCode);
         return r;
     }
 }

tianhu-system/src/main/java/com/tianhu/system/service/IOwnNoticeService.java

@@ -32,7 +32,8 @@ public interface IOwnNoticeService
      * @param workType      待办类型 00待审批 01链属企业申请 02融信失效
      * @param messageSend   是否发送短信 0不发送 1发送
      * @param userIds       收到信息用户id集合
+     * @param templateCode  短信模板(aliyun_message_code)
      * @return
      */
-    public R sendNotice(String companyId, String tableId, String title, String type, String noticeType, String workType, String messageSend, List<Long> userIds);
+    public R sendNotice(String companyId, String tableId, String title, String type, String noticeType, String workType, String messageSend, List<Long> userIds, String templateCode);
 }

tianhu-system/src/main/java/com/tianhu/system/service/impl/OwnNoticeServiceImpl.java

@@ -76,13 +76,14 @@ public class OwnNoticeServiceImpl implements IOwnNoticeService
      * @param tableId       表主键
      * @param title         标题
      * @param type          类型 00待办 01消息
-     * @param noticeType    消息类型 00费用提醒 01发票寄出 02到期还款
-     * @param workType      待办类型 00待审批 01链属企业申请 02融信失效
+     * @param noticeType    消息类型 00:平台欢迎信, 01:发起人审批结果通知, 02:经办人的平台审批结果通知, 03:融资企业经办人融信失效消息通知, 04:融资企业经办人融信生效消息通知
+     * @param workType      待办类型 00:融信审批待审批, 01:审批拒绝待编辑, 02:核心企业待确权, 03:待盖章, 04:待签收, 05:待融资, 06:待还款
      * @param messageSend   是否发送短信 0不发送 1发送
      * @param userIds       收到信息用户id集合
+     * @param templateCode  短信模板(aliyun_message_code)
      */
     @Override
-    public R sendNotice(String companyId, String tableId, String title, String type, String noticeType, String workType, String messageSend, List<Long> userIds)
+    public R sendNotice(String companyId, String tableId, String title, String type, String noticeType, String workType, String messageSend, List<Long> userIds, String templateCode)
     {
         //新增通知公告
         SysNotice notice = new SysNotice();
@@ -122,19 +123,10 @@ public class OwnNoticeServiceImpl implements IOwnNoticeService
         //如果发送短信
         if(SEND_MESSAGES.equals(messageSend)){
             try {
-                //消息模版id
-                String templateCode = null;
-                if(TYPE_WORK.equals(type)){
-                    //待办
-                    templateCode = RedisUtils.getDictValue("sys_work_type", workType);
-                }else if (TYPE_NOTICE.equals(type)){
-                    //消息
-                    templateCode = RedisUtils.getDictValue("sys_notice_type", noticeType);
-                }
                 //消息模版参数
                 Map map = new HashMap();
                 //TODO 发送短信
-//                messageUtilsService.sendMessageCode(phones, templateCode, map,null);
+                messageUtilsService.sendMessageCode(phones, templateCode, map,null);
                 //发送短信成功
                 notice.setMessageStatus("1");
             }catch(Exception e){