no message

src/biz/public.ts

 import moment = require("moment");
-import { ARTICLEPOSITION, CLIENTMSGLABLE, DONGTAIZIXUNSUBTYPE, PARTYBUILDSUBTYPEENUM, PARTYBUILDTYPEENUM } from "../config/enum";
+import { ARTICLEPOSITION, CLIENTACTIVITYLABLE, CLIENTMSGLABLE, DONGTAIZIXUNSUBTYPE, PARTYBUILDSUBTYPEENUM, PARTYBUILDTYPEENUM } from "../config/enum";
 import { TABLEENUM } from "../data/models/model";
 import { find } from "../data/select";
 import { getEdition } from "../tools/system";
@@ -115,17 +115,34 @@ export async function getSession() {
 /**
  * 获取通知对象
  */
+ export async function getMsgNoticeObject() {
+    let lableData = setEnumInterface({defaultParam:CLIENTMSGLABLE});
+
+    let lableInfo = await find(TABLEENUM.标签表, {}, ["lableId", "lableName"]);
+    lableInfo.forEach( info => {
+        let item = {key:info.lableName, value:info.lableId}
+        lableData.dataList.push(item);
+    })
+
+    return {lableData};
+}
+
+
+/**
+ * 获取通知对象
+ */
  export async function getNoticeObject() {
-    let msgLable = setEnumInterface({defaultParam:CLIENTMSGLABLE});
+    let lableData = setEnumInterface({defaultParam:CLIENTACTIVITYLABLE});
 
     let lableInfo = await find(TABLEENUM.标签表, {}, ["lableId", "lableName"]);
     lableInfo.forEach( info => {
         let item = {key:info.lableName, value:info.lableId}
-        msgLable.dataList.push(item);
+        lableData.dataList.push(item);
     })
 
-    return {msgLable};
+    return {lableData};
 }
 
 
 
+

src/config/enum.ts

@@ -670,7 +670,8 @@ export enum OOSCODE {
     会费发票,
     个人会员详情 = 15,
     单位会员详情,
-    注册信息
+    注册信息,
+    退款凭证 = 18,
 }
 
 
@@ -678,9 +679,23 @@ export enum OOSCODE {
  * 消息通知-除标签外固定通知类型
  */
 export enum CLIENTMSGLABLE {
-    所有人 = "0",
-    个人会员 = "1",
-    单位会员 = "2"
+    所有人 = "所有人（包括游客）", //所有人（包括游客）
+    个人会员 = "个人会员",
+    单位会员 = "单位会员",
+    理事 = "理事会员",
+    常务理事 = "常务理事会员",
+}
+
+
+/**
+ * 活动通知-除标签外固定通知类型
+ */
+export enum CLIENTACTIVITYLABLE {
+    个人会员 = "个人会员",
+    单位会员 = "单位会员",
+    理事 = "理事会员",
+    常务理事 = "常务理事会员",
+
 }
 
 
@@ -707,8 +722,8 @@ export enum ACTIVITYSTATE {
  * 前端参数
  */
 export enum CLIENTACTIVITYSTATE {
-    已开始 = 1,
-    已结束,
-    已参加
+    全部 = 0,
+    已结束 = 2,
+    已参加,
 }
 

src/data/models/model.ts

@@ -91,6 +91,7 @@ enum TABLEENUM {
     订单审批历史表 = "orderApprovalHistory",
     标签表 = "lable",
     消息通知表 = "massageNotice",
+    消息已读状态表 = "massageReads",
     活动通知表 = "activityNotice",
     活动报名表 = "sctivityEnroll"
 }
@@ -528,7 +529,18 @@ const ModelArray = [
             effectiveTime:'Number',//有效时间
             msgContent:'String',//消息内容
             lableId:{type:'[String]', default:[]},//消息对象 标签id 外键
-            isPop:{type:'Number', default:STATE.否}
+            isPop:{type:'Number', default:STATE.否}//是否弹窗
+        }
+    },
+    {
+        tableName:TABLEENUM.消息已读状态表,
+        source:TABLESOURCEENUM.mongo,
+        schema:{
+            readId:{type:'String', index:true},//消息已读id
+            msgId:'String',//消息id
+            userId:'String',//用户id
+            readTime:'Number',//阅读时间
+            isRead:{type:'Number', default:STATE.否}//是否已读
         }
     },
     {

src/main.ts

 
+import { initActivity } from "./biz/member/msgActivity";
 import { initAdmin } from "./biz/member/rightsMgmt";
 import { t } from "./biz/provide";
 import { initSMS } from "./biz/sms";
@@ -18,6 +19,7 @@ async function lanuch() {
     await initSMS();
     await initAdmin();
     await initSystemTask();
+    await initActivity();
 
     // await test1();
     // await inputData();  20240520日导入数据

src/routers/msgActivity/router.ts

@@ -66,7 +66,29 @@ export const Config = {
                 {key:"msgId", type:"String", desc:"消息Id"},
             ],
             bindBiz:msgActivityBiz.delMessage
-        }
+        },
+        {
+            apiName:"消息通知",
+            subUrl:'/msgdb/noticemessage',
+            param:[],
+            bindBiz:msgActivityBiz.noticeMessage
+        },
+        {
+            apiName:"全部已读",
+            subUrl:'/msgdb/allmsgread',
+            param:[
+                {key:"msgId", type:"String", desc:"消息Id"},
+            ],
+            bindBiz:msgActivityBiz.allMsgRead
+        },
+        {
+            apiName:"修改消息为已读",
+            subUrl:'/msgdb/allmsgread',
+            param:[
+                {key:"readId", type:"String", desc:"消息已读Id"},
+            ],
+            bindBiz:msgActivityBiz.updateMsgRead
+        },
     ],
     "活动通知":[
         {
@@ -93,7 +115,7 @@ export const Config = {
                         activityAdd:{type:'String', desc:'活动地点'},
                         activityStartTime:{type:'Number', desc:'活动开始时间', notMustHave:true},
                         activityEndTime:{type:'Number', desc:'活动结束时间', notMustHave:true},
-                        lableId:{type:'String', desc:'活动对象（标签Id）'},
+                        lableId:{type:'[String]', desc:'活动对象（标签Id）'},
                         enrollStartTime:{type:'Number', desc:'报名开始时间'},
                         enrollEndTime:{type:'Number', desc:'报名结束时间'},
                         activityContent:{type:'String', desc:'详细内容'},
@@ -115,7 +137,7 @@ export const Config = {
                         activityAdd:{type:'String', desc:'活动地点'},
                         activityStartTime:{type:'Number', desc:'活动开始时间'},
                         activityEndTime:{type:'Number', desc:'活动结束时间'},
-                        lableId:{type:'String', desc:'活动对象（标签Id）'},
+                        lableId:{type:'[String]', desc:'活动对象（标签Id）'},
                         enrollStartTime:{type:'Number', desc:'报名开始时间'},
                         enrollEndTime:{type:'Number', desc:'报名结束时间'},
                         activityContent:{type:'String', desc:'详细内容'},
@@ -125,6 +147,14 @@ export const Config = {
             bindBiz:msgActivityBiz.addActivity
         },
         {
+            apiName:"获取活动详细-修改回显",
+            subUrl:'/activitydb/activitydetailed',
+            param:[
+                {key:"activityId", type:"String", desc:"活动Id"},
+            ],
+            bindBiz:msgActivityBiz.getActivityDetailed
+        },
+        {
             apiName:"修改活动",
             subUrl:'/activitydb/updateactivity',
             param:[
@@ -136,7 +166,7 @@ export const Config = {
                         activityAdd:{type:'String', desc:'活动地点'},
                         activityStartTime:{type:'Number', desc:'活动开始时间', notMustHave:true},
                         activityEndTime:{type:'Number', desc:'活动结束时间', notMustHave:true},
-                        lableId:{type:'String', desc:'活动对象（标签Id）'},
+                        lableId:{type:'[String]', desc:'活动对象（标签Id）'},
                         enrollStartTime:{type:'Number', desc:'报名开始时间'},
                         enrollEndTime:{type:'Number', desc:'报名结束时间'},
                         activityContent:{type:'String', desc:'详细内容'},
@@ -172,10 +202,26 @@ export const Config = {
                 {key:"activityId", type:"String", desc:"活动Id"},
             ],
             bindBiz:msgActivityBiz.enrollList
+        },
+        {
+            apiName:"根据选择的会员下载报名表",
+            subUrl:'/activitydb/enrollurl',
+            param:[
+                {key:"id", type:"String", desc:"用户id"}
+            ],
+            bindBiz:msgActivityBiz.getEnrollUrl
         }
     ],
     "会员个人页活动通知":[
         {
+            apiName:"下载报名表",
+            subUrl:'/homepage/activityenrollform',
+            param:[
+                {key:"activityId", type:"String", desc:"活动Id"},
+            ],
+            bindBiz:msgActivityBiz.activityEnrollForm
+        },
+        {
             apiName:"申请报名表",
             subUrl:'/homepage/activityenroll',
             param:[
@@ -195,9 +241,18 @@ export const Config = {
             subUrl:'/homepage/activitylist',
             param:[
                 {key:"activityState", type:"Number", desc:"活动状态"},
+                {key:"pageNumber", type:"Number", desc:"当前页"}
             ],
             bindBiz:msgActivityBiz.homeActivityList
         },
+        {
+            apiName:"查看更多活动列表-详情",
+            subUrl:'/homepage/activitydetailed',
+            param:[
+                {key:"activityId", type:"String", desc:"活动Id"},
+            ],
+            bindBiz:msgActivityBiz.homeActivityDetailed
+        },
 
     ]
 }

src/routers/public/router.ts

@@ -258,6 +258,12 @@ export const Config = {
             apiName:"消息对象固定类型",
             subUrl:'/msglabletype',
             param:[],
+            bindBiz:publicBiz.getMsgNoticeObject
+        },
+        {
+            apiName:"活动对象固定类型",
+            subUrl:'/activitylabletype',
+            param:[],
             bindBiz:publicBiz.getNoticeObject
         },
         {
@@ -273,6 +279,21 @@ export const Config = {
             param:[],
             defaultParam:enumConfig.STATE,
             bindBiz:publicBiz.setEnumInterface
-        }
+        },
+        {
+            apiName:"活动状态",
+            subUrl:'/activitystate', 
+            param:[],
+            defaultParam:enumConfig.CLIENTACTIVITYSTATE,
+            bindBiz:publicBiz.setEnumInterface
+        },
+        {
+            apiName:"活动类型",
+            subUrl:'/activitytype', 
+            param:[],
+            defaultParam:enumConfig.ACTIVITYTYPE,
+            bindBiz:publicBiz.setEnumInterface
+        },
+
     ],
 }

src/routers/router.ts

@@ -22,15 +22,15 @@ import * as asyncHandler from 'express-async-handler';
 import { payCallback } from "../biz/member/cost";
 import { checkUser } from "../middleware/user";
 
-const Look = false;//true更新文档
+const Look = true;//true更新文档
 
 export async function setRouter(httpServer){
     if (Look) {
         await getDoc();
-        await initDoc(portalRouter.FirstName, portalRouter.Config, portalRouter.FirstRouter);//网站编辑
+        // await initDoc(portalRouter.FirstName, portalRouter.Config, portalRouter.FirstRouter);//网站编辑
         await initDoc(publicRouter.FirstName, publicRouter.Config, publicRouter.FirstRouter);//公用组件
         // await initDoc(memberRouter.FirstName, memberRouter.Config, memberRouter.FirstRouter);//用户路由
-        await initDoc(officalWebsiteRouter.FirstName, officalWebsiteRouter.Config, officalWebsiteRouter.FirstRouter);//官网路由
+        // await initDoc(officalWebsiteRouter.FirstName, officalWebsiteRouter.Config, officalWebsiteRouter.FirstRouter);//官网路由
         // await initDoc(orderRouter.FirstName, orderRouter.Config, orderRouter.FirstRouter);//会费相关
         // await initDoc(costRouter.FirstName, costRouter.Config, costRouter.FirstRouter);//支付
         // await initDoc(outPutRouter.FirstName, outPutRouter.Config, outPutRouter.FirstRouter);//导出路由

src/tools/reqResult.ts

@@ -143,7 +143,7 @@ export async function initDoc(firstName, apiConfig, apiFirstRouter) {
             itemStr += `|:---- |:----- |:----- |----- |\n`;
             itemStr += `|401 |身份验证失败 |headers中的userid错误 |强制跳转到登陆页面 |\n`;
             itemStr += `|402 |非法登录 |headers中没有token或者userid |强制跳转到登陆页面 |\n`;
-            itemStr += `|403 |身份验证过期 |token过期 |+强制跳转到登陆页面 |\n`;
+            itemStr += `|403 |身份验证过期 |token过期 |强制跳转到登陆页面 |\n`;
             itemStr += ``;
     
     

src/tools/system.ts

@@ -17,6 +17,16 @@ export function successResult() {
     return {success:true}
 }
 
+
+/**
+ * 抛出错误信息
+ * @returns 
+ */
+ export function successErrorResult(msg) {
+    return {code:500, success:false, msg};
+}
+
+
 /**
  * 生成系统id
  * @param tableName