namirasoft-alarm 1.4.4 → 1.4.5
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/dist/NamirasoftAlarmServerAlarm.d.ts +2 -1
- package/dist/NamirasoftAlarmServerAlarm.js +4 -2
- package/dist/NamirasoftAlarmServerAlarm.js.map +1 -1
- package/dist/NamirasoftAlarmServerAlarmCategory.d.ts +2 -1
- package/dist/NamirasoftAlarmServerAlarmCategory.js +4 -2
- package/dist/NamirasoftAlarmServerAlarmCategory.js.map +1 -1
- package/dist/NamirasoftAlarmServerAlarmField.d.ts +2 -1
- package/dist/NamirasoftAlarmServerAlarmField.js +4 -2
- package/dist/NamirasoftAlarmServerAlarmField.js.map +1 -1
- package/dist/NamirasoftAlarmServerAlarmTag.d.ts +2 -1
- package/dist/NamirasoftAlarmServerAlarmTag.js +4 -2
- package/dist/NamirasoftAlarmServerAlarmTag.js.map +1 -1
- package/dist/NamirasoftAlarmServerBase.js +1 -1
- package/dist/command/AlarmCategoryListCommand.js +2 -2
- package/dist/command/AlarmCategoryListCommand.js.map +1 -1
- package/dist/command/AlarmFieldListCommand.js +2 -2
- package/dist/command/AlarmFieldListCommand.js.map +1 -1
- package/dist/command/AlarmListCommand.js +2 -2
- package/dist/command/AlarmListCommand.js.map +1 -1
- package/dist/command/AlarmTagListCommand.js +2 -2
- package/dist/command/AlarmTagListCommand.js.map +1 -1
- package/package.json +3 -3
- package/src/NamirasoftAlarmServerAlarm.ts +4 -2
- package/src/NamirasoftAlarmServerAlarmCategory.ts +4 -2
- package/src/NamirasoftAlarmServerAlarmField.ts +4 -2
- package/src/NamirasoftAlarmServerAlarmTag.ts +4 -2
- package/src/NamirasoftAlarmServerBase.ts +1 -1
- package/src/command/AlarmCategoryListCommand.ts +2 -2
- package/src/command/AlarmFieldListCommand.ts +2 -2
- package/src/command/AlarmListCommand.ts +2 -2
- package/src/command/AlarmTagListCommand.ts +2 -2
|
@@ -2,10 +2,11 @@ import { AlarmInputRow } from "./row/AlarmInputRow";
|
|
|
2
2
|
import { AlarmRow } from "./row/AlarmRow";
|
|
3
3
|
import { FilterItem } from "namirasoft-core";
|
|
4
4
|
import { NamirasoftAlarmServerBase } from "./NamirasoftAlarmServerBase";
|
|
5
|
+
import { SortItem } from "namirasoft-core";
|
|
5
6
|
import { TokenManager } from "namirasoft-account";
|
|
6
7
|
export declare class NamirasoftAlarmServerAlarm extends NamirasoftAlarmServerBase {
|
|
7
8
|
constructor(base_url: string, manager: TokenManager, onError: (error: Error) => void);
|
|
8
|
-
List(filters: FilterItem[] | null, page: (number | null), size: (number | null), user_id: (string | null)): Promise<{
|
|
9
|
+
List(filters: FilterItem[] | null, page: (number | null), size: (number | null), sorts: SortItem[], user_id: (string | null)): Promise<{
|
|
9
10
|
rows: AlarmRow[];
|
|
10
11
|
count: number;
|
|
11
12
|
}>;
|
|
@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.NamirasoftAlarmServerAlarm = void 0;
|
|
13
13
|
const namirasoft_core_1 = require("namirasoft-core");
|
|
14
14
|
const NamirasoftAlarmServerBase_1 = require("./NamirasoftAlarmServerBase");
|
|
15
|
+
const namirasoft_core_2 = require("namirasoft-core");
|
|
15
16
|
class NamirasoftAlarmServerAlarm extends NamirasoftAlarmServerBase_1.NamirasoftAlarmServerBase {
|
|
16
17
|
constructor(base_url, manager, onError) {
|
|
17
18
|
super(base_url, manager, onError);
|
|
@@ -21,11 +22,12 @@ class NamirasoftAlarmServerAlarm extends NamirasoftAlarmServerBase_1.NamirasoftA
|
|
|
21
22
|
this.Update = this.Update.bind(this);
|
|
22
23
|
this.Delete = this.Delete.bind(this);
|
|
23
24
|
}
|
|
24
|
-
List(filters, page, size, user_id) {
|
|
25
|
+
List(filters, page, size, sorts, user_id) {
|
|
25
26
|
return __awaiter(this, void 0, void 0, function* () {
|
|
26
27
|
let filters_string_value = namirasoft_core_1.FilterItem.stringify(filters);
|
|
28
|
+
let sorts_string_value = namirasoft_core_2.SortItem.stringify(sorts);
|
|
27
29
|
let path = `/alarm/list`;
|
|
28
|
-
let { data } = yield this._get(path, { filters: filters_string_value, page, size, user_id });
|
|
30
|
+
let { data } = yield this._get(path, { filters: filters_string_value, page, size, sorts: sorts_string_value, user_id });
|
|
29
31
|
return data;
|
|
30
32
|
});
|
|
31
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NamirasoftAlarmServerAlarm.js","sourceRoot":"","sources":["../src/NamirasoftAlarmServerAlarm.ts"],"names":[],"mappings":";;;;;;;;;;;;AAsBA,qDAA6C;AAC7C,2EAAwE;
|
|
1
|
+
{"version":3,"file":"NamirasoftAlarmServerAlarm.js","sourceRoot":"","sources":["../src/NamirasoftAlarmServerAlarm.ts"],"names":[],"mappings":";;;;;;;;;;;;AAsBA,qDAA6C;AAC7C,2EAAwE;AACxE,qDAA2C;AAG3C,MAAa,0BAA2B,SAAQ,qDAAyB;IAErE,YAAY,QAAgB,EAAE,OAAqB,EAAE,OAA+B;QAEhF,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAClC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IACK,IAAI,CAAC,OAA4B,EAAE,IAAqB,EAAE,IAAqB,EAAE,KAAiB,EAAE,OAAwB;;YAE9H,IAAI,oBAAoB,GAAW,4BAAU,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YACjE,IAAI,kBAAkB,GAAW,0BAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAC3D,IAAI,IAAI,GAAG,aAAa,CAAC;YACzB,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAsC,IAAI,EAAE,EAAE,OAAO,EAAE,oBAAoB,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,CAAC,CAAC;YAC7J,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IACK,GAAG,CAAC,EAAU;;YAEhB,IAAI,IAAI,GAAG,UAAU,EAAE,EAAE,CAAC;YAC1B,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAW,IAAI,EAAE,EAAE,CAAC,CAAC;YACnD,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IACK,MAAM,CAAC,IAAmB;;YAE5B,IAAI,IAAI,GAAG,QAAQ,CAAC;YACpB,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAW,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;YAC1D,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IACK,MAAM,CAAC,EAAU,EAAE,IAAmB;;YAExC,IAAI,IAAI,GAAG,UAAU,EAAE,EAAE,CAAC;YAC1B,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAW,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;YACzD,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IACK,MAAM,CAAC,EAAU;;YAEnB,IAAI,IAAI,GAAG,UAAU,EAAE,EAAE,CAAC;YAC1B,MAAM,IAAI,CAAC,OAAO,CAAO,IAAI,EAAE,EAAE,CAAC,CAAC;QACvC,CAAC;KAAA;CACJ;AA1CD,gEA0CC;AAAA,CAAC"}
|
|
@@ -2,10 +2,11 @@ import { AlarmCategoryRow } from "./row/AlarmCategoryRow";
|
|
|
2
2
|
import { EntityCategoryInputRow } from "./row/EntityCategoryInputRow";
|
|
3
3
|
import { FilterItem } from "namirasoft-core";
|
|
4
4
|
import { NamirasoftAlarmServerBase } from "./NamirasoftAlarmServerBase";
|
|
5
|
+
import { SortItem } from "namirasoft-core";
|
|
5
6
|
import { TokenManager } from "namirasoft-account";
|
|
6
7
|
export declare class NamirasoftAlarmServerAlarmCategory extends NamirasoftAlarmServerBase {
|
|
7
8
|
constructor(base_url: string, manager: TokenManager, onError: (error: Error) => void);
|
|
8
|
-
List(filters: FilterItem[] | null, page: (number | null), size: (number | null), user_id: (string | null)): Promise<{
|
|
9
|
+
List(filters: FilterItem[] | null, page: (number | null), size: (number | null), sorts: SortItem[], user_id: (string | null)): Promise<{
|
|
9
10
|
rows: AlarmCategoryRow[];
|
|
10
11
|
count: number;
|
|
11
12
|
}>;
|
|
@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.NamirasoftAlarmServerAlarmCategory = void 0;
|
|
13
13
|
const namirasoft_core_1 = require("namirasoft-core");
|
|
14
14
|
const NamirasoftAlarmServerBase_1 = require("./NamirasoftAlarmServerBase");
|
|
15
|
+
const namirasoft_core_2 = require("namirasoft-core");
|
|
15
16
|
class NamirasoftAlarmServerAlarmCategory extends NamirasoftAlarmServerBase_1.NamirasoftAlarmServerBase {
|
|
16
17
|
constructor(base_url, manager, onError) {
|
|
17
18
|
super(base_url, manager, onError);
|
|
@@ -20,11 +21,12 @@ class NamirasoftAlarmServerAlarmCategory extends NamirasoftAlarmServerBase_1.Nam
|
|
|
20
21
|
this.Create = this.Create.bind(this);
|
|
21
22
|
this.Delete = this.Delete.bind(this);
|
|
22
23
|
}
|
|
23
|
-
List(filters, page, size, user_id) {
|
|
24
|
+
List(filters, page, size, sorts, user_id) {
|
|
24
25
|
return __awaiter(this, void 0, void 0, function* () {
|
|
25
26
|
let filters_string_value = namirasoft_core_1.FilterItem.stringify(filters);
|
|
27
|
+
let sorts_string_value = namirasoft_core_2.SortItem.stringify(sorts);
|
|
26
28
|
let path = `alarm/category/list`;
|
|
27
|
-
let { data } = yield this._get(path, { filters: filters_string_value, page, size, user_id });
|
|
29
|
+
let { data } = yield this._get(path, { filters: filters_string_value, page, size, sorts: sorts_string_value, user_id });
|
|
28
30
|
return data;
|
|
29
31
|
});
|
|
30
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NamirasoftAlarmServerAlarmCategory.js","sourceRoot":"","sources":["../src/NamirasoftAlarmServerAlarmCategory.ts"],"names":[],"mappings":";;;;;;;;;;;;AAsBA,qDAA6C;AAC7C,2EAAwE;
|
|
1
|
+
{"version":3,"file":"NamirasoftAlarmServerAlarmCategory.js","sourceRoot":"","sources":["../src/NamirasoftAlarmServerAlarmCategory.ts"],"names":[],"mappings":";;;;;;;;;;;;AAsBA,qDAA6C;AAC7C,2EAAwE;AACxE,qDAA2C;AAG3C,MAAa,kCAAmC,SAAQ,qDAAyB;IAE7E,YAAY,QAAgB,EAAE,OAAqB,EAAE,OAA+B;QAEhF,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAClC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IACK,IAAI,CAAC,OAA4B,EAAE,IAAqB,EAAE,IAAqB,EAAE,KAAiB,EAAE,OAAwB;;YAE9H,IAAI,oBAAoB,GAAW,4BAAU,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YACjE,IAAI,kBAAkB,GAAW,0BAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAC3D,IAAI,IAAI,GAAG,qBAAqB,CAAC;YACjC,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAA8C,IAAI,EAAE,EAAE,OAAO,EAAE,oBAAoB,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,CAAC,CAAC;YACrK,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IACK,GAAG,CAAC,EAAU;;YAEhB,IAAI,IAAI,GAAG,kBAAkB,EAAE,EAAE,CAAC;YAClC,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAmB,IAAI,EAAE,EAAE,CAAC,CAAC;YAC3D,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IACK,MAAM,CAAC,IAA4B;;YAErC,IAAI,IAAI,GAAG,gBAAgB,CAAC;YAC5B,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAmB,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;YAClE,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IACK,MAAM,CAAC,EAAU;;YAEnB,IAAI,IAAI,GAAG,kBAAkB,EAAE,EAAE,CAAC;YAClC,MAAM,IAAI,CAAC,OAAO,CAAO,IAAI,EAAE,EAAE,CAAC,CAAC;QACvC,CAAC;KAAA;CACJ;AAnCD,gFAmCC;AAAA,CAAC"}
|
|
@@ -2,10 +2,11 @@ import { AlarmFieldRow } from "./row/AlarmFieldRow";
|
|
|
2
2
|
import { EntityFieldInputRow } from "./row/EntityFieldInputRow";
|
|
3
3
|
import { FilterItem } from "namirasoft-core";
|
|
4
4
|
import { NamirasoftAlarmServerBase } from "./NamirasoftAlarmServerBase";
|
|
5
|
+
import { SortItem } from "namirasoft-core";
|
|
5
6
|
import { TokenManager } from "namirasoft-account";
|
|
6
7
|
export declare class NamirasoftAlarmServerAlarmField extends NamirasoftAlarmServerBase {
|
|
7
8
|
constructor(base_url: string, manager: TokenManager, onError: (error: Error) => void);
|
|
8
|
-
List(filters: FilterItem[] | null, page: (number | null), size: (number | null), user_id: (string | null)): Promise<{
|
|
9
|
+
List(filters: FilterItem[] | null, page: (number | null), size: (number | null), sorts: SortItem[], user_id: (string | null)): Promise<{
|
|
9
10
|
rows: AlarmFieldRow[];
|
|
10
11
|
count: number;
|
|
11
12
|
}>;
|
|
@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.NamirasoftAlarmServerAlarmField = void 0;
|
|
13
13
|
const namirasoft_core_1 = require("namirasoft-core");
|
|
14
14
|
const NamirasoftAlarmServerBase_1 = require("./NamirasoftAlarmServerBase");
|
|
15
|
+
const namirasoft_core_2 = require("namirasoft-core");
|
|
15
16
|
class NamirasoftAlarmServerAlarmField extends NamirasoftAlarmServerBase_1.NamirasoftAlarmServerBase {
|
|
16
17
|
constructor(base_url, manager, onError) {
|
|
17
18
|
super(base_url, manager, onError);
|
|
@@ -21,11 +22,12 @@ class NamirasoftAlarmServerAlarmField extends NamirasoftAlarmServerBase_1.Namira
|
|
|
21
22
|
this.Update = this.Update.bind(this);
|
|
22
23
|
this.Delete = this.Delete.bind(this);
|
|
23
24
|
}
|
|
24
|
-
List(filters, page, size, user_id) {
|
|
25
|
+
List(filters, page, size, sorts, user_id) {
|
|
25
26
|
return __awaiter(this, void 0, void 0, function* () {
|
|
26
27
|
let filters_string_value = namirasoft_core_1.FilterItem.stringify(filters);
|
|
28
|
+
let sorts_string_value = namirasoft_core_2.SortItem.stringify(sorts);
|
|
27
29
|
let path = `alarm/field/list`;
|
|
28
|
-
let { data } = yield this._get(path, { filters: filters_string_value, page, size, user_id });
|
|
30
|
+
let { data } = yield this._get(path, { filters: filters_string_value, page, size, sorts: sorts_string_value, user_id });
|
|
29
31
|
return data;
|
|
30
32
|
});
|
|
31
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NamirasoftAlarmServerAlarmField.js","sourceRoot":"","sources":["../src/NamirasoftAlarmServerAlarmField.ts"],"names":[],"mappings":";;;;;;;;;;;;AAsBA,qDAA6C;AAC7C,2EAAwE;
|
|
1
|
+
{"version":3,"file":"NamirasoftAlarmServerAlarmField.js","sourceRoot":"","sources":["../src/NamirasoftAlarmServerAlarmField.ts"],"names":[],"mappings":";;;;;;;;;;;;AAsBA,qDAA6C;AAC7C,2EAAwE;AACxE,qDAA2C;AAG3C,MAAa,+BAAgC,SAAQ,qDAAyB;IAE1E,YAAY,QAAgB,EAAE,OAAqB,EAAE,OAA+B;QAEhF,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAClC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IACK,IAAI,CAAC,OAA4B,EAAE,IAAqB,EAAE,IAAqB,EAAE,KAAiB,EAAE,OAAwB;;YAE9H,IAAI,oBAAoB,GAAW,4BAAU,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YACjE,IAAI,kBAAkB,GAAW,0BAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAC3D,IAAI,IAAI,GAAG,kBAAkB,CAAC;YAC9B,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAA2C,IAAI,EAAE,EAAE,OAAO,EAAE,oBAAoB,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,CAAC,CAAC;YAClK,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IACK,GAAG,CAAC,EAAU;;YAEhB,IAAI,IAAI,GAAG,eAAe,EAAE,EAAE,CAAC;YAC/B,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAgB,IAAI,EAAE,EAAE,CAAC,CAAC;YACxD,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IACK,MAAM,CAAC,IAAyB;;YAElC,IAAI,IAAI,GAAG,aAAa,CAAC;YACzB,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAgB,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;YAC/D,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IACK,MAAM,CAAC,EAAU,EAAE,IAAyB;;YAE9C,IAAI,IAAI,GAAG,eAAe,EAAE,EAAE,CAAC;YAC/B,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAgB,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;YAC9D,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IACK,MAAM,CAAC,EAAU;;YAEnB,IAAI,IAAI,GAAG,eAAe,EAAE,EAAE,CAAC;YAC/B,MAAM,IAAI,CAAC,OAAO,CAAO,IAAI,EAAE,EAAE,CAAC,CAAC;QACvC,CAAC;KAAA;CACJ;AA1CD,0EA0CC;AAAA,CAAC"}
|
|
@@ -2,10 +2,11 @@ import { AlarmTagRow } from "./row/AlarmTagRow";
|
|
|
2
2
|
import { EntityTagInputRow } from "./row/EntityTagInputRow";
|
|
3
3
|
import { FilterItem } from "namirasoft-core";
|
|
4
4
|
import { NamirasoftAlarmServerBase } from "./NamirasoftAlarmServerBase";
|
|
5
|
+
import { SortItem } from "namirasoft-core";
|
|
5
6
|
import { TokenManager } from "namirasoft-account";
|
|
6
7
|
export declare class NamirasoftAlarmServerAlarmTag extends NamirasoftAlarmServerBase {
|
|
7
8
|
constructor(base_url: string, manager: TokenManager, onError: (error: Error) => void);
|
|
8
|
-
List(filters: FilterItem[] | null, page: (number | null), size: (number | null), user_id: (string | null)): Promise<{
|
|
9
|
+
List(filters: FilterItem[] | null, page: (number | null), size: (number | null), sorts: SortItem[], user_id: (string | null)): Promise<{
|
|
9
10
|
rows: AlarmTagRow[];
|
|
10
11
|
count: number;
|
|
11
12
|
}>;
|
|
@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.NamirasoftAlarmServerAlarmTag = void 0;
|
|
13
13
|
const namirasoft_core_1 = require("namirasoft-core");
|
|
14
14
|
const NamirasoftAlarmServerBase_1 = require("./NamirasoftAlarmServerBase");
|
|
15
|
+
const namirasoft_core_2 = require("namirasoft-core");
|
|
15
16
|
class NamirasoftAlarmServerAlarmTag extends NamirasoftAlarmServerBase_1.NamirasoftAlarmServerBase {
|
|
16
17
|
constructor(base_url, manager, onError) {
|
|
17
18
|
super(base_url, manager, onError);
|
|
@@ -21,11 +22,12 @@ class NamirasoftAlarmServerAlarmTag extends NamirasoftAlarmServerBase_1.Namiraso
|
|
|
21
22
|
this.Update = this.Update.bind(this);
|
|
22
23
|
this.Delete = this.Delete.bind(this);
|
|
23
24
|
}
|
|
24
|
-
List(filters, page, size, user_id) {
|
|
25
|
+
List(filters, page, size, sorts, user_id) {
|
|
25
26
|
return __awaiter(this, void 0, void 0, function* () {
|
|
26
27
|
let filters_string_value = namirasoft_core_1.FilterItem.stringify(filters);
|
|
28
|
+
let sorts_string_value = namirasoft_core_2.SortItem.stringify(sorts);
|
|
27
29
|
let path = `alarm/tag/list`;
|
|
28
|
-
let { data } = yield this._get(path, { filters: filters_string_value, page, size, user_id });
|
|
30
|
+
let { data } = yield this._get(path, { filters: filters_string_value, page, size, sorts: sorts_string_value, user_id });
|
|
29
31
|
return data;
|
|
30
32
|
});
|
|
31
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NamirasoftAlarmServerAlarmTag.js","sourceRoot":"","sources":["../src/NamirasoftAlarmServerAlarmTag.ts"],"names":[],"mappings":";;;;;;;;;;;;AAsBA,qDAA6C;AAC7C,2EAAwE;
|
|
1
|
+
{"version":3,"file":"NamirasoftAlarmServerAlarmTag.js","sourceRoot":"","sources":["../src/NamirasoftAlarmServerAlarmTag.ts"],"names":[],"mappings":";;;;;;;;;;;;AAsBA,qDAA6C;AAC7C,2EAAwE;AACxE,qDAA2C;AAG3C,MAAa,6BAA8B,SAAQ,qDAAyB;IAExE,YAAY,QAAgB,EAAE,OAAqB,EAAE,OAA+B;QAEhF,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAClC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IACK,IAAI,CAAC,OAA4B,EAAE,IAAqB,EAAE,IAAqB,EAAE,KAAiB,EAAE,OAAwB;;YAE9H,IAAI,oBAAoB,GAAW,4BAAU,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YACjE,IAAI,kBAAkB,GAAW,0BAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAC3D,IAAI,IAAI,GAAG,gBAAgB,CAAC;YAC5B,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAyC,IAAI,EAAE,EAAE,OAAO,EAAE,oBAAoB,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,CAAC,CAAC;YAChK,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IACK,GAAG,CAAC,EAAU;;YAEhB,IAAI,IAAI,GAAG,aAAa,EAAE,EAAE,CAAC;YAC7B,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAc,IAAI,EAAE,EAAE,CAAC,CAAC;YACtD,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IACK,MAAM,CAAC,IAAuB;;YAEhC,IAAI,IAAI,GAAG,WAAW,CAAC;YACvB,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAc,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;YAC7D,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IACK,MAAM,CAAC,EAAU,EAAE,IAAuB;;YAE5C,IAAI,IAAI,GAAG,aAAa,EAAE,EAAE,CAAC;YAC7B,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAc,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;YAC5D,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IACK,MAAM,CAAC,EAAU;;YAEnB,IAAI,IAAI,GAAG,aAAa,EAAE,EAAE,CAAC;YAC7B,MAAM,IAAI,CAAC,OAAO,CAAO,IAAI,EAAE,EAAE,CAAC,CAAC;QACvC,CAAC;KAAA;CACJ;AA1CD,sEA0CC;AAAA,CAAC"}
|
|
@@ -4,7 +4,7 @@ exports.NamirasoftAlarmServerBase = void 0;
|
|
|
4
4
|
const namirasoft_account_1 = require("namirasoft-account");
|
|
5
5
|
class NamirasoftAlarmServerBase extends namirasoft_account_1.NamirasoftServerBase {
|
|
6
6
|
constructor(base_url, manager, onError) {
|
|
7
|
-
super(base_url, `1.4.
|
|
7
|
+
super(base_url, `1.4.5`, manager, onError);
|
|
8
8
|
}
|
|
9
9
|
}
|
|
10
10
|
exports.NamirasoftAlarmServerBase = NamirasoftAlarmServerBase;
|
|
@@ -16,7 +16,7 @@ const NamirasoftAlarmServer_1 = require("../NamirasoftAlarmServer");
|
|
|
16
16
|
const namirasoft_account_1 = require("namirasoft-account");
|
|
17
17
|
class AlarmCategoryListCommand extends namirasoft_node_cli_1.BaseFinalCommand {
|
|
18
18
|
constructor(argv) {
|
|
19
|
-
super(argv, ["filters", "page", "size", "user_id"], []);
|
|
19
|
+
super(argv, ["filters", "page", "size", "sorts", "user_id"], []);
|
|
20
20
|
}
|
|
21
21
|
exec() {
|
|
22
22
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -28,7 +28,7 @@ class AlarmCategoryListCommand extends namirasoft_node_cli_1.BaseFinalCommand {
|
|
|
28
28
|
manager.setValue(token, false);
|
|
29
29
|
let url = this.app.storage.getItem("ns-alarm-server-url");
|
|
30
30
|
let server = new NamirasoftAlarmServer_1.NamirasoftAlarmServer(url, manager, e => this.app.logger.error(e.message));
|
|
31
|
-
let ans = yield server.alarmcategory.List(this.arg_values[0], this.arg_values[1], this.arg_values[2], this.arg_values[3]);
|
|
31
|
+
let ans = yield server.alarmcategory.List(this.arg_values[0], this.arg_values[1], this.arg_values[2], this.arg_values[3], this.arg_values[4]);
|
|
32
32
|
this.app.logger.success(JSON.stringify(ans));
|
|
33
33
|
});
|
|
34
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AlarmCategoryListCommand.js","sourceRoot":"","sources":["../../src/command/AlarmCategoryListCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;AAoBA,6DAAuD;AACvD,qDAAiD;AACjD,oEAAiE;AACjE,2DAAkD;AAElD,MAAa,wBAAyB,SAAQ,sCAAgB;IAE1D,YAAY,IAAc;QAEtB,KAAK,CAAC,IAAI,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"AlarmCategoryListCommand.js","sourceRoot":"","sources":["../../src/command/AlarmCategoryListCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;AAoBA,6DAAuD;AACvD,qDAAiD;AACjD,oEAAiE;AACjE,2DAAkD;AAElD,MAAa,wBAAyB,SAAQ,sCAAgB;IAE1D,YAAY,IAAc;QAEtB,KAAK,CAAC,IAAI,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;IACrE,CAAC;IACc,IAAI;;YAEf,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YAC3C,IAAI,KAAK,IAAI,IAAI;gBACb,MAAM,IAAI,KAAK,CAAC,iHAAiH,CAAC,CAAC;YACvI,IAAI,OAAO,GAAG,IAAI,gCAAc,EAAE,CAAC;YACnC,IAAI,OAAO,GAAG,IAAI,iCAAY,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;YACnD,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAC/B,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;YAC1D,IAAI,MAAM,GAAG,IAAI,6CAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YAC5F,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9I,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;QACjD,CAAC;KAAA;CACJ;AAnBD,4DAmBC;AAAA,CAAC"}
|
|
@@ -16,7 +16,7 @@ const NamirasoftAlarmServer_1 = require("../NamirasoftAlarmServer");
|
|
|
16
16
|
const namirasoft_account_1 = require("namirasoft-account");
|
|
17
17
|
class AlarmFieldListCommand extends namirasoft_node_cli_1.BaseFinalCommand {
|
|
18
18
|
constructor(argv) {
|
|
19
|
-
super(argv, ["filters", "page", "size", "user_id"], []);
|
|
19
|
+
super(argv, ["filters", "page", "size", "sorts", "user_id"], []);
|
|
20
20
|
}
|
|
21
21
|
exec() {
|
|
22
22
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -28,7 +28,7 @@ class AlarmFieldListCommand extends namirasoft_node_cli_1.BaseFinalCommand {
|
|
|
28
28
|
manager.setValue(token, false);
|
|
29
29
|
let url = this.app.storage.getItem("ns-alarm-server-url");
|
|
30
30
|
let server = new NamirasoftAlarmServer_1.NamirasoftAlarmServer(url, manager, e => this.app.logger.error(e.message));
|
|
31
|
-
let ans = yield server.alarmfield.List(this.arg_values[0], this.arg_values[1], this.arg_values[2], this.arg_values[3]);
|
|
31
|
+
let ans = yield server.alarmfield.List(this.arg_values[0], this.arg_values[1], this.arg_values[2], this.arg_values[3], this.arg_values[4]);
|
|
32
32
|
this.app.logger.success(JSON.stringify(ans));
|
|
33
33
|
});
|
|
34
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AlarmFieldListCommand.js","sourceRoot":"","sources":["../../src/command/AlarmFieldListCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;AAoBA,6DAAuD;AACvD,qDAAiD;AACjD,oEAAiE;AACjE,2DAAkD;AAElD,MAAa,qBAAsB,SAAQ,sCAAgB;IAEvD,YAAY,IAAc;QAEtB,KAAK,CAAC,IAAI,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"AlarmFieldListCommand.js","sourceRoot":"","sources":["../../src/command/AlarmFieldListCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;AAoBA,6DAAuD;AACvD,qDAAiD;AACjD,oEAAiE;AACjE,2DAAkD;AAElD,MAAa,qBAAsB,SAAQ,sCAAgB;IAEvD,YAAY,IAAc;QAEtB,KAAK,CAAC,IAAI,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;IACrE,CAAC;IACc,IAAI;;YAEf,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YAC3C,IAAI,KAAK,IAAI,IAAI;gBACb,MAAM,IAAI,KAAK,CAAC,iHAAiH,CAAC,CAAC;YACvI,IAAI,OAAO,GAAG,IAAI,gCAAc,EAAE,CAAC;YACnC,IAAI,OAAO,GAAG,IAAI,iCAAY,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;YACnD,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAC/B,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;YAC1D,IAAI,MAAM,GAAG,IAAI,6CAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YAC5F,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3I,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;QACjD,CAAC;KAAA;CACJ;AAnBD,sDAmBC;AAAA,CAAC"}
|
|
@@ -16,7 +16,7 @@ const NamirasoftAlarmServer_1 = require("../NamirasoftAlarmServer");
|
|
|
16
16
|
const namirasoft_account_1 = require("namirasoft-account");
|
|
17
17
|
class AlarmListCommand extends namirasoft_node_cli_1.BaseFinalCommand {
|
|
18
18
|
constructor(argv) {
|
|
19
|
-
super(argv, ["filters", "page", "size", "user_id"], []);
|
|
19
|
+
super(argv, ["filters", "page", "size", "sorts", "user_id"], []);
|
|
20
20
|
}
|
|
21
21
|
exec() {
|
|
22
22
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -28,7 +28,7 @@ class AlarmListCommand extends namirasoft_node_cli_1.BaseFinalCommand {
|
|
|
28
28
|
manager.setValue(token, false);
|
|
29
29
|
let url = this.app.storage.getItem("ns-alarm-server-url");
|
|
30
30
|
let server = new NamirasoftAlarmServer_1.NamirasoftAlarmServer(url, manager, e => this.app.logger.error(e.message));
|
|
31
|
-
let ans = yield server.alarm.List(this.arg_values[0], this.arg_values[1], this.arg_values[2], this.arg_values[3]);
|
|
31
|
+
let ans = yield server.alarm.List(this.arg_values[0], this.arg_values[1], this.arg_values[2], this.arg_values[3], this.arg_values[4]);
|
|
32
32
|
this.app.logger.success(JSON.stringify(ans));
|
|
33
33
|
});
|
|
34
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AlarmListCommand.js","sourceRoot":"","sources":["../../src/command/AlarmListCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;AAoBA,6DAAuD;AACvD,qDAAiD;AACjD,oEAAiE;AACjE,2DAAkD;AAElD,MAAa,gBAAiB,SAAQ,sCAAgB;IAElD,YAAY,IAAc;QAEtB,KAAK,CAAC,IAAI,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"AlarmListCommand.js","sourceRoot":"","sources":["../../src/command/AlarmListCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;AAoBA,6DAAuD;AACvD,qDAAiD;AACjD,oEAAiE;AACjE,2DAAkD;AAElD,MAAa,gBAAiB,SAAQ,sCAAgB;IAElD,YAAY,IAAc;QAEtB,KAAK,CAAC,IAAI,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;IACrE,CAAC;IACc,IAAI;;YAEf,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YAC3C,IAAI,KAAK,IAAI,IAAI;gBACb,MAAM,IAAI,KAAK,CAAC,iHAAiH,CAAC,CAAC;YACvI,IAAI,OAAO,GAAG,IAAI,gCAAc,EAAE,CAAC;YACnC,IAAI,OAAO,GAAG,IAAI,iCAAY,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;YACnD,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAC/B,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;YAC1D,IAAI,MAAM,GAAG,IAAI,6CAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YAC5F,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;YACtI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;QACjD,CAAC;KAAA;CACJ;AAnBD,4CAmBC;AAAA,CAAC"}
|
|
@@ -16,7 +16,7 @@ const NamirasoftAlarmServer_1 = require("../NamirasoftAlarmServer");
|
|
|
16
16
|
const namirasoft_account_1 = require("namirasoft-account");
|
|
17
17
|
class AlarmTagListCommand extends namirasoft_node_cli_1.BaseFinalCommand {
|
|
18
18
|
constructor(argv) {
|
|
19
|
-
super(argv, ["filters", "page", "size", "user_id"], []);
|
|
19
|
+
super(argv, ["filters", "page", "size", "sorts", "user_id"], []);
|
|
20
20
|
}
|
|
21
21
|
exec() {
|
|
22
22
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -28,7 +28,7 @@ class AlarmTagListCommand extends namirasoft_node_cli_1.BaseFinalCommand {
|
|
|
28
28
|
manager.setValue(token, false);
|
|
29
29
|
let url = this.app.storage.getItem("ns-alarm-server-url");
|
|
30
30
|
let server = new NamirasoftAlarmServer_1.NamirasoftAlarmServer(url, manager, e => this.app.logger.error(e.message));
|
|
31
|
-
let ans = yield server.alarmtag.List(this.arg_values[0], this.arg_values[1], this.arg_values[2], this.arg_values[3]);
|
|
31
|
+
let ans = yield server.alarmtag.List(this.arg_values[0], this.arg_values[1], this.arg_values[2], this.arg_values[3], this.arg_values[4]);
|
|
32
32
|
this.app.logger.success(JSON.stringify(ans));
|
|
33
33
|
});
|
|
34
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AlarmTagListCommand.js","sourceRoot":"","sources":["../../src/command/AlarmTagListCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;AAoBA,6DAAuD;AACvD,qDAAiD;AACjD,oEAAiE;AACjE,2DAAkD;AAElD,MAAa,mBAAoB,SAAQ,sCAAgB;IAErD,YAAY,IAAc;QAEtB,KAAK,CAAC,IAAI,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"AlarmTagListCommand.js","sourceRoot":"","sources":["../../src/command/AlarmTagListCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;AAoBA,6DAAuD;AACvD,qDAAiD;AACjD,oEAAiE;AACjE,2DAAkD;AAElD,MAAa,mBAAoB,SAAQ,sCAAgB;IAErD,YAAY,IAAc;QAEtB,KAAK,CAAC,IAAI,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;IACrE,CAAC;IACc,IAAI;;YAEf,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YAC3C,IAAI,KAAK,IAAI,IAAI;gBACb,MAAM,IAAI,KAAK,CAAC,iHAAiH,CAAC,CAAC;YACvI,IAAI,OAAO,GAAG,IAAI,gCAAc,EAAE,CAAC;YACnC,IAAI,OAAO,GAAG,IAAI,iCAAY,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;YACnD,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAC/B,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;YAC1D,IAAI,MAAM,GAAG,IAAI,6CAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YAC5F,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;YACzI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;QACjD,CAAC;KAAA;CACJ;AAnBD,kDAmBC;AAAA,CAAC"}
|
package/package.json
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
"framework": "npm",
|
|
9
9
|
"application": "package",
|
|
10
10
|
"private": false,
|
|
11
|
-
"version": "1.4.
|
|
11
|
+
"version": "1.4.5",
|
|
12
12
|
"author": "Amir Abolhasani",
|
|
13
13
|
"license": "MIT",
|
|
14
14
|
"main": "./dist/index.js",
|
|
@@ -17,10 +17,10 @@
|
|
|
17
17
|
"build": ""
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"namirasoft-core": "^1.4.
|
|
20
|
+
"namirasoft-core": "^1.4.14",
|
|
21
21
|
"namirasoft-site": "^1.4.0",
|
|
22
22
|
"namirasoft-node-cli": "^1.4.4",
|
|
23
|
-
"namirasoft-account": "^1.4.
|
|
23
|
+
"namirasoft-account": "^1.4.23"
|
|
24
24
|
},
|
|
25
25
|
"bin": {
|
|
26
26
|
"ns-alarm": "./dist/command/cli.js"
|
|
@@ -22,6 +22,7 @@ import { AlarmInputRow } from "./row/AlarmInputRow";
|
|
|
22
22
|
import { AlarmRow } from "./row/AlarmRow";
|
|
23
23
|
import { FilterItem } from "namirasoft-core";
|
|
24
24
|
import { NamirasoftAlarmServerBase } from "./NamirasoftAlarmServerBase";
|
|
25
|
+
import { SortItem } from "namirasoft-core";
|
|
25
26
|
import { TokenManager } from "namirasoft-account";
|
|
26
27
|
|
|
27
28
|
export class NamirasoftAlarmServerAlarm extends NamirasoftAlarmServerBase
|
|
@@ -35,11 +36,12 @@ export class NamirasoftAlarmServerAlarm extends NamirasoftAlarmServerBase
|
|
|
35
36
|
this.Update = this.Update.bind(this);
|
|
36
37
|
this.Delete = this.Delete.bind(this);
|
|
37
38
|
}
|
|
38
|
-
async List(filters: FilterItem[] | null, page: (number | null), size: (number | null), user_id: (string | null)): Promise<{ rows: AlarmRow[], count: number }>
|
|
39
|
+
async List(filters: FilterItem[] | null, page: (number | null), size: (number | null), sorts: SortItem[], user_id: (string | null)): Promise<{ rows: AlarmRow[], count: number }>
|
|
39
40
|
{
|
|
40
41
|
let filters_string_value: string = FilterItem.stringify(filters);
|
|
42
|
+
let sorts_string_value: string = SortItem.stringify(sorts);
|
|
41
43
|
let path = `/alarm/list`;
|
|
42
|
-
let { data } = await this._get<{ rows: AlarmRow[], count: number }>(path, { filters: filters_string_value, page, size, user_id });
|
|
44
|
+
let { data } = await this._get<{ rows: AlarmRow[], count: number }>(path, { filters: filters_string_value, page, size, sorts: sorts_string_value, user_id });
|
|
43
45
|
return data;
|
|
44
46
|
}
|
|
45
47
|
async Get(id: string): Promise<AlarmRow>
|
|
@@ -22,6 +22,7 @@ import { AlarmCategoryRow } from "./row/AlarmCategoryRow";
|
|
|
22
22
|
import { EntityCategoryInputRow } from "./row/EntityCategoryInputRow";
|
|
23
23
|
import { FilterItem } from "namirasoft-core";
|
|
24
24
|
import { NamirasoftAlarmServerBase } from "./NamirasoftAlarmServerBase";
|
|
25
|
+
import { SortItem } from "namirasoft-core";
|
|
25
26
|
import { TokenManager } from "namirasoft-account";
|
|
26
27
|
|
|
27
28
|
export class NamirasoftAlarmServerAlarmCategory extends NamirasoftAlarmServerBase
|
|
@@ -34,11 +35,12 @@ export class NamirasoftAlarmServerAlarmCategory extends NamirasoftAlarmServerBas
|
|
|
34
35
|
this.Create = this.Create.bind(this);
|
|
35
36
|
this.Delete = this.Delete.bind(this);
|
|
36
37
|
}
|
|
37
|
-
async List(filters: FilterItem[] | null, page: (number | null), size: (number | null), user_id: (string | null)): Promise<{ rows: AlarmCategoryRow[], count: number }>
|
|
38
|
+
async List(filters: FilterItem[] | null, page: (number | null), size: (number | null), sorts: SortItem[], user_id: (string | null)): Promise<{ rows: AlarmCategoryRow[], count: number }>
|
|
38
39
|
{
|
|
39
40
|
let filters_string_value: string = FilterItem.stringify(filters);
|
|
41
|
+
let sorts_string_value: string = SortItem.stringify(sorts);
|
|
40
42
|
let path = `alarm/category/list`;
|
|
41
|
-
let { data } = await this._get<{ rows: AlarmCategoryRow[], count: number }>(path, { filters: filters_string_value, page, size, user_id });
|
|
43
|
+
let { data } = await this._get<{ rows: AlarmCategoryRow[], count: number }>(path, { filters: filters_string_value, page, size, sorts: sorts_string_value, user_id });
|
|
42
44
|
return data;
|
|
43
45
|
}
|
|
44
46
|
async Get(id: string): Promise<AlarmCategoryRow>
|
|
@@ -22,6 +22,7 @@ import { AlarmFieldRow } from "./row/AlarmFieldRow";
|
|
|
22
22
|
import { EntityFieldInputRow } from "./row/EntityFieldInputRow";
|
|
23
23
|
import { FilterItem } from "namirasoft-core";
|
|
24
24
|
import { NamirasoftAlarmServerBase } from "./NamirasoftAlarmServerBase";
|
|
25
|
+
import { SortItem } from "namirasoft-core";
|
|
25
26
|
import { TokenManager } from "namirasoft-account";
|
|
26
27
|
|
|
27
28
|
export class NamirasoftAlarmServerAlarmField extends NamirasoftAlarmServerBase
|
|
@@ -35,11 +36,12 @@ export class NamirasoftAlarmServerAlarmField extends NamirasoftAlarmServerBase
|
|
|
35
36
|
this.Update = this.Update.bind(this);
|
|
36
37
|
this.Delete = this.Delete.bind(this);
|
|
37
38
|
}
|
|
38
|
-
async List(filters: FilterItem[] | null, page: (number | null), size: (number | null), user_id: (string | null)): Promise<{ rows: AlarmFieldRow[], count: number }>
|
|
39
|
+
async List(filters: FilterItem[] | null, page: (number | null), size: (number | null), sorts: SortItem[], user_id: (string | null)): Promise<{ rows: AlarmFieldRow[], count: number }>
|
|
39
40
|
{
|
|
40
41
|
let filters_string_value: string = FilterItem.stringify(filters);
|
|
42
|
+
let sorts_string_value: string = SortItem.stringify(sorts);
|
|
41
43
|
let path = `alarm/field/list`;
|
|
42
|
-
let { data } = await this._get<{ rows: AlarmFieldRow[], count: number }>(path, { filters: filters_string_value, page, size, user_id });
|
|
44
|
+
let { data } = await this._get<{ rows: AlarmFieldRow[], count: number }>(path, { filters: filters_string_value, page, size, sorts: sorts_string_value, user_id });
|
|
43
45
|
return data;
|
|
44
46
|
}
|
|
45
47
|
async Get(id: string): Promise<AlarmFieldRow>
|
|
@@ -22,6 +22,7 @@ import { AlarmTagRow } from "./row/AlarmTagRow";
|
|
|
22
22
|
import { EntityTagInputRow } from "./row/EntityTagInputRow";
|
|
23
23
|
import { FilterItem } from "namirasoft-core";
|
|
24
24
|
import { NamirasoftAlarmServerBase } from "./NamirasoftAlarmServerBase";
|
|
25
|
+
import { SortItem } from "namirasoft-core";
|
|
25
26
|
import { TokenManager } from "namirasoft-account";
|
|
26
27
|
|
|
27
28
|
export class NamirasoftAlarmServerAlarmTag extends NamirasoftAlarmServerBase
|
|
@@ -35,11 +36,12 @@ export class NamirasoftAlarmServerAlarmTag extends NamirasoftAlarmServerBase
|
|
|
35
36
|
this.Update = this.Update.bind(this);
|
|
36
37
|
this.Delete = this.Delete.bind(this);
|
|
37
38
|
}
|
|
38
|
-
async List(filters: FilterItem[] | null, page: (number | null), size: (number | null), user_id: (string | null)): Promise<{ rows: AlarmTagRow[], count: number }>
|
|
39
|
+
async List(filters: FilterItem[] | null, page: (number | null), size: (number | null), sorts: SortItem[], user_id: (string | null)): Promise<{ rows: AlarmTagRow[], count: number }>
|
|
39
40
|
{
|
|
40
41
|
let filters_string_value: string = FilterItem.stringify(filters);
|
|
42
|
+
let sorts_string_value: string = SortItem.stringify(sorts);
|
|
41
43
|
let path = `alarm/tag/list`;
|
|
42
|
-
let { data } = await this._get<{ rows: AlarmTagRow[], count: number }>(path, { filters: filters_string_value, page, size, user_id });
|
|
44
|
+
let { data } = await this._get<{ rows: AlarmTagRow[], count: number }>(path, { filters: filters_string_value, page, size, sorts: sorts_string_value, user_id });
|
|
43
45
|
return data;
|
|
44
46
|
}
|
|
45
47
|
async Get(id: string): Promise<AlarmTagRow>
|
|
@@ -25,6 +25,6 @@ export class NamirasoftAlarmServerBase extends NamirasoftServerBase
|
|
|
25
25
|
{
|
|
26
26
|
constructor(base_url: string, manager: TokenManager, onError: (error: Error) => void)
|
|
27
27
|
{
|
|
28
|
-
super(base_url, `1.4.
|
|
28
|
+
super(base_url, `1.4.5`, manager, onError);
|
|
29
29
|
}
|
|
30
30
|
};
|
|
@@ -27,7 +27,7 @@ export class AlarmCategoryListCommand extends BaseFinalCommand
|
|
|
27
27
|
{
|
|
28
28
|
constructor(argv: string[])
|
|
29
29
|
{
|
|
30
|
-
super(argv, ["filters", "page", "size", "user_id"], []);
|
|
30
|
+
super(argv, ["filters", "page", "size", "sorts", "user_id"], []);
|
|
31
31
|
}
|
|
32
32
|
override async exec()
|
|
33
33
|
{
|
|
@@ -39,7 +39,7 @@ export class AlarmCategoryListCommand extends BaseFinalCommand
|
|
|
39
39
|
manager.setValue(token, false);
|
|
40
40
|
let url = this.app.storage.getItem("ns-alarm-server-url");
|
|
41
41
|
let server = new NamirasoftAlarmServer(url, manager, e => this.app.logger.error(e.message));
|
|
42
|
-
let ans = await server.alarmcategory.List(this.arg_values[0], this.arg_values[1], this.arg_values[2], this.arg_values[3]);
|
|
42
|
+
let ans = await server.alarmcategory.List(this.arg_values[0], this.arg_values[1], this.arg_values[2], this.arg_values[3], this.arg_values[4]);
|
|
43
43
|
this.app.logger.success(JSON.stringify(ans));
|
|
44
44
|
}
|
|
45
45
|
};
|
|
@@ -27,7 +27,7 @@ export class AlarmFieldListCommand extends BaseFinalCommand
|
|
|
27
27
|
{
|
|
28
28
|
constructor(argv: string[])
|
|
29
29
|
{
|
|
30
|
-
super(argv, ["filters", "page", "size", "user_id"], []);
|
|
30
|
+
super(argv, ["filters", "page", "size", "sorts", "user_id"], []);
|
|
31
31
|
}
|
|
32
32
|
override async exec()
|
|
33
33
|
{
|
|
@@ -39,7 +39,7 @@ export class AlarmFieldListCommand extends BaseFinalCommand
|
|
|
39
39
|
manager.setValue(token, false);
|
|
40
40
|
let url = this.app.storage.getItem("ns-alarm-server-url");
|
|
41
41
|
let server = new NamirasoftAlarmServer(url, manager, e => this.app.logger.error(e.message));
|
|
42
|
-
let ans = await server.alarmfield.List(this.arg_values[0], this.arg_values[1], this.arg_values[2], this.arg_values[3]);
|
|
42
|
+
let ans = await server.alarmfield.List(this.arg_values[0], this.arg_values[1], this.arg_values[2], this.arg_values[3], this.arg_values[4]);
|
|
43
43
|
this.app.logger.success(JSON.stringify(ans));
|
|
44
44
|
}
|
|
45
45
|
};
|
|
@@ -27,7 +27,7 @@ export class AlarmListCommand extends BaseFinalCommand
|
|
|
27
27
|
{
|
|
28
28
|
constructor(argv: string[])
|
|
29
29
|
{
|
|
30
|
-
super(argv, ["filters", "page", "size", "user_id"], []);
|
|
30
|
+
super(argv, ["filters", "page", "size", "sorts", "user_id"], []);
|
|
31
31
|
}
|
|
32
32
|
override async exec()
|
|
33
33
|
{
|
|
@@ -39,7 +39,7 @@ export class AlarmListCommand extends BaseFinalCommand
|
|
|
39
39
|
manager.setValue(token, false);
|
|
40
40
|
let url = this.app.storage.getItem("ns-alarm-server-url");
|
|
41
41
|
let server = new NamirasoftAlarmServer(url, manager, e => this.app.logger.error(e.message));
|
|
42
|
-
let ans = await server.alarm.List(this.arg_values[0], this.arg_values[1], this.arg_values[2], this.arg_values[3]);
|
|
42
|
+
let ans = await server.alarm.List(this.arg_values[0], this.arg_values[1], this.arg_values[2], this.arg_values[3], this.arg_values[4]);
|
|
43
43
|
this.app.logger.success(JSON.stringify(ans));
|
|
44
44
|
}
|
|
45
45
|
};
|
|
@@ -27,7 +27,7 @@ export class AlarmTagListCommand extends BaseFinalCommand
|
|
|
27
27
|
{
|
|
28
28
|
constructor(argv: string[])
|
|
29
29
|
{
|
|
30
|
-
super(argv, ["filters", "page", "size", "user_id"], []);
|
|
30
|
+
super(argv, ["filters", "page", "size", "sorts", "user_id"], []);
|
|
31
31
|
}
|
|
32
32
|
override async exec()
|
|
33
33
|
{
|
|
@@ -39,7 +39,7 @@ export class AlarmTagListCommand extends BaseFinalCommand
|
|
|
39
39
|
manager.setValue(token, false);
|
|
40
40
|
let url = this.app.storage.getItem("ns-alarm-server-url");
|
|
41
41
|
let server = new NamirasoftAlarmServer(url, manager, e => this.app.logger.error(e.message));
|
|
42
|
-
let ans = await server.alarmtag.List(this.arg_values[0], this.arg_values[1], this.arg_values[2], this.arg_values[3]);
|
|
42
|
+
let ans = await server.alarmtag.List(this.arg_values[0], this.arg_values[1], this.arg_values[2], this.arg_values[3], this.arg_values[4]);
|
|
43
43
|
this.app.logger.success(JSON.stringify(ans));
|
|
44
44
|
}
|
|
45
45
|
};
|