@reglow/reglow 0.4.1 → 0.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +51 -0
- package/dist/reglow/common/sort.d.ts +66 -0
- package/dist/reglow/common/sort.js +102 -0
- package/dist/reglow/common/sort.js.map +1 -0
- package/dist/reglow/core/config.js +1 -1
- package/dist/reglow/core/payment.d.ts +16 -1
- package/dist/reglow/core/payment.js +25 -6
- package/dist/reglow/core/payment.js.map +1 -1
- package/dist/reglow/core/wechat.d.ts +11 -0
- package/dist/reglow/core/wechat.js +149 -0
- package/dist/reglow/core/wechat.js.map +1 -0
- package/dist/reglow/modules/agreement/controller.js +47 -14
- package/dist/reglow/modules/agreement/controller.js.map +1 -1
- package/dist/reglow/modules/agreement/repository.d.ts +6 -2
- package/dist/reglow/modules/agreement/repository.js +50 -10
- package/dist/reglow/modules/agreement/repository.js.map +1 -1
- package/dist/reglow/modules/agreement/service.d.ts +2 -2
- package/dist/reglow/modules/agreement/service.js +4 -4
- package/dist/reglow/modules/agreement/service.js.map +1 -1
- package/dist/reglow/modules/article/controller.js +46 -13
- package/dist/reglow/modules/article/controller.js.map +1 -1
- package/dist/reglow/modules/article/repository.d.ts +6 -2
- package/dist/reglow/modules/article/repository.js +48 -10
- package/dist/reglow/modules/article/repository.js.map +1 -1
- package/dist/reglow/modules/article/service.d.ts +2 -2
- package/dist/reglow/modules/article/service.js +10 -8
- package/dist/reglow/modules/article/service.js.map +1 -1
- package/dist/reglow/modules/config/controller.js +1 -1
- package/dist/reglow/modules/config/controller.js.map +1 -1
- package/dist/reglow/modules/config/repository.d.ts +3 -1
- package/dist/reglow/modules/config/repository.js +18 -4
- package/dist/reglow/modules/config/repository.js.map +1 -1
- package/dist/reglow/modules/customer_service/controller.js +77 -23
- package/dist/reglow/modules/customer_service/controller.js.map +1 -1
- package/dist/reglow/modules/customer_service/repository.d.ts +15 -5
- package/dist/reglow/modules/customer_service/repository.js +93 -15
- package/dist/reglow/modules/customer_service/repository.js.map +1 -1
- package/dist/reglow/modules/customer_service/service.d.ts +5 -5
- package/dist/reglow/modules/customer_service/service.js +10 -10
- package/dist/reglow/modules/customer_service/service.js.map +1 -1
- package/dist/reglow/modules/dept/controller.js +1 -1
- package/dist/reglow/modules/dept/controller.js.map +1 -1
- package/dist/reglow/modules/dept/repository.d.ts +3 -1
- package/dist/reglow/modules/dept/repository.js +42 -5
- package/dist/reglow/modules/dept/repository.js.map +1 -1
- package/dist/reglow/modules/dept/service.d.ts +1 -1
- package/dist/reglow/modules/dept/service.js +2 -2
- package/dist/reglow/modules/dept/service.js.map +1 -1
- package/dist/reglow/modules/dict/controller.js +18 -6
- package/dist/reglow/modules/dict/controller.js.map +1 -1
- package/dist/reglow/modules/dict/repository.d.ts +6 -2
- package/dist/reglow/modules/dict/repository.js +28 -7
- package/dist/reglow/modules/dict/repository.js.map +1 -1
- package/dist/reglow/modules/dict/service.d.ts +2 -2
- package/dist/reglow/modules/dict/service.js +4 -4
- package/dist/reglow/modules/dict/service.js.map +1 -1
- package/dist/reglow/modules/employee/controller.js +1 -1
- package/dist/reglow/modules/employee/controller.js.map +1 -1
- package/dist/reglow/modules/employee/repository.d.ts +3 -1
- package/dist/reglow/modules/employee/repository.js +35 -4
- package/dist/reglow/modules/employee/repository.js.map +1 -1
- package/dist/reglow/modules/employee/service.d.ts +1 -1
- package/dist/reglow/modules/employee/service.js +2 -2
- package/dist/reglow/modules/employee/service.js.map +1 -1
- package/dist/reglow/modules/log/controller.js +46 -7
- package/dist/reglow/modules/log/controller.js.map +1 -1
- package/dist/reglow/modules/material/controller.js +26 -8
- package/dist/reglow/modules/material/controller.js.map +1 -1
- package/dist/reglow/modules/material/repository.d.ts +4 -2
- package/dist/reglow/modules/material/repository.js +24 -7
- package/dist/reglow/modules/material/repository.js.map +1 -1
- package/dist/reglow/modules/material/service.d.ts +2 -2
- package/dist/reglow/modules/material/service.js +11 -7
- package/dist/reglow/modules/material/service.js.map +1 -1
- package/dist/reglow/modules/message/controller.js +32 -13
- package/dist/reglow/modules/message/controller.js.map +1 -1
- package/dist/reglow/modules/message/repository.d.ts +7 -3
- package/dist/reglow/modules/message/repository.js +63 -19
- package/dist/reglow/modules/message/repository.js.map +1 -1
- package/dist/reglow/modules/message/service.d.ts +3 -3
- package/dist/reglow/modules/message/service.js +18 -8
- package/dist/reglow/modules/message/service.js.map +1 -1
- package/dist/reglow/modules/notice/controller.js +22 -7
- package/dist/reglow/modules/notice/controller.js.map +1 -1
- package/dist/reglow/modules/notice/repository.d.ts +4 -2
- package/dist/reglow/modules/notice/repository.js +24 -9
- package/dist/reglow/modules/notice/repository.js.map +1 -1
- package/dist/reglow/modules/notice/service.d.ts +2 -2
- package/dist/reglow/modules/notice/service.js +16 -7
- package/dist/reglow/modules/notice/service.js.map +1 -1
- package/dist/reglow/modules/payment/schema.js +6 -2
- package/dist/reglow/modules/payment/schema.js.map +1 -1
- package/dist/reglow/modules/photo/controller.js +46 -13
- package/dist/reglow/modules/photo/controller.js.map +1 -1
- package/dist/reglow/modules/photo/repository.d.ts +6 -2
- package/dist/reglow/modules/photo/repository.js +53 -8
- package/dist/reglow/modules/photo/repository.js.map +1 -1
- package/dist/reglow/modules/photo/service.d.ts +2 -2
- package/dist/reglow/modules/photo/service.js +23 -11
- package/dist/reglow/modules/photo/service.js.map +1 -1
- package/dist/reglow/modules/post/controller.js +1 -1
- package/dist/reglow/modules/post/controller.js.map +1 -1
- package/dist/reglow/modules/post/repository.d.ts +3 -1
- package/dist/reglow/modules/post/repository.js +26 -6
- package/dist/reglow/modules/post/repository.js.map +1 -1
- package/dist/reglow/modules/post/service.d.ts +1 -1
- package/dist/reglow/modules/post/service.js +2 -2
- package/dist/reglow/modules/post/service.js.map +1 -1
- package/dist/reglow/modules/role/controller.js +1 -1
- package/dist/reglow/modules/role/controller.js.map +1 -1
- package/dist/reglow/modules/role/repository.d.ts +3 -1
- package/dist/reglow/modules/role/repository.js +38 -9
- package/dist/reglow/modules/role/repository.js.map +1 -1
- package/dist/reglow/modules/role/service.d.ts +1 -1
- package/dist/reglow/modules/role/service.js +2 -2
- package/dist/reglow/modules/role/service.js.map +1 -1
- package/dist/reglow/modules/user/controller.js +1 -1
- package/dist/reglow/modules/user/controller.js.map +1 -1
- package/dist/reglow/modules/user/repository.d.ts +3 -1
- package/dist/reglow/modules/user/repository.js +30 -3
- package/dist/reglow/modules/user/repository.js.map +1 -1
- package/dist/reglow/modules/user/service.d.ts +1 -1
- package/dist/reglow/modules/user/service.js +2 -2
- package/dist/reglow/modules/user/service.js.map +1 -1
- package/dist/reglow/modules/video/controller.js +54 -15
- package/dist/reglow/modules/video/controller.js.map +1 -1
- package/dist/reglow/modules/video/repository.d.ts +6 -2
- package/dist/reglow/modules/video/repository.js +41 -8
- package/dist/reglow/modules/video/repository.js.map +1 -1
- package/dist/reglow/modules/video/service.d.ts +2 -2
- package/dist/reglow/modules/video/service.js +16 -10
- package/dist/reglow/modules/video/service.js.map +1 -1
- package/dist/reglow/modules/wechat/controller.d.ts +6 -0
- package/dist/reglow/modules/wechat/controller.js +41 -0
- package/dist/reglow/modules/wechat/controller.js.map +1 -0
- package/dist/reglow/modules/wechat/router.d.ts +10 -0
- package/dist/reglow/modules/wechat/router.js +8 -0
- package/dist/reglow/modules/wechat/router.js.map +1 -0
- package/dist/reglow/modules/wechat/schema.d.ts +14 -0
- package/dist/reglow/modules/wechat/schema.js +23 -0
- package/dist/reglow/modules/wechat/schema.js.map +1 -0
- package/package.json +3 -2
|
@@ -4,8 +4,42 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import { knex } from "../../core/database.js";
|
|
6
6
|
import { ModelRegistry } from "../../core/models.js";
|
|
7
|
+
import { applySort } from "../../common/sort.js";
|
|
7
8
|
const M = ModelRegistry.get("Message");
|
|
8
9
|
const MT = ModelRegistry.get("MessageTemplate");
|
|
10
|
+
/** sys_message 表可排序列白名单(自有列,无敏感列) */
|
|
11
|
+
export const MESSAGE_SORTABLE_COLUMNS = [
|
|
12
|
+
"id",
|
|
13
|
+
"receiver_id",
|
|
14
|
+
"category",
|
|
15
|
+
"template_code",
|
|
16
|
+
"title",
|
|
17
|
+
"content",
|
|
18
|
+
"level",
|
|
19
|
+
"biz_type",
|
|
20
|
+
"biz_id",
|
|
21
|
+
"link_url",
|
|
22
|
+
"is_read",
|
|
23
|
+
"read_at",
|
|
24
|
+
"created_at",
|
|
25
|
+
"updated_at",
|
|
26
|
+
"deleted_at",
|
|
27
|
+
];
|
|
28
|
+
/** sys_message_template 表可排序列白名单(自有列,无敏感列) */
|
|
29
|
+
export const MESSAGE_TEMPLATE_SORTABLE_COLUMNS = [
|
|
30
|
+
"id",
|
|
31
|
+
"code",
|
|
32
|
+
"name",
|
|
33
|
+
"category",
|
|
34
|
+
"title_tpl",
|
|
35
|
+
"content_tpl",
|
|
36
|
+
"level",
|
|
37
|
+
"status",
|
|
38
|
+
"remark",
|
|
39
|
+
"created_at",
|
|
40
|
+
"updated_at",
|
|
41
|
+
"deleted_at",
|
|
42
|
+
];
|
|
9
43
|
export class MessageRepository {
|
|
10
44
|
// ── 消息 ──
|
|
11
45
|
async createMany(payloads) {
|
|
@@ -14,12 +48,15 @@ export class MessageRepository {
|
|
|
14
48
|
await knex(M).insert(payloads);
|
|
15
49
|
}
|
|
16
50
|
async findById(msgId) {
|
|
17
|
-
return (await knex(M)
|
|
51
|
+
return (await knex(M)
|
|
52
|
+
.where("id", msgId)
|
|
53
|
+
.whereNull("deleted_at")
|
|
54
|
+
.first());
|
|
18
55
|
}
|
|
19
56
|
async softDelete(id) {
|
|
20
57
|
await knex(M).where("id", id).update({ deleted_at: knex.fn.now() });
|
|
21
58
|
}
|
|
22
|
-
async listEmployee(page, size, keyword, category, receiverId, isRead) {
|
|
59
|
+
async listEmployee(page, size, keyword, category, receiverId, isRead, sortBy, sortOrder) {
|
|
23
60
|
let query = knex(M).whereNull("deleted_at");
|
|
24
61
|
let cnt = knex(M).whereNull("deleted_at");
|
|
25
62
|
if (keyword) {
|
|
@@ -39,15 +76,19 @@ export class MessageRepository {
|
|
|
39
76
|
query = query.where("is_read", isRead);
|
|
40
77
|
cnt = cnt.where("is_read", isRead);
|
|
41
78
|
}
|
|
42
|
-
const items = (await query
|
|
43
|
-
.orderBy("id", "desc")
|
|
79
|
+
const items = (await applySort(query, sortBy, sortOrder, MESSAGE_SORTABLE_COLUMNS, [["id", "desc"]])
|
|
44
80
|
.offset((page - 1) * size)
|
|
45
81
|
.limit(size));
|
|
46
82
|
const totalRow = await cnt.count({ c: "*" }).first();
|
|
47
|
-
return {
|
|
83
|
+
return {
|
|
84
|
+
items,
|
|
85
|
+
total: Number(totalRow.c) || 0,
|
|
86
|
+
};
|
|
48
87
|
}
|
|
49
|
-
async listMy(receiverId, page, size, isRead, category) {
|
|
50
|
-
let query = knex(M)
|
|
88
|
+
async listMy(receiverId, page, size, isRead, category, sortBy, sortOrder) {
|
|
89
|
+
let query = knex(M)
|
|
90
|
+
.where("receiver_id", receiverId)
|
|
91
|
+
.whereNull("deleted_at");
|
|
51
92
|
let cnt = knex(M).where("receiver_id", receiverId).whereNull("deleted_at");
|
|
52
93
|
if (isRead !== null && isRead !== undefined) {
|
|
53
94
|
query = query.where("is_read", isRead);
|
|
@@ -57,12 +98,14 @@ export class MessageRepository {
|
|
|
57
98
|
query = query.where("category", category);
|
|
58
99
|
cnt = cnt.where("category", category);
|
|
59
100
|
}
|
|
60
|
-
const items = (await query
|
|
61
|
-
.orderBy("id", "desc")
|
|
101
|
+
const items = (await applySort(query, sortBy, sortOrder, MESSAGE_SORTABLE_COLUMNS, [["id", "desc"]])
|
|
62
102
|
.offset((page - 1) * size)
|
|
63
103
|
.limit(size));
|
|
64
104
|
const totalRow = await cnt.count({ c: "*" }).first();
|
|
65
|
-
return {
|
|
105
|
+
return {
|
|
106
|
+
items,
|
|
107
|
+
total: Number(totalRow.c) || 0,
|
|
108
|
+
};
|
|
66
109
|
}
|
|
67
110
|
async countUnread(receiverId) {
|
|
68
111
|
const r = await knex(M)
|
|
@@ -76,7 +119,9 @@ export class MessageRepository {
|
|
|
76
119
|
async markRead(msgId, receiverId) {
|
|
77
120
|
const obj = await this.findById(msgId);
|
|
78
121
|
if (obj && obj.receiver_id === receiverId && !obj.is_read) {
|
|
79
|
-
await knex(M)
|
|
122
|
+
await knex(M)
|
|
123
|
+
.where("id", msgId)
|
|
124
|
+
.update({ is_read: true, read_at: knex.fn.now() });
|
|
80
125
|
}
|
|
81
126
|
}
|
|
82
127
|
async markAllRead(receiverId) {
|
|
@@ -110,12 +155,9 @@ export class MessageRepository {
|
|
|
110
155
|
.first());
|
|
111
156
|
}
|
|
112
157
|
async findTemplateById(tid) {
|
|
113
|
-
return (await knex(MT)
|
|
114
|
-
.where("id", tid)
|
|
115
|
-
.whereNull("deleted_at")
|
|
116
|
-
.first());
|
|
158
|
+
return (await knex(MT).where("id", tid).whereNull("deleted_at").first());
|
|
117
159
|
}
|
|
118
|
-
async listTemplates(page, size, keyword) {
|
|
160
|
+
async listTemplates(page, size, keyword, sortBy, sortOrder) {
|
|
119
161
|
let query = knex(MT).whereNull("deleted_at");
|
|
120
162
|
let cnt = knex(MT).whereNull("deleted_at");
|
|
121
163
|
if (keyword) {
|
|
@@ -123,12 +165,14 @@ export class MessageRepository {
|
|
|
123
165
|
query = query.where((b) => b.where("code", "like", like).orWhere("name", "like", like));
|
|
124
166
|
cnt = cnt.where((b) => b.where("code", "like", like).orWhere("name", "like", like));
|
|
125
167
|
}
|
|
126
|
-
const items = (await query
|
|
127
|
-
.orderBy("id", "desc")
|
|
168
|
+
const items = (await applySort(query, sortBy, sortOrder, MESSAGE_TEMPLATE_SORTABLE_COLUMNS, [["id", "desc"]])
|
|
128
169
|
.offset((page - 1) * size)
|
|
129
170
|
.limit(size));
|
|
130
171
|
const totalRow = await cnt.count({ c: "*" }).first();
|
|
131
|
-
return {
|
|
172
|
+
return {
|
|
173
|
+
items,
|
|
174
|
+
total: Number(totalRow.c) || 0,
|
|
175
|
+
};
|
|
132
176
|
}
|
|
133
177
|
async createTemplate(data) {
|
|
134
178
|
const [id] = await knex(MT).insert(data);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../../reglow/modules/message/repository.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../../reglow/modules/message/repository.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGjD,MAAM,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;AACvC,MAAM,EAAE,GAAG,aAAa,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAEhD,qCAAqC;AACrC,MAAM,CAAC,MAAM,wBAAwB,GAAsB;IACzD,IAAI;IACJ,aAAa;IACb,UAAU;IACV,eAAe;IACf,OAAO;IACP,SAAS;IACT,OAAO;IACP,UAAU;IACV,QAAQ;IACR,UAAU;IACV,SAAS;IACT,SAAS;IACT,YAAY;IACZ,YAAY;IACZ,YAAY;CACb,CAAC;AAEF,8CAA8C;AAC9C,MAAM,CAAC,MAAM,iCAAiC,GAAsB;IAClE,IAAI;IACJ,MAAM;IACN,MAAM;IACN,UAAU;IACV,WAAW;IACX,aAAa;IACb,OAAO;IACP,QAAQ;IACR,QAAQ;IACR,YAAY;IACZ,YAAY;IACZ,YAAY;CACb,CAAC;AAEF,MAAM,OAAO,iBAAiB;IAC5B,WAAW;IACX,KAAK,CAAC,UAAU,CAAC,QAAmC;QAClD,IAAI,CAAC,QAAQ,CAAC,MAAM;YAAE,OAAO;QAC7B,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,KAAa;QAC1B,OAAO,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;aAClB,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC;aAClB,SAAS,CAAC,YAAY,CAAC;aACvB,KAAK,EAAE,CAAwB,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAU;QACzB,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACtE,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,IAAY,EACZ,IAAY,EACZ,OAAsB,EACtB,QAAuB,EACvB,UAAyB,EACzB,MAAsB,EACtB,MAAsB,EACtB,SAAyB;QAEzB,IAAI,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QAC5C,IAAI,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QAC1C,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,IAAI,GAAG,IAAI,OAAO,GAAG,CAAC;YAC5B,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CACxB,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,CAChE,CAAC;YACF,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CACpB,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,CAChE,CAAC;QACJ,CAAC;QACD,IAAI,QAAQ,EAAE,CAAC;YACb,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YAC1C,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QACxC,CAAC;QACD,IAAI,UAAU,KAAK,IAAI,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YACpD,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;YAC/C,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QAC7C,CAAC;QACD,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YAC5C,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACvC,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACrC,CAAC;QACD,MAAM,KAAK,GAAG,CAAC,MAAM,SAAS,CAC5B,KAAK,EACL,MAAM,EACN,SAAS,EACT,wBAAwB,EACxB,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CACjB;aACE,MAAM,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC;aACzB,KAAK,CAAC,IAAI,CAAC,CAAc,CAAC;QAC7B,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;QACrD,OAAO;YACL,KAAK;YACL,KAAK,EAAE,MAAM,CAAE,QAAmC,CAAC,CAAC,CAAC,IAAI,CAAC;SAC3D,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,MAAM,CACV,UAAkB,EAClB,IAAY,EACZ,IAAY,EACZ,MAAsB,EACtB,QAAuB,EACvB,MAAsB,EACtB,SAAyB;QAEzB,IAAI,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC;aAChB,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC;aAChC,SAAS,CAAC,YAAY,CAAC,CAAC;QAC3B,IAAI,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QAC3E,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YAC5C,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACvC,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACrC,CAAC;QACD,IAAI,QAAQ,EAAE,CAAC;YACb,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YAC1C,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QACxC,CAAC;QACD,MAAM,KAAK,GAAG,CAAC,MAAM,SAAS,CAC5B,KAAK,EACL,MAAM,EACN,SAAS,EACT,wBAAwB,EACxB,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CACjB;aACE,MAAM,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC;aACzB,KAAK,CAAC,IAAI,CAAC,CAAc,CAAC;QAC7B,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;QACrD,OAAO;YACL,KAAK;YACL,KAAK,EAAE,MAAM,CAAE,QAAmC,CAAC,CAAC,CAAC,IAAI,CAAC;SAC3D,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,UAAkB;QAClC,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,CAAC,CAAC;aACpB,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC;aAChC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC;aACvB,SAAS,CAAC,YAAY,CAAC;aACvB,KAAK,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC;aACjB,KAAK,EAAE,CAAC;QACX,OAAO,MAAM,CAAE,CAA4B,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,KAAa,EAAE,UAAkB;QAC9C,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACvC,IAAI,GAAG,IAAI,GAAG,CAAC,WAAW,KAAK,UAAU,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;YAC1D,MAAM,IAAI,CAAC,CAAC,CAAC;iBACV,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC;iBAClB,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,UAAkB;QAClC,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;aAC1B,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC;aAChC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC;aACvB,SAAS,CAAC,YAAY,CAAC;aACvB,MAAM,CAAC,IAAI,CAAC,CAA0B,CAAC;QAC1C,IAAI,CAAC,MAAM,CAAC,MAAM;YAAE,OAAO,CAAC,CAAC;QAC7B,MAAM,IAAI,CAAC,CAAC,CAAC;aACV,OAAO,CACN,IAAI,EACJ,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CACxB;aACA,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACrD,OAAO,MAAM,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,UAAkB,EAClB,OAAe,EACf,KAAa,EACb,YAAoB;QAEpB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,CAAC,CAAC;aACtB,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC;aAChC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC;aAC1B,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC;aACtB,KAAK,CAAC,eAAe,EAAE,YAAY,CAAC;aACpC,SAAS,CAAC,YAAY,CAAC;aACvB,KAAK,EAAE,CAAC;QACX,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC;IACtB,CAAC;IAED,WAAW;IACX,KAAK,CAAC,kBAAkB,CAAC,IAAY;QACnC,OAAO,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;aACnB,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC;aACnB,SAAS,CAAC,YAAY,CAAC;aACvB,KAAK,EAAE,CAAgC,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,GAAW;QAChC,OAAO,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,KAAK,EAAE,CAE1D,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,IAAY,EACZ,IAAY,EACZ,OAAsB,EACtB,MAAsB,EACtB,SAAyB;QAEzB,IAAI,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QAC7C,IAAI,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QAC3C,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,IAAI,GAAG,IAAI,OAAO,GAAG,CAAC;YAC5B,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CACxB,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CAC5D,CAAC;YACF,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CACpB,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CAC5D,CAAC;QACJ,CAAC;QACD,MAAM,KAAK,GAAG,CAAC,MAAM,SAAS,CAC5B,KAAK,EACL,MAAM,EACN,SAAS,EACT,iCAAiC,EACjC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CACjB;aACE,MAAM,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC;aACzB,KAAK,CAAC,IAAI,CAAC,CAAsB,CAAC;QACrC,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;QACrD,OAAO;YACL,KAAK;YACL,KAAK,EAAE,MAAM,CAAE,QAAmC,CAAC,CAAC,CAAC,IAAI,CAAC;SAC3D,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,IAA6B;QAE7B,MAAM,CAAC,EAAE,CAAC,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACzC,OAAO,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAoB,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,EAAU,EACV,IAA6B;QAE7B,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC5C,OAAO,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAoB,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,EAAU;QACjC,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACvE,CAAC;CACF"}
|
|
@@ -47,12 +47,12 @@ export declare class MessageService {
|
|
|
47
47
|
idempotent?: boolean;
|
|
48
48
|
}): Promise<number>;
|
|
49
49
|
buildResponse(m: Message, receiverName?: string | null): Promise<MessageResponseDto>;
|
|
50
|
-
listEmployee(page: number, size: number, keyword: string | null, category: string | null, receiverId: number | null, isRead: boolean | null): Promise<{
|
|
50
|
+
listEmployee(page: number, size: number, keyword: string | null, category: string | null, receiverId: number | null, isRead: boolean | null, sortBy?: string | null, sortOrder?: string | null): Promise<{
|
|
51
51
|
items: MessageResponseDto[];
|
|
52
52
|
total: number;
|
|
53
53
|
}>;
|
|
54
54
|
delete(msgId: number): Promise<void>;
|
|
55
|
-
listMy(receiverId: number, page: number, size: number, isRead: boolean | null, category: string | null): Promise<{
|
|
55
|
+
listMy(receiverId: number, page: number, size: number, isRead: boolean | null, category: string | null, sortBy?: string | null, sortOrder?: string | null): Promise<{
|
|
56
56
|
items: MessageResponseDto[];
|
|
57
57
|
total: number;
|
|
58
58
|
}>;
|
|
@@ -60,7 +60,7 @@ export declare class MessageService {
|
|
|
60
60
|
markAllRead(receiverId: number): Promise<number>;
|
|
61
61
|
countUnread(receiverId: number): Promise<number>;
|
|
62
62
|
toTemplateDto(t: MessageTemplate): TemplateResponseDto;
|
|
63
|
-
listTemplates(page: number, size: number, keyword: string | null): Promise<{
|
|
63
|
+
listTemplates(page: number, size: number, keyword: string | null, sortBy?: string | null, sortOrder?: string | null): Promise<{
|
|
64
64
|
items: TemplateResponseDto[];
|
|
65
65
|
total: number;
|
|
66
66
|
}>;
|
|
@@ -14,7 +14,9 @@ export function renderTemplate(tpl, variables) {
|
|
|
14
14
|
return tpl;
|
|
15
15
|
let out = tpl;
|
|
16
16
|
for (const [k, v] of Object.entries(variables)) {
|
|
17
|
-
out = out
|
|
17
|
+
out = out
|
|
18
|
+
.split(`{${k}}`)
|
|
19
|
+
.join(v === null || v === undefined ? "" : String(v));
|
|
18
20
|
}
|
|
19
21
|
return out;
|
|
20
22
|
}
|
|
@@ -107,8 +109,8 @@ export class MessageService {
|
|
|
107
109
|
receiver_name: receiverName,
|
|
108
110
|
};
|
|
109
111
|
}
|
|
110
|
-
async listEmployee(page, size, keyword, category, receiverId, isRead) {
|
|
111
|
-
const { items, total } = await this.repo.listEmployee(page, size, keyword, category, receiverId, isRead);
|
|
112
|
+
async listEmployee(page, size, keyword, category, receiverId, isRead, sortBy, sortOrder) {
|
|
113
|
+
const { items, total } = await this.repo.listEmployee(page, size, keyword, category, receiverId, isRead, sortBy, sortOrder);
|
|
112
114
|
const ids = Array.from(new Set(items.map((m) => m.receiver_id)));
|
|
113
115
|
const nameMap = await employeeNames(ids);
|
|
114
116
|
const result = [];
|
|
@@ -123,8 +125,8 @@ export class MessageService {
|
|
|
123
125
|
throw new AppException(ErrorCode.NOT_FOUND, "消息不存在", 404);
|
|
124
126
|
await this.repo.softDelete(msgId);
|
|
125
127
|
}
|
|
126
|
-
async listMy(receiverId, page, size, isRead, category) {
|
|
127
|
-
const { items, total } = await this.repo.listMy(receiverId, page, size, isRead, category);
|
|
128
|
+
async listMy(receiverId, page, size, isRead, category, sortBy, sortOrder) {
|
|
129
|
+
const { items, total } = await this.repo.listMy(receiverId, page, size, isRead, category, sortBy, sortOrder);
|
|
128
130
|
const result = [];
|
|
129
131
|
for (const m of items) {
|
|
130
132
|
result.push(await this.buildResponse(m));
|
|
@@ -156,8 +158,8 @@ export class MessageService {
|
|
|
156
158
|
updated_at: t.updated_at ?? null,
|
|
157
159
|
};
|
|
158
160
|
}
|
|
159
|
-
async listTemplates(page, size, keyword) {
|
|
160
|
-
const { items, total } = await this.repo.listTemplates(page, size, keyword);
|
|
161
|
+
async listTemplates(page, size, keyword, sortBy, sortOrder) {
|
|
162
|
+
const { items, total } = await this.repo.listTemplates(page, size, keyword, sortBy, sortOrder);
|
|
161
163
|
return { items: items.map((t) => this.toTemplateDto(t)), total };
|
|
162
164
|
}
|
|
163
165
|
async createTemplate(data) {
|
|
@@ -181,7 +183,15 @@ export class MessageService {
|
|
|
181
183
|
if (!obj)
|
|
182
184
|
throw new AppException(ErrorCode.NOT_FOUND, "模板不存在", 404);
|
|
183
185
|
const updateData = {};
|
|
184
|
-
for (const field of [
|
|
186
|
+
for (const field of [
|
|
187
|
+
"name",
|
|
188
|
+
"category",
|
|
189
|
+
"title_tpl",
|
|
190
|
+
"content_tpl",
|
|
191
|
+
"level",
|
|
192
|
+
"status",
|
|
193
|
+
"remark",
|
|
194
|
+
]) {
|
|
185
195
|
const v = data[field];
|
|
186
196
|
if (v !== undefined && v !== null)
|
|
187
197
|
updateData[field] = v;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../reglow/modules/message/service.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAIjE,MAAM,SAAS,GAAG,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;AAEhD,MAAM,UAAU,cAAc,
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../reglow/modules/message/service.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,14 +39,17 @@ function toNoticeDto(d) {
|
|
|
39
39
|
export async function noticeRoutes(fastify, _opts) {
|
|
40
40
|
const service = new NoticeService();
|
|
41
41
|
// 通知公告列表
|
|
42
|
-
fastify.get("/", {
|
|
42
|
+
fastify.get("/", {
|
|
43
|
+
schema: { summary: "通知公告列表" },
|
|
44
|
+
preHandler: [fastify.requirePermission("system:notice:list")],
|
|
45
|
+
}, async (request) => {
|
|
43
46
|
const query = request.query;
|
|
44
47
|
const page = Math.max(1, int(query.page, 1));
|
|
45
48
|
const size = Math.min(100, Math.max(1, int(query.size, 10)));
|
|
46
49
|
const keyword = query.keyword || null;
|
|
47
50
|
const type = intOrNull(query.type);
|
|
48
51
|
const status = intOrNull(query.status);
|
|
49
|
-
const { items, total } = await service.listEmployee(page, size, keyword, type, status);
|
|
52
|
+
const { items, total } = await service.listEmployee(page, size, keyword, type, status, query.sort_by || null, query.sort_order || null);
|
|
50
53
|
return ApiResponse.success(new PageData(items.map(toNoticeDto), total, page, size));
|
|
51
54
|
});
|
|
52
55
|
// 未读数量
|
|
@@ -62,7 +65,7 @@ export async function noticeRoutes(fastify, _opts) {
|
|
|
62
65
|
const page = Math.max(1, int(query.page, 1));
|
|
63
66
|
const size = Math.min(100, Math.max(1, int(query.size, 20)));
|
|
64
67
|
const isRead = toBoolQuery(query.is_read);
|
|
65
|
-
const { items, total } = await service.listMy(adminId, page, size, isRead);
|
|
68
|
+
const { items, total } = await service.listMy(adminId, page, size, isRead, query.sort_by || null, query.sort_order || null);
|
|
66
69
|
return ApiResponse.success(new PageData(items.map(toNoticeDto), total, page, size));
|
|
67
70
|
});
|
|
68
71
|
// 全部标记已读
|
|
@@ -79,7 +82,10 @@ export async function noticeRoutes(fastify, _opts) {
|
|
|
79
82
|
return ApiResponse.success(null, "标记成功");
|
|
80
83
|
});
|
|
81
84
|
// 通知详情
|
|
82
|
-
fastify.get("/:notice_id", {
|
|
85
|
+
fastify.get("/:notice_id", {
|
|
86
|
+
schema: { summary: "通知详情" },
|
|
87
|
+
preHandler: [fastify.requirePermission("system:notice:list")],
|
|
88
|
+
}, async (request) => {
|
|
83
89
|
const id = int(request.params.notice_id, 0);
|
|
84
90
|
return ApiResponse.success(toNoticeDto(await service.detailEmployee(id)));
|
|
85
91
|
});
|
|
@@ -101,20 +107,29 @@ export async function noticeRoutes(fastify, _opts) {
|
|
|
101
107
|
return ApiResponse.success(toNoticeDto(dto), "更新成功");
|
|
102
108
|
});
|
|
103
109
|
// 删除通知
|
|
104
|
-
fastify.delete("/:notice_id", {
|
|
110
|
+
fastify.delete("/:notice_id", {
|
|
111
|
+
schema: { summary: "删除通知" },
|
|
112
|
+
preHandler: [fastify.requirePermission("system:notice:delete")],
|
|
113
|
+
}, async (request) => {
|
|
105
114
|
const id = int(request.params.notice_id, 0);
|
|
106
115
|
await service.delete(id);
|
|
107
116
|
return ApiResponse.success(null, "删除成功");
|
|
108
117
|
});
|
|
109
118
|
// 发布通知
|
|
110
|
-
fastify.put("/:notice_id/publish", {
|
|
119
|
+
fastify.put("/:notice_id/publish", {
|
|
120
|
+
schema: { summary: "发布通知" },
|
|
121
|
+
preHandler: [fastify.requirePermission("system:notice:publish")],
|
|
122
|
+
}, async (request) => {
|
|
111
123
|
const id = int(request.params.notice_id, 0);
|
|
112
124
|
const publisherId = request.currentEmployee.id;
|
|
113
125
|
const dto = await service.publish(id, publisherId);
|
|
114
126
|
return ApiResponse.success(toNoticeDto(dto), "发布成功");
|
|
115
127
|
});
|
|
116
128
|
// 撤回通知
|
|
117
|
-
fastify.put("/:notice_id/revoke", {
|
|
129
|
+
fastify.put("/:notice_id/revoke", {
|
|
130
|
+
schema: { summary: "撤回通知" },
|
|
131
|
+
preHandler: [fastify.requirePermission("system:notice:publish")],
|
|
132
|
+
}, async (request) => {
|
|
118
133
|
const id = int(request.params.notice_id, 0);
|
|
119
134
|
const dto = await service.revoke(id);
|
|
120
135
|
return ApiResponse.success(toNoticeDto(dto), "已撤回");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../../reglow/modules/notice/controller.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAA0B,MAAM,cAAc,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EACL,kBAAkB,EAElB,kBAAkB,GAEnB,MAAM,aAAa,CAAC;AAErB,SAAS,GAAG,CAAC,CAAU,EAAE,GAAW;IAClC,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAClC,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AACnC,CAAC;AAED,SAAS,SAAS,CAAC,CAAU;IAC3B,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE;QAAE,OAAO,IAAI,CAAC;IAC3D,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAClC,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AACpC,CAAC;AAED,SAAS,WAAW,CAAC,CAAU;IAC7B,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE;QAAE,OAAO,IAAI,CAAC;IAC3D,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,MAAM,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;AAC5D,CAAC;AAED,SAAS,WAAW,CAAC,CAAoB;IACvC,OAAO,YAAY,CACjB;QACE,EAAE,EAAE,CAAC,CAAC,EAAE;QACR,KAAK,EAAE,CAAC,CAAC,KAAK;QACd,OAAO,EAAE,CAAC,CAAC,OAAO;QAClB,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,KAAK,EAAE,CAAC,CAAC,KAAK;QACd,KAAK,EAAE,CAAC,CAAC,KAAK;QACd,WAAW,EAAE,CAAC,CAAC,WAAW;QAC1B,MAAM,EAAE,CAAC,CAAC,MAAM;QAChB,YAAY,EAAE,CAAC,CAAC,YAAY;QAC5B,cAAc,EAAE,CAAC,CAAC,cAAc;QAChC,YAAY,EAAE,CAAC,CAAC,YAAY;QAC5B,OAAO,EAAE,CAAC,CAAC,OAAO;QAClB,UAAU,EAAE,CAAC,CAAC,UAAU;QACxB,UAAU,EAAE,CAAC,CAAC,UAAU;QACxB,UAAU,EAAE,CAAC,CAAC,UAAU;KACzB,EACD,CAAC,YAAY,EAAE,YAAY,EAAE,cAAc,CAAC,CAC7C,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,OAAwB,EACxB,KAA8B;IAE9B,MAAM,OAAO,GAAG,IAAI,aAAa,EAAE,CAAC;IAEpC,SAAS;IACT,OAAO,CAAC,GAAG,CACT,GAAG,EACH,
|
|
1
|
+
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../../reglow/modules/notice/controller.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAA0B,MAAM,cAAc,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EACL,kBAAkB,EAElB,kBAAkB,GAEnB,MAAM,aAAa,CAAC;AAErB,SAAS,GAAG,CAAC,CAAU,EAAE,GAAW;IAClC,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAClC,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AACnC,CAAC;AAED,SAAS,SAAS,CAAC,CAAU;IAC3B,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE;QAAE,OAAO,IAAI,CAAC;IAC3D,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAClC,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AACpC,CAAC;AAED,SAAS,WAAW,CAAC,CAAU;IAC7B,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE;QAAE,OAAO,IAAI,CAAC;IAC3D,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,MAAM,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;AAC5D,CAAC;AAED,SAAS,WAAW,CAAC,CAAoB;IACvC,OAAO,YAAY,CACjB;QACE,EAAE,EAAE,CAAC,CAAC,EAAE;QACR,KAAK,EAAE,CAAC,CAAC,KAAK;QACd,OAAO,EAAE,CAAC,CAAC,OAAO;QAClB,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,KAAK,EAAE,CAAC,CAAC,KAAK;QACd,KAAK,EAAE,CAAC,CAAC,KAAK;QACd,WAAW,EAAE,CAAC,CAAC,WAAW;QAC1B,MAAM,EAAE,CAAC,CAAC,MAAM;QAChB,YAAY,EAAE,CAAC,CAAC,YAAY;QAC5B,cAAc,EAAE,CAAC,CAAC,cAAc;QAChC,YAAY,EAAE,CAAC,CAAC,YAAY;QAC5B,OAAO,EAAE,CAAC,CAAC,OAAO;QAClB,UAAU,EAAE,CAAC,CAAC,UAAU;QACxB,UAAU,EAAE,CAAC,CAAC,UAAU;QACxB,UAAU,EAAE,CAAC,CAAC,UAAU;KACzB,EACD,CAAC,YAAY,EAAE,YAAY,EAAE,cAAc,CAAC,CAC7C,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,OAAwB,EACxB,KAA8B;IAE9B,MAAM,OAAO,GAAG,IAAI,aAAa,EAAE,CAAC;IAEpC,SAAS;IACT,OAAO,CAAC,GAAG,CACT,GAAG,EACH;QACE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE;QAC7B,UAAU,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,CAAC;KAC9D,EACD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,KAAK,GAAG,OAAO,CAAC,KAAgC,CAAC;QACvD,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7C,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7D,MAAM,OAAO,GAAI,KAAK,CAAC,OAAkB,IAAI,IAAI,CAAC;QAClD,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACvC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,OAAO,CAAC,YAAY,CACjD,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,MAAM,EACL,KAAK,CAAC,OAAkB,IAAI,IAAI,EAChC,KAAK,CAAC,UAAqB,IAAI,IAAI,CACrC,CAAC;QACF,OAAO,WAAW,CAAC,OAAO,CACxB,IAAI,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CACxD,CAAC;IACJ,CAAC,CACF,CAAC;IAEF,OAAO;IACP,OAAO,CAAC,GAAG,CACT,eAAe,EACf,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,EAClE,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,OAAO,GAAG,OAAO,CAAC,eAAgB,CAAC,EAAE,CAAC;QAC5C,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC3D,OAAO,WAAW,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAChD,CAAC,CACF,CAAC;IAEF,SAAS;IACT,OAAO,CAAC,GAAG,CACT,KAAK,EACL,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,UAAU,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,EACpE,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,OAAO,GAAG,OAAO,CAAC,eAAgB,CAAC,EAAE,CAAC;QAC5C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAgC,CAAC;QACvD,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7C,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7D,MAAM,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC1C,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,OAAO,CAAC,MAAM,CAC3C,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,MAAM,EACL,KAAK,CAAC,OAAkB,IAAI,IAAI,EAChC,KAAK,CAAC,UAAqB,IAAI,IAAI,CACrC,CAAC;QACF,OAAO,WAAW,CAAC,OAAO,CACxB,IAAI,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CACxD,CAAC;IACJ,CAAC,CACF,CAAC;IAEF,SAAS;IACT,OAAO,CAAC,GAAG,CACT,WAAW,EACX,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,UAAU,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,EACpE,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,OAAO,GAAG,OAAO,CAAC,eAAgB,CAAC,EAAE,CAAC;QAC5C,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QACjD,OAAO,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,KAAK,OAAO,CAAC,CAAC;IACxD,CAAC,CACF,CAAC;IAEF,SAAS;IACT,OAAO,CAAC,GAAG,CACT,kBAAkB,EAClB,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,UAAU,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,EACpE,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,EAAE,GAAG,GAAG,CAAE,OAAO,CAAC,MAAgC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG,OAAO,CAAC,eAAgB,CAAC,EAAE,CAAC;QAC5C,MAAM,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QACpC,OAAO,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC3C,CAAC,CACF,CAAC;IAEF,OAAO;IACP,OAAO,CAAC,GAAG,CACT,aAAa,EACb;QACE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;QAC3B,UAAU,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,CAAC;KAC9D,EACD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,EAAE,GAAG,GAAG,CAAE,OAAO,CAAC,MAAgC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QACvE,OAAO,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5E,CAAC,CACF,CAAC;IAEF,WAAW;IACX,OAAO,CAAC,IAAI,CACV,GAAG,EACH;QACE,UAAU,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,CAAC;QAC/D,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,kBAAkB,EAAE;KAC1D,EACD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,IAAwB,CAAC,CAAC;QACnE,OAAO,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;IACvD,CAAC,CACF,CAAC;IAEF,OAAO;IACP,OAAO,CAAC,GAAG,CACT,aAAa,EACb;QACE,UAAU,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,CAAC;QAC/D,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,kBAAkB,EAAE;KACtD,EACD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,EAAE,GAAG,GAAG,CAAE,OAAO,CAAC,MAAgC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QACvE,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,IAAwB,CAAC,CAAC;QACvE,OAAO,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;IACvD,CAAC,CACF,CAAC;IAEF,OAAO;IACP,OAAO,CAAC,MAAM,CACZ,aAAa,EACb;QACE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;QAC3B,UAAU,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,CAAC;KAChE,EACD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,EAAE,GAAG,GAAG,CAAE,OAAO,CAAC,MAAgC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QACvE,MAAM,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACzB,OAAO,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC3C,CAAC,CACF,CAAC;IAEF,OAAO;IACP,OAAO,CAAC,GAAG,CACT,qBAAqB,EACrB;QACE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;QAC3B,UAAU,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,CAAC;KACjE,EACD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,EAAE,GAAG,GAAG,CAAE,OAAO,CAAC,MAAgC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QACvE,MAAM,WAAW,GAAG,OAAO,CAAC,eAAgB,CAAC,EAAE,CAAC;QAChD,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;QACnD,OAAO,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;IACvD,CAAC,CACF,CAAC;IAEF,OAAO;IACP,OAAO,CAAC,GAAG,CACT,oBAAoB,EACpB;QACE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;QAC3B,UAAU,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,CAAC;KACjE,EACD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,EAAE,GAAG,GAAG,CAAE,OAAO,CAAC,MAAgC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QACvE,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACrC,OAAO,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;IACtD,CAAC,CACF,CAAC;AACJ,CAAC"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import type { Notice } from "../../core/entities.js";
|
|
2
|
+
/** sys_notice 表可排序列白名单(自有列,无敏感列) */
|
|
3
|
+
export declare const NOTICE_SORTABLE_COLUMNS: readonly string[];
|
|
2
4
|
export declare class NoticeRepository {
|
|
3
5
|
findById(noticeId: number): Promise<Notice | undefined>;
|
|
4
6
|
create(data: Record<string, unknown>): Promise<Notice>;
|
|
5
7
|
update(id: number, data: Record<string, unknown>): Promise<Notice>;
|
|
6
8
|
softDelete(id: number): Promise<void>;
|
|
7
|
-
listEmployee(page: number, size: number, keyword: string | null, type: number | null, status: number | null): Promise<{
|
|
9
|
+
listEmployee(page: number, size: number, keyword: string | null, type: number | null, status: number | null, sortBy?: string | null, sortOrder?: string | null): Promise<{
|
|
8
10
|
items: Notice[];
|
|
9
11
|
total: number;
|
|
10
12
|
}>;
|
|
@@ -13,7 +15,7 @@ export declare class NoticeRepository {
|
|
|
13
15
|
getReadCount(noticeId: number): Promise<number>;
|
|
14
16
|
markRead(noticeId: number, adminId: number): Promise<void>;
|
|
15
17
|
markAllRead(adminId: number): Promise<number>;
|
|
16
|
-
listMyMessages(adminId: number, page: number, size: number, isRead: boolean | null): Promise<{
|
|
18
|
+
listMyMessages(adminId: number, page: number, size: number, isRead: boolean | null, sortBy?: string | null, sortOrder?: string | null): Promise<{
|
|
17
19
|
items: Notice[];
|
|
18
20
|
total: number;
|
|
19
21
|
readSet: Set<number>;
|
|
@@ -4,8 +4,25 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import { knex } from "../../core/database.js";
|
|
6
6
|
import { ModelRegistry } from "../../core/models.js";
|
|
7
|
+
import { applySort } from "../../common/sort.js";
|
|
7
8
|
const N = ModelRegistry.get("Notice");
|
|
8
9
|
const NR = ModelRegistry.get("NoticeRead");
|
|
10
|
+
/** sys_notice 表可排序列白名单(自有列,无敏感列) */
|
|
11
|
+
export const NOTICE_SORTABLE_COLUMNS = [
|
|
12
|
+
"id",
|
|
13
|
+
"title",
|
|
14
|
+
"content",
|
|
15
|
+
"type",
|
|
16
|
+
"level",
|
|
17
|
+
"scope",
|
|
18
|
+
"scope_depts",
|
|
19
|
+
"status",
|
|
20
|
+
"publisher_id",
|
|
21
|
+
"published_at",
|
|
22
|
+
"created_at",
|
|
23
|
+
"updated_at",
|
|
24
|
+
"deleted_at",
|
|
25
|
+
];
|
|
9
26
|
export class NoticeRepository {
|
|
10
27
|
async findById(noticeId) {
|
|
11
28
|
return (await knex(N)
|
|
@@ -24,7 +41,7 @@ export class NoticeRepository {
|
|
|
24
41
|
async softDelete(id) {
|
|
25
42
|
await knex(N).where("id", id).update({ deleted_at: knex.fn.now() });
|
|
26
43
|
}
|
|
27
|
-
async listEmployee(page, size, keyword, type, status) {
|
|
44
|
+
async listEmployee(page, size, keyword, type, status, sortBy, sortOrder) {
|
|
28
45
|
let query = knex(N).whereNull("deleted_at");
|
|
29
46
|
let countQuery = knex(N).whereNull("deleted_at");
|
|
30
47
|
if (keyword) {
|
|
@@ -40,8 +57,7 @@ export class NoticeRepository {
|
|
|
40
57
|
query = query.where("status", status);
|
|
41
58
|
countQuery = countQuery.where("status", status);
|
|
42
59
|
}
|
|
43
|
-
const items = (await query
|
|
44
|
-
.orderBy("id", "desc")
|
|
60
|
+
const items = (await applySort(query, sortBy, sortOrder, NOTICE_SORTABLE_COLUMNS, [["id", "desc"]])
|
|
45
61
|
.offset((page - 1) * size)
|
|
46
62
|
.limit(size));
|
|
47
63
|
const totalRow = await countQuery.count({ c: "*" }).first();
|
|
@@ -104,12 +120,11 @@ export class NoticeRepository {
|
|
|
104
120
|
}
|
|
105
121
|
return unreadIds.length;
|
|
106
122
|
}
|
|
107
|
-
async listMyMessages(adminId, page, size, isRead) {
|
|
108
|
-
const allItems = (await knex(N)
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
.orderBy("id", "desc"));
|
|
123
|
+
async listMyMessages(adminId, page, size, isRead, sortBy, sortOrder) {
|
|
124
|
+
const allItems = (await applySort(knex(N).where("status", 1).whereNull("deleted_at"), sortBy, sortOrder, NOTICE_SORTABLE_COLUMNS, [
|
|
125
|
+
["published_at", "desc"],
|
|
126
|
+
["id", "desc"],
|
|
127
|
+
]));
|
|
113
128
|
const allIds = allItems.map((n) => n.id);
|
|
114
129
|
const readSet = await this.getReadAdminIds(allIds, adminId);
|
|
115
130
|
let filtered;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../../reglow/modules/notice/repository.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../../reglow/modules/notice/repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ export declare class NoticeService {
|
|
|
22
22
|
repo: NoticeRepository;
|
|
23
23
|
buildResponse(notice: Notice, isRead?: boolean, readCount?: number, publisherName?: string | null): Promise<NoticeResponseDto>;
|
|
24
24
|
getNotice(noticeId: number): Promise<Notice>;
|
|
25
|
-
listEmployee(page: number, size: number, keyword: string | null, type: number | null, status: number | null): Promise<{
|
|
25
|
+
listEmployee(page: number, size: number, keyword: string | null, type: number | null, status: number | null, sortBy?: string | null, sortOrder?: string | null): Promise<{
|
|
26
26
|
items: NoticeResponseDto[];
|
|
27
27
|
total: number;
|
|
28
28
|
}>;
|
|
@@ -32,7 +32,7 @@ export declare class NoticeService {
|
|
|
32
32
|
delete(noticeId: number): Promise<void>;
|
|
33
33
|
publish(noticeId: number, publisherId: number): Promise<NoticeResponseDto>;
|
|
34
34
|
revoke(noticeId: number): Promise<NoticeResponseDto>;
|
|
35
|
-
listMy(adminId: number, page: number, size: number, isRead: boolean | null): Promise<{
|
|
35
|
+
listMy(adminId: number, page: number, size: number, isRead: boolean | null, sortBy?: string | null, sortOrder?: string | null): Promise<{
|
|
36
36
|
items: NoticeResponseDto[];
|
|
37
37
|
total: number;
|
|
38
38
|
}>;
|
|
@@ -57,8 +57,8 @@ export class NoticeService {
|
|
|
57
57
|
throw new AppException(ErrorCode.NOTICE_NOT_FOUND, "通知不存在", 404);
|
|
58
58
|
return notice;
|
|
59
59
|
}
|
|
60
|
-
async listEmployee(page, size, keyword, type, status) {
|
|
61
|
-
const { items, total } = await this.repo.listEmployee(page, size, keyword, type, status);
|
|
60
|
+
async listEmployee(page, size, keyword, type, status, sortBy, sortOrder) {
|
|
61
|
+
const { items, total } = await this.repo.listEmployee(page, size, keyword, type, status, sortBy, sortOrder);
|
|
62
62
|
const result = [];
|
|
63
63
|
for (const item of items) {
|
|
64
64
|
result.push(await this.buildResponse(item));
|
|
@@ -90,7 +90,14 @@ export class NoticeService {
|
|
|
90
90
|
throw new AppException(ErrorCode.NOTICE_NOT_FOUND, "已发布的通知不可直接编辑,请先撤回");
|
|
91
91
|
}
|
|
92
92
|
const updateData = {};
|
|
93
|
-
for (const field of [
|
|
93
|
+
for (const field of [
|
|
94
|
+
"title",
|
|
95
|
+
"content",
|
|
96
|
+
"type",
|
|
97
|
+
"level",
|
|
98
|
+
"scope",
|
|
99
|
+
"scope_depts",
|
|
100
|
+
]) {
|
|
94
101
|
const v = data[field];
|
|
95
102
|
if (v !== undefined && v !== null)
|
|
96
103
|
updateData[field] = v;
|
|
@@ -123,13 +130,15 @@ export class NoticeService {
|
|
|
123
130
|
return this.buildResponse(updated);
|
|
124
131
|
}
|
|
125
132
|
// ── 我的消息 ──
|
|
126
|
-
async listMy(adminId, page, size, isRead) {
|
|
127
|
-
const { items, total, readSet } = await this.repo.listMyMessages(adminId, page, size, isRead);
|
|
128
|
-
const publisherIds = Array.from(new Set(items
|
|
133
|
+
async listMy(adminId, page, size, isRead, sortBy, sortOrder) {
|
|
134
|
+
const { items, total, readSet } = await this.repo.listMyMessages(adminId, page, size, isRead, sortBy, sortOrder);
|
|
135
|
+
const publisherIds = Array.from(new Set(items
|
|
136
|
+
.map((n) => n.publisher_id)
|
|
137
|
+
.filter((id) => Boolean(id))));
|
|
129
138
|
const publisherMap = await employeeNames(publisherIds);
|
|
130
139
|
const result = [];
|
|
131
140
|
for (const n of items) {
|
|
132
|
-
result.push(await this.buildResponse(n, readSet.has(n.id), undefined, n.publisher_id ? publisherMap.get(n.publisher_id) ?? null : null));
|
|
141
|
+
result.push(await this.buildResponse(n, readSet.has(n.id), undefined, n.publisher_id ? (publisherMap.get(n.publisher_id) ?? null) : null));
|
|
133
142
|
}
|
|
134
143
|
return { items: result, total };
|
|
135
144
|
}
|