@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
|
@@ -3,7 +3,31 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import { knex } from "../../core/database.js";
|
|
5
5
|
import { DICT_TYPE_TABLE, DICT_DATA_TABLE } from "./model.js";
|
|
6
|
+
import { applySort } from "../../common/sort.js";
|
|
6
7
|
import { mapTimestamp } from "../../common/serialize.js";
|
|
8
|
+
/** sys_dict_type 表可排序列白名单(自有列,无敏感列) */
|
|
9
|
+
export const DICT_TYPE_SORTABLE_COLUMNS = [
|
|
10
|
+
"id",
|
|
11
|
+
"name",
|
|
12
|
+
"code",
|
|
13
|
+
"source",
|
|
14
|
+
"status",
|
|
15
|
+
"remark",
|
|
16
|
+
"created_at",
|
|
17
|
+
"updated_at",
|
|
18
|
+
];
|
|
19
|
+
/** sys_dict_data 表可排序列白名单(自有列,无敏感列) */
|
|
20
|
+
export const DICT_DATA_SORTABLE_COLUMNS = [
|
|
21
|
+
"id",
|
|
22
|
+
"type_id",
|
|
23
|
+
"label",
|
|
24
|
+
"value",
|
|
25
|
+
"sort",
|
|
26
|
+
"status",
|
|
27
|
+
"remark",
|
|
28
|
+
"created_at",
|
|
29
|
+
"updated_at",
|
|
30
|
+
];
|
|
7
31
|
export class DictRepository {
|
|
8
32
|
// ── DictType ──
|
|
9
33
|
async findTypeById(typeId) {
|
|
@@ -12,7 +36,7 @@ export class DictRepository {
|
|
|
12
36
|
async findTypeByCode(code) {
|
|
13
37
|
return (await knex(DICT_TYPE_TABLE).where("code", code).first());
|
|
14
38
|
}
|
|
15
|
-
async listTypes(page, size, keyword, status) {
|
|
39
|
+
async listTypes(page, size, keyword, status, sortBy, sortOrder) {
|
|
16
40
|
let query = knex(DICT_TYPE_TABLE);
|
|
17
41
|
let countQuery = knex(DICT_TYPE_TABLE);
|
|
18
42
|
if (keyword) {
|
|
@@ -24,8 +48,7 @@ export class DictRepository {
|
|
|
24
48
|
query = query.where("status", status);
|
|
25
49
|
countQuery = countQuery.where("status", status);
|
|
26
50
|
}
|
|
27
|
-
const items = (await query
|
|
28
|
-
.orderBy("id", "desc")
|
|
51
|
+
const items = (await applySort(query, sortBy, sortOrder, DICT_TYPE_SORTABLE_COLUMNS, [["id", "desc"]])
|
|
29
52
|
.offset((page - 1) * size)
|
|
30
53
|
.limit(size));
|
|
31
54
|
const totalRow = await countQuery.count({ c: "*" }).first();
|
|
@@ -57,10 +80,8 @@ export class DictRepository {
|
|
|
57
80
|
return Number(r.c) > 0;
|
|
58
81
|
}
|
|
59
82
|
// ── DictData ──
|
|
60
|
-
async listData(typeId, page, size) {
|
|
61
|
-
const items = (await knex(DICT_DATA_TABLE)
|
|
62
|
-
.where("type_id", typeId)
|
|
63
|
-
.orderBy("sort", "asc")
|
|
83
|
+
async listData(typeId, page, size, sortBy, sortOrder) {
|
|
84
|
+
const items = (await applySort(knex(DICT_DATA_TABLE).where("type_id", typeId), sortBy, sortOrder, DICT_DATA_SORTABLE_COLUMNS, [["sort", "asc"]])
|
|
64
85
|
.offset((page - 1) * size)
|
|
65
86
|
.limit(size));
|
|
66
87
|
const totalRow = await knex(DICT_DATA_TABLE)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../../reglow/modules/dict/repository.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAGzD,MAAM,OAAO,cAAc;IACzB,iBAAiB;IACjB,KAAK,CAAC,YAAY,CAAC,MAAc;QAC/B,OAAO,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,KAAK,EAAE,CAElD,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,IAAY;QAC/B,OAAO,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,KAAK,EAAE,CAElD,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,SAAS,CACb,IAAY,EACZ,IAAY,EACZ,OAAsB,EACtB,MAAqB;
|
|
1
|
+
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../../reglow/modules/dict/repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,11 +3,11 @@ import type { CreateDictTypeBody, CreateDictDataBody } from "./schema.js";
|
|
|
3
3
|
export declare class DictService {
|
|
4
4
|
private repo;
|
|
5
5
|
constructor();
|
|
6
|
-
listTypes(page: number, size: number, keyword: string | null, status: number | null): Promise<[DictType[], number]>;
|
|
6
|
+
listTypes(page: number, size: number, keyword: string | null, status: number | null, sortBy?: string | null, sortOrder?: string | null): Promise<[DictType[], number]>;
|
|
7
7
|
createType(data: CreateDictTypeBody): Promise<DictType>;
|
|
8
8
|
updateType(typeId: number, data: Record<string, unknown>, isSuperAdmin?: boolean): Promise<DictType | undefined>;
|
|
9
9
|
deleteType(typeId: number, isSuperAdmin?: boolean): Promise<void>;
|
|
10
|
-
listData(typeId: number, page: number, size: number): Promise<[DictData[], number]>;
|
|
10
|
+
listData(typeId: number, page: number, size: number, sortBy?: string | null, sortOrder?: string | null): Promise<[DictData[], number]>;
|
|
11
11
|
createData(data: CreateDictDataBody): Promise<DictData>;
|
|
12
12
|
updateData(dataId: number, data: Record<string, unknown>, isSuperAdmin?: boolean): Promise<DictData | undefined>;
|
|
13
13
|
deleteData(dataId: number, isSuperAdmin?: boolean): Promise<void>;
|
|
@@ -10,8 +10,8 @@ export class DictService {
|
|
|
10
10
|
this.repo = new DictRepository();
|
|
11
11
|
}
|
|
12
12
|
// ── DictType ──
|
|
13
|
-
async listTypes(page, size, keyword, status) {
|
|
14
|
-
return this.repo.listTypes(page, size, keyword, status);
|
|
13
|
+
async listTypes(page, size, keyword, status, sortBy, sortOrder) {
|
|
14
|
+
return this.repo.listTypes(page, size, keyword, status, sortBy, sortOrder);
|
|
15
15
|
}
|
|
16
16
|
async createType(data) {
|
|
17
17
|
if (await this.repo.findTypeByCode(data.code)) {
|
|
@@ -43,8 +43,8 @@ export class DictService {
|
|
|
43
43
|
await this.repo.deleteType(typeId);
|
|
44
44
|
}
|
|
45
45
|
// ── DictData ──
|
|
46
|
-
async listData(typeId, page, size) {
|
|
47
|
-
return this.repo.listData(typeId, page, size);
|
|
46
|
+
async listData(typeId, page, size, sortBy, sortOrder) {
|
|
47
|
+
return this.repo.listData(typeId, page, size, sortBy, sortOrder);
|
|
48
48
|
}
|
|
49
49
|
async createData(data) {
|
|
50
50
|
const typeObj = await this.repo.findTypeById(data.type_id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../reglow/modules/dict/service.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAI3C,MAAM,OAAO,WAAW;IACd,IAAI,CAAiB;IAE7B;QACE,IAAI,CAAC,IAAI,GAAG,IAAI,cAAc,EAAE,CAAC;IACnC,CAAC;IAED,iBAAiB;IACjB,KAAK,CAAC,SAAS,CACb,IAAY,EACZ,IAAY,EACZ,OAAsB,EACtB,MAAqB;
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../reglow/modules/dict/service.ts"],"names":[],"mappings":"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"}
|
|
@@ -107,7 +107,7 @@ export async function employeeRoutes(fastify, _opts) {
|
|
|
107
107
|
dept_ids,
|
|
108
108
|
has_dept,
|
|
109
109
|
exclude_super,
|
|
110
|
-
});
|
|
110
|
+
}, query.sort_by || null, query.sort_order || null);
|
|
111
111
|
return ApiResponse.success(new PageData(items.map((e) => toListDto(e)), total, page, size));
|
|
112
112
|
});
|
|
113
113
|
// 创建员工
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../../reglow/modules/employee/controller.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../../reglow/modules/employee/controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import type { Employee } from "../../core/entities.js";
|
|
2
|
+
/** sys_employee 表可排序列白名单(自有列,排除 password_hash 等敏感列与 join 列) */
|
|
3
|
+
export declare const EMPLOYEE_SORTABLE_COLUMNS: readonly string[];
|
|
2
4
|
export interface EmployeeListFilter {
|
|
3
5
|
keyword?: string | null;
|
|
4
6
|
status?: number | null;
|
|
@@ -15,7 +17,7 @@ export declare class EmployeeRepository {
|
|
|
15
17
|
create(data: Record<string, unknown>): Promise<Employee>;
|
|
16
18
|
update(id: number, data: Record<string, unknown>): Promise<Employee>;
|
|
17
19
|
softDelete(id: number): Promise<void>;
|
|
18
|
-
findAll(page: number, size: number, f: EmployeeListFilter): Promise<{
|
|
20
|
+
findAll(page: number, size: number, f: EmployeeListFilter, sortBy?: string | null, sortOrder?: string | null): Promise<{
|
|
19
21
|
items: Employee[];
|
|
20
22
|
total: number;
|
|
21
23
|
}>;
|
|
@@ -4,8 +4,41 @@
|
|
|
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 E = ModelRegistry.get("Employee");
|
|
8
9
|
const ED = ModelRegistry.get("EmployeeDept");
|
|
10
|
+
/** sys_employee 表可排序列白名单(自有列,排除 password_hash 等敏感列与 join 列) */
|
|
11
|
+
export const EMPLOYEE_SORTABLE_COLUMNS = [
|
|
12
|
+
"id",
|
|
13
|
+
"username",
|
|
14
|
+
"nickname",
|
|
15
|
+
"real_name",
|
|
16
|
+
"avatar",
|
|
17
|
+
"gender",
|
|
18
|
+
"email",
|
|
19
|
+
"phone",
|
|
20
|
+
"employee_no",
|
|
21
|
+
"dept_id",
|
|
22
|
+
"post_ids",
|
|
23
|
+
"superior_id",
|
|
24
|
+
"entry_date",
|
|
25
|
+
"work_status",
|
|
26
|
+
"employment_type",
|
|
27
|
+
"job_level",
|
|
28
|
+
"job_position",
|
|
29
|
+
"job_title",
|
|
30
|
+
"status",
|
|
31
|
+
"is_agent",
|
|
32
|
+
"is_super_admin",
|
|
33
|
+
"login_fail_count",
|
|
34
|
+
"lock_until",
|
|
35
|
+
"last_login_at",
|
|
36
|
+
"last_login_ip",
|
|
37
|
+
"remark",
|
|
38
|
+
"created_at",
|
|
39
|
+
"updated_at",
|
|
40
|
+
"deleted_at",
|
|
41
|
+
];
|
|
9
42
|
export class EmployeeRepository {
|
|
10
43
|
async findById(id) {
|
|
11
44
|
return (await knex(E)
|
|
@@ -36,7 +69,7 @@ export class EmployeeRepository {
|
|
|
36
69
|
async softDelete(id) {
|
|
37
70
|
await knex(E).where("id", id).update({ deleted_at: knex.fn.now() });
|
|
38
71
|
}
|
|
39
|
-
async findAll(page, size, f) {
|
|
72
|
+
async findAll(page, size, f, sortBy, sortOrder) {
|
|
40
73
|
const query = knex(E).whereNull(`${E}.deleted_at`);
|
|
41
74
|
const countQuery = knex(E).whereNull(`${E}.deleted_at`);
|
|
42
75
|
if (f.exclude_super) {
|
|
@@ -115,9 +148,7 @@ export class EmployeeRepository {
|
|
|
115
148
|
query.leftJoin(ED, `${ED}.employee_id`, `${E}.id`).where(noDept);
|
|
116
149
|
countQuery.leftJoin(ED, `${ED}.employee_id`, `${E}.id`).where(noDept);
|
|
117
150
|
}
|
|
118
|
-
const items = (await query
|
|
119
|
-
.select(`${E}.*`)
|
|
120
|
-
.orderBy(`${E}.id`, "desc")
|
|
151
|
+
const items = (await applySort(query.select(`${E}.*`), sortBy, sortOrder, EMPLOYEE_SORTABLE_COLUMNS, [[`${E}.id`, "desc"]], E)
|
|
121
152
|
.offset((page - 1) * size)
|
|
122
153
|
.limit(size));
|
|
123
154
|
const totalRow = (await countQuery
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../../reglow/modules/employee/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/employee/repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@ export declare class EmployeeService {
|
|
|
18
18
|
dept_ids?: number[] | null;
|
|
19
19
|
has_dept?: boolean | null;
|
|
20
20
|
exclude_super?: boolean;
|
|
21
|
-
}): Promise<{
|
|
21
|
+
}, sortBy?: string | null, sortOrder?: string | null): Promise<{
|
|
22
22
|
items: Array<Employee & {
|
|
23
23
|
dept_ids: number[];
|
|
24
24
|
}>;
|
|
@@ -146,8 +146,8 @@ export class EmployeeService {
|
|
|
146
146
|
await this.repo.softDelete(employeeId);
|
|
147
147
|
invalidateEmployeeCache(employeeId);
|
|
148
148
|
}
|
|
149
|
-
async listEmployees(page, size, filters) {
|
|
150
|
-
const { items, total } = await this.repo.findAll(page, size, filters);
|
|
149
|
+
async listEmployees(page, size, filters, sortBy, sortOrder) {
|
|
150
|
+
const { items, total } = await this.repo.findAll(page, size, filters, sortBy, sortOrder);
|
|
151
151
|
if (items.length) {
|
|
152
152
|
const ids = items.map((e) => e.id);
|
|
153
153
|
const rows = (await knex(ED)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../reglow/modules/employee/service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../reglow/modules/employee/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,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAIrD,MAAM,EAAE,GAAG,aAAa,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;AAC7C,MAAM,EAAE,GAAG,aAAa,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;AAO7C,SAAS,sBAAsB,CAAC,QAAgB;IAC9C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,YAAY,CAAC,SAAS,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;IAC/D,CAAC;AACH,CAAC;AAED,MAAM,OAAO,eAAe;IAClB,IAAI,GAAG,IAAI,kBAAkB,EAAE,CAAC;IAExC,KAAK,CAAC,WAAW,CAAC,UAAkB;QAClC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACtD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,YAAY,CAAC,SAAS,CAAC,kBAAkB,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QACrE,CAAC;QACD,MAAM,OAAO,GACX,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAGnE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QACxB,MAAM,OAAO,GACX,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAGnE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QACxB,OAAO,EAAE,GAAG,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,IAAwB;QAC3C,sBAAsB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEtC,IAAI,MAAM,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAClD,MAAM,IAAI,YAAY,CAAC,SAAS,CAAC,wBAAwB,EAAE,QAAQ,CAAC,CAAC;QACvE,CAAC;QACD,IAAI,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YAC5D,MAAM,IAAI,YAAY,CAAC,SAAS,CAAC,qBAAqB,EAAE,QAAQ,CAAC,CAAC;QACpE,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;YACtC,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,aAAa,EAAE,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC;YAC1C,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI,IAAI;YAC/B,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,IAAI;YACjC,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,CAAC;YACxB,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,IAAI;YACzB,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,IAAI;YACzB,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,IAAI;YACrC,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,IAAI;YAC7B,QAAQ,EACN,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI;YACxE,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,IAAI;YACrC,eAAe,EAAE,IAAI,CAAC,eAAe,IAAI,CAAC;YAC1C,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,IAAI;YACjC,YAAY,EAAE,IAAI,CAAC,YAAY,IAAI,IAAI;YACvC,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,IAAI;YACjC,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,IAAI;YACnC,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,CAAC;YAClC,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI,KAAK;YAChC,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,IAAI;SAC5B,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAC1C,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,CACnB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,CACzE,CAAC;QACJ,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,GAAG,CAAS,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;QAC3D,IAAI,IAAI,CAAC,OAAO;YAAE,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,aAAa,CAAC,IAAI,EAAE,CAAC;YACvB,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,CACnB,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBACtC,WAAW,EAAE,QAAQ,CAAC,EAAE;gBACxB,OAAO,EAAE,GAAG;aACb,CAAC,CAAC,CACJ,CAAC;QACJ,CAAC;QAED,qDAAqD;QACrD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,UAAkB,EAClB,IAAwB;QAExB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAEpD,MAAM,UAAU,GAA4B,EAAE,CAAC;QAC/C,KAAK,MAAM,KAAK,IAAI;YAClB,UAAU;YACV,WAAW;YACX,OAAO;YACP,OAAO;YACP,QAAQ;YACR,SAAS;YACT,aAAa;YACb,iBAAiB;YACjB,WAAW;YACX,cAAc;YACd,WAAW;YACX,YAAY;YACZ,aAAa;YACb,QAAQ;YACR,QAAQ;YACR,aAAa;YACb,QAAQ;SACT,EAAE,CAAC;YACF,MAAM,CAAC,GAAI,IAAgC,CAAC,KAAK,CAAC,CAAC;YACnD,IAAI,CAAC,KAAK,SAAS;gBAAE,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC7C,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;YAC1D,UAAU,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnD,CAAC;QACD,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,EAAE,CAAC;YACnC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QACjD,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAChC,IAAI,QAAQ,CAAC,cAAc,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;gBACrE,MAAM,IAAI,YAAY,CACpB,SAAS,CAAC,iBAAiB,EAC3B,oBAAoB,CACrB,CAAC;YACJ,CAAC;YACD,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC,MAAM,EAAE,CAAC;YACzD,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;gBAC1C,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,CACnB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;oBAC1B,WAAW,EAAE,UAAU;oBACvB,OAAO,EAAE,GAAG;iBACb,CAAC,CAAC,CACJ,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAChC,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC,MAAM,EAAE,CAAC;YACzD,MAAM,MAAM,GAAG,IAAI,GAAG,CAAS,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;YACpD,IAAI,IAAI,CAAC,OAAO;gBAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC3C,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;gBAChB,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,CACnB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;oBAC/B,WAAW,EAAE,UAAU;oBACvB,OAAO,EAAE,GAAG;iBACb,CAAC,CAAC,CACJ,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YACtC,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC,MAAM,EAAE,CAAC;YACzD,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;gBACjB,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YAC5E,CAAC;QACH,CAAC;QAED,uBAAuB,CAAC,UAAU,CAAC,CAAC;QACpC,6CAA6C;QAC7C,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,UAAkB;QACrC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QACpD,IAAI,QAAQ,CAAC,cAAc,EAAE,CAAC;YAC5B,MAAM,IAAI,YAAY,CAAC,SAAS,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;QACnE,CAAC;QACD,qCAAqC;QACrC,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC,MAAM,EAAE,CAAC;QACzD,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACvC,uBAAuB,CAAC,UAAU,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,IAAY,EACZ,IAAY,EACZ,OAQC,EACD,MAAsB,EACtB,SAAyB;QAEzB,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAC9C,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,MAAM,EACN,SAAS,CACV,CAAC;QACF,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACnC,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;iBACzB,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC;iBAC3B,MAAM,CAAC,aAAa,EAAE,SAAS,CAAC,CAGjC,CAAC;YACH,MAAM,OAAO,GAAG,IAAI,GAAG,EAAoB,CAAC;YAC5C,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;gBACrB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;gBAC7C,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;gBACpB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;YAClC,CAAC;YACD,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;gBACrB,CAAuC,CAAC,QAAQ;oBAC/C,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;YAC5B,CAAC;QACH,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,KAAiD,EAAE,KAAK,EAAE,CAAC;IAC7E,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,UAAkB,EAAE,MAAc;QACnD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QACpD,IAAI,QAAQ,CAAC,cAAc,EAAE,CAAC;YAC5B,MAAM,IAAI,YAAY,CAAC,SAAS,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;QACnE,CAAC;QACD,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAC/C,uBAAuB,CAAC,UAAU,CAAC,CAAC;QACpC,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,UAAkB,EAAE,WAAmB;QACzD,sBAAsB,CAAC,WAAW,CAAC,CAAC;QACpC,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QACnC,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACxC,aAAa,EAAE,YAAY,CAAC,WAAW,CAAC;SACzC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,UAAkB;QAC7B,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QACnC,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACxC,gBAAgB,EAAE,CAAC;YACnB,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;IACL,CAAC;CACF"}
|
|
@@ -2,9 +2,41 @@ import { knex } from "../../core/database.js";
|
|
|
2
2
|
import { ModelRegistry } from "../../core/models.js";
|
|
3
3
|
import { ApiResponse, PageData } from "../../common/response.js";
|
|
4
4
|
import { mapTimestamp } from "../../common/serialize.js";
|
|
5
|
+
import { applySort } from "../../common/sort.js";
|
|
5
6
|
import { resolveVisibility, applyVisibility } from "./data-scope.js";
|
|
6
7
|
const OL = ModelRegistry.get("OperationLog");
|
|
7
8
|
const LL = ModelRegistry.get("LoginLog");
|
|
9
|
+
/** sys_operation_log 表可排序列白名单(自有列,无敏感列) */
|
|
10
|
+
const OPERATION_LOG_SORTABLE_COLUMNS = [
|
|
11
|
+
"id",
|
|
12
|
+
"admin_id",
|
|
13
|
+
"admin_name",
|
|
14
|
+
"module",
|
|
15
|
+
"action",
|
|
16
|
+
"method",
|
|
17
|
+
"url",
|
|
18
|
+
"params",
|
|
19
|
+
"result",
|
|
20
|
+
"ip",
|
|
21
|
+
"user_agent",
|
|
22
|
+
"detail",
|
|
23
|
+
"created_at",
|
|
24
|
+
];
|
|
25
|
+
/** sys_login_log 表可排序列白名单(自有列,无敏感列) */
|
|
26
|
+
const LOGIN_LOG_SORTABLE_COLUMNS = [
|
|
27
|
+
"id",
|
|
28
|
+
"admin_id",
|
|
29
|
+
"username",
|
|
30
|
+
"status",
|
|
31
|
+
"ip",
|
|
32
|
+
"location",
|
|
33
|
+
"browser",
|
|
34
|
+
"os",
|
|
35
|
+
"device_type",
|
|
36
|
+
"session_id",
|
|
37
|
+
"message",
|
|
38
|
+
"created_at",
|
|
39
|
+
];
|
|
8
40
|
function int(v, def) {
|
|
9
41
|
const n = parseInt(String(v), 10);
|
|
10
42
|
return Number.isNaN(n) ? def : n;
|
|
@@ -57,7 +89,10 @@ function toLoginLogDto(l) {
|
|
|
57
89
|
}
|
|
58
90
|
export async function logRoutes(fastify, _opts) {
|
|
59
91
|
// 操作日志列表
|
|
60
|
-
fastify.get("/operations", {
|
|
92
|
+
fastify.get("/operations", {
|
|
93
|
+
schema: { summary: "操作日志列表" },
|
|
94
|
+
preHandler: [fastify.requirePermission("operation:log:operation")],
|
|
95
|
+
}, async (request) => {
|
|
61
96
|
const employee = request.currentEmployee;
|
|
62
97
|
const query = request.query;
|
|
63
98
|
const page = Math.max(1, int(query.page, 1));
|
|
@@ -81,8 +116,7 @@ export async function logRoutes(fastify, _opts) {
|
|
|
81
116
|
applyVisibility(cq, `${OL}.admin_id`, employee, vis);
|
|
82
117
|
const items = empty
|
|
83
118
|
? []
|
|
84
|
-
: (await q
|
|
85
|
-
.orderBy(`${OL}.id`, "desc")
|
|
119
|
+
: (await applySort(q, query.sort_by || null, query.sort_order || null, OPERATION_LOG_SORTABLE_COLUMNS, [[`${OL}.id`, "desc"]])
|
|
86
120
|
.offset((page - 1) * size)
|
|
87
121
|
.limit(size));
|
|
88
122
|
let total = 0;
|
|
@@ -93,7 +127,10 @@ export async function logRoutes(fastify, _opts) {
|
|
|
93
127
|
return ApiResponse.success(new PageData(items.map(toOperationLogDto), total, page, size));
|
|
94
128
|
});
|
|
95
129
|
// 操作日志详情
|
|
96
|
-
fastify.get("/operations/:log_id", {
|
|
130
|
+
fastify.get("/operations/:log_id", {
|
|
131
|
+
schema: { summary: "操作日志详情" },
|
|
132
|
+
preHandler: [fastify.requirePermission("operation:log:operation")],
|
|
133
|
+
}, async (request) => {
|
|
97
134
|
const employee = request.currentEmployee;
|
|
98
135
|
const id = int(request.params.log_id, 0);
|
|
99
136
|
const q = knex(OL).where(`${OL}.id`, id);
|
|
@@ -105,7 +142,10 @@ export async function logRoutes(fastify, _opts) {
|
|
|
105
142
|
return ApiResponse.success(toOperationLogDetailDto(log));
|
|
106
143
|
});
|
|
107
144
|
// 登录日志列表
|
|
108
|
-
fastify.get("/logins", {
|
|
145
|
+
fastify.get("/logins", {
|
|
146
|
+
schema: { summary: "登录日志列表" },
|
|
147
|
+
preHandler: [fastify.requirePermission("operation:log:login")],
|
|
148
|
+
}, async (request) => {
|
|
109
149
|
const employee = request.currentEmployee;
|
|
110
150
|
const query = request.query;
|
|
111
151
|
const page = Math.max(1, int(query.page, 1));
|
|
@@ -124,8 +164,7 @@ export async function logRoutes(fastify, _opts) {
|
|
|
124
164
|
applyVisibility(cq, `${LL}.admin_id`, employee, vis);
|
|
125
165
|
const items = empty
|
|
126
166
|
? []
|
|
127
|
-
: (await q
|
|
128
|
-
.orderBy(`${LL}.id`, "desc")
|
|
167
|
+
: (await applySort(q, query.sort_by || null, query.sort_order || null, LOGIN_LOG_SORTABLE_COLUMNS, [[`${LL}.id`, "desc"]])
|
|
129
168
|
.offset((page - 1) * size)
|
|
130
169
|
.limit(size));
|
|
131
170
|
const total = empty
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../../reglow/modules/log/controller.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../../reglow/modules/log/controller.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAErE,MAAM,EAAE,GAAG,aAAa,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;AAC7C,MAAM,EAAE,GAAG,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;AAEzC,2CAA2C;AAC3C,MAAM,8BAA8B,GAAsB;IACxD,IAAI;IACJ,UAAU;IACV,YAAY;IACZ,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,KAAK;IACL,QAAQ;IACR,QAAQ;IACR,IAAI;IACJ,YAAY;IACZ,QAAQ;IACR,YAAY;CACb,CAAC;AAEF,uCAAuC;AACvC,MAAM,0BAA0B,GAAsB;IACpD,IAAI;IACJ,UAAU;IACV,UAAU;IACV,QAAQ;IACR,IAAI;IACJ,UAAU;IACV,SAAS;IACT,IAAI;IACJ,aAAa;IACb,YAAY;IACZ,SAAS;IACT,YAAY;CACb,CAAC;AAEF,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,WAAW,CAAC,CAAU;IAC7B,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IAC/C,IAAI,OAAO,CAAC,KAAK,QAAQ;QAAE,OAAO,CAAC,CAAC;IACpC,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,CAAC;IACX,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,CAAe;IACxC,OAAO,YAAY,CACjB;QACE,EAAE,EAAE,CAAC,CAAC,EAAE;QACR,QAAQ,EAAE,CAAC,CAAC,QAAQ,IAAI,IAAI;QAC5B,UAAU,EAAE,CAAC,CAAC,UAAU,IAAI,IAAI;QAChC,MAAM,EAAE,CAAC,CAAC,MAAM,IAAI,IAAI;QACxB,MAAM,EAAE,CAAC,CAAC,MAAM,IAAI,IAAI;QACxB,MAAM,EAAE,CAAC,CAAC,MAAM,IAAI,IAAI;QACxB,GAAG,EAAE,CAAC,CAAC,GAAG,IAAI,IAAI;QAClB,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,IAAI;QAChB,UAAU,EAAE,CAAC,CAAC,UAAU,IAAI,IAAI;KACjC,EACD,CAAC,YAAY,CAAC,CACf,CAAC;AACJ,CAAC;AAED,SAAS,uBAAuB,CAAC,CAAe;IAC9C,OAAO;QACL,GAAG,iBAAiB,CAAC,CAAC,CAAC;QACvB,MAAM,EAAE,CAAC,CAAC,MAAM,IAAI,IAAI;QACxB,MAAM,EAAE,CAAC,CAAC,MAAM,IAAI,IAAI;QACxB,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC;KAC9B,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,CAAW;IAChC,OAAO,YAAY,CACjB;QACE,EAAE,EAAE,CAAC,CAAC,EAAE;QACR,QAAQ,EAAE,CAAC,CAAC,QAAQ,IAAI,IAAI;QAC5B,QAAQ,EAAE,CAAC,CAAC,QAAQ,IAAI,IAAI;QAC5B,MAAM,EAAE,CAAC,CAAC,MAAM,IAAI,IAAI;QACxB,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,IAAI;QAChB,OAAO,EAAE,CAAC,CAAC,OAAO,IAAI,IAAI;QAC1B,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,IAAI;QAChB,OAAO,EAAE,CAAC,CAAC,OAAO,IAAI,IAAI;QAC1B,UAAU,EAAE,CAAC,CAAC,UAAU,IAAI,IAAI;KACjC,EACD,CAAC,YAAY,CAAC,CACf,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,OAAwB,EACxB,KAA8B;IAE9B,SAAS;IACT,OAAO,CAAC,GAAG,CACT,aAAa,EACb;QACE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE;QAC7B,UAAU,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,CAAC;KACnE,EACD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,QAAQ,GAAG,OAAO,CAAC,eAAgB,CAAC;QAC1C,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,YAAY,GAAI,KAAK,CAAC,aAAwB,IAAI,IAAI,CAAC;QAC7D,MAAM,MAAM,GAAI,KAAK,CAAC,MAAiB,IAAI,IAAI,CAAC;QAEhD,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;QACjB,IAAI,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;QAClB,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,IAAI,GAAG,IAAI,YAAY,GAAG,CAAC;YACjC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YACxC,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAC5C,CAAC;QACD,IAAI,MAAM,EAAE,CAAC;YACX,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YAC9B,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAClC,CAAC;QAED,MAAM,GAAG,GAAG,MAAM,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAC9C,MAAM,KAAK,GAAG,eAAe,CAAC,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;QAClE,IAAI,CAAC,KAAK;YAAE,eAAe,CAAC,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;QAEjE,MAAM,KAAK,GAAG,KAAK;YACjB,CAAC,CAAC,EAAE;YACJ,CAAC,CAAE,CAAC,MAAM,SAAS,CACf,CAAC,EACA,KAAK,CAAC,OAAkB,IAAI,IAAI,EAChC,KAAK,CAAC,UAAqB,IAAI,IAAI,EACpC,8BAA8B,EAC9B,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CACvB;iBACE,MAAM,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC;iBACzB,KAAK,CAAC,IAAI,CAAC,CAAoB,CAAC;QACvC,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,QAAQ,GAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,EAAE,CAEvC,CAAC;YACd,KAAK,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QACnC,CAAC;QAED,OAAO,WAAW,CAAC,OAAO,CACxB,IAAI,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAC9D,CAAC;IACJ,CAAC,CACF,CAAC;IAEF,SAAS;IACT,OAAO,CAAC,GAAG,CACT,qBAAqB,EACrB;QACE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE;QAC7B,UAAU,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,CAAC;KACnE,EACD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,QAAQ,GAAG,OAAO,CAAC,eAAgB,CAAC;QAC1C,MAAM,EAAE,GAAG,GAAG,CAAE,OAAO,CAAC,MAA6B,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACjE,MAAM,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QACzC,MAAM,GAAG,GAAG,MAAM,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAC9C,MAAM,KAAK,GAAG,eAAe,CAAC,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;QAClE,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAyB,CAAC;QACtE,IAAI,CAAC,GAAG;YAAE,OAAO,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3C,OAAO,WAAW,CAAC,OAAO,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3D,CAAC,CACF,CAAC;IAEF,SAAS;IACT,OAAO,CAAC,GAAG,CACT,SAAS,EACT;QACE,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE;QAC7B,UAAU,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,qBAAqB,CAAC,CAAC;KAC/D,EACD,KAAK,EAAE,OAAO,EAAE,EAAE;QAChB,MAAM,QAAQ,GAAG,OAAO,CAAC,eAAgB,CAAC;QAC1C,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,QAAQ,GAAI,KAAK,CAAC,QAAmB,IAAI,IAAI,CAAC;QAEpD,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;QACjB,IAAI,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;QAClB,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,IAAI,GAAG,IAAI,QAAQ,GAAG,CAAC;YAC7B,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YACtC,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAC1C,CAAC;QAED,MAAM,GAAG,GAAG,MAAM,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAC9C,MAAM,KAAK,GAAG,eAAe,CAAC,CAAC,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;QAClE,IAAI,CAAC,KAAK;YAAE,eAAe,CAAC,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;QAEjE,MAAM,KAAK,GAAG,KAAK;YACjB,CAAC,CAAC,EAAE;YACJ,CAAC,CAAE,CAAC,MAAM,SAAS,CACf,CAAC,EACA,KAAK,CAAC,OAAkB,IAAI,IAAI,EAChC,KAAK,CAAC,UAAqB,IAAI,IAAI,EACpC,0BAA0B,EAC1B,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CACvB;iBACE,MAAM,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC;iBACzB,KAAK,CAAC,IAAI,CAAC,CAAgB,CAAC;QACnC,MAAM,KAAK,GAAG,KAAK;YACjB,CAAC,CAAC,CAAC;YACH,CAAC,CAAC,MAAM,CACH,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,EAAE,CAA4B,CAAC,CAAC,CACnE,IAAI,CAAC,CAAC;QAEX,OAAO,WAAW,CAAC,OAAO,CACxB,IAAI,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAC1D,CAAC;IACJ,CAAC,CACF,CAAC;AACJ,CAAC"}
|
|
@@ -245,15 +245,21 @@ async function fetchVideosFromPage(url) {
|
|
|
245
245
|
// ── 素材路由 ──
|
|
246
246
|
export async function materialRoutes(fastify) {
|
|
247
247
|
const service = new MaterialService();
|
|
248
|
-
fastify.get("/", {
|
|
248
|
+
fastify.get("/", {
|
|
249
|
+
schema: { summary: "查询素材列表" },
|
|
250
|
+
preHandler: [fastify.requirePermission("system:material:list")],
|
|
251
|
+
}, async (request) => {
|
|
249
252
|
const query = request.query;
|
|
250
253
|
const page = Math.max(1, int(query.page, 1));
|
|
251
254
|
const size = Math.min(100, Math.max(1, int(query.size, 20)));
|
|
252
255
|
await service.moveExpiredToRecycleBin();
|
|
253
|
-
const { items, total } = await service.list(page, size, parseIntList(query.group_ids), toBoolQuery(query.ungrouped), query.type || null, query.source || null, query.keyword || null);
|
|
256
|
+
const { items, total } = await service.list(page, size, parseIntList(query.group_ids), toBoolQuery(query.ungrouped), query.type || null, query.source || null, query.keyword || null, query.sort_by || null, query.sort_order || null);
|
|
254
257
|
return ApiResponse.success(new PageData(items.map(toMaterialDto), total, page, size));
|
|
255
258
|
});
|
|
256
|
-
fastify.get("/sources", {
|
|
259
|
+
fastify.get("/sources", {
|
|
260
|
+
schema: { summary: "查询素材列表" },
|
|
261
|
+
preHandler: [fastify.requirePermission("system:material:list")],
|
|
262
|
+
}, async () => ApiResponse.success(await service.listSources()));
|
|
257
263
|
fastify.post("/upload", { schema: { summary: "上传文件" }, preHandler: [fastify.requireAuth] }, async (request) => {
|
|
258
264
|
const currentEmployee = request.currentEmployee;
|
|
259
265
|
let buffer = null;
|
|
@@ -313,11 +319,14 @@ export async function materialRoutes(fastify) {
|
|
|
313
319
|
const count = await service.assignGroups(body.material_ids, body.group_ids);
|
|
314
320
|
return ApiResponse.success(null, `已更新 ${count} 个素材的分组`);
|
|
315
321
|
});
|
|
316
|
-
fastify.get("/recycle-bin", {
|
|
322
|
+
fastify.get("/recycle-bin", {
|
|
323
|
+
schema: { summary: "查询素材列表" },
|
|
324
|
+
preHandler: [fastify.requirePermission("system:material:list")],
|
|
325
|
+
}, async (request) => {
|
|
317
326
|
const query = request.query;
|
|
318
327
|
const page = Math.max(1, int(query.page, 1));
|
|
319
328
|
const size = Math.min(100, Math.max(1, int(query.size, 20)));
|
|
320
|
-
const { items, total } = await service.listRecycleBin(page, size);
|
|
329
|
+
const { items, total } = await service.listRecycleBin(page, size, query.sort_by || null, query.sort_order || null);
|
|
321
330
|
return ApiResponse.success(new PageData(items.map(toRecycleDto), total, page, size));
|
|
322
331
|
});
|
|
323
332
|
fastify.put("/recycle-bin/restore", {
|
|
@@ -328,7 +337,10 @@ export async function materialRoutes(fastify) {
|
|
|
328
337
|
const count = await service.restore(body.ids);
|
|
329
338
|
return ApiResponse.success(null, `已还原 ${count} 个素材`);
|
|
330
339
|
});
|
|
331
|
-
fastify.delete("/recycle-bin/permanent", {
|
|
340
|
+
fastify.delete("/recycle-bin/permanent", {
|
|
341
|
+
preHandler: [fastify.requireAuth],
|
|
342
|
+
schema: { summary: "删除素材", body: BatchRestoreSchema },
|
|
343
|
+
}, async (request) => {
|
|
332
344
|
const body = request.body;
|
|
333
345
|
const isSuperAdmin = Boolean(request.currentEmployee.is_super_admin);
|
|
334
346
|
const count = await service.permanentDelete(body.ids, isSuperAdmin);
|
|
@@ -359,7 +371,10 @@ export async function materialRoutes(fastify) {
|
|
|
359
371
|
// ── 分组路由 ──
|
|
360
372
|
export async function groupRoutes(fastify) {
|
|
361
373
|
const service = new MaterialService();
|
|
362
|
-
fastify.get("/", {
|
|
374
|
+
fastify.get("/", {
|
|
375
|
+
schema: { summary: "查询素材列表" },
|
|
376
|
+
preHandler: [fastify.requirePermission("system:material:list")],
|
|
377
|
+
}, async () => {
|
|
363
378
|
const { groups, ungrouped_count } = await service.listGroups();
|
|
364
379
|
return ApiResponse.success({
|
|
365
380
|
groups: groups.map(toGroupDto),
|
|
@@ -391,7 +406,10 @@ export async function groupRoutes(fastify) {
|
|
|
391
406
|
const dto = await service.updateGroup(groupId, body);
|
|
392
407
|
return ApiResponse.success(toGroupDto(dto), "更新成功");
|
|
393
408
|
});
|
|
394
|
-
fastify.delete("/:group_id", {
|
|
409
|
+
fastify.delete("/:group_id", {
|
|
410
|
+
schema: { summary: "删除素材" },
|
|
411
|
+
preHandler: [fastify.requirePermission("system:material:delete")],
|
|
412
|
+
}, async (request) => {
|
|
395
413
|
const groupId = int(request.params.group_id, 0);
|
|
396
414
|
await service.deleteGroup(groupId);
|
|
397
415
|
return ApiResponse.success(null, "删除成功");
|